Version bump.

Package-Manager: portage-2.1.2_rc1-r1

4 files changed, 138 insertions, 16 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 9ca4c5e8ee30..6e3b02e59ec5 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.132 2006/10/22 09:14:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.133 2006/10/31 10:15:10 vapier Exp $
+
+*netpbm-10.26.33 (31 Oct 2006)
+
+  31 Oct 2006; Mike Frysinger <vapier@gentoo.org> +netpbm-10.26.33.ebuild:
+  Version bump.
 
   22 Oct 2006; Mike Frysinger <vapier@gentoo.org>
   +files/netpbm-10.34-ppmtompeg.patch, netpbm-10.34.ebuild,
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 4e66ecd8616b..f402a8d3de77 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.31.tgz 2541053 RMD160 3de542779a3d4ffc5b66c1f2680d4aafe8fa7dd2 SHA1 80bcfa1dc7c54a986188e1cf0698ba0ee04af2e0 SHA256 db57e60013a73c85b721ac3429602f340d68d984cb700bb7f91ce6c5cb10f649
 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.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.31.ebuild 2804 RMD160 ec8d7970099e8dd06ca92fb7f160a00df95a0089 SHA1 7fddc8e21ee8d113508e37f355242742472cd0eb SHA256 a32f5f4e8775bfa8120fc7d593c939c33f16255f0da24bc02bca8e387738cd70
-MD5 1ee8dd04df8583b5b3296d7ceb23c1ef netpbm-10.26.31.ebuild 2804
-RMD160 ec8d7970099e8dd06ca92fb7f160a00df95a0089 netpbm-10.26.31.ebuild 2804
-SHA256 a32f5f4e8775bfa8120fc7d593c939c33f16255f0da24bc02bca8e387738cd70 netpbm-10.26.31.ebuild 2804
 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.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 3108 RMD160 a56db16611d0cc6f862ceb9fc470b212ff57b07
 MD5 7338763cbfe9b292936610dc61fcadc3 netpbm-10.36.0.ebuild 3108
 RMD160 a56db16611d0cc6f862ceb9fc470b212ff57b079 netpbm-10.36.0.ebuild 3108
 SHA256 c45b1dc64db286a75024f8e23182510684a02364891ff2433f067438a04b1793 netpbm-10.36.0.ebuild 3108
-MISC ChangeLog 18935 RMD160 fc946d6454f92a161452897eb189707201f609c7 SHA1 2fd33828e072d192b60e14940a2d4e3325fd63d5 SHA256 7ea78905583c4232064e3601f502ba2222f476fe0b8e12b0a5824086407758ce
-MD5 4a37b658280268178c18ae8b45268b4c ChangeLog 18935
-RMD160 fc946d6454f92a161452897eb189707201f609c7 ChangeLog 18935
-SHA256 7ea78905583c4232064e3601f502ba2222f476fe0b8e12b0a5824086407758ce ChangeLog 18935
+MISC ChangeLog 19059 RMD160 c7cddc07cc401fef8389372c96de0a60ea0ea6b3 SHA1 2a669dab5e086a9ad153e05bc03ad021ecde54a6 SHA256 769e27487d8f47dc3b8a8db79c485a959b8ab431718a38d6872af021a6e3b473
+MD5 bd52c83d8271c1e2bfd938c56c90896a ChangeLog 19059
+RMD160 c7cddc07cc401fef8389372c96de0a60ea0ea6b3 ChangeLog 19059
+SHA256 769e27487d8f47dc3b8a8db79c485a959b8ab431718a38d6872af021a6e3b473 ChangeLog 19059
 MISC metadata.xml 224 RMD160 b7bf7da46cd75283f29d006f5d6854890a3d8aab SHA1 222093833f902db8f97b1e4b00ad402caf7f9c78 SHA256 06e3a779a82014f8783ebfc67e1b11107bcb670aacdf1f81faa361642046ba23
 MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
 RMD160 b7bf7da46cd75283f29d006f5d6854890a3d8aab metadata.xml 224
 SHA256 06e3a779a82014f8783ebfc67e1b11107bcb670aacdf1f81faa361642046ba23 metadata.xml 224
-MD5 64668fcf286d249175ef1e10f9aa4b48 files/digest-netpbm-10.26.31 509
-RMD160 ee8be59659991b1a3641e49e56839bdf35ff7842 files/digest-netpbm-10.26.31 509
-SHA256 54aa10176140a79ae5f9a3f347725ed9719d2f70e8205d2537206ced55176f54 files/digest-netpbm-10.26.31 509
 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 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)
 
-iD8DBQFFOzaFamhnQswr0vIRAjsYAJ9cA2JlAD5tFHuBEHa+tzC2+gTz8QCgh9k5
-t7HIl09PklFsXC1Ktfue1eE=
-=Zkw5
+iD8DBQFFRyI2amhnQswr0vIRAmH7AKCBfClUi7ivWby620pkxwg03B4DZwCfUtCS
+MYTKYDFXjQcF7C91+LjGz4Q=
+=g8Bx
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.33 b/media-libs/netpbm/files/digest-netpbm-10.26.33
new file mode 100644
index 000000000000..b761225d40ef
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.26.33
@@ -0,0 +1,6 @@
+MD5 e420141313a8b40d8960c74f7ae21361 netpbm-10.26.33.tgz 2541213
+RMD160 a158bd1660a38cc10d95a380e97f0a0588fdd707 netpbm-10.26.33.tgz 2541213
+SHA256 580193a73409a41bd8ae3470bac6d69a070c9c46543ac815f68496d47be1ebc4 netpbm-10.26.33.tgz 2541213
+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.33.ebuild b/media-libs/netpbm/netpbm-10.26.33.ebuild
new file mode 100644
index 000000000000..a5b622815925
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.26.33.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.33.ebuild,v 1.1 2006/10/31 10:15:10 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
+}