Version bump.

Package-Manager: portage-2.0.53

6 files changed, 15 insertions, 124 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index b0b69834963b..ed7bdc94a614 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.89 2005/11/19 20:44:55 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.90 2005/12/07 23:31:53 vapier Exp $
+
+*netpbm-10.26.20 (07 Dec 2005)
+
+  07 Dec 2005; Mike Frysinger <vapier@gentoo.org> -netpbm-10.26.18.ebuild,
+  -netpbm-10.26.19.ebuild, +netpbm-10.26.20.ebuild:
+  Version bump.
 
   19 Nov 2005; Joseph Jezak <josejx@gentoo.org> netpbm-10.30-r1.ebuild:
   Marked ~ppc.
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 68c98d5fe6c1..5101c2017967 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,9 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f0bed6c66fb78f3f24131c3b679b56fb ChangeLog 12747
-MD5 08ce9acb79a75a5d63c62122a4d4c8ae files/digest-netpbm-10.26.18 139
-MD5 503432ec233b1297c311cc4a4deea37f files/digest-netpbm-10.26.19 139
+MD5 3f63d3b2306cc46ee963c7f87176e2bf ChangeLog 12923
+MD5 001de4d11bfaea065cf6ca5c4d3f5a34 files/digest-netpbm-10.26.20 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
@@ -19,8 +18,7 @@ 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 fdba89dc66d463a4fb3d50d0c046a230 netpbm-10.26.18.ebuild 2799
-MD5 367aa6598d5ec3d2288c3996aecf2131 netpbm-10.26.19.ebuild 2799
+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
@@ -28,7 +26,7 @@ MD5 1e671be8088225205752b599f9eed045 netpbm-10.30-r1.ebuild 3047
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDf47WcsIHjyDViGQRAmIVAJsEmMuNLdL/kgd0UK9VGA1YfucKGwCaAs3n
-JgGjBQTCTQLMvIW4W0KpITA=
-=Joc2
+iD8DBQFDl3GcgIKl8Uu19MoRAn2aAJ91AXSJ9Uds5oRXTXvUQ+5e5WZtWwCeJ9kr
+gViirpTaCzfmsERIxI8FSkY=
+=49NM
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.19 b/media-libs/netpbm/files/digest-netpbm-10.26.19
deleted file mode 100644
index 8ac19cf5d418..000000000000
--- a/media-libs/netpbm/files/digest-netpbm-10.26.19
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5c00c01f46ac9142514793436fb397d0 netpbm-10.26.19.tgz 2539328
-MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.18 b/media-libs/netpbm/files/digest-netpbm-10.26.20
index 2cd8739b1ea8..2771ada897d7 100644
--- a/media-libs/netpbm/files/digest-netpbm-10.26.18
+++ b/media-libs/netpbm/files/digest-netpbm-10.26.20
@@ -1,2 +1,2 @@
-MD5 dd9a77ea27d0dd4d2d0113ced30c4e8e netpbm-10.26.18.tgz 2539400
+MD5 986d5d4d3172af23449559cb109dd2e3 netpbm-10.26.20.tgz 2539433
 MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254
diff --git a/media-libs/netpbm/netpbm-10.26.19.ebuild b/media-libs/netpbm/netpbm-10.26.19.ebuild
deleted file mode 100644
index da9b2e51d4ad..000000000000
--- a/media-libs/netpbm/netpbm-10.26.19.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.19.ebuild,v 1.1 2005/11/18 05:26:29 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
-}
diff --git a/media-libs/netpbm/netpbm-10.26.18.ebuild b/media-libs/netpbm/netpbm-10.26.20.ebuild
index 15d25a7ae638..7eda61f512e8 100644
--- a/media-libs/netpbm/netpbm-10.26.18.ebuild
+++ b/media-libs/netpbm/netpbm-10.26.20.ebuild
@@ -1,6 +1,6 @@
 # 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.18.ebuild,v 1.1 2005/11/09 06:03:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.20.ebuild,v 1.1 2005/12/07 23:31:53 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib