Version bumps.

Package-Manager: portage-2.2_pre5
RepoMan-Options: --force

4 files changed, 276 insertions, 5 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index bd4e303d79c3..d7dea2a2ceb7 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.184 2008/03/08 23:07:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.185 2008/03/28 03:29:34 vapier Exp $
+
+*netpbm-10.42.0 (28 Mar 2008)
+*netpbm-10.26.52 (28 Mar 2008)
+
+  28 Mar 2008; Mike Frysinger <vapier@gentoo.org> +netpbm-10.26.52.ebuild,
+  +netpbm-10.42.0.ebuild:
+  Version bumps.
 
 *netpbm-10.26.51 (08 Mar 2008)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 2e4874e443bf..dfff7c19ea22 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -8,23 +8,27 @@ AUX netpbm-10.35.0-xml2.patch 850 RMD160 426cc33a622b8641bdbff8e60a8418318cdee68
 DIST netpbm-10.26.49.tgz 2543652 RMD160 d99cdb34e0734b62fd188c4dd9aea12808a09359 SHA1 851275ae4a077c4e2ef6b0d2b5bc0c540d5f43ce SHA256 b3014a81abd9ff9850012dcda29f27d3e513bafca96e07bf8e4508fd94c7b53e
 DIST netpbm-10.26.50.tgz 2543723 RMD160 2edb0c7d5aed78347bf2431c45dea3dfe00c4623 SHA1 2bca48ba95faa3a76fa10fd5a70d2508347f9edd SHA256 b15cf451277b4868b045f5589332e68d875a25abd3f46515f26dd0a3ecbc0c0d
 DIST netpbm-10.26.51.tgz 2543699 RMD160 b6312abb18fc5e572b63c04b65f3aa800a0d1948 SHA1 5091fb90b2c5143b440821b8468546fbe146a3e6 SHA256 4d82999648824fa99919491d569cd105158c42b734dde97beda29bfefb2655c8
+DIST netpbm-10.26.52.tgz 2543975 RMD160 6b34c761fec49d8afaf8c95a95429011517c4757 SHA1 3b2b913789d04acdc6b23eabaf50e764a20db7aa SHA256 e83492bc2a7f5ce88c59f0dd3f81495e4cc6cddee4be444021ff14b665f026ca
 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.37.0.tar.bz2 2097635 RMD160 240759eebb9eb7619019d55fdd5fcf7f548f6512 SHA1 73ac4325930d6d0a3779f33879e8bbf0402c4e9b SHA256 5107920e6adbecc0511f5d7c24224abc98b5872a6ce48074537314ecd83a7952
 DIST netpbm-10.40.0.tar.bz2 2126805 RMD160 17057c1bb90c90080a83726a60cc69fa0084022b SHA1 2b4c1346e142d7310f266918702121198d10f5dd SHA256 b30e71386211d6e144706c673ede113dcf11f5b481abd5836285b021800e33c7
 DIST netpbm-10.41.0.tar.lzma 1859778 RMD160 13ce996b6edbcd8602fc830a1796138cfc46cdb5 SHA1 51b1abb41059b342c4a6db2224728aaf5aa20c19 SHA256 88974be8cb7fe2df15e742663855239ab8d9a7476c864b6b6a2d5a8fcf08a92d
+DIST netpbm-10.42.0.tar.lzma 1867436 RMD160 2cbf2122893aa101004aed1551e13514d7da0489 SHA1 40133c85d38e66917c790a7c2fddecd93e5d0303 SHA256 7f48b4892369de75609c15a09b1f186f9e23bf242124901ede41ab07d3883c0a
 EBUILD netpbm-10.26.49.ebuild 2888 RMD160 ece9dbeadc7ac34c8c21b865d2faae7c84b7ff96 SHA1 08aa56d44f2b15168c4158c589a63e4c832ed678 SHA256 229ff0299c0d45350b69b08d7e841dd1e77aced7f2ca09fec0bd3cd20160e338
 EBUILD netpbm-10.26.50.ebuild 2836 RMD160 1a17429330464842bc0af2cd62d66e76d2121aae SHA1 8ef0b73b934217a5d42228f67d17c6ca48251142 SHA256 5359c7dfb0b419e28899108403165536880041f36d5a2e7621b444e5536b44e2
 EBUILD netpbm-10.26.51.ebuild 2836 RMD160 0db5fc4e36d5df80dce225656b433f70fb633720 SHA1 244f4116b0b650df263d740d999d67a44fc6443e SHA256 e15b3d1be4ddda55432f11f7cf9def76785117a4a7be8f77426391399fd1430d
