Version bump.

Package-Manager: portage-2.1.2-r12

4 files changed, 151 insertions, 9 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index f5312d9df8c2..244f5cfface8 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.156 2007/02/05 12:52:35 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.157 2007/03/01 14:34:28 vapier Exp $
+
+*netpbm-10.26.40 (01 Mar 2007)
+
+  01 Mar 2007; Mike Frysinger <vapier@gentoo.org> +netpbm-10.26.40.ebuild:
+  Version bump.
 
   05 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org> netpbm-10.37.0.ebuild:
   Stable on sparc wrt #165236
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 2c63dfcde48f..50df51259ccf 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX netpbm-10.26.37-headers.patch 5913 RMD160 e11c89ca996b6f843c92064c2d633fa56cca2f62 SHA1 b1ca06491054eff6418c4b8d179de612841d059c SHA256 e587d5f17ed93edfaa2b4adbb83e05e8043b5ace24d47eb71f8e17a275128499
 MD5 abb5d815be703065ef93474acf563d82 files/netpbm-10.26.37-headers.patch 5913
 RMD160 e11c89ca996b6f843c92064c2d633fa56cca2f62 files/netpbm-10.26.37-headers.patch 5913
@@ -30,16 +33,21 @@ 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.39.tgz 2542473 RMD160 174c920a80c11b23d51cee2909192f31a04a9f13 SHA1 6f24377b83016ff2694fc3fe8892c65b0aa7f6d9 SHA256 906f338475fd242913b7e093c33beeeae6cd23f9c8891d26ed76c3aff0e27f21
 DIST netpbm-10.26.40.tgz 2541903 RMD160 7f14ab9ca45ba529503910f091b53f5abe75b186 SHA1 2c22a46c07d7c14334aa27053d9baaa6d6a10440 SHA256 fb893e5bba8769cf7f6469bd4fcba8b4c2e69de21da7604f393414238d19f086
 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
 DIST netpbm-10.37.0.tar.bz2 2097635 RMD160 240759eebb9eb7619019d55fdd5fcf7f548f6512 SHA1 73ac4325930d6d0a3779f33879e8bbf0402c4e9b SHA256 5107920e6adbecc0511f5d7c24224abc98b5872a6ce48074537314ecd83a7952
-EBUILD netpbm-10.26.40.ebuild 2888 RMD160 4e01be45fff2ac686e03123925b9271229205f86 SHA1 6ee7496b7f2e244e474d72f9b2eb1b87ca62dfc6 SHA256 ad67b6ad853326cb410b592586ca7d8c31c90a45b2e7bb80cd69ec4e87f9f606
-MD5 09442af8aff109683706691bcda277f9 netpbm-10.26.40.ebuild 2888
-RMD160 4e01be45fff2ac686e03123925b9271229205f86 netpbm-10.26.40.ebuild 2888
-SHA256 ad67b6ad853326cb410b592586ca7d8c31c90a45b2e7bb80cd69ec4e87f9f606 netpbm-10.26.40.ebuild 2888
+EBUILD netpbm-10.26.39.ebuild 2888 RMD160 4e01be45fff2ac686e03123925b9271229205f86 SHA1 6ee7496b7f2e244e474d72f9b2eb1b87ca62dfc6 SHA256 ad67b6ad853326cb410b592586ca7d8c31c90a45b2e7bb80cd69ec4e87f9f606
+MD5 09442af8aff109683706691bcda277f9 netpbm-10.26.39.ebuild 2888
+RMD160 4e01be45fff2ac686e03123925b9271229205f86 netpbm-10.26.39.ebuild 2888
+SHA256 ad67b6ad853326cb410b592586ca7d8c31c90a45b2e7bb80cd69ec4e87f9f606 netpbm-10.26.39.ebuild 2888
+EBUILD netpbm-10.26.40.ebuild 2888 RMD160 390cef0d7014ba061928c0631701a515dedfd0ae SHA1 8e7f6047ff94deef668622bfa6263a7d28aeb8ce SHA256 714357bcc753a7f07df60f645e31052f0869dfb47cb70fd4be94e2b98c525329
+MD5 4b93fb5bc9bca83ae5880c3d536d08ac netpbm-10.26.40.ebuild 2888
+RMD160 390cef0d7014ba061928c0631701a515dedfd0ae netpbm-10.26.40.ebuild 2888
+SHA256 714357bcc753a7f07df60f645e31052f0869dfb47cb70fd4be94e2b98c525329 netpbm-10.26.40.ebuild 2888
 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
