Version bump.

Package-Manager: portage-2.1.2_rc2-r2

4 files changed, 138 insertions, 16 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 198491dad249..63520e2924f3 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.135 2006/11/09 08:41:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.136 2006/11/27 04:50:20 vapier Exp $
+
+*netpbm-10.26.34 (27 Nov 2006)
+
+  27 Nov 2006; Mike Frysinger <vapier@gentoo.org> +netpbm-10.26.34.ebuild:
+  Version bump.
 
   09 Nov 2006; Mike Frysinger <vapier@gentoo.org> netpbm-10.36.0.ebuild:
   Cleanup previous commit and make jbig/urt optional via USE=jbig/rle #154535.
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 0673577dc3dc..0eb1d57b6cef 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -29,20 +29,20 @@ AUX netpbm-10.35.0-xml2.patch 850 RMD160 426cc33a622b8641bdbff8e60a8418318cdee68
 MD5 1505c38760a92008a8de01390f575fdf files/netpbm-10.35.0-xml2.patch 850
 RMD160 426cc33a622b8641bdbff8e60a8418318cdee682 files/netpbm-10.35.0-xml2.patch 850
 SHA256 b36d159a7e3ec7377760f30e835b8b2bed6c00a9aa992562d50de5ddb6937847 files/netpbm-10.35.0-xml2.patch 850
-DIST netpbm-10.26.32.tgz 2541260 RMD160 16ddf6c2579d603ba5a768f2ae63a3c7168ac87c SHA1 69b05ff94e7219b4d20b1b814a121ff9534fb94c SHA256 cc6a592898626f66fa31f5d70101963a4496a3de0b8bef7bf971f1e796266a44
 DIST netpbm-10.26.33.tgz 2541213 RMD160 a158bd1660a38cc10d95a380e97f0a0588fdd707 SHA1 1b0c9c014c9610ac48975a61caf756398aeef5fd SHA256 580193a73409a41bd8ae3470bac6d69a070c9c46543ac815f68496d47be1ebc4
+DIST netpbm-10.26.34.tgz 2542179 RMD160 a8f308b7d68489b53008e60d09411ee56f30cfb4 SHA1 d37f5cecc6394a6a7c2a083f94d820060f7f9049 SHA256 d0e0ff62447908f671bad67eeb034475b541d6b5bf74661d78795772d20ae7fb
 DIST netpbm-10.30-manpages.tar.bz2 233254 RMD160 6312e1486f473f57332a5dc050a03ac1dfce7f47 SHA1 a1893e67380029ddbb76a1451833a134f4d42818 SHA256 75eb6ceaebafffb6a2d608d49f2b61c5049e5795976bbfb2d55608de1f858124
 DIST netpbm-10.33-manpages.tar.bz2 236722 RMD160 5e43836a5f4d16f1ba5ece21e9996dbe60b252ae SHA1 6c0372f540ad040771beae15a8c2015252679e5f SHA256 aa18adee4a187ad5df243cb1a7c51097dc6a7d6a8072cf6da09972b74ac5454a
 DIST netpbm-10.34.tgz 2507007 RMD160 57a596efa6cacb981135d554a72cbaffc4cfe72c SHA1 530458871f9d3dc763a1bf82f227eeb79098c601 SHA256 b1e0a35be36e763e85c68b47806e7e1abf431f68289dd108923384b77ded785b
 DIST netpbm-10.36.0.tar.bz2 2092304 RMD160 c459c167aa6829ccb44d3acee7b6d8a3250c26fc SHA1 e7a43bbaa8183c632c79dabfcbf3a5e46a4e6870 SHA256 90bbf3cab6b4e2428bcb1d0be39d238c88706dd0ba219eec6f30019d09f05013
