Version bump.

Package-Manager: portage-2.1.3.9

4 files changed, 150 insertions, 8 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 133c4351778f..63ef18e65144 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.164 2007/09/28 00:57:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.165 2007/09/28 01:24:26 vapier Exp $
+
+*netpbm-10.40.0 (28 Sep 2007)
+
+  28 Sep 2007; Mike Frysinger <vapier@gentoo.org> +netpbm-10.40.0.ebuild:
+  Version bump.
 
 *netpbm-10.26.45 (28 Sep 2007)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index c9fbeb2ef8b8..9ec4205f0b43 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -27,6 +27,7 @@ DIST netpbm-10.30-manpages.tar.bz2 233254 RMD160 6312e1486f473f57332a5dc050a03ac
 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.39.0.tar.bz2 2124872 RMD160 72e732e8670d5d3d91780250ebff94a75d61b46b SHA1 cb31bf75e817c5f80c5764a224fff00a721c017c SHA256 01526b1552b60f5b432a58d4b8694afcf0c9047e6ed8c23e02844c45e0c643fe
+DIST netpbm-10.40.0.tar.bz2 2126805 RMD160 17057c1bb90c90080a83726a60cc69fa0084022b SHA1 2b4c1346e142d7310f266918702121198d10f5dd SHA256 b30e71386211d6e144706c673ede113dcf11f5b481abd5836285b021800e33c7
 EBUILD netpbm-10.26.44.ebuild 2888 RMD160 62b2b32c843c45f73490f76442a1eb25f0f46939 SHA1 b927d3f5f85c103ad61390807fbd4a4ee0b3e1c3 SHA256 9a89600a9e477ec2119ab6fea1027c081a935732dcab409de21df4a4da917b9e
 MD5 4a3e6800af827725abca7654f93a2b57 netpbm-10.26.44.ebuild 2888
 RMD160 62b2b32c843c45f73490f76442a1eb25f0f46939 netpbm-10.26.44.ebuild 2888
@@ -43,10 +44,14 @@ EBUILD netpbm-10.39.0.ebuild 3187 RMD160 b4d22f02419aed94561a10260f7f2b00f50caa5
 MD5 6ab204dc3f449f0722dd9637d13fbdcb netpbm-10.39.0.ebuild 3187
 RMD160 b4d22f02419aed94561a10260f7f2b00f50caa56 netpbm-10.39.0.ebuild 3187
 SHA256 06748ecb290f2d12624c50dbc0ae6c51d608eac44e24ea7484c656ef117efd49 netpbm-10.39.0.ebuild 3187
-MISC ChangeLog 23031 RMD160 2426232243f25d2c2502200d578f09fee804568a SHA1 8f33df402991495f9d51c8ea2d1fa4344148a0c2 SHA256 296ce4f139dce009c782f5ff81e90094ff768caed5ded6bf0fa03a13cbf08694
-MD5 8412f3621f7b1ccb8f244c0fb1e5780d ChangeLog 23031
-RMD160 2426232243f25d2c2502200d578f09fee804568a ChangeLog 23031
-SHA256 296ce4f139dce009c782f5ff81e90094ff768caed5ded6bf0fa03a13cbf08694 ChangeLog 23031
+EBUILD netpbm-10.40.0.ebuild 3187 RMD160 89636de745ad1ed90b46f4e68be6172b1a085eac SHA1 17c0846667e725c20e973af06f0d3df9cbded7b2 SHA256 b8bc720410b37ec42af43f13b415d5052327a4babcf38f50838573c3b7fe8220
+MD5 28612f8c7658a77cfcd611a1f41041cf netpbm-10.40.0.ebuild 3187
+RMD160 89636de745ad1ed90b46f4e68be6172b1a085eac netpbm-10.40.0.ebuild 3187
+SHA256 b8bc720410b37ec42af43f13b415d5052327a4babcf38f50838573c3b7fe8220 netpbm-10.40.0.ebuild 3187
+MISC ChangeLog 23153 RMD160 653cd5719e3b1ad7276f64d227df8ff5fd2784b5 SHA1 8eaf17da89118b759258714add3c6b5a9a9c2e9c SHA256 be639b58091510bafe25dfddc17a69ee5881570b6b31cf32e2525c620b598cd3
+MD5 47d3c59abbfc64e71163506178de0b4c ChangeLog 23153
+RMD160 653cd5719e3b1ad7276f64d227df8ff5fd2784b5 ChangeLog 23153
+SHA256 be639b58091510bafe25dfddc17a69ee5881570b6b31cf32e2525c620b598cd3 ChangeLog 23153
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 metadata.xml 161
@@ -63,10 +68,13 @@ SHA256 a427fccacb195a5758556a0a2180efb03ea8816c0425a139b09ed36a6f96cd75 files/di
 MD5 2c58fb835b05b349b011774b44b82960 files/digest-netpbm-10.39.0 518
 RMD160 26a79e9f77668c9173e3f1cb716e9402fe2f0387 files/digest-netpbm-10.39.0 518
 SHA256 5071b6fa68514152fc9cbf22e46954e174fd108156ac1baa6a5ac77e506c23fd files/digest-netpbm-10.39.0 518
