Version bump.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 x86_64
RepoMan-Options: --force

3 files changed, 132 insertions, 4 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index cd0d151a92b7..2967932cea3b 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.192 2008/08/16 01:40:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.193 2008/09/25 22:14:56 vapier Exp $
+
+*netpbm-10.26.57 (25 Sep 2008)
+
+  25 Sep 2008; Mike Frysinger <vapier@gentoo.org> +netpbm-10.26.57.ebuild:
+  Version bump.
 
 *netpbm-10.43.00 (16 Aug 2008)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index ce8fc3cbc8f0..16ad53439b80 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,20 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX netpbm-10.30-build.patch 2276 RMD160 aa69ccc2d3e332b4fa50e33621ead91f95a124ed SHA1 d14b5144c310c9182c45cefb629f2b4e77be0058 SHA256 aa7c4dcad0fe5aa71cce357236aa859b14c3794c92c5a5b848cc31618194b174
 AUX netpbm-10.31-build.patch 1629 RMD160 4226692b199871b3bfb27a9e6fec97d8ac1a4bf6 SHA1 574bd4443c6dbd8a2508bc2d2e3096cfcc815710 SHA256 eaf363941337718390856c318c8e69114c8fb9dbcea8b07755350dbdabce6323
 AUX netpbm-10.35.0-xml2.patch 850 RMD160 426cc33a622b8641bdbff8e60a8418318cdee682 SHA1 ce767bd1a0fe861cc9d1a47fa0bb53b12b4a58cc SHA256 b36d159a7e3ec7377760f30e835b8b2bed6c00a9aa992562d50de5ddb6937847
 AUX netpbm-10.42.0-gcc43.patch 541 RMD160 4162fc8f0020941d9072ce595a4586a8a9f2159e SHA1 aebb30f5196d88acd8156f6954bf2c2903700aa3 SHA256 259f194d7d55742d2d7d0915f57814642e059890157eef1eeb3c5c2ba511ef86
-DIST netpbm-10.26.55.tgz 2544353 RMD160 e1bd68ec2ffcafef2dada06d6bf69b587c06cafd SHA1 f2944b9bf1e51989e7b01c16e40955ae1c63787a SHA256 752f3cc3f932e8eaef9f488a862648d62cc725b3791197748d228f66ddb8b91c
 DIST netpbm-10.26.56.tgz 2544411 RMD160 c10a650e18a1f629a3427a6c45f427099e8e9274 SHA1 3c452d17f73bd8820736905db8dad3d8b7b0e0bb SHA256 c2d7d5bd969d3c1a222be7bde9d782e7149b0fd63a12879b8cdb69abc8177802
+DIST netpbm-10.26.57.tgz 2544590 RMD160 69f5a44e57b21d8a45f93e8f982ef16c0d775e4e SHA1 159d297902facbbae4621e194448b01a24baf365 SHA256 59db903246d8ccff53eb6c2e0a1711b8ebf4b9bad32953e200759680d3f503e4
 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.40.0.tar.bz2 2126805 RMD160 17057c1bb90c90080a83726a60cc69fa0084022b SHA1 2b4c1346e142d7310f266918702121198d10f5dd SHA256 b30e71386211d6e144706c673ede113dcf11f5b481abd5836285b021800e33c7
 DIST netpbm-10.41.0.tar.lzma 1859778 RMD160 13ce996b6edbcd8602fc830a1796138cfc46cdb5 SHA1 51b1abb41059b342c4a6db2224728aaf5aa20c19 SHA256 88974be8cb7fe2df15e742663855239ab8d9a7476c864b6b6a2d5a8fcf08a92d
 DIST netpbm-10.42.0.tar.lzma 1867436 RMD160 2cbf2122893aa101004aed1551e13514d7da0489 SHA1 40133c85d38e66917c790a7c2fddecd93e5d0303 SHA256 7f48b4892369de75609c15a09b1f186f9e23bf242124901ede41ab07d3883c0a
 DIST netpbm-10.43.00.tar.lzma 1870919 RMD160 ab7efe1f7239a8dba1609767e959016da9143b2f SHA1 961828c75ba6cc2afbb42a1ba12383df412daee9 SHA256 35dfd184e405bd2aa723a7ace17d70931b103c17f2aba84fd0ef614c33fe66b6
