Version bump.

Package-Manager: portage-2.1.1_pre4

4 files changed, 138 insertions, 8 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index c5aa84c09943..8566f31417fc 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.125 2006/07/15 03:00:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.126 2006/08/05 06:50:36 vapier Exp $
+
+*netpbm-10.26.30 (05 Aug 2006)
+
+  05 Aug 2006; Mike Frysinger <vapier@gentoo.org> +netpbm-10.26.30.ebuild:
+  Version bump.
 
   15 Jul 2006; Mike Frysinger <vapier@gentoo.org>
   +files/netpbm-10.34-rgb-paths.patch, netpbm-10.34.ebuild:
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 06762c4148ec..73cebdf3df39 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -62,6 +62,7 @@ MD5 a8a24cc76003bd9b963688e79e0e2dfd files/netpbm-10.34-xml2.patch 988
 RMD160 3875b151e1688cdc6caef52dd36ffb14a3a9c1ab files/netpbm-10.34-xml2.patch 988
 SHA256 61cbd386f31d53d09719561dfbcd36ea53bce5bd696e00a2838e203b7b8b1492 files/netpbm-10.34-xml2.patch 988
 DIST netpbm-10.26.29.tgz 2540954 RMD160 6cf2dbd2c78cc1271ef24705bd8dba97224dd537 SHA1 9c0431c64500018c6f51af6e85d9f7574391c0d8 SHA256 bca1c7867705f0d6feaab3807442394dddebfb3fa8fcce9ade8b6df50594138e
+DIST netpbm-10.26.30.tgz 2540954 RMD160 f01dd1bf0d8400454cc0a05862d50ff4f9b1179c SHA1 0e753ff62ca5a75a7dfc6f249a96fc1acecdc39b SHA256 8c906b349abe4991b4d907062c447a844c7ec973aa8cf21329092bfd5da40fcd
 DIST netpbm-10.29.tgz 2359729 RMD160 c88d01b1106c7eb1f087d98a5570c0c61200d083 SHA1 0733a0e1a7413e48eeb060aed1d1cc326e12ef8d SHA256 b0e4e0d7a21809a606d55ad7f30d0715b080e35609791257ab3f075b7449f964
 DIST netpbm-10.30-manpages.tar.bz2 233254 RMD160 6312e1486f473f57332a5dc050a03ac1dfce7f47 SHA1 a1893e67380029ddbb76a1451833a134f4d42818 SHA256 75eb6ceaebafffb6a2d608d49f2b61c5049e5795976bbfb2d55608de1f858124
 DIST netpbm-10.30.tgz 2370761 RMD160 6e0409e7c7085751d266f1137a89d2a3d37022da SHA1 b07ff527f4b2f8adaf7b44abd00f16b10b0ab403 SHA256 cf682d5cbe185d535c12f65067c7ce991601d16595125c502cf4f8c15a6f801c
@@ -74,6 +75,10 @@ EBUILD netpbm-10.26.29.ebuild 2803 RMD160 5fa22b3a7aa079146f64377ab374adf3ca2661
 MD5 77f7da79d633a4a753b21d953921d66c netpbm-10.26.29.ebuild 2803
 RMD160 5fa22b3a7aa079146f64377ab374adf3ca2661f9 netpbm-10.26.29.ebuild 2803
 SHA256 db7f61dd9268f3ff0b86cd52cdc08ef64992879c9649dc997566719f69f7c0fd netpbm-10.26.29.ebuild 2803
+EBUILD netpbm-10.26.30.ebuild 2803 RMD160 d55ed2b8c2a43bb632412dbb03051598326de0c9 SHA1 ef68043cfc557c436fdefc710f4f40e7473359a3 SHA256 8857e44f74509a33e48e655c70fc46444503252b536aae4db0015881d8b21aa8
+MD5 b8d5a52d0faa3a53230073413539b66a netpbm-10.26.30.ebuild 2803
+RMD160 d55ed2b8c2a43bb632412dbb03051598326de0c9 netpbm-10.26.30.ebuild 2803
+SHA256 8857e44f74509a33e48e655c70fc46444503252b536aae4db0015881d8b21aa8 netpbm-10.26.30.ebuild 2803
 EBUILD netpbm-10.29.ebuild 2423 RMD160 0d4e834d6042b8f2da780be23001aedd5cd615b2 SHA1 99c64ee6c8612532bae126bad7c4d48224b0a2ae SHA256 2578108433562638a815a411ea920694ffe1bc930c659bfcc9dc4a34abeb09fe
 MD5 44a56191027bdda13f3bd51f336a971a netpbm-10.29.ebuild 2423
 RMD160 0d4e834d6042b8f2da780be23001aedd5cd615b2 netpbm-10.29.ebuild 2423