@@ -52,14 +60,17 @@ EBUILD netpbm-10.37.0.ebuild 3180 RMD160 04eb0fe5b32772a4122cfa20fa9bd139b197c88
 MD5 a8b1533dd238d9807950d8ff66dbec4b netpbm-10.37.0.ebuild 3180
 RMD160 04eb0fe5b32772a4122cfa20fa9bd139b197c886 netpbm-10.37.0.ebuild 3180
 SHA256 b8292c0a717e4b0a87c023e2aae691b29fbf30b45992f43895f44e1815292cc0 netpbm-10.37.0.ebuild 3180
-MISC ChangeLog 22028 RMD160 daa48b9aa53e85c42dd2d07fe91376ded93c9df2 SHA1 5beb6d37cc06f672ebad2e02a648d9cce0a75d0b SHA256 19ba3bbe50ea59bba568a8a235c6ebe2fc22a714eaf93892df92730094c2a41b
-MD5 227c7a6955649320ed372d95f56b1c10 ChangeLog 22028
-RMD160 daa48b9aa53e85c42dd2d07fe91376ded93c9df2 ChangeLog 22028
-SHA256 19ba3bbe50ea59bba568a8a235c6ebe2fc22a714eaf93892df92730094c2a41b ChangeLog 22028
+MISC ChangeLog 22150 RMD160 573950f1e83ce96d0cb8b27d27e0cad3494d84c6 SHA1 14470e258f6182bafaea55dcfcff26a65c20d0aa SHA256 f3af61f9a798c697c5af7e9a0020f54839bfd34c1d1c663d3869aec89f60d904
+MD5 151c91c243d25bf9aeeea81ebeb24811 ChangeLog 22150
+RMD160 573950f1e83ce96d0cb8b27d27e0cad3494d84c6 ChangeLog 22150
+SHA256 f3af61f9a798c697c5af7e9a0020f54839bfd34c1d1c663d3869aec89f60d904 ChangeLog 22150
 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 044f979020cc363f60dcbf802ff55c65 files/digest-netpbm-10.26.39 509
+RMD160 08f7bc947c8f0af76f8b00205087d97c476429d8 files/digest-netpbm-10.26.39 509
+SHA256 340737a1f3c212b2105a7820fb00ac7f93cd9f5db8a9d091ececec874b01a1f7 files/digest-netpbm-10.26.39 509
 MD5 29a52191edb2419e865c9e6b5691c1ef files/digest-netpbm-10.26.40 509
 RMD160 164511495ecf817fd0b61c034e3b1c07ef1d436a files/digest-netpbm-10.26.40 509
 SHA256 2cc24f28747019bd01589977c80fb817b344772bc54f39e522d144822e669f5b files/digest-netpbm-10.26.40 509
@@ -72,3 +83,10 @@ SHA256 602a4f958a7818b28e7d08cc5cfffea28512524b89fb499233aaedff9bc9af86 files/di
 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF5uTV8bi6rjpTunYRAg8/AKCP3yc4xMIx0DLpb4K7Tir7r/StdACdHL1L
+UYMhOSI0cUBQZ1nTUjcM2jA=
+=DeH0
+-----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.40 b/media-libs/netpbm/files/digest-netpbm-10.26.40
new file mode 100644
index 000000000000..aaa1434adbd6
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.26.40
@@ -0,0 +1,6 @@
+MD5 dcc2b424514ad15c4afe2a7e7b5683e2 netpbm-10.26.40.tgz 2541903
+RMD160 7f14ab9ca45ba529503910f091b53f5abe75b186 netpbm-10.26.40.tgz 2541903
+SHA256 fb893e5bba8769cf7f6469bd4fcba8b4c2e69de21da7604f393414238d19f086 netpbm-10.26.40.tgz 2541903
+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.40.ebuild b/media-libs/netpbm/netpbm-10.26.40.ebuild
new file mode 100644
index 000000000000..aff6873b0302
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.26.40.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.40.ebuild,v 1.1 2007/03/01 14:34:28 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.37-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
+}