Version bump.

Package-Manager: portage-2.1.2_rc4-r3

4 files changed, 149 insertions, 8 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 4d76f984d0dc..e4eb17e26220 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.139 2007/01/03 03:19:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.140 2007/01/03 03:46:19 vapier Exp $
+
+*netpbm-10.37.0 (03 Jan 2007)
+
+  03 Jan 2007; Mike Frysinger <vapier@gentoo.org> +netpbm-10.37.0.ebuild:
+  Version bump.
 
 *netpbm-10.26.37 (03 Jan 2007)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index e93d2742482a..db055c69d5db 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -36,6 +36,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.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.35.ebuild 2804 RMD160 9664aff822be68b50fe45d8771e721333b04f678 SHA1 39c80c25f03f02584d9ef206ba2c96380fcaa69a SHA256 5f45a611bdd491866c3ad98f96cc3457c74c1484683cbad9f5cd98b648f7dd9c
 MD5 ec1cf9d6a4402c44eeb4c74f2fa1a230 netpbm-10.26.35.ebuild 2804
 RMD160 9664aff822be68b50fe45d8771e721333b04f678 netpbm-10.26.35.ebuild 2804
@@ -56,10 +57,14 @@ EBUILD netpbm-10.36.0.ebuild 3218 RMD160 ccf9085f621c589ab329eafb1aef6be1ae38644
 MD5 b87e62654219acbec592fe5464aca988 netpbm-10.36.0.ebuild 3218
 RMD160 ccf9085f621c589ab329eafb1aef6be1ae38644c netpbm-10.36.0.ebuild 3218
 SHA256 728d5b4e14a55530c87e19427d76c3b57cee56300461b45aa8ffc195370a6785 netpbm-10.36.0.ebuild 3218
-MISC ChangeLog 19873 RMD160 610edee3be94bc655997a2700d63cfddb58c2d8b SHA1 9e09b03b63a56bf0897aca3feba8f871bd183625 SHA256 c62b88ade6391899fc4eda41039fbbc8f19efc27fe623113f4f16b06e2f38211
-MD5 1d58c46db384723d62b05ecec3bb633e ChangeLog 19873
-RMD160 610edee3be94bc655997a2700d63cfddb58c2d8b ChangeLog 19873
-SHA256 c62b88ade6391899fc4eda41039fbbc8f19efc27fe623113f4f16b06e2f38211 ChangeLog 19873
+EBUILD netpbm-10.37.0.ebuild 3159 RMD160 9c204b6d3ee1a259dce5935bc13e2b135c6d97ff SHA1 a888485dfb442bbeef1fbb74d18d8143254e4c1a SHA256 bf7e93bb6ba515eae041617a2efc74ce5a701c321727e5be273d8a39af6964c8
+MD5 cbbf2d2c37165b8ff738f22858ed01ca netpbm-10.37.0.ebuild 3159
+RMD160 9c204b6d3ee1a259dce5935bc13e2b135c6d97ff netpbm-10.37.0.ebuild 3159
+SHA256 bf7e93bb6ba515eae041617a2efc74ce5a701c321727e5be273d8a39af6964c8 netpbm-10.37.0.ebuild 3159
+MISC ChangeLog 19995 RMD160 a7f611c6c4807cdc337db5a16b4eb1410ea5500e SHA1 d6d1d6bfa1ec1a2e64540a5c03a1dc0cb5fdea1b SHA256 5f0bddfccb10369ad168e59802db0f75161c15d24c4e9c6c838f131c00aaa26d
+MD5 fe526b8d01f9154bfcd80f73551a9046 ChangeLog 19995
+RMD160 a7f611c6c4807cdc337db5a16b4eb1410ea5500e ChangeLog 19995
+SHA256 5f0bddfccb10369ad168e59802db0f75161c15d24c4e9c6c838f131c00aaa26d ChangeLog 19995
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 metadata.xml 161
@@ -79,10 +84,13 @@ SHA256 02ab164f86c651741c75c27cf1b7434fbdaa1fa8db3d7caedbd3cbb4c8e51baf files/di
 MD5 069b8933b453464f9089412eb7315a27 files/digest-netpbm-10.36.0 518
 RMD160 4f94f4fc05f5be1561ad2edf0f597127cce57810 files/digest-netpbm-10.36.0 518
 SHA256 602a4f958a7818b28e7d08cc5cfffea28512524b89fb499233aaedff9bc9af86 files/digest-netpbm-10.36.0 518
+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.1 (GNU/Linux)
 
-iD8DBQFFmyEY8bi6rjpTunYRApOIAJ428QkVeJ30HRZ3UoSEengxp/gXVgCfcpWZ
-nyMNQSZzBU694x7uihxemBY=
-=9AJa
+iD8DBQFFmydb8bi6rjpTunYRAseBAJ4+zGffZUxDONdHEJpA/aOwuac22wCgxOF7
+7rOB3vfvYg0zcXIG0yHhZTQ=
+=prgS
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/digest-netpbm-10.37.0 b/media-libs/netpbm/files/digest-netpbm-10.37.0
new file mode 100644
index 000000000000..c0582af8eb4b
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.37.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 189d6ce531b98655975c6c2bf4440ee6 netpbm-10.37.0.tar.bz2 2097635
+RMD160 240759eebb9eb7619019d55fdd5fcf7f548f6512 netpbm-10.37.0.tar.bz2 2097635
+SHA256 5107920e6adbecc0511f5d7c24224abc98b5872a6ce48074537314ecd83a7952 netpbm-10.37.0.tar.bz2 2097635
diff --git a/media-libs/netpbm/netpbm-10.37.0.ebuild b/media-libs/netpbm/netpbm-10.37.0.ebuild
new file mode 100644
index 000000000000..1da2d1aa1e1c
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.37.0.ebuild
@@ -0,0 +1,122 @@
+# 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.37.0.ebuild,v 1.1 2007/01/03 03:46:19 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 || 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 -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
+}