@@ -98,10 +103,10 @@ EBUILD netpbm-10.34.ebuild 3149 RMD160 e12fd04e009d34484ece8b91e70e1084d072d36f
 MD5 e727ee850ece8e4de8e57552f42f0bca netpbm-10.34.ebuild 3149
 RMD160 e12fd04e009d34484ece8b91e70e1084d072d36f netpbm-10.34.ebuild 3149
 SHA256 9c1689d2b5805c1c6a75c0eace35b7d916666c0dad8dac30f231760552b8eb3a netpbm-10.34.ebuild 3149
-MISC ChangeLog 17997 RMD160 0ab5a25599bf2af703e1f4e96c71dfc6918adc13 SHA1 9741244d7ec494e93356f11f2d0a9507d874d08f SHA256 069046c1cdbcd283a9ede344c1722e47f744fc247a8cf5ab43e49b5c9daed9e9
-MD5 a8cf0bb2aa997e4ca6f24dcc53206764 ChangeLog 17997
-RMD160 0ab5a25599bf2af703e1f4e96c71dfc6918adc13 ChangeLog 17997
-SHA256 069046c1cdbcd283a9ede344c1722e47f744fc247a8cf5ab43e49b5c9daed9e9 ChangeLog 17997
+MISC ChangeLog 18121 RMD160 e61d8cc19702f93251df2e53e7e5d1eea5465947 SHA1 63b482024249899521e67121187470a4fe815951 SHA256 bae920416b56224c11af46505d39ec5cd62baead64fc351d2f75a55b97be3c9e
+MD5 e5b20a200d2d0d5a46713ee74f71b287 ChangeLog 18121
+RMD160 e61d8cc19702f93251df2e53e7e5d1eea5465947 ChangeLog 18121
+SHA256 bae920416b56224c11af46505d39ec5cd62baead64fc351d2f75a55b97be3c9e ChangeLog 18121
 MISC metadata.xml 224 RMD160 b7bf7da46cd75283f29d006f5d6854890a3d8aab SHA1 222093833f902db8f97b1e4b00ad402caf7f9c78 SHA256 06e3a779a82014f8783ebfc67e1b11107bcb670aacdf1f81faa361642046ba23
 MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
 RMD160 b7bf7da46cd75283f29d006f5d6854890a3d8aab metadata.xml 224
@@ -109,6 +114,9 @@ SHA256 06e3a779a82014f8783ebfc67e1b11107bcb670aacdf1f81faa361642046ba23 metadata
 MD5 a6219895543c38fdaf23811febcadfc4 files/digest-netpbm-10.26.29 509
 RMD160 111be1088a061f305b319b2b324a0469e9bbacc7 files/digest-netpbm-10.26.29 509
 SHA256 70112510281033590c7d9c5d1c9a3e4eae10f608058e0e16dcc726e3db8d8369 files/digest-netpbm-10.26.29 509
+MD5 43b17f2d4a6fed244948b04ab97431f0 files/digest-netpbm-10.26.30 509
+RMD160 9bff0b0d5946b3d2a6135bc4f6f16fd35f407868 files/digest-netpbm-10.26.30 509
+SHA256 7e74584179a571b937e0540786d62168fb647e6c319c45b78f2c30c0bf51900f files/digest-netpbm-10.26.30 509
 MD5 bbe9e6a21615dc49d878ccea003cc8b4 files/digest-netpbm-10.29 232
 RMD160 73dd3b6da0582a396af9dcb26e39b3e7fa7c5fb4 files/digest-netpbm-10.29 232
 SHA256 903934b747c25e198d10cb33b2aac21c13453d7d08d4f5cb28403195ff18284d files/digest-netpbm-10.29 232
@@ -130,7 +138,7 @@ SHA256 02ab164f86c651741c75c27cf1b7434fbdaa1fa8db3d7caedbd3cbb4c8e51baf files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEuFqEamhnQswr0vIRAjGCAKCsrnsOBKWIaKRQV22mDofCLr66XQCfSxLu
-EimzsMo6B+3W8U7dLcgad3o=
-=ZepY
+iD8DBQFE1D/LamhnQswr0vIRAvFKAJ9uCrmbnthtaVtWqlJBbd55MMyVVQCfVykl
+a9C0CHWj2PdY6xn0SmTtGBo=
+=wmsZ
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.30 b/media-libs/netpbm/files/digest-netpbm-10.26.30
new file mode 100644
index 000000000000..40dc06b36f36
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.26.30
@@ -0,0 +1,6 @@
+MD5 c7fcfa99980fbdd049198d6e79aae978 netpbm-10.26.30.tgz 2540954
+RMD160 f01dd1bf0d8400454cc0a05862d50ff4f9b1179c netpbm-10.26.30.tgz 2540954
+SHA256 8c906b349abe4991b4d907062c447a844c7ec973aa8cf21329092bfd5da40fcd netpbm-10.26.30.tgz 2540954
+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.30.ebuild b/media-libs/netpbm/netpbm-10.26.30.ebuild
new file mode 100644
index 000000000000..a4bfc7ad7e91
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.26.30.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.30.ebuild,v 1.1 2006/08/05 06:50:36 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 ~hppa ~ia64 ~mips ~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
+}