-EBUILD netpbm-10.26.32.ebuild 2804 RMD160 8fb838fc118971f2c1661cc47fe1305ee11cd6ac SHA1 6755dd70c1c851f9322c06e7ff1e49e8bc8ce40d SHA256 3d4247790dc082cba9cd4c7ea0fdaf507814861ac80f872784408ad7bb02e261
-MD5 7bfa245922333b94df1e646fd37ab571 netpbm-10.26.32.ebuild 2804
-RMD160 8fb838fc118971f2c1661cc47fe1305ee11cd6ac netpbm-10.26.32.ebuild 2804
-SHA256 3d4247790dc082cba9cd4c7ea0fdaf507814861ac80f872784408ad7bb02e261 netpbm-10.26.32.ebuild 2804
 EBUILD netpbm-10.26.33.ebuild 2804 RMD160 33dede57ae42a85db05b22f0dcb5d85f1982a690 SHA1 070e30159573f5b0a34780616ba5245806643d06 SHA256 4e692ca3d5d1a348de43ea338a34efaaafc30843ec2146f5fca340d59698368d
 MD5 20525112009dd96239669767a96bb030 netpbm-10.26.33.ebuild 2804
 RMD160 33dede57ae42a85db05b22f0dcb5d85f1982a690 netpbm-10.26.33.ebuild 2804
 SHA256 4e692ca3d5d1a348de43ea338a34efaaafc30843ec2146f5fca340d59698368d netpbm-10.26.33.ebuild 2804
+EBUILD netpbm-10.26.34.ebuild 2804 RMD160 7ca6cd0f81afc849156d266ec09ac5d5eaa2f9e0 SHA1 1c3aca656ccad779c50a095e124d178642a372e5 SHA256 6c924704b8ee9d1f82db6b43f86028ffa5d61fb194314c8b4b36eb81333dad09
+MD5 b03e6dfbdf816e09cc5884ab0ca4dcb4 netpbm-10.26.34.ebuild 2804
+RMD160 7ca6cd0f81afc849156d266ec09ac5d5eaa2f9e0 netpbm-10.26.34.ebuild 2804
+SHA256 6c924704b8ee9d1f82db6b43f86028ffa5d61fb194314c8b4b36eb81333dad09 netpbm-10.26.34.ebuild 2804
 EBUILD netpbm-10.34.ebuild 3207 RMD160 c02448c9092821ea29ecb8c045a7906dccf547c5 SHA1 6701bc459db19057cfac64b8707de7d8c27a8d6f SHA256 202b73c0274774c0f69f03d2f4015001c71e942b1f3edcea8bde5bde16f8af9a
 MD5 bf474a5af02f5038b9fc6688242ac5fa netpbm-10.34.ebuild 3207
 RMD160 c02448c9092821ea29ecb8c045a7906dccf547c5 netpbm-10.34.ebuild 3207
@@ -51,20 +51,20 @@ EBUILD netpbm-10.36.0.ebuild 3218 RMD160 ccf9085f621c589ab329eafb1aef6be1ae38644
 MD5 b87e62654219acbec592fe5464aca988 netpbm-10.36.0.ebuild 3218
 RMD160 ccf9085f621c589ab329eafb1aef6be1ae38644c netpbm-10.36.0.ebuild 3218
 SHA256 728d5b4e14a55530c87e19427d76c3b57cee56300461b45aa8ffc195370a6785 netpbm-10.36.0.ebuild 3218
-MISC ChangeLog 19377 RMD160 953dbf6416c693c3fc2c2fff0e6a801f5fb882e2 SHA1 38aa949e90cc40b3ae605b6ef8baaf17ea71c17b SHA256 c78c10b3e414eb435acb561d8ca367e46f05897988f0f8bece9f3862ada4ef1d
-MD5 f4f26d5c0daa4b67719b16c7478f5244 ChangeLog 19377
-RMD160 953dbf6416c693c3fc2c2fff0e6a801f5fb882e2 ChangeLog 19377
-SHA256 c78c10b3e414eb435acb561d8ca367e46f05897988f0f8bece9f3862ada4ef1d ChangeLog 19377
+MISC ChangeLog 19501 RMD160 c2a74aa7351c43933f225f324e867de794fd0465 SHA1 aa11c3a4473d8d07502cbe84a8962fa97d36146f SHA256 385825a8623a96b23013615e76ebf6603102c48eb1c9f7335e9d4c794fdbddb7
+MD5 0b1359ab99fec05353e8a266ea2fdca8 ChangeLog 19501
+RMD160 c2a74aa7351c43933f225f324e867de794fd0465 ChangeLog 19501
+SHA256 385825a8623a96b23013615e76ebf6603102c48eb1c9f7335e9d4c794fdbddb7 ChangeLog 19501
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 metadata.xml 161
 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 metadata.xml 161
