Version bump.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 295 insertions, 8 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index e9328cb39149..b15874e83cf0 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.209 2009/03/06 02:51:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.210 2009/05/05 02:10:48 vapier Exp $
+
+*netpbm-10.46.00 (05 May 2009)
+
+  05 May 2009; Mike Frysinger <vapier@gentoo.org> +netpbm-10.46.00.ebuild:
+  Version bump.
+
+*netpbm-10.26.61 (05 May 2009)
+
+  05 May 2009; Mike Frysinger <vapier@gentoo.org> +netpbm-10.26.61.ebuild:
+  Version bump.
 
   06 Mar 2009; Jeroen Roovers <jer@gentoo.org> netpbm-10.44.00-r1.ebuild:
   Stable for HPPA (bug #249384).
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 8092f77be5f9..c452da13c469 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,18 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX netpbm-10.30-build.patch 2276 RMD160 aa69ccc2d3e332b4fa50e33621ead91f95a124ed SHA1 d14b5144c310c9182c45cefb629f2b4e77be0058 SHA256 aa7c4dcad0fe5aa71cce357236aa859b14c3794c92c5a5b848cc31618194b174
 AUX netpbm-10.31-build.patch 1629 RMD160 4226692b199871b3bfb27a9e6fec97d8ac1a4bf6 SHA1 574bd4443c6dbd8a2508bc2d2e3096cfcc815710 SHA256 eaf363941337718390856c318c8e69114c8fb9dbcea8b07755350dbdabce6323
 AUX netpbm-10.35.0-xml2.patch 850 RMD160 426cc33a622b8641bdbff8e60a8418318cdee682 SHA1 ce767bd1a0fe861cc9d1a47fa0bb53b12b4a58cc SHA256 b36d159a7e3ec7377760f30e835b8b2bed6c00a9aa992562d50de5ddb6937847
 AUX netpbm-10.42.0-gcc43.patch 541 RMD160 4162fc8f0020941d9072ce595a4586a8a9f2159e SHA1 aebb30f5196d88acd8156f6954bf2c2903700aa3 SHA256 259f194d7d55742d2d7d0915f57814642e059890157eef1eeb3c5c2ba511ef86
 AUX netpbm-10.44.00-fontdir.patch 1120 RMD160 9fee334109a2dc6922dbc5c1b000077434f21e6b SHA1 08d05597f3afa38ac2a5e4bc383d409f8f848503 SHA256 22ae6474afc747e3163c61b128ea92cd138b656cedae8a79c8b1ab67e335fc14
-DIST netpbm-10.26.58.tgz 2550354 RMD160 29695ca9ef5cca1e147a3bbb5b0d60fe5a6fca5d SHA1 663baa755e8336622cff48009435503119fbce00 SHA256 9f55e41b13a6a27de07033506a870aa6a0fe288faff8958e338eb5a4ea468360
 DIST netpbm-10.26.59.tgz 2544733 RMD160 05b7d4b4d29e120239eaee6ba55cbba96da7f8af SHA1 3fe1349c285a12b936c39f6b49ef3baa73de4def SHA256 a63416cecd9c88bad57f035e54ae9ca5ba5f48dd434869d5555593d511a0b60b
+DIST netpbm-10.26.61.tgz 2545265 RMD160 18a8ee7160edeaf99e98125b9af01352f359f4ec SHA1 38e47c96adcfdaa8a8cc4741b6985f82f0100260 SHA256 060a4ed3ca14255d8cab00854a507b1a2a02602dd65094997ecdf4089c47de8a
 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.43.00.tar.lzma 1870919 RMD160 ab7efe1f7239a8dba1609767e959016da9143b2f SHA1 961828c75ba6cc2afbb42a1ba12383df412daee9 SHA256 35dfd184e405bd2aa723a7ace17d70931b103c17f2aba84fd0ef614c33fe66b6
 DIST netpbm-10.44.00.tar.lzma 1880748 RMD160 8da4bc01241c3b281f63f2105292af8efe492bfb SHA1 6f5d59b878fdebcb3d7243392b56b4d79dc299b5 SHA256 84c9212e3fd6cde274301de1ef063061bfbac050ee57554ccaf29aa657d86a49
-EBUILD netpbm-10.26.58.ebuild 2895 RMD160 8a8fee01473d703ec0ea85622bf05d169739d51a SHA1 57bcff40f9ac1d1800da768b7f4ddca6536fa435 SHA256 a4db977a55259e1348e2fc1e57cc8a954b51a57201a95bfc59a2b85fe7e49fc6
+DIST netpbm-10.46.00.tar.lzma 1897731 RMD160 79230ebe58c90f9f6f7d5de13f215ac22c581c18 SHA1 0dee5f49bf1ebd5d08675db21a621f3d7ceea3d0 SHA256 598350fc2b65f268666a711ae50952573c606157727a1fe5295de9bff4e1fd3a
 EBUILD netpbm-10.26.59.ebuild 2895 RMD160 b0403bdea6bfbf2da6ed88983904e6f6d79c1594 SHA1 11b63292a24f725b9e5d981e1cada6246c77b3bc SHA256 ad7c2f01044afeff466a339f4549b080371fc7db337da65e394aa62fb0921765
-EBUILD netpbm-10.43.00.ebuild 3927 RMD160 0138350a176529084e647f4feab0cb898805e42f SHA1 0dd67797e46e0a1508152cec58fa4f4157d25b34 SHA256 33cdda1b5a77013f40c4132cc8fedecfddb66b493b022930ed3d9d4bb971a2cd
-EBUILD netpbm-10.44.00-r1.ebuild 3993 RMD160 c40ab1102fd0e77f7492e6fd19f717b2ea6e8b44 SHA1 ce7f214f7b916da042725dd560b87895d4352725 SHA256 12e5f315e73d496d44b48fd562a23f528851f562242518797fd1e7895c90b39c
-EBUILD netpbm-10.44.00.ebuild 3938 RMD160 ca0228359bd7d52482606e99e21f885295d62a4e SHA1 75f27f95e8e96a7ae36e6f6bae316c647997d5e6 SHA256 9052b77de00a06cfef6e72823a859a590bae101eadc16e62a22753e950588c00
-MISC ChangeLog 28050 RMD160 05872de5ea134e8df4ef45bcd16dc41852f1474a SHA1 fe43f42b53304c3601e9160b192529793040e051 SHA256 077a3d4d0efecc3f2c05b63811654de699bf4eb83c370abcdc78a256d1d6e4d8
+EBUILD netpbm-10.26.61.ebuild 2895 RMD160 d7d383e9a53b498c10535e342fc927894d193a67 SHA1 30c4a970b004ad602cbf653e94a56ac8c4302f68 SHA256 3568417a0b968eb6ddb1f555c45e77391ac76eba9a0f7abe4a210e2e5a8b13f8
+EBUILD netpbm-10.44.00-r1.ebuild 3993 RMD160 37c38beca30d58121a5b1bfa078805d11ac9a1cc SHA1 8a906fb9dabf52b707c5827e0b2112a64eaa2925 SHA256 f9a77a40c0fe78d68f3dfb6940eaca0454ff04c292ed9b4802d266c6efc9d305
+EBUILD netpbm-10.46.00.ebuild 4033 RMD160 1854e785de81ef0d3e0fc17c1aaec143f9b5cf5d SHA1 101d6678d744363a5e9b130cb10f36fe3feba4c1 SHA256 785a021fbe77ea5f4b9356fca941d0199b298000591ba2af636bb3745bb3f8ee
+MISC ChangeLog 28301 RMD160 e44fe8f56b8699c310fd98ef8da95337b7f41b84 SHA1 49a005b4de923773a78d9b9da4699e39e0dd3b12 SHA256 934c33f25ef36c0dfa49e8096ecc76da15e9aed5f4fba86c73ee640fbe86d08b
 MISC metadata.xml 266 RMD160 de6149ba44458a170c3f6f6d5c015a3b4e5fe3bd SHA1 bb0d212119622779ede27328c6df989b362deac3 SHA256 4db3c087a1641cf4b8ae3750db0fb27bf8ff9a4dcbe496d1c173a9f9c04df75d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkn/oC8ACgkQn/5bYzqsSmFNvQCfbQeYxt2SEevVvw7ljjte987a
+wScAoIgXze+tsZ62WtKzrcG9gNBzW3GX
+=SfEc
+-----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/netpbm-10.26.61.ebuild b/media-libs/netpbm/netpbm-10.26.61.ebuild
new file mode 100644
index 000000000000..68b202c427e3
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.26.61.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.61.ebuild,v 1.1 2009/05/05 02:10:48 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
+	epatch "${FILESDIR}"/netpbm-10.42.0-gcc43.patch #211296
+
+	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() {
+	emake 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.46.00.ebuild b/media-libs/netpbm/netpbm-10.46.00.ebuild
new file mode 100644
index 000000000000..1896d0ee05c1
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.46.00.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.46.00.ebuild,v 1.1 2009/05/05 02:10:48 vapier Exp $
+
+inherit 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 X 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 )
+	X? ( x11-libs/libX11 )"
+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
+
+	# avoid ugly depend.mk warnings
+	touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
+
+	cat config.mk.in /dev/stdin >> config.mk <<-EOF
+	# Misc crap
+	BUILD_FIASCO = N
+	SYMLINK = ln -sf
+
+	# Toolchain options
+	CC = $(tc-getCC) -Wall
+	LD = \$(CC)
+	CC_FOR_BUILD = $(tc-getBUILD_CC)
+	LD_FOR_BUILD = \$(CC_FOR_BUILD)
+	AR = $(tc-getAR)
+	RANLIB = $(tc-getRANLIB)
+
+	STRIPFLAG =
+	CFLAGS_SHLIB = -fPIC
+
+	LDRELOC = \$(LD) -r
+	LDSHLIB = $(netpbm_ldshlib)
+	LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
+	LINKERISCOMPILER = Y
+	NETPBMLIBSUFFIX = $(netpbm_libsuffix)
+	NETPBMLIBTYPE = $(netpbm_libtype)
+
+	# 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 =
+	X11LIB = $(netpbm_config X X11)
+	X11HDR_DIR =
+	EOF
+}
+
+src_compile() {
+	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
+}