+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)
 
-iD8DBQFG/FGKp/wUKkr7RBoRAluAAJ9nOEESlMyyDe0JDGC5bcX5q0jAswCfbDz+
-tA4bactDZBgoUKtGz1YQL7o=
-=TxJ/
+iD8DBQFG/FfQp/wUKkr7RBoRAkiSAKChDBiJ2USK23barZo1DMOUjg2IoACeIKPW
+EVQdgJZMaK8C9lJr+Sp+/3M=
+=wj36
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/digest-netpbm-10.40.0 b/media-libs/netpbm/files/digest-netpbm-10.40.0
new file mode 100644
index 000000000000..2225436afcf6
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.40.0
@@ -0,0 +1,6 @@
+MD5 61a2d777a3eb0ce803bf021c7b99076f netpbm-10.33-manpages.tar.bz2 236722
+RMD160 5e43836a5f4d16f1ba5ece21e9996dbe60b252ae netpbm-10.33-manpages.tar.bz2 236722
+SHA256 aa18adee4a187ad5df243cb1a7c51097dc6a7d6a8072cf6da09972b74ac5454a netpbm-10.33-manpages.tar.bz2 236722
+MD5 56b813106c78e37660fc2a70026d4058 netpbm-10.40.0.tar.bz2 2126805
+RMD160 17057c1bb90c90080a83726a60cc69fa0084022b netpbm-10.40.0.tar.bz2 2126805
+SHA256 b30e71386211d6e144706c673ede113dcf11f5b481abd5836285b021800e33c7 netpbm-10.40.0.tar.bz2 2126805
diff --git a/media-libs/netpbm/netpbm-10.40.0.ebuild b/media-libs/netpbm/netpbm-10.40.0.ebuild
new file mode 100644
index 000000000000..c221201f7b26
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.40.0.ebuild
@@ -0,0 +1,123 @@
+# 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.40.0.ebuild,v 1.1 2007/09/28 01:24:26 vapier Exp $
+
+inherit flag-o-matic toolchain-funcs eutils multilib
+
+MAN_VER=10.33
+DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="http://netpbm.sourceforge.net/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/${PN}-${MAN_VER}-manpages.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="jbig jpeg jpeg2k png rle svga tiff xml zlib"
+
+DEPEND="jpeg? ( >=media-libs/jpeg-6b )
+	jpeg2k? ( media-libs/jasper )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	png? ( >=media-libs/libpng-1.2.1 )
+	xml? ( dev-libs/libxml2 )
+	zlib? ( sys-libs/zlib )
+	svga? ( media-libs/svgalib )
+	jbig? ( media-libs/jbigkit )
+	rle? ( 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 '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
+		*)		   echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
+	esac
+}
+netpbm_config() {
+	if use $1 ; then
+		[[ $2 != "!" ]] && echo -l${2:-$1}
+	else
+		echo NONE
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/netpbm-10.31-build.patch
+	epatch "${FILESDIR}"/netpbm-10.35.0-xml2.patch #137871
+
+	rm -f configure
+	cp Makefile.config.in Makefile.config
+	cat >> Makefile.config <<-EOF
+	# Gentoo toolchain options
+	CC = $(tc-getCC) -Wall
+	CC_FOR_BUILD = $(tc-getBUILD_CC)
+	AR = $(tc-getAR)
+	RANLIB = $(tc-getRANLIB)
+	STRIPFLAG =
+	CFLAGS_SHLIB = -fPIC
+
+	# workaround parallel build issues
+	SYMLINK = ln -sf
+
+	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)
+	XML2_LIBS = $(netpbm_config xml xml2)
+	JBIGLIB = -ljbig
+	JBIGHDR_DIR = $(netpbm_config jbig "!")
+	JASPERLIB = -ljasper
+	JASPERHDR_DIR = $(netpbm_config jpeg2k "!")
+	URTLIB = $(netpbm_config rle)
+	URTHDR_DIR =
+	EOF
+}
+
+src_compile() {
+	replace-flags -mcpu=ultrasparc "-mcpu=v8 -mtune=ultrasparc"
+	replace-flags -mcpu=v9 "-mcpu=v8 -mtune=v9"
+
+	emake -j1 || die
+}
+
+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
+}