Version bump.

Package-Manager: portage-2.2_pre5.spank.spunk
RepoMan-Options: --force

3 files changed, 126 insertions, 8 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index aaeb09b18b62..36084400a84e 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.188 2008/05/23 16:42:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.189 2008/05/25 20:32:01 vapier Exp $
+
+*netpbm-10.26.54 (25 May 2008)
+
+  25 May 2008; Mike Frysinger <vapier@gentoo.org> +netpbm-10.26.54.ebuild:
+  Version bump.
 
   23 May 2008; Markus Meier <maekke@gentoo.org> netpbm-10.26.52.ebuild,
   netpbm-10.26.53.ebuild, netpbm-10.40.0.ebuild:
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 17d934baf126..51937da34a66 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -5,24 +5,24 @@ AUX netpbm-10.30-build.patch 2276 RMD160 aa69ccc2d3e332b4fa50e33621ead91f95a124e
 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
-DIST netpbm-10.26.52.tgz 2543975 RMD160 6b34c761fec49d8afaf8c95a95429011517c4757 SHA1 3b2b913789d04acdc6b23eabaf50e764a20db7aa SHA256 e83492bc2a7f5ce88c59f0dd3f81495e4cc6cddee4be444021ff14b665f026ca
 DIST netpbm-10.26.53.tgz 2544017 RMD160 fcda1c4cab8caf9f45cee7a3183e289ab2344bbe SHA1 e997f7e322e2e262bc419df7c527557395f26c54 SHA256 935620692994b98f1739d1429b7dd431fcd83cd243e760777b9d7a58446b75e3
+DIST netpbm-10.26.54.tgz 2544144 RMD160 08f4f4a447571c9c419ac23e28ce182dafa1fed5 SHA1 498493d9a14ef571e646111d12439bb8c9ad8960 SHA256 b43796a49a2b7078af2702b7f5b9704bc01497ab602b825bcc161a12b71e2337
 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.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.52.ebuild 2895 RMD160 8b216bb48f1e256e8bfe90fbf640aba3d6811a3d SHA1 dd2b83a3d0e22ab53187892a3645bf108f6e0d3f SHA256 3e3e64b10786ba39e98e152105d5183b10c0882bf4bca632f2dc384b3fc1896b
 EBUILD netpbm-10.26.53.ebuild 2895 RMD160 14a5e325e3526bb1a9d19ac936d529e2a53035b1 SHA1 fce494bc70dd3f8e5ee9170872ee757d4413e956 SHA256 ab1c6812e01917d8b2ed73b6c78ba3319bf0d6c356264241bc7899ed23d03222
+EBUILD netpbm-10.26.54.ebuild 2895 RMD160 e2a5b0a69aa82e0f8a226696e35d4cf691a66b9f SHA1 df8eeca51cdb41ed1e56823d6912cab1a42bf0b2 SHA256 7efc4758f09b599890f7f20aa76d39f25cd288512008b76a25ec14a30fb55a90
 EBUILD netpbm-10.40.0.ebuild 3177 RMD160 bab89a0465962ff1485d289a662ce1307d5c2a43 SHA1 f2de6fe36b480558fc353ef478687a867b90f39d SHA256 a46e59de1e8c73ebd5772ddb9853af9b35ef4ca58c2235e7f0bf86b48cf80dad
 EBUILD netpbm-10.41.0.ebuild 3910 RMD160 afb96830be2f4cde04262ad4090c1da24900efea SHA1 30241615209e93cc6e0800921a15b3c9a530a56b SHA256 d8ed0c8ea88e9b41bce0a50fcf6f88f2cd762ff7680aa6fe3423f09a2999f4ae
 EBUILD netpbm-10.42.0.ebuild 3994 RMD160 50a1c101b1b62b82ec0012e2f4985d90e7b36a6a SHA1 416633d607286a574308685bca8ebfad92ab8a4f SHA256 c34a4fa0cd5e2a576d05985262c3cf41779a61683e92953c01d2aefb21757354
-MISC ChangeLog 25587 RMD160 ff72f010caed8d740a7fa7317ace39f5c04d6206 SHA1 9a2a287df74a7e5376c51754f0d6d7250725ad4b SHA256 c537e96305ef2174f1907d829b487eb58277ef85004a519d44338952352f094f
+MISC ChangeLog 25711 RMD160 85a707dbf85ac9f9cb377afa965ddb47ec841891 SHA1 60e13f824035eacf0ef8b974c2299a121781ddad SHA256 a86a2952884d24f2f1b096efcd098c166dc5e319c7ca25493b75da99f2957e0a
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkg29CEACgkQkKaRLQcq0GIwsACfVm1yOYBpbssmiMTkoz0KQCWt
-Kv4AnjygnB8qdwXf6t7FXgQEZLzbzvSm
-=izoc
+iD8DBQFIOczIj9hvisErhMIRApGHAKChdfZ+K5RJi3gexQ4F7I+MC5vDZgCg0uDn
+CSz/YckSNK/pTczLVL2R/vs=
+=sqJP
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/netpbm-10.26.54.ebuild b/media-libs/netpbm/netpbm-10.26.54.ebuild
new file mode 100644
index 000000000000..caf9641f1746
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.26.54.ebuild
@@ -0,0 +1,113 @@
+# 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.54.ebuild,v 1.1 2008/05/25 20:32:01 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
+}