Version bump.

Package-Manager: portage-2.0.53

4 files changed, 138 insertions, 8 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index f859b85c0e94..4957e5bc245f 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.93 2005/12/10 20:43:16 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.94 2005/12/18 01:43:13 vapier Exp $
+
+*netpbm-10.26.21 (18 Dec 2005)
+
+  18 Dec 2005; Mike Frysinger <vapier@gentoo.org> +netpbm-10.26.21.ebuild:
+  Version bump.
 
   10 Dec 2005; Tom Gall <tgall@gentoo.org> netpbm-10.30-r1.ebuild:
   stable on ppc64
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 98e1a0492295..da26b1c5f969 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,11 +1,9 @@
-MD5 efe41650886fee6d2dc976d9d11a0ab5 ChangeLog 13284
-MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
-MD5 6da743132b9702be3b38b2a292bd7bfd netpbm-10.26.20.ebuild 2799
-MD5 4ff1d95265184a7c760d4748a4cb1beb netpbm-10.28.ebuild 2460
-MD5 4b1a6bc24bd0b85afb5756e7c1e218e8 netpbm-10.29-r1.ebuild 2937
-MD5 44a56191027bdda13f3bd51f336a971a netpbm-10.29.ebuild 2423
-MD5 1261c870084fb83566704ba767ba1799 netpbm-10.30-r1.ebuild 3045
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3ccd5a1ac000bc27a577b26b10998f71 ChangeLog 13409
 MD5 001de4d11bfaea065cf6ca5c4d3f5a34 files/digest-netpbm-10.26.20 139
+MD5 cced4bdf3ef27f117d94b1c108b9a97b files/digest-netpbm-10.26.21 139
 MD5 c6c3222383568021fbbdc34114b6f279 files/digest-netpbm-10.28 62
 MD5 8c4a20ca06c83687436b8cb75917d5f1 files/digest-netpbm-10.29 62
 MD5 e03ba0a74da10891ecaa41fb86191275 files/digest-netpbm-10.29-r1 136
@@ -20,3 +18,17 @@ MD5 f877055480e9ba8f7c11ff8386782621 files/netpbm-10.30-jpeg-prototypes.patch 20
 MD5 2dd6e3d7a2601a35259474344f7feb20 files/netpbm-10.30-pngtopnm.patch 417
 MD5 87a9972b59b90f26620b09ad990a8546 files/netpbm-10.30-tifftopnm.patch 373
 MD5 ef9c07e7cbf6b830f8dd61e59fb0a34b files/netpbm-dSAFER.patch 818
+MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
+MD5 6da743132b9702be3b38b2a292bd7bfd netpbm-10.26.20.ebuild 2799
+MD5 4569c7796d2f5cd2fcbd5e34022d0ed6 netpbm-10.26.21.ebuild 2799
+MD5 4ff1d95265184a7c760d4748a4cb1beb netpbm-10.28.ebuild 2460
+MD5 4b1a6bc24bd0b85afb5756e7c1e218e8 netpbm-10.29-r1.ebuild 2937
+MD5 44a56191027bdda13f3bd51f336a971a netpbm-10.29.ebuild 2423
+MD5 1261c870084fb83566704ba767ba1799 netpbm-10.30-r1.ebuild 3045
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDpL7T2+ySkm8kpY0RApU4AJ9HpDYMZS5APRfrKwl/QShy5bOmQACghlnc
++awSd9uSjlUf/2+iqCFMpVE=
+=DGfy
+-----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.21 b/media-libs/netpbm/files/digest-netpbm-10.26.21
new file mode 100644
index 000000000000..103670852a74
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.26.21
@@ -0,0 +1,2 @@
+MD5 f939c7e918938d1af511c82b263aaffc netpbm-10.26.21.tgz 2539453
+MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254
diff --git a/media-libs/netpbm/netpbm-10.26.21.ebuild b/media-libs/netpbm/netpbm-10.26.21.ebuild
new file mode 100644
index 000000000000..477272edea59
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.26.21.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.21.ebuild,v 1.1 2005/12/18 01:43:14 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 ~hppa ~ia64 ~mips ~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 -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
+}