Version bump.

Package-Manager: portage-2.1.3_rc5

4 files changed, 150 insertions, 8 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index ebf168a580e5..15301a0b2385 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.161 2007/06/26 04:24:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.162 2007/06/26 04:30:36 vapier Exp $
+
+*netpbm-10.39.0 (26 Jun 2007)
+
+  26 Jun 2007; Mike Frysinger <vapier@gentoo.org> +netpbm-10.39.0.ebuild:
+  Version bump.
 
 *netpbm-10.26.43 (26 Jun 2007)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index e8626b9c1ba6..7beda10288fd 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -39,6 +39,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.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
+DIST netpbm-10.39.0.tar.bz2 2124872 RMD160 72e732e8670d5d3d91780250ebff94a75d61b46b SHA1 cb31bf75e817c5f80c5764a224fff00a721c017c SHA256 01526b1552b60f5b432a58d4b8694afcf0c9047e6ed8c23e02844c45e0c643fe
 EBUILD netpbm-10.26.42.ebuild 2888 RMD160 0458661292ec7abe91405d27f4d332bdcfb2f21d SHA1 7bb059dff8f25d6ff80c82e6e854dcb2ddf52e8b SHA256 45a480d920add31564256d8cad1ed8f86adc9f918e6a2bc006070a43b451ca85
 MD5 2873541264efb63a6a6f5751580bf424 netpbm-10.26.42.ebuild 2888
 RMD160 0458661292ec7abe91405d27f4d332bdcfb2f21d netpbm-10.26.42.ebuild 2888
@@ -55,10 +56,14 @@ EBUILD netpbm-10.37.0.ebuild 3176 RMD160 c845bcb06d679218d0c5f1ad803c9cd879ad341
 MD5 26490d70103fb5a3cf0060660ab007c4 netpbm-10.37.0.ebuild 3176
 RMD160 c845bcb06d679218d0c5f1ad803c9cd879ad3410 netpbm-10.37.0.ebuild 3176
 SHA256 5f273a533588bd933701d2e3efabc034701a9c1e01085a7d810646f2f07676b6 netpbm-10.37.0.ebuild 3176
-MISC ChangeLog 22621 RMD160 ebaa8cfb3285d06477656b94d5b4de13abe7fc70 SHA1 5365d19e5d11ee678de1ac0cd960a56709f5c524 SHA256 1ce60c8f8ca4656004f10e0eb5d12ebc8fde4bcc85ac1fc3c2bc4a7ee2326e31
-MD5 159195a5e84a4e7865cea5aee61bab9d ChangeLog 22621
-RMD160 ebaa8cfb3285d06477656b94d5b4de13abe7fc70 ChangeLog 22621
-SHA256 1ce60c8f8ca4656004f10e0eb5d12ebc8fde4bcc85ac1fc3c2bc4a7ee2326e31 ChangeLog 22621
+EBUILD netpbm-10.39.0.ebuild 3187 RMD160 b4d22f02419aed94561a10260f7f2b00f50caa56 SHA1 9b9060c5d041d2c8c78800562454472f1b26fc47 SHA256 06748ecb290f2d12624c50dbc0ae6c51d608eac44e24ea7484c656ef117efd49
+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 22743 RMD160 5588f6dde1d0d809f5f302fc2716ef4500ce46aa SHA1 96ab8e53fccd43f58f1c303c63783511599c1c2d SHA256 eb680a73d196e577c9fff3c6eb6529d81f5d7e1b4097961050a192543eee7c28
+MD5 1713a7e121cef47b60dd2bd4069bb4d4 ChangeLog 22743
+RMD160 5588f6dde1d0d809f5f302fc2716ef4500ce46aa ChangeLog 22743
+SHA256 eb680a73d196e577c9fff3c6eb6529d81f5d7e1b4097961050a192543eee7c28 ChangeLog 22743
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 metadata.xml 161
@@ -75,10 +80,13 @@ 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
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGgJUhp/wUKkr7RBoRAtNqAJ0ZmltzJy94H1o+fIaXsKLQgrbYlACfYyJj
-XF6yPser8ltsz45VqrfIxdI=
-=X+FN
+iD8DBQFGgJaBp/wUKkr7RBoRApwTAKDackK+zAyjRi+NcFOXMgtAthIUrACg4e5t
+0lXYoB7VLeGsDlXvllJ2eqA=
+=0e32
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/digest-netpbm-10.39.0 b/media-libs/netpbm/files/digest-netpbm-10.39.0
new file mode 100644
index 000000000000..bebd563f89aa
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.39.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 01cfa67bdc047666f23bdd0134926574 netpbm-10.39.0.tar.bz2 2124872
+RMD160 72e732e8670d5d3d91780250ebff94a75d61b46b netpbm-10.39.0.tar.bz2 2124872
+SHA256 01526b1552b60f5b432a58d4b8694afcf0c9047e6ed8c23e02844c45e0c643fe netpbm-10.39.0.tar.bz2 2124872
diff --git a/media-libs/netpbm/netpbm-10.39.0.ebuild b/media-libs/netpbm/netpbm-10.39.0.ebuild
new file mode 100644
index 000000000000..5ca7403de28f
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.39.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.39.0.ebuild,v 1.1 2007/06/26 04:30:36 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
+}