old

3 files changed, 8 insertions, 145 deletions

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index f91ea852c496..2c63dfcde48f 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX netpbm-10.26.37-headers.patch 5913 RMD160 e11c89ca996b6f843c92064c2d633fa56cca2f62 SHA1 b1ca06491054eff6418c4b8d179de612841d059c SHA256 e587d5f17ed93edfaa2b4adbb83e05e8043b5ace24d47eb71f8e17a275128499
 MD5 abb5d815be703065ef93474acf563d82 files/netpbm-10.26.37-headers.patch 5913
 RMD160 e11c89ca996b6f843c92064c2d633fa56cca2f62 files/netpbm-10.26.37-headers.patch 5913
@@ -33,21 +30,16 @@ AUX netpbm-10.35.0-xml2.patch 850 RMD160 426cc33a622b8641bdbff8e60a8418318cdee68
 MD5 1505c38760a92008a8de01390f575fdf files/netpbm-10.35.0-xml2.patch 850
 RMD160 426cc33a622b8641bdbff8e60a8418318cdee682 files/netpbm-10.35.0-xml2.patch 850
 SHA256 b36d159a7e3ec7377760f30e835b8b2bed6c00a9aa992562d50de5ddb6937847 files/netpbm-10.35.0-xml2.patch 850
-DIST netpbm-10.26.38.tgz 2542564 RMD160 cdafa3545093200032a1efb56dde269316cca6d6 SHA1 e6aa1d7d0cd4ad9d01e2ec5870a800876ab1db59 SHA256 6ba6c59b6a3c5d5b12a3cb9f12cdbf1ff2a5ecdcc04c14449263bb50a4a5b43e
-DIST netpbm-10.26.39.tgz 2542473 RMD160 174c920a80c11b23d51cee2909192f31a04a9f13 SHA1 6f24377b83016ff2694fc3fe8892c65b0aa7f6d9 SHA256 906f338475fd242913b7e093c33beeeae6cd23f9c8891d26ed76c3aff0e27f21
+DIST netpbm-10.26.40.tgz 2541903 RMD160 7f14ab9ca45ba529503910f091b53f5abe75b186 SHA1 2c22a46c07d7c14334aa27053d9baaa6d6a10440 SHA256 fb893e5bba8769cf7f6469bd4fcba8b4c2e69de21da7604f393414238d19f086
 DIST netpbm-10.30-manpages.tar.bz2 233254 RMD160 6312e1486f473f57332a5dc050a03ac1dfce7f47 SHA1 a1893e67380029ddbb76a1451833a134f4d42818 SHA256 75eb6ceaebafffb6a2d608d49f2b61c5049e5795976bbfb2d55608de1f858124
 DIST netpbm-10.33-manpages.tar.bz2 236722 RMD160 5e43836a5f4d16f1ba5ece21e9996dbe60b252ae SHA1 6c0372f540ad040771beae15a8c2015252679e5f SHA256 aa18adee4a187ad5df243cb1a7c51097dc6a7d6a8072cf6da09972b74ac5454a
 DIST netpbm-10.34.tgz 2507007 RMD160 57a596efa6cacb981135d554a72cbaffc4cfe72c SHA1 530458871f9d3dc763a1bf82f227eeb79098c601 SHA256 b1e0a35be36e763e85c68b47806e7e1abf431f68289dd108923384b77ded785b
 DIST netpbm-10.36.0.tar.bz2 2092304 RMD160 c459c167aa6829ccb44d3acee7b6d8a3250c26fc SHA1 e7a43bbaa8183c632c79dabfcbf3a5e46a4e6870 SHA256 90bbf3cab6b4e2428bcb1d0be39d238c88706dd0ba219eec6f30019d09f05013
 DIST netpbm-10.37.0.tar.bz2 2097635 RMD160 240759eebb9eb7619019d55fdd5fcf7f548f6512 SHA1 73ac4325930d6d0a3779f33879e8bbf0402c4e9b SHA256 5107920e6adbecc0511f5d7c24224abc98b5872a6ce48074537314ecd83a7952