-MD5 d382342e2a83eabe2b2fe78afa350b3c files/digest-netpbm-10.26.32 509
-RMD160 6f05e86bc419b191e0caffea0e9cfd38dbda83e5 files/digest-netpbm-10.26.32 509
-SHA256 1fbb03dcadb341bbc9c7f7c6f650f0b1c6845b1bbf888c8d84ba06b16257d91e files/digest-netpbm-10.26.32 509
 MD5 cbacff37fe299893e092d80c9c3a91cf files/digest-netpbm-10.26.33 509
 RMD160 a5de968c4c3f874f81104ff6396b3690f6b01eae files/digest-netpbm-10.26.33 509
 SHA256 5c9800336bf1dc20b80256e77ffbce0d91ac54eebec85f8f1fc741b309cc4d56 files/digest-netpbm-10.26.33 509
+MD5 7ff394ec303d4b5894e2515c26b82632 files/digest-netpbm-10.26.34 509
+RMD160 49e1903ef4a7ea0326fd08c6a39ad458aaddd214 files/digest-netpbm-10.26.34 509
+SHA256 73584a15db98b9042b6c3a3ef4eb8da319d11fd755490cc778c2235635e32f54 files/digest-netpbm-10.26.34 509
 MD5 aa322e4cfbd60cf8ff55e2bdc716b3d3 files/digest-netpbm-10.34 500
 RMD160 40829b0750c9d553b14403a2afeb29b89ac310a2 files/digest-netpbm-10.34 500
 SHA256 02ab164f86c651741c75c27cf1b7434fbdaa1fa8db3d7caedbd3cbb4c8e51baf files/digest-netpbm-10.34 500