+EBUILD netpbm-10.26.52.ebuild 2836 RMD160 3a67e56b5cb1ecf3dd997757ebf4f44a8dd03ebd SHA1 96c2876e820e199d3c2d40e274dab3c03c7758f0 SHA256 cb19f0790687c72a87c4bc9f57c4b7ca9fcb6e748bda99bc643492efbd45e5b8
 EBUILD netpbm-10.37.0.ebuild 3176 RMD160 c845bcb06d679218d0c5f1ad803c9cd879ad3410 SHA1 e5582dce796933d3a4049a07befaf3aeac9628a0 SHA256 5f273a533588bd933701d2e3efabc034701a9c1e01085a7d810646f2f07676b6
 EBUILD netpbm-10.40.0.ebuild 3175 RMD160 77e350a029ed0b406e59614c6aa60bdc0f15e231 SHA1 7b5bc1fc11319ef6309c6d53bad11e8446bb3886 SHA256 ca385bb5fcb3a0d0afc6138e4c47cf8187ba33f309030211a191964c06511def
 EBUILD netpbm-10.41.0.ebuild 3910 RMD160 afb96830be2f4cde04262ad4090c1da24900efea SHA1 30241615209e93cc6e0800921a15b3c9a530a56b SHA256 d8ed0c8ea88e9b41bce0a50fcf6f88f2cd762ff7680aa6fe3423f09a2999f4ae
-MISC ChangeLog 24954 RMD160 6b39f857a85d534b2ca204505543206c3cd1d09e SHA1 ad31e1a428c86ee638b0c5c769ee7618f6c86575 SHA256 effaba0865fafc89fd20cf3d3692a76bff14a8f00042b2505a8b76c77ed71525
+EBUILD netpbm-10.42.0.ebuild 3937 RMD160 f3ebf662434d719f4246fcd2dc5d8500a75bc1c7 SHA1 08004347b680a9d8cb52b0b8c3818c1e33780fbd SHA256 e3b7cb1599d54fbd99c31ac9be4e1cbc885de8978f46ded853fe56c2260446f0
+MISC ChangeLog 25135 RMD160 46a770814bd6b697f8c29dfebd19924bac3f56c7 SHA1 d9437f82d9b88f562214d9875a3dd8a81efc9b15 SHA256 b6a8a3577537ed5736f46edd580d9eb6c7dfc4341788e8f0d9625823d79e999e
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH0xw8j9hvisErhMIRApWQAJ42+jvWbWeF95yVXwZSk4uuu22HDQCeKWh0
-fz1UlBlTebbVs/58chSw/SA=
-=YyzZ
+iD8DBQFH7Gbhj9hvisErhMIRAhfmAKCINnnYEMHS+C8Rn/6s/eMPlKDpPACfeqfa
+nMJV9NjiQazOnMJsb/zXNnk=
+=8O1T
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/netpbm-10.26.52.ebuild b/media-libs/netpbm/netpbm-10.26.52.ebuild
new file mode 100644
index 000000000000..f6fce73c1360
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.26.52.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.52.ebuild,v 1.1 2008/03/28 03:29:34 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
+
+	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
+}
diff --git a/media-libs/netpbm/netpbm-10.42.0.ebuild b/media-libs/netpbm/netpbm-10.42.0.ebuild
new file mode 100644
index 000000000000..dc3e78c3a810
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.42.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.42.0.ebuild,v 1.1 2008/03/28 03:29:34 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.lzma
+	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"
+
+RDEPEND="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 )"
+DEPEND="${RDEPEND}
+	app-arch/lzma-utils"
+
+maint_pkg_create() {
+	local base="/usr/local/src"
+	local srcdir="${base}/netpbm/release_number"
+	if [[ -d ${srcdir} ]] ; then
+		cd "${T}" || die
+
+		ebegin "Exporting ${srcdir}/${PV} to netpbm-${PV}"
+		svn export -q ${srcdir}/${PV} netpbm-${PV}
+		eend $? || return 1
+
+		ebegin "Creating netpbm-${PV}.tar.lzma"
+		tar cf - netpbm-${PV} | lzma > netpbm-${PV}.tar.lzma
+		eend $?
+
+		einfo "Tarball now ready at: ${T}/netpbm-${PV}.tar.lzma"
+	else
+		einfo "You need to run:"
+		einfo " cd ${base}"
+		einfo " svn co https://netpbm.svn.sourceforge.net/svnroot/netpbm"
+		die "need svn checkout dir"
+	fi
+}
+pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} && ! -e ${DISTDIR}/${P}.tar.lzma ]] && maint_pkg_create ; }
+
+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() {
+	emake -j1 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} || die
+	rm -r "${D}"/usr/man/web || die
+	rm -r "${D}"/usr/link || die
+	rm -f "${D}"/usr/{README,VERSION,config_template,pkginfo} || die
+	dodir /usr/share
+	mv "${D}"/usr/man "${D}"/usr/share/ || die
+	mv "${D}"/usr/misc "${D}"/usr/share/netpbm || die
+
+	dodoc README
+	cd doc
+	GLOBIGNORE='*.html:.*' dodoc *
+	dohtml -r .
+
+	cd "${WORKDIR}"/${PN}-${MAN_VER}-manpages || die
+	doman *.[0-9]
+	dodoc README* gen-netpbm-manpages
+}