-EBUILD netpbm-10.26.38.ebuild 2888 RMD160 72502520a3ac6c9765c20fb7a9ecd12ae669293e SHA1 8d4eee9102754d397b7fecfdc186d1abeb5efa64 SHA256 474f82a7f9bf5062d3bfcd0391a6bbde2cdfee24bb6e75539c1c00618e479074
-MD5 4fb12cbbaf65b7a5aa353da8f180e466 netpbm-10.26.38.ebuild 2888
-RMD160 72502520a3ac6c9765c20fb7a9ecd12ae669293e netpbm-10.26.38.ebuild 2888
-SHA256 474f82a7f9bf5062d3bfcd0391a6bbde2cdfee24bb6e75539c1c00618e479074 netpbm-10.26.38.ebuild 2888
-EBUILD netpbm-10.26.39.ebuild 2888 RMD160 4e01be45fff2ac686e03123925b9271229205f86 SHA1 6ee7496b7f2e244e474d72f9b2eb1b87ca62dfc6 SHA256 ad67b6ad853326cb410b592586ca7d8c31c90a45b2e7bb80cd69ec4e87f9f606
-MD5 09442af8aff109683706691bcda277f9 netpbm-10.26.39.ebuild 2888
-RMD160 4e01be45fff2ac686e03123925b9271229205f86 netpbm-10.26.39.ebuild 2888
-SHA256 ad67b6ad853326cb410b592586ca7d8c31c90a45b2e7bb80cd69ec4e87f9f606 netpbm-10.26.39.ebuild 2888
+EBUILD netpbm-10.26.40.ebuild 2888 RMD160 4e01be45fff2ac686e03123925b9271229205f86 SHA1 6ee7496b7f2e244e474d72f9b2eb1b87ca62dfc6 SHA256 ad67b6ad853326cb410b592586ca7d8c31c90a45b2e7bb80cd69ec4e87f9f606
+MD5 09442af8aff109683706691bcda277f9 netpbm-10.26.40.ebuild 2888
+RMD160 4e01be45fff2ac686e03123925b9271229205f86 netpbm-10.26.40.ebuild 2888
+SHA256 ad67b6ad853326cb410b592586ca7d8c31c90a45b2e7bb80cd69ec4e87f9f606 netpbm-10.26.40.ebuild 2888
 EBUILD netpbm-10.34.ebuild 3207 RMD160 c02448c9092821ea29ecb8c045a7906dccf547c5 SHA1 6701bc459db19057cfac64b8707de7d8c27a8d6f SHA256 202b73c0274774c0f69f03d2f4015001c71e942b1f3edcea8bde5bde16f8af9a
 MD5 bf474a5af02f5038b9fc6688242ac5fa netpbm-10.34.ebuild 3207
 RMD160 c02448c9092821ea29ecb8c045a7906dccf547c5 netpbm-10.34.ebuild 3207
@@ -68,12 +60,9 @@ MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c353
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 metadata.xml 161
 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 metadata.xml 161
-MD5 79a48d0c98af1902da47173b3bdf812e files/digest-netpbm-10.26.38 509
-RMD160 e0aaa0078caabd706844c98c22ecc002a170db65 files/digest-netpbm-10.26.38 509
-SHA256 779da78fcdb6691677262f520cfc621ddf2695e64931baba9db86326198c23f4 files/digest-netpbm-10.26.38 509
-MD5 044f979020cc363f60dcbf802ff55c65 files/digest-netpbm-10.26.39 509
-RMD160 08f7bc947c8f0af76f8b00205087d97c476429d8 files/digest-netpbm-10.26.39 509
-SHA256 340737a1f3c212b2105a7820fb00ac7f93cd9f5db8a9d091ececec874b01a1f7 files/digest-netpbm-10.26.39 509
+MD5 29a52191edb2419e865c9e6b5691c1ef files/digest-netpbm-10.26.40 509
+RMD160 164511495ecf817fd0b61c034e3b1c07ef1d436a files/digest-netpbm-10.26.40 509
+SHA256 2cc24f28747019bd01589977c80fb817b344772bc54f39e522d144822e669f5b files/digest-netpbm-10.26.40 509
 MD5 aa322e4cfbd60cf8ff55e2bdc716b3d3 files/digest-netpbm-10.34 500
 RMD160 40829b0750c9d553b14403a2afeb29b89ac310a2 files/digest-netpbm-10.34 500
 SHA256 02ab164f86c651741c75c27cf1b7434fbdaa1fa8db3d7caedbd3cbb4c8e51baf files/digest-netpbm-10.34 500
@@ -83,10 +72,3 @@ SHA256 602a4f958a7818b28e7d08cc5cfffea28512524b89fb499233aaedff9bc9af86 files/di
 MD5 dc3c20a3170fb2f7dd1e5683409a97f7 files/digest-netpbm-10.37.0 518
 RMD160 1944d991a31e4a95ac2a3e61dc1d176ed5cbc915 files/digest-netpbm-10.37.0 518
 SHA256 a427fccacb195a5758556a0a2180efb03ea8816c0425a139b09ed36a6f96cd75 files/digest-netpbm-10.37.0 518
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
-
-iD8DBQFFxyicKRy60XGEcJIRAuoEAJ9tNTMupzxJKNLeBJ7QIcWJzzlqggCfa76j
-esGGPRTackewfCTYrb2Gd1Q=
-=06nd
------END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.38 b/media-libs/netpbm/files/digest-netpbm-10.26.38
deleted file mode 100644
index 3d95c2028ebd..000000000000
--- a/media-libs/netpbm/files/digest-netpbm-10.26.38
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 602959d72b1c342362c0b659407ede9a netpbm-10.26.38.tgz 2542564
-RMD160 cdafa3545093200032a1efb56dde269316cca6d6 netpbm-10.26.38.tgz 2542564
-SHA256 6ba6c59b6a3c5d5b12a3cb9f12cdbf1ff2a5ecdcc04c14449263bb50a4a5b43e netpbm-10.26.38.tgz 2542564
-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.38.ebuild b/media-libs/netpbm/netpbm-10.26.38.ebuild
deleted file mode 100644
index eb530a089bb8..000000000000
--- a/media-libs/netpbm/netpbm-10.26.38.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.38.ebuild,v 1.1 2007/01/16 02:43:32 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
-}