-EBUILD netpbm-10.26.55.ebuild 2895 RMD160 7831359a8d9bfd4ee4440c4095a8d34fda8eb4c4 SHA1 16d838762df6579aef3bb59be44d25a595ed5005 SHA256 b4110a55ecea1a4b00bf35c2b9b53d83dae79b92c51d2e82d5b9bb090c97172e
 EBUILD netpbm-10.26.56.ebuild 2895 RMD160 ca3f8a08b4be208241136016c442ed502fd19970 SHA1 976eec9802de5e2486fe963a68658d3eee2df872 SHA256 7f5b71fb6c4c9c78ef707eaaa83fbb5c9ad956fdbb8a2bacdab30e354744c2b8
+EBUILD netpbm-10.26.57.ebuild 2895 RMD160 d4aa80213b11acb723f8003097c21d5fb240c2ab SHA1 e01d09a377a5b1f89de33e8322cb6d1df0e939a2 SHA256 b2369ea4864fa5c9e15b13d65f62f16baec2d5b4c0faa70086a7fdaed6625c13
 EBUILD netpbm-10.40.0.ebuild 3177 RMD160 bab89a0465962ff1485d289a662ce1307d5c2a43 SHA1 f2de6fe36b480558fc353ef478687a867b90f39d SHA256 a46e59de1e8c73ebd5772ddb9853af9b35ef4ca58c2235e7f0bf86b48cf80dad
 EBUILD netpbm-10.41.0.ebuild 3910 RMD160 afb96830be2f4cde04262ad4090c1da24900efea SHA1 30241615209e93cc6e0800921a15b3c9a530a56b SHA256 d8ed0c8ea88e9b41bce0a50fcf6f88f2cd762ff7680aa6fe3423f09a2999f4ae
 EBUILD netpbm-10.42.0.ebuild 3994 RMD160 50a1c101b1b62b82ec0012e2f4985d90e7b36a6a SHA1 416633d607286a574308685bca8ebfad92ab8a4f SHA256 c34a4fa0cd5e2a576d05985262c3cf41779a61683e92953c01d2aefb21757354
 EBUILD netpbm-10.43.00.ebuild 3938 RMD160 f08fd80ebe48d4b10b5235d1eb610a550ee496e7 SHA1 3a978728af76155ae60f9e65c0f17a0b49f224d5 SHA256 c06397f85b73be95821683f6a6efcc28b111b602c41dc15222cdc0a092f8383b
-MISC ChangeLog 26083 RMD160 f7c59b6d35aa1a897bcda8fbefee6edc2cf360a7 SHA1 5eb66ee93d0e4de1b3855b122dc57dc7f865e262 SHA256 481fa51eaa53dd1473bd597129ca6998b2d53a357f5207ef0f14a2ed22b2d8f9
+MISC ChangeLog 26207 RMD160 f1d1ffe94dbcb1833934daac6db19ad12f0b65d1 SHA1 99e768f954822a13b7538f68ec3cbb59a4d9b745 SHA256 05102deb79698f12e0ca42c65cd064ed4db54aab7690d75cb956d8de6d9f12b8
 MISC metadata.xml 266 RMD160 de6149ba44458a170c3f6f6d5c015a3b4e5fe3bd SHA1 bb0d212119622779ede27328c6df989b362deac3 SHA256 4db3c087a1641cf4b8ae3750db0fb27bf8ff9a4dcbe496d1c173a9f9c04df75d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjcDWYACgkQ67wieSYcaxf4BQCfb4rWXT0/K5m94ygcD8eL/ZDD
+0rwAniHoAKyGP2KBOAQA76rdhi9Skx3i
+=YJKK
+-----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/netpbm-10.26.57.ebuild b/media-libs/netpbm/netpbm-10.26.57.ebuild
new file mode 100644
index 000000000000..475e12668479
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.26.57.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.57.ebuild,v 1.1 2008/09/25 22:14:56 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
+	epatch "${FILESDIR}"/netpbm-10.42.0-gcc43.patch #211296
+
+	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() {
+	emake 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 "${D}"/usr/include/shhopt.h
+	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
+}