Version bump.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 135 insertions, 7 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 4abd4aa72ada..551feb230fd5 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.104 2006/02/09 21:01:22 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.105 2006/02/09 23:41:25 vapier Exp $
+
+*netpbm-10.26.24 (09 Feb 2006)
+
+  09 Feb 2006; Mike Frysinger <vapier@gentoo.org> +netpbm-10.26.24.ebuild:
+  Version bump.
 
   02 Feb 2006; Mike Frysinger <vapier@gentoo.org>
   +files/netpbm-10.31-need-libm.patch, netpbm-10.31-r1.ebuild:
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 14da57d814be..ba02d03ccdc6 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e2df6d5aabb35507f36f9442ee9b9de6 ChangeLog 14721
-RMD160 dabee94fca15b21238b189460735c9ae9c291175 ChangeLog 14721
-SHA256 5776299a33df1f4d738d4b8030eedcec5692aea00e946e671a5f30ae9b02e1c1 ChangeLog 14721
+MD5 1ea891c150eacbaa2edf9e7bc1c261c4 ChangeLog 14847
+RMD160 00b0dec9f619f27dc0a37874556c7519bff80453 ChangeLog 14847
+SHA256 92fd4aa025a8becee5285d0e0cecc95f6066d0643681621c143e725060dde276 ChangeLog 14847
 MD5 e348f459a46ba5a94ec7095398a7e523 files/digest-netpbm-10.26.22 139
 RMD160 d38dbd1d60d20dff62d4fa16c5b0dcf6e44d1740 files/digest-netpbm-10.26.22 139
 SHA256 204ba405903c957b64461e899a1ad0c32520f7361a9fb4ef4a2f5b03a152e5d6 files/digest-netpbm-10.26.22 139
 MD5 6cecfd127f62bc8737d354d267a67d81 files/digest-netpbm-10.26.23 139
 RMD160 32593181d495d0467303de86928c9d8843a42c7c files/digest-netpbm-10.26.23 139
 SHA256 c261f11795e626e1f50e6e76d076e51a853a1142a13d7edf64feca6c79010e5d files/digest-netpbm-10.26.23 139
+MD5 125fcf41ce0966bfca9e81ef32ae31f2 files/digest-netpbm-10.26.24 509
+RMD160 4d2382475d2251ab805faf74b33f73e4459eb8a4 files/digest-netpbm-10.26.24 509
+SHA256 0a7cec48efa34b0fd0116aa07180bd22c1ab91bc0706b226f60caa76b1615e44 files/digest-netpbm-10.26.24 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
@@ -73,6 +76,9 @@ SHA256 6c6d1f5e54997be2a408fae7a79723bc55d857367b38fd972447a7a890ef18e2 netpbm-1
 MD5 0a5a5050c0cba7ea8639eb452320cfc5 netpbm-10.26.23.ebuild 2803
 RMD160 bb93076c115d125bd809289bb16354c41144e539 netpbm-10.26.23.ebuild 2803
 SHA256 bf5651cef1601a01d1f8fa94786332f6bf6cce045cdb8f7263e1093d3f8b58c8 netpbm-10.26.23.ebuild 2803
+MD5 6b2b0274ae97f30dc64dd9878d225dab netpbm-10.26.24.ebuild 2803
+RMD160 12ccc8666f539b0bbdfca7d5949ee8f7db9d9999 netpbm-10.26.24.ebuild 2803
+SHA256 86ea48040908051197c89d6e8e7f91f8b0cba0c5b2838f200db514f7bce93d29 netpbm-10.26.24.ebuild 2803
 MD5 44a56191027bdda13f3bd51f336a971a netpbm-10.29.ebuild 2423
 RMD160 0d4e834d6042b8f2da780be23001aedd5cd615b2 netpbm-10.29.ebuild 2423
 SHA256 0d31480585431af95a7623d28ea1fe9c37224f92f4169d4705e65e112f69e4b3 netpbm-10.29.ebuild 2423
@@ -85,7 +91,7 @@ SHA256 d7e14b2bb73a23bb46f74e8081ab717265ee1db5322b57adf5a4cc8297e9388a netpbm-1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD662vV3J2n04EauwRAnhxAJ9XqYz/ZAxdX7kT2k9raOFLXO20VwCfYSDh
-olT4s7F/CXZQEJ1k6DcJY5A=
-=HLCu
+iD8DBQFD69My2+ySkm8kpY0RAtOaAKCF2EToSB7pnL07J02v/DIASwIhcgCeLc4U
+hJlXuS7QC+IU8MOcVOP4YqI=
+=0IGO
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.24 b/media-libs/netpbm/files/digest-netpbm-10.26.24
new file mode 100644
index 000000000000..debaf2b1bdb9
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.26.24
@@ -0,0 +1,6 @@
+MD5 f1c204b454fb7d6b417016a0aea32d68 netpbm-10.26.24.tgz 2540150
+RMD160 e62e853a66c144b8cec8f540ea3fac50e43aed39 netpbm-10.26.24.tgz 2540150
+SHA256 a261ae2030dbd6a81554a51729074cc211c1b4147046eb9b7dbe0344ee878ec5 netpbm-10.26.24.tgz 2540150
+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.24.ebuild b/media-libs/netpbm/netpbm-10.26.24.ebuild
new file mode 100644
index 000000000000..41bb7e187f26
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.26.24.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.24.ebuild,v 1.1 2006/02/09 23:41:25 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
+}