Version bump.

Package-Manager: portage-2.1_pre6-r3

4 files changed, 135 insertions, 7 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index c715e9508c40..3dd27a23bcbb 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.109 2006/03/05 08:55:51 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.110 2006/03/15 23:46:25 vapier Exp $
+
+*netpbm-10.26.26 (15 Mar 2006)
+
+  15 Mar 2006; Mike Frysinger <vapier@gentoo.org> +netpbm-10.26.26.ebuild:
+  Version bump.
 
   05 Mar 2006; Luca Barbato <lu_zero@gentoo.org>
   -files/netpbm-10.29-anytopnm.patch, -files/netpbm-10.29-build.patch,
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 77f7683ca4db..7d3d7826d240 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,12 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 983a0d98d400cded392778d6334c3fb7 ChangeLog 15617
-RMD160 9449f4ecc4b42777a406dadc657b503a5c4db5b2 ChangeLog 15617
-SHA256 a31b8b15a8a2132b2d5bb1822d9c5e7e53c3aa20fa43b396ec3c918a0df0db11 ChangeLog 15617
+MD5 6c8e5b6253b9c809e28851277265632b ChangeLog 15740
+RMD160 28f276815d5b354de957590723c26df551a1122b ChangeLog 15740
+SHA256 56d215cde305674bfb21cb1d1d9f99c088e62a199c774295205c6fd514ead853 ChangeLog 15740
 MD5 0ddde32893ebaac2d3fb25e7b258202c files/digest-netpbm-10.26.25 509
 RMD160 43b0ce1241a32396b6a1bcf7492421b5e87c16a5 files/digest-netpbm-10.26.25 509
 SHA256 4cffdbdd12e81a734589972355414988a77f16fb01bcb7fcc702f7f414fd2e4f files/digest-netpbm-10.26.25 509
+MD5 159e29cd2afddab5b87ce78f7d3c26a5 files/digest-netpbm-10.26.26 509
+RMD160 9eb0636ccb4aa1a56c5bc48a34f350890cb1a767 files/digest-netpbm-10.26.26 509
+SHA256 549c0951ccc671f130982b70ef76de50c0dc6c18675ccca9de127a164988b745 files/digest-netpbm-10.26.26 509
 MD5 8c4a20ca06c83687436b8cb75917d5f1 files/digest-netpbm-10.29 62
 RMD160 17c24907f2d3e4a1a59479e1767609ad16586224 files/digest-netpbm-10.29 62
 SHA256 e3919e50f5e05f7221fae56eb27e057518e8180fceb0609639e4b9de30b8e0e1 files/digest-netpbm-10.29 62
@@ -58,6 +61,9 @@ SHA256 06e3a779a82014f8783ebfc67e1b11107bcb670aacdf1f81faa361642046ba23 metadata
 MD5 45f821277fc352f41b8877d1105104cd netpbm-10.26.25.ebuild 2809
 RMD160 7284222e9fcf3a55aeab04a50420341364c7fbf1 netpbm-10.26.25.ebuild 2809
 SHA256 dcfeeb62a863acab0516a2e1883b7cbc2c2c43b4b2fb8f9bbc8801f766af293b netpbm-10.26.25.ebuild 2809
+MD5 81d0bb86805e15c951e669e75b5c72bc netpbm-10.26.26.ebuild 2803
+RMD160 59c965086c4724e1c8e29bf677fb24a56fa9aa2c netpbm-10.26.26.ebuild 2803
+SHA256 64c3eb6e9760289e8f8652d43ca80dcf95e1a13d833b1fd10992d71bee0e22a3 netpbm-10.26.26.ebuild 2803
 MD5 44a56191027bdda13f3bd51f336a971a netpbm-10.29.ebuild 2423
 RMD160 0d4e834d6042b8f2da780be23001aedd5cd615b2 netpbm-10.29.ebuild 2423
 SHA256 0d31480585431af95a7623d28ea1fe9c37224f92f4169d4705e65e112f69e4b3 netpbm-10.29.ebuild 2423
@@ -73,7 +79,7 @@ SHA256 badbc1c51bc823ab1ee550b630bddb9802f633af6e7ab3178f0d6a86f9583895 netpbm-1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEGKYE2+ySkm8kpY0RAkqBAJ9QOjst3ChpnJA+NG0wXL23I49ktQCgof/U
-T8WI7elVxL/9lNmj/vmCjWs=
-=ATuN
+iD8DBQFEGKdh2+ySkm8kpY0RAtc/AJ47jJcQWHrpLiNa9wLXmwpGgkjDJgCfUEhI
+0FM6KMB/HUrFoQEi15B2Mok=
+=kLkS
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.26 b/media-libs/netpbm/files/digest-netpbm-10.26.26
new file mode 100644
index 000000000000..ebe293600152
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.26.26
@@ -0,0 +1,6 @@
+MD5 b6770fddeea53586a5f65d2468a8ca0b netpbm-10.26.26.tgz 2540667
+RMD160 26016f1f84bc0dfb112b4c6e703317f5cdfd9192 netpbm-10.26.26.tgz 2540667
+SHA256 6c0bc0288087eed2577ece3360464c63dce1b14d234c200605f6d3158336463c netpbm-10.26.26.tgz 2540667
+MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254
+RMD160 6312e1486f473f57332a5dc050a03ac1dfce7f47 netpbm-10.30-manpages.tar.bz2 233254
+SHA256 75eb6ceaebafffb6a2d608d49f2b61c5049e5795976bbfb2d55608de1f858124 netpbm-10.30-manpages.tar.bz2 233254
diff --git a/media-libs/netpbm/netpbm-10.26.26.ebuild b/media-libs/netpbm/netpbm-10.26.26.ebuild
new file mode 100644
index 000000000000..19756d8e0b92
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.26.26.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.26.ebuild,v 1.1 2006/03/15 23:46:26 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
+}