Version bump.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 126 insertions, 14 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index b9e72ae83a6b..6f302ca89263 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.100 2005/12/31 02:22:20 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.101 2006/01/16 09:04:11 vapier Exp $
+
+*netpbm-10.26.23 (16 Jan 2006)
+
+  16 Jan 2006; Mike Frysinger <vapier@gentoo.org> +netpbm-10.26.23.ebuild:
+  Version bump.
 
 *netpbm-10.31-r1 (31 Dec 2005)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index cbf5fb8210ba..a408d9c7d0ec 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,14 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 afda4fda6b9bd4d6160822cc852ae4e0 ChangeLog 14266
-MD5 cced4bdf3ef27f117d94b1c108b9a97b files/digest-netpbm-10.26.21 139
+MD5 c623c95c049ffe89644a6cc8a33cc84a ChangeLog 14390
 MD5 e348f459a46ba5a94ec7095398a7e523 files/digest-netpbm-10.26.22 139
-MD5 c6c3222383568021fbbdc34114b6f279 files/digest-netpbm-10.28 62
+MD5 6cecfd127f62bc8737d354d267a67d81 files/digest-netpbm-10.26.23 139
 MD5 8c4a20ca06c83687436b8cb75917d5f1 files/digest-netpbm-10.29 62
-MD5 e03ba0a74da10891ecaa41fb86191275 files/digest-netpbm-10.29-r1 136
 MD5 af57721491b0a7cd11ccba542d8e20c6 files/digest-netpbm-10.30-r1 136
-MD5 ac1e123fe227bbcf7b3721a298efb0a9 files/digest-netpbm-10.31 136
 MD5 ac1e123fe227bbcf7b3721a298efb0a9 files/digest-netpbm-10.31-r1 136
 MD5 8ef24fe5097b041d3dcac4a1ea1ae8fa files/netpbm-10.19-message.patch 633
 MD5 3e364cbe32c6c5bd2f329b8dbcf604d5 files/netpbm-10.29-anytopnm.patch 1562
@@ -24,18 +21,15 @@ MD5 dc7c33e66fdb4bc51604243af2ea9b76 files/netpbm-10.31-build.patch 1629
 MD5 0d32ba4e0bc01d32022c6f91040015af files/netpbm-10.31-pnmtopng-modtime-segfault.patch 989
 MD5 ef9c07e7cbf6b830f8dd61e59fb0a34b files/netpbm-dSAFER.patch 818
 MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
-MD5 4569c7796d2f5cd2fcbd5e34022d0ed6 netpbm-10.26.21.ebuild 2799
 MD5 71bc4b3be909385bf3a008edb6b35409 netpbm-10.26.22.ebuild 2803
-MD5 4ff1d95265184a7c760d4748a4cb1beb netpbm-10.28.ebuild 2460
-MD5 4b1a6bc24bd0b85afb5756e7c1e218e8 netpbm-10.29-r1.ebuild 2937
+MD5 0a5a5050c0cba7ea8639eb452320cfc5 netpbm-10.26.23.ebuild 2803
 MD5 44a56191027bdda13f3bd51f336a971a netpbm-10.29.ebuild 2423
 MD5 22b543823e2a6dc4928d307e87ff6e62 netpbm-10.30-r1.ebuild 3047
 MD5 60981a7a99081eaa52f43e89565f5d39 netpbm-10.31-r1.ebuild 3023
-MD5 735ba0b4509f3dd9fe932b2f2be92839 netpbm-10.31.ebuild 2884
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDv5KU2+ySkm8kpY0RAisGAKCwkxGIIcz/I6tgRUkXsM9p1K0YzwCgrROc
-1gZBWnxRtXmxe68V1AphxFs=
-=FkKl
+iD8DBQFDy2H+2+ySkm8kpY0RAuY3AKCTMyjAwP7/KY/YAW91s2EbUOxnOwCcCh3X
+tHcG75nRd9i93tS/9OhRHHk=
+=OjrE
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.23 b/media-libs/netpbm/files/digest-netpbm-10.26.23
new file mode 100644
index 000000000000..574d939e36c2
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.26.23
@@ -0,0 +1,2 @@
+MD5 94ead481d0fb0dd14b74a9aee8472bc5 netpbm-10.26.23.tgz 2539937
+MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254
diff --git a/media-libs/netpbm/netpbm-10.26.23.ebuild b/media-libs/netpbm/netpbm-10.26.23.ebuild
new file mode 100644
index 000000000000..bff5c9322245
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.26.23.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.23.ebuild,v 1.1 2006/01/16 09:04:11 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 ~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 -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
+}