@@ -74,7 +74,7 @@ SHA256 602a4f958a7818b28e7d08cc5cfffea28512524b89fb499233aaedff9bc9af86 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFUunZamhnQswr0vIRAtnSAJkBs2b+sZwT0XkW3MMwVHMROVeDyQCZAbVB
-pwVMFu68i6RWuwLZkB6uYRs=
-=XMv+
+iD8DBQFFam7jamhnQswr0vIRAms7AKCpc2Qm1aSqeKQ36P0k8WmzVWIoUQCeO1+C
+XFCu9YzNmzk3rW0gYw5ydNA=
+=mqn2
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.34 b/media-libs/netpbm/files/digest-netpbm-10.26.34
new file mode 100644
index 000000000000..f59ac7185467
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.26.34
@@ -0,0 +1,6 @@
+MD5 6f2feaf1edcd03da83d018e6bc40ca16 netpbm-10.26.34.tgz 2542179
+RMD160 a8f308b7d68489b53008e60d09411ee56f30cfb4 netpbm-10.26.34.tgz 2542179
+SHA256 d0e0ff62447908f671bad67eeb034475b541d6b5bf74661d78795772d20ae7fb netpbm-10.26.34.tgz 2542179
+MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254
+RMD160 6312e1486f473f57332a5dc050a03ac1dfce7f47 netpbm-10.30-manpages.tar.bz2 233254
+SHA256 75eb6ceaebafffb6a2d608d49f2b61c5049e5795976bbfb2d55608de1f858124 netpbm-10.30-manpages.tar.bz2 233254
diff --git a/media-libs/netpbm/netpbm-10.26.34.ebuild b/media-libs/netpbm/netpbm-10.26.34.ebuild
new file mode 100644
index 000000000000..04f430fd3ad2
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.26.34.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.34.ebuild,v 1.1 2006/11/27 04:50:20 vapier Exp $
+
+inherit flag-o-matic toolchain-funcs eutils multilib
+
+MAN_VER=10.30
+DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="http://netpbm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
+	mirror://gentoo/${PN}-${MAN_VER}-manpages.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips s390 sh sparc x86"
+IUSE="svga jpeg tiff png zlib"
+
+DEPEND="jpeg? ( >=media-libs/jpeg-6b )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	png? ( >=media-libs/libpng-1.2.1 )
+	zlib? ( sys-libs/zlib )
+	svga? ( media-libs/svgalib )
+	media-libs/jbigkit
+	media-libs/jasper
+	media-libs/urt"
+
+netpbm_libtype() {
+	case ${CHOST} in
+		*-darwin*) echo dylib;;
+		*)         echo unixshared;;
+	esac
+}
+netpbm_libsuffix() {
+	local suffix=$(get_libname)
+	echo ${suffix//\.}
+}
+netpbm_ldshlib() {
+	case ${CHOST} in
+		*-darwin*) echo '-dynamiclib -install_name $(SONAME)';;
+		*)         echo '-shared -Wl,-soname,$(SONAME)';;
+	esac
+}
+netpbm_config() {
+	use $1 && echo -l${2:-$1} || echo NONE
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/netpbm-10.30-build.patch
+
+	rm -f configure
+	cp Makefile.config.in Makefile.config
+	cat >> Makefile.config <<-EOF
+	# Gentoo toolchain options
+	CC = $(tc-getCC)
+	CC_FOR_BUILD = $(tc-getBUILD_CC)
+	AR = $(tc-getAR)
+	RANLIB = $(tc-getRANLIB)
+	STRIPFLAG =
+	CFLAGS_SHLIB = -fPIC
+
+	NETPBMLIBTYPE = $(netpbm_libtype)
+	NETPBMLIBSUFFIX = $(netpbm_libsuffix)
+	LDSHLIB = $(netpbm_ldshlib)
+
+	# Gentoo build options
+	TIFFLIB = $(netpbm_config tiff)
+	JPEGLIB = $(netpbm_config jpeg)
+	PNGLIB = $(netpbm_config png)
+	ZLIB = $(netpbm_config zlib z)
+	LINUXSVGALIB = $(netpbm_config svga vga)
+
+	# Use system versions instead of bundled
+	JBIGLIB = -ljbig
+	JBIGHDR_DIR =
+	JASPERLIB = -ljasper
+	JASPERHDR_DIR =
+	URTLIB = -lrle
+	URTHDR_DIR =
+	EOF
+
+	# Sparc support ...
+	replace-flags -mcpu=ultrasparc "-mcpu=v8 -mtune=ultrasparc"
+	replace-flags -mcpu=v9 "-mcpu=v8 -mtune=v9"
+}
+
+src_install() {
+	make package pkgdir="${D}"/usr || die "make package failed"
+
+	[[ $(get_libdir) != "lib" ]] && mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
+
+	# Remove cruft that we don't need, and move around stuff we want
+	rm -f "${D}"/usr/bin/{doc.url,manweb}
+	rm -rf "${D}"/usr/man/web
+	rm -rf "${D}"/usr/link
+	rm -f "${D}"/usr/{README,VERSION,config_template,pkginfo}
+	dodir /usr/share
+	mv "${D}"/usr/man "${D}"/usr/share/
+	mv "${D}"/usr/misc "${D}"/usr/share/netpbm
+
+	dodoc README
+	cd doc
+	GLOBIGNORE='*.html:.*' dodoc *
+	dohtml -r .
+
+	cd "${WORKDIR}"/${PN}-${MAN_VER}-manpages || die
+	doman *.[0-9]
+	dodoc README* gen-netpbm-manpages
+}