3 files changed, 6 insertions, 120 deletions
diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 0b0e1d0aedfd..576ae7e9bc27 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.167 2007/10/13 13:25:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.168 2007/10/13 13:32:14 vapier Exp $
+
+*netpbm-10.26.46 (13 Oct 2007)
+
+  13 Oct 2007; Mike Frysinger <vapier@gentoo.org> +netpbm-10.26.46.ebuild:
+  Version bump.
 
 *netpbm-10.40.0 (28 Sep 2007)
 
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.44 b/media-libs/netpbm/files/digest-netpbm-10.26.44
deleted file mode 100644
index a69b3fd852b0..000000000000
--- a/media-libs/netpbm/files/digest-netpbm-10.26.44
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 7cbfabae216ed3796ceec1c18d9d73c0 netpbm-10.26.44.tgz 2542815
-RMD160 9c2671189866c86539f0caa924f1301950daacec netpbm-10.26.44.tgz 2542815
-SHA256 612a625a378b8cacd165d604c4d9a801dce30c9e15714b3138d4c4949eb09d2d netpbm-10.26.44.tgz 2542815
-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.44.ebuild b/media-libs/netpbm/netpbm-10.26.44.ebuild
deleted file mode 100644
index f5d33d78372d..000000000000
--- a/media-libs/netpbm/netpbm-10.26.44.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.44.ebuild,v 1.1 2007/07/10 09:49:31 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 arm hppa ia64 mips s390 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
-	epatch "${FILESDIR}"/netpbm-10.26.37-headers.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 "${D}"/usr/include/shhopt.h
-	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
-}