Version bump.

Package-Manager: portage-2.1.4_rc12
RepoMan-Options: --force

4 files changed, 142 insertions, 18 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 2679a598a3d4..bc01f248126d 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/netpbm
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.175 2007/12/08 07:26:03 vapier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.176 2008/01/01 12:37:55 vapier Exp $
+
+*netpbm-10.26.48 (01 Jan 2008)
+
+  01 Jan 2008; Mike Frysinger <vapier@gentoo.org> +netpbm-10.26.48.ebuild:
+  Version bump.
 
 *netpbm-10.26.47 (08 Dec 2007)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 3ca98baf5c8f..27a4b9aa51d4 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -21,20 +21,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.46.tgz 2542956 RMD160 f4d1d727e0cdf54f6e523037bd51438fbebf257f SHA1 6b4e779d3d33c73846adebec59ff6a866b2d76b6 SHA256 bd256d988eafef7d00a200df75fb26f1600d42497dc81ab55d108e7ca96d4a8f
 DIST netpbm-10.26.47.tgz 2543079 RMD160 cf264041ee3a344bab7f833879410c5670e984ee SHA1 9e4d9e90cafada5fb31caa98d719e1a0a93518ca SHA256 6781fc53cafce995282f217121773bde670b1ac4d4ffc34ba34be469372ed6fc
+DIST netpbm-10.26.48.tgz 2543576 RMD160 af02e50ddba9b5012a75b5475ab933a9b1e6a1c5 SHA1 01e6fdf65fe40551f910118541514152485c1c2a SHA256 7f2d659a79e6b23521b2bc4309dc1ecf69674273184ab3dcb8578110850d60d3
 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.37.0.tar.bz2 2097635 RMD160 240759eebb9eb7619019d55fdd5fcf7f548f6512 SHA1 73ac4325930d6d0a3779f33879e8bbf0402c4e9b SHA256 5107920e6adbecc0511f5d7c24224abc98b5872a6ce48074537314ecd83a7952
 DIST netpbm-10.40.0.tar.bz2 2126805 RMD160 17057c1bb90c90080a83726a60cc69fa0084022b SHA1 2b4c1346e142d7310f266918702121198d10f5dd SHA256 b30e71386211d6e144706c673ede113dcf11f5b481abd5836285b021800e33c7
-EBUILD netpbm-10.26.46.ebuild 2888 RMD160 fe302638c7de882d21ce4ff8b3b276ddfc39b0a1 SHA1 0d41eb814668ec9f822a693b38263ef73cba52cb SHA256 127e6da7afac00e06149bb8976dccda68a0da840db069805c73b8c141a68c251
-MD5 2c0eba36ac529f954aece26af37ba69a netpbm-10.26.46.ebuild 2888
-RMD160 fe302638c7de882d21ce4ff8b3b276ddfc39b0a1 netpbm-10.26.46.ebuild 2888
-SHA256 127e6da7afac00e06149bb8976dccda68a0da840db069805c73b8c141a68c251 netpbm-10.26.46.ebuild 2888
 EBUILD netpbm-10.26.47.ebuild 2888 RMD160 514b6db3db5f5e345b3f84a5be366cdc03441667 SHA1 2988f6ba8eece2cbf775f20b1f166522a5ef4350 SHA256 b050e10076806f714ee9ae91bbcd21670368e931b352034e3c729f335d3f97b4
 MD5 f8ffb02883e82d5d86d60ea730502ea4 netpbm-10.26.47.ebuild 2888
 RMD160 514b6db3db5f5e345b3f84a5be366cdc03441667 netpbm-10.26.47.ebuild 2888
 SHA256 b050e10076806f714ee9ae91bbcd21670368e931b352034e3c729f335d3f97b4 netpbm-10.26.47.ebuild 2888
+EBUILD netpbm-10.26.48.ebuild 2888 RMD160 a77d1452bc8566b0437a08bdc18cd9fc86245900 SHA1 e908f37a8f983ede4bfd999dffebddff26151ce9 SHA256 4c3e32d42c6371c75983b4afb13f85ce7249605e836c9af1f5f775cedc08b8f9
+MD5 f2bdc6f0cbef00a95636d6c353d885c4 netpbm-10.26.48.ebuild 2888
+RMD160 a77d1452bc8566b0437a08bdc18cd9fc86245900 netpbm-10.26.48.ebuild 2888
+SHA256 4c3e32d42c6371c75983b4afb13f85ce7249605e836c9af1f5f775cedc08b8f9 netpbm-10.26.48.ebuild 2888
 EBUILD netpbm-10.37.0.ebuild 3176 RMD160 c845bcb06d679218d0c5f1ad803c9cd879ad3410 SHA1 e5582dce796933d3a4049a07befaf3aeac9628a0 SHA256 5f273a533588bd933701d2e3efabc034701a9c1e01085a7d810646f2f07676b6
 MD5 26490d70103fb5a3cf0060660ab007c4 netpbm-10.37.0.ebuild 3176
 RMD160 c845bcb06d679218d0c5f1ad803c9cd879ad3410 netpbm-10.37.0.ebuild 3176
@@ -43,20 +43,20 @@ EBUILD netpbm-10.40.0.ebuild 3176 RMD160 f55a7bb26a9e77fca095583dda37c289a27aa86
 MD5 fb7b334b1d4e7c5ef23248d185c51a56 netpbm-10.40.0.ebuild 3176
 RMD160 f55a7bb26a9e77fca095583dda37c289a27aa865 netpbm-10.40.0.ebuild 3176
 SHA256 1d2aa91e2ce566a2129541b4a545164ea70b40784b9054062ba2bd8fb8c49bf7 netpbm-10.40.0.ebuild 3176
-MISC ChangeLog 24019 RMD160 b420ac6f1c4b23ebbaea5a03d14732982b2e21fe SHA1 5976847702c91572d59d57d7c68e87e3af07af15 SHA256 744a80bd78055a8052d93d6f949544331f95b3de3e51b1c91f70c0daf02e5641
-MD5 6b61e05f40b6a8ddf7fa8f073e87ab7c ChangeLog 24019
-RMD160 b420ac6f1c4b23ebbaea5a03d14732982b2e21fe ChangeLog 24019
-SHA256 744a80bd78055a8052d93d6f949544331f95b3de3e51b1c91f70c0daf02e5641 ChangeLog 24019
+MISC ChangeLog 24143 RMD160 d5e25da39f6402dd64717a2a33dc64a5ec56e2b3 SHA1 52a87369014485d039dd0014631c7d3e583ccf64 SHA256 aec2cb922333065113ae8ccc86ffde6a094ad0d914da50ed0ba30382ea320f92
+MD5 62338a6bf2a7afd3c56394480cd3dc35 ChangeLog 24143
+RMD160 d5e25da39f6402dd64717a2a33dc64a5ec56e2b3 ChangeLog 24143
+SHA256 aec2cb922333065113ae8ccc86ffde6a094ad0d914da50ed0ba30382ea320f92 ChangeLog 24143
 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 da7ef61e27feb64f370b514d00646ccd files/digest-netpbm-10.26.46 509
-RMD160 8e2343ad39f17c6196a7698e6902855c13222eb1 files/digest-netpbm-10.26.46 509
-SHA256 cbef2c3d5a919450f5b654ec8d5a75b20b67d95434429216f0aec93a43b70135 files/digest-netpbm-10.26.46 509
 MD5 af2b0c675444c94620ea7505a761d851 files/digest-netpbm-10.26.47 509
 RMD160 c8c598de0d59e8e4b34aa89e5d6ddbf7a8951777 files/digest-netpbm-10.26.47 509
 SHA256 6565223c05769ee47e7357e7889e85ff0b8b86c2da9554c14e0be5a87d1f9bec files/digest-netpbm-10.26.47 509
+MD5 4ae9788e814e125925dc3052be368d8f files/digest-netpbm-10.26.48 509
+RMD160 9b8b44cd9be84e819d16ea0670cba7fcd4202af0 files/digest-netpbm-10.26.48 509
+SHA256 6019e83e667607b6af030c726394501b30c4dcf781f3fefc9f320e26a217f918 files/digest-netpbm-10.26.48 509
 MD5 dc3c20a3170fb2f7dd1e5683409a97f7 files/digest-netpbm-10.37.0 518
 RMD160 1944d991a31e4a95ac2a3e61dc1d176ed5cbc915 files/digest-netpbm-10.37.0 518
 SHA256 a427fccacb195a5758556a0a2180efb03ea8816c0425a139b09ed36a6f96cd75 files/digest-netpbm-10.37.0 518
@@ -64,9 +64,9 @@ MD5 bec9ebb19739b8c7cae00cb2758aeda0 files/digest-netpbm-10.40.0 518
 RMD160 1b9c3b632accc2f1a3bc5e65df4ef93ab87a47cc files/digest-netpbm-10.40.0 518
 SHA256 ce8f382ecfc59e61481af532cd9afaff348eaebd39c67dc3540170e7dc2610e8 files/digest-netpbm-10.40.0 518
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHWkcRp/wUKkr7RBoRAv7NAJ9VcNcOXgkamWe+5tcyAh9SxRmJrwCgzN+G
-JXIQpKsIWCDqeuX9lc1wn9M=
-=XNQW
+iEYEARECAAYFAkd6NCkACgkQj9hvisErhMKvNQCgyLuxBb8m7yFRChq+QzqsEg/X
+q/MAn1oCGncNiJ9XuBRDFVnHToGYvnm0
+=NBsg
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.48 b/media-libs/netpbm/files/digest-netpbm-10.26.48
new file mode 100644
index 000000000000..a721823bc303
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.26.48
@@ -0,0 +1,6 @@
+MD5 627354242fe3b19ef182ee62dfdbdd84 netpbm-10.26.48.tgz 2543576
+RMD160 af02e50ddba9b5012a75b5475ab933a9b1e6a1c5 netpbm-10.26.48.tgz 2543576
+SHA256 7f2d659a79e6b23521b2bc4309dc1ecf69674273184ab3dcb8578110850d60d3 netpbm-10.26.48.tgz 2543576
+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.48.ebuild b/media-libs/netpbm/netpbm-10.26.48.ebuild
new file mode 100644
index 000000000000..01b581bc7d8b
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.26.48.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.48.ebuild,v 1.1 2008/01/01 12:37:55 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.26.45-headers.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 "${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
+}