Remove old.

Package-Manager: portage-2.2.20/cvs/Linux x86_64

17 files changed, 24 insertions, 600 deletions

diff --git a/media-libs/celt/ChangeLog b/media-libs/celt/ChangeLog
index 359e18362874..ea63266d78a9 100644
--- a/media-libs/celt/ChangeLog
+++ b/media-libs/celt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/celt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/celt/ChangeLog,v 1.40 2015/04/02 16:19:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/celt/ChangeLog,v 1.41 2015/05/30 00:29:56 mrueg Exp $
+
+  30 May 2015; Manuel Rüger <mrueg@gentoo.org> -celt-0.11.1.ebuild,
+  -celt-0.6.1.ebuild, -celt-0.7.1.ebuild, -celt-0.8.1.ebuild:
+  Remove old.
 
   02 Apr 2015; Jeroen Roovers <jer@gentoo.org> celt-0.11.1-r1.ebuild:
   Stable for HPPA (bug #538798).
diff --git a/media-libs/celt/Manifest b/media-libs/celt/Manifest
index 50466019edb3..34e2598aea96 100644
--- a/media-libs/celt/Manifest
+++ b/media-libs/celt/Manifest
@@ -1,23 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST celt-0.11.1.tar.gz 465853 SHA256 01c2579fba8b283c9068cb704a70a6e654aa74ced064c091cafffbe6fb1d4cbf SHA512 73d17486ae0ef544baf74f7cf7d4b82b7dcba5143f480ffefec2c16ae9aa240d207aac4aa28c6888ba26e925f6d6f5545f71ef157b95906b63d017ce7b7ce842 WHIRLPOOL 7232af7abb58ef1fccc111a3ef74d1426bb807d3039067d8af37252cac4ba95395900903bbeff93257c6a097463ec3126a2d2ec14528449a0424a7db6dc23d8a
 DIST celt-0.5.1.3.tar.gz 440772 SHA256 fc2e5b68382eb436a38c3104684a6c494df9bde133c139fbba3ddb5d7eaa6a2e SHA512 bf5621dc3ec1b0808bdd83f006fd7b88df1b6caffe07e18eb696c268b31c6c7127329ecb4c9582c44e0ecf9577bbe2f3dbe40f15b80f8681bb7f4115f1501921 WHIRLPOOL 86355696a7aaef2d1dfc51526c29c5e39cdb6ef8e19cd23f8f49fa5b8d962ced8f395684c869a77bc67e20320c28ecf5c9d8bf8eb690f84bfccad3013736c3fd
-DIST celt-0.6.1.tar.gz 422769 SHA256 a991dff4a9e0772ede0881d81cdc7ac559148c2194885cbdd534fe4af43779da
-DIST celt-0.7.1.tar.gz 425092 SHA256 93f0e2dfb59021b19e69dc0dee855eb89f19397db1dea0d0d6f9329cff933066 SHA512 e40a291c0a4d9aee5295507b3bd4abf292c958da82bbba59604b531eb66c11391658a3901cc52e0dbd86a879072f7b22755b5b82fbc40d7ba6c0d939ab4ac3f7 WHIRLPOOL 74a9ca01a5171397ddae5f9d883bf6bd6afdfe9732b6f33b36f6278911f3750ded873ebf24275bcd8ca24c6c4bbf376066fb0b42c6a7ca632389945a904c7b11
-DIST celt-0.8.1.tar.gz 429638 SHA256 cbaa8d2ba4d4807f29a5ed40b9f2be233f988c6e3ac8dd1737b6e2ac20174542 SHA512 6dc6246904bee6104dc14fbfb41b37814f7b564d5830fced4c6a32daaa97459023b6ace2a4d8b4af07cc4a8f77d63f0ff8b55b62020abfb7913b2c920000313f WHIRLPOOL f7a5868a809ef0b370982cf9c648f1eb088bdb085e0dfea90be0e96e22c978c3619a8bba799aecd97671ccbc8f0b5e0b0094ad51b1e9bd2fb2a14f9659955782
 EBUILD celt-0.11.1-r1.ebuild 936 SHA256 30766849d3e06902b19713f67a35388f2a47aafbe230afdf6c8604e38f255151 SHA512 f1d99a41f22df9bf2090842f62df0ed89909eaac49f3726199cae6d7e839451aa5f7231576a66af717901582502e88be6be6c30030e1b57bc0459143c6286d89 WHIRLPOOL 11d32be06dcf6466601fbedce903e9ccd9b7a66199ecfc71a76324c4b817335eaa66e7d15476767288974609f38fefb3b311ea5b1aa2867602e8a9ff3223d8b2
-EBUILD celt-0.11.1.ebuild 859 SHA256 19631efb6ca0940a15292dcf910bbc781675dc489425395821cbb50ec3f6755d SHA512 04b378d1a06be237b4cdfcdc5acc310c84c858da8bb43618d03a17604288d6cc3f63845d9dd6bd393ca37641122244c4601ed7058c5e12693a37a836b0ada854 WHIRLPOOL fa559ba3e9e78d9d5d70c0ae1837b128db68062eca443be608dc6a86eae9a9c43978b95f678f4541d30e0b0d75a1ec6a78b2859f653c1e78d39ad8c9aa2b9b4e
 EBUILD celt-0.5.1.3.ebuild 855 SHA256 23f1c7fc8a005c15db0aeacb642a8db23d0acfcfeb94738b2d8c9ac7fad81ec3 SHA512 7ede777624cc53331fae01f909bf3c881baffb84669b785ee7a4fd62c2d46a7d6eea337e8bccb772b3854cc1435cacb27e87f26711b60e77fb592364e4c886d7 WHIRLPOOL 1529f5367b58d8339129d4bf46f1f498b8d6a245ca0abaa963532d68809a5b3a9c566ea08e413b616521f5ffa0cbfd3fa03236a14a652758ecea28277f968157
-EBUILD celt-0.6.1.ebuild 843 SHA256 638ffb29445f3b909c2a35a9d4627d7db8c38ba94625060dc11cfbcb8bcf723c SHA512 1d1cae906a142e22c9cdde69a7f9b456e2497def0349e4529641facca926c80b090c0e9f01cd3fd629d3cc8b030de5381bd03a06f7a5ae0b98a36184bceb0ad0 WHIRLPOOL 9b8228e51c60aaca6a82067e45979ec5d7b9315b4330780760371936a12921b42769433dcb38808dcccc9747aebd44727c761caf9f16b0712e5df57cdf2ea601
-EBUILD celt-0.7.1.ebuild 809 SHA256 ede56540b0752199e8ca42d3ea863c229bc23a3ef452a917a2b79ce6cb04fae8 SHA512 3c387210357b468eb68ece55e342d2615a70fbbce9e4862671c2270f95712b3a81e9862e5c096de22754f05ba7917771beb9cf99c31dcf39011a140777ef2cec WHIRLPOOL 3597570181da63b25f4bd327702d4026e066d7017017b652ce29ef083326240df8f738ef317639afbeed6c5c6ccdf24e7f68022f18954e5f81eaceb608916bfb
-EBUILD celt-0.8.1.ebuild 831 SHA256 b772b4288c581da92a5479d181a0ae621bf40101e4f297d22f6804ab0c963b08 SHA512 eb5d41cf23a871ae6a43f80e0089410268f2393c9a2e33020d9c5e9c7a3442ea00e7330bd78197eb698d04c971ed0dafe3dba973838b6b963d8d89afd84e6653 WHIRLPOOL 642b20d1885345f14f1adb30663313c0bf852ee18b3d215e896f50c52b20f375e17c09a9e2d2ccaa909cf6aeb097bdb53106e2c180470f8086291ef0ad8ef361
-MISC ChangeLog 5443 SHA256 d2e60328189fabe530cefd43c47f8e76df264d96b867add5df4c7ed0d0e258aa SHA512 e28e5a9ed740cba845df54e4b34d3dbf2210797b9ce3b9f41257e400d81c9615a9977bab9f26c14f817deb9d086f89fb528c0136b2693ec7765a7b5693ad44a8 WHIRLPOOL eaad77a773f3693f4d46cce5d75551d409355035455ac9e26b6235cbf13a3d5751d84479ff509193e1f724db11373eca20c1bd759a0a22d8302a147ad7331d33
+MISC ChangeLog 5591 SHA256 f9f873fa731d9606047f0af41516cfa935cf42f7e431c5dc48b0410a0d6816c4 SHA512 94eec26ae7524840e8d61a7c2b4468ee40743905deefedc415501318e99aded82ac55d643ca8cbd329c10a5b83510050b33c1959d12acefa5474aa57b7816a9c WHIRLPOOL 6c16a5437b55fe911acd156cdc2d249c1d5a626d6d19e8a95f8c8a1060e0ae79a2c79744e9a6eff7e13ae1b96212adfd9651d35ff9b5f141cffef70ed95e041e
 MISC metadata.xml 344 SHA256 a5eee590a9ebcc0640ca9409fbe05e8d1777ec52d0c9610f5943765287db7d88 SHA512 bebbb5cdaaffcb25d4f549e2acd921c8a1976808350d636f07a56b82642cd4c4a5d28efe22e69dc85080ac7f1bb8848fc90b9d009ebff6e34c156a2b99c6183c WHIRLPOOL 327abcc56356e15b425be9d041b9e07a2b8150d31532c7f389e86cc98b63330307413f5a8db266f1b4a7d89fdc81276651d729ebc599dc665d9b71e806dad689
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlUdbCUACgkQVWmRsqeSphN3vgCfXLXJ53YBN5nhhAfIG9uKzzJd
-SD4AnRSPmLQLGzGTiUBAjuLZiVh14rTg
-=pm85
------END PGP SIGNATURE-----
diff --git a/media-libs/celt/celt-0.11.1.ebuild b/media-libs/celt/celt-0.11.1.ebuild
deleted file mode 100644
index f11171a57423..000000000000
--- a/media-libs/celt/celt-0.11.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/celt/celt-0.11.1.ebuild,v 1.7 2014/08/10 21:08:08 slyfox Exp $
-
-EAPI="2"
-
-DESCRIPTION="CELT is a very low delay audio codec designed for high-quality communications"
-HOMEPAGE="http://www.celt-codec.org/"
-SRC_URI="http://downloads.us.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ogg static-libs"
-
-DEPEND="ogg? ( media-libs/libogg )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with ogg ogg /usr)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc README TODO || die "dodoc failed."
-
-	use static-libs || find "${D}" -name '*.la' -delete
-}
diff --git a/media-libs/celt/celt-0.6.1.ebuild b/media-libs/celt/celt-0.6.1.ebuild
deleted file mode 100644
index 572ec71e41fe..000000000000
--- a/media-libs/celt/celt-0.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/celt/celt-0.6.1.ebuild,v 1.6 2014/08/10 21:08:08 slyfox Exp $
-
-EAPI="2"
-
-inherit autotools
-
-DESCRIPTION="CELT is a very low delay audio codec designed for high-quality communications"
-HOMEPAGE="http://www.celt-codec.org/"
-SRC_URI="http://downloads.us.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="ogg"
-
-DEPEND="ogg? ( media-libs/libogg )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with ogg ogg /usr)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc ChangeLog README TODO || die "dodoc failed."
-
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-libs/celt/celt-0.7.1.ebuild b/media-libs/celt/celt-0.7.1.ebuild
deleted file mode 100644
index bc1cbcd43848..000000000000
--- a/media-libs/celt/celt-0.7.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/celt/celt-0.7.1.ebuild,v 1.11 2014/08/10 21:08:08 slyfox Exp $
-
-EAPI="2"
-
-inherit multilib
-
-DESCRIPTION="CELT is a very low delay audio codec designed for high-quality communications"
-HOMEPAGE="http://www.celt-codec.org/"
-SRC_URI="http://downloads.us.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="ogg"
-
-DEPEND="ogg? ( media-libs/libogg )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf $(use_with ogg ogg /usr)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc ChangeLog README TODO || die "dodoc failed."
-
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-libs/celt/celt-0.8.1.ebuild b/media-libs/celt/celt-0.8.1.ebuild
deleted file mode 100644
index 748f4832a126..000000000000
--- a/media-libs/celt/celt-0.8.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/celt/celt-0.8.1.ebuild,v 1.3 2014/08/10 21:08:08 slyfox Exp $
-
-EAPI="2"
-
-DESCRIPTION="CELT is a very low delay audio codec designed for high-quality communications"
-HOMEPAGE="http://www.celt-codec.org/"
-SRC_URI="http://downloads.us.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="ogg static-libs"
-
-DEPEND="ogg? ( media-libs/libogg )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with ogg ogg /usr)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc README TODO || die "dodoc failed."
-
-	use static-libs || find "${D}" -name '*.la' -delete
-}
diff --git a/media-libs/dumb/ChangeLog b/media-libs/dumb/ChangeLog
index 4cf75322ca6e..6b35efeaef59 100644
--- a/media-libs/dumb/ChangeLog
+++ b/media-libs/dumb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/dumb
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/ChangeLog,v 1.53 2014/03/30 10:36:11 nimiux Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/ChangeLog,v 1.54 2015/05/30 00:31:12 mrueg Exp $
+
+  30 May 2015; Manuel Rüger <mrueg@gentoo.org> -dumb-0.9.3-r1.ebuild,
+  -dumb-0.9.3-r2.ebuild:
+  Remove old.
 
   30 Mar 2014; Chema Alonso <nimiux@gentoo.org> dumb-0.9.3-r3.ebuild:
   Stable for amd64 wrt bug #495710
diff --git a/media-libs/dumb/Manifest b/media-libs/dumb/Manifest
index 6d789baeb2e0..a74949287998 100644
--- a/media-libs/dumb/Manifest
+++ b/media-libs/dumb/Manifest
@@ -1,22 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX dumb-0.9.3-PIC-as-needed.patch 2730 SHA256 483baf39a2540ca06051e91b7c629b7ada76e0b137fc00c673624c0681be28da SHA512 b97bfdedfe4f64cc37ca52e50d0ac919747dd523f686350d8681a7629508f83ae87220622f9d431132aeb149dc6011e1461ac560ccece20a4dfb6a7d2ec9d962 WHIRLPOOL f13e4bd72c9c1a44c12d0c4e7578c5d3f439ef8e9a797351c78265b5ae2d034b53156030fb570888c435135f22535d875f1267eade73c215a519445772966416
 AUX dumb-0.9.3_CVE-2006-3668.patch 637 SHA256 9f6785435757db725bc73b1c4874b91e80b9277c6fdd2b56e47dae1cfbc968e6 SHA512 ecce27757b27d997fffcc8b5736c1921a947664e2a73a4fc9ff269d8d24524fe3823a9076a3270b4296d6294102c0c7f5d2fc5c05152878dcaa11d6acede2125 WHIRLPOOL d59963d4634b3601e30c6a00fb722949e638559c1e8ec8c3d51ae74a77af759413ec5d21a769cc06b624a7e4c51626cfc1f548fdefd3ccaf253af8412552056d
 DIST dumb-0.9.3.tar.gz 167379 SHA256 8d44fbc9e57f3bac9f761c3b12ce102d47d717f0dd846657fb988e0bb5d1ea33 SHA512 9ecdea460858b7e6ad7ca2534ecb3581397e6c1fa904459affe19ce49f528e580e143b42b13413b292ae7b57901a8008e6a9ee3821824f6ff7914b136f75c658 WHIRLPOOL c5139d6d845245fc60a9984064b5bf9b0cb54e0499ddd55db56ca5faa31ebc6158b486b70409dc6068c8261330e9200c84c278e19c9fa16bf32b67c403f44e9b
-EBUILD dumb-0.9.3-r1.ebuild 2101 SHA256 0a572ab4f55008701f61b7dabb61494fe6eeb21ca1b9e3aae020ef70c27d012d SHA512 8b3f89d5d4be5075f462bb763d634af884002afee58a21a02d8c7cce6e00990c47f6cba6ab971295ea117016e88b57ab0db9916d2455f4048c40181944a9fa2f WHIRLPOOL 3f6191a6ed771c8651499c51679d3cf6285ffc54efc2f5d943797f7a117da888573c30d0ae599ae2999f7198919f022d5a820b3f71fcb11c38939017f6e5854c
-EBUILD dumb-0.9.3-r2.ebuild 2021 SHA256 c568476934bda2ca1adb0d18972e312e6fa76bf8619c22473917af1ac01204a5 SHA512 d221b20d0683929cf5cf251ff63516881565b5c2b1bb9bbedcc1e71b40fc0c459aa61b47fec7654069344ccdd85f6ac829a94cfe6b4226abde3f64468f80df99 WHIRLPOOL 47ed6188635474a7778d72342ad4d293e865e6de4f9709129c3c293e6b718a17117368a2828a062d91c90d632e4aa2bf83aacff4507dd85340ff900720596550
 EBUILD dumb-0.9.3-r3.ebuild 2055 SHA256 ce386d3dbf3390273a95fed567b58ea4a9b255e99be4223261578ea077d2645d SHA512 337de62a1c2ce11e3b487c17949a3e50bdfff4f053a55b97524b014446c4c33705ef8261d447b07691a214ecd5e642d3dada74692c64df869e344d08d257d40c WHIRLPOOL 2c923a669a8b16094655df9d64ca30f474b9b016069a4372f98e20248dc8ba07baf653f9276ffcbc2fc335675aedd0059bdac714bbb86a20194d89be53a42667
-MISC ChangeLog 6949 SHA256 29b3c451632009cf574acb728df39c7b2bdaba074d8518e35f1464018d19e1cf SHA512 9e2a11d25c4f244539ec0c80eb335ea69104c93e81db677a5e29f6eb187fb32f4bb2f4510adbae2b1a13594810bc50cd8236360c9e33b881751f48a81e310c12 WHIRLPOOL 654f2eefa2efee6044f5830ddc2a801c8681f1f943f15c9d6a8e14164282a525abfa231206d03820ce2dd8cc4e85978d8be656403096226452004fa8ef0d6aa9
+MISC ChangeLog 7059 SHA256 a1200e638c642ec6bfeb6a7ec8e6bfdedb38e8320e6359307c24ebc004eb73f9 SHA512 b1d213e12133b42bd209768daed17d465d307b8ab2444dcbbc8536e43768967d1d18fdea224e35ac5f4e96b604072e5bcea73f00b62d48a4a497a2ac8f7f6ae0 WHIRLPOOL 67ce00190d8c6e454109596f01bc072940986d1d4cc6e8f006f6dfd9c1f9dfe45288539d16b1c4b46975831633c79f63579dfdb8d78dba6f692bb86dcbb6fd3c
 MISC metadata.xml 251 SHA256 c6bc54aeb1244159055765e01a1d89c4bf47fa956a3e065de5f4d4b7b24a6753 SHA512 5eca20f204822ed2e24c57d5eb11955edf85316b475c0c760bef6ead9786d994c9c2f1fe6d1ce6a514cfe5698195b51ea575ad6010ea355bfc51b0df519c5cd0 WHIRLPOOL 27e1147deb5067fc75dd8c619ad183dad1c07355e9dcac48d84ad9148781da267029feea75754bd5810353803322cb05a1eee61066970d58fe2937e114f64156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQEcBAEBCAAGBQJTN/PSAAoJEA2sAkrWKOU20JkIALSF/q4H7SnDVaJE7C9vBaYl
-ZtQtSjgpu7PkW0GIoecc47+dI6VkLPNpCfjyDvru9O2g4lpH3SZNz/mEW/lnw4F4
-3iyA0GpAq5ebF0y+xX/STv7nd9FQlvOMwTEm7f9nmxMSTTpTiSabWzsv7LL2HsMX
-4foKtNFBmS1vfFfV4Q+5l92X0NTOsTUbMYi6WKZ4eFtgKKF5YTHppL5q25NJSVW1
-7DMS2fNNU2rsSvFhXjt5/O33q7iOIDYGTUPnOrW5P/R/2vHrWtE03wRUbX1htzh4
-Bwse4ZGdbMveFoUQtz15W9cUsz9BebeaOCEvXQOyzuij5r+bFRtL8wteGreI5/A=
-=2mQL
------END PGP SIGNATURE-----
diff --git a/media-libs/dumb/dumb-0.9.3-r1.ebuild b/media-libs/dumb/dumb-0.9.3-r1.ebuild
deleted file mode 100644
index 588c0d92015b..000000000000
--- a/media-libs/dumb/dumb-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/dumb-0.9.3-r1.ebuild,v 1.14 2011/08/09 12:28:53 xarthisius Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="IT/XM/S3M/MOD player library with click removal and IT filters"
-HOMEPAGE="http://dumb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dumb/${P}.tar.gz"
-
-LICENSE="DUMB-0.9.2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="debug"
-
-RDEPEND=""
-DEPEND=""
-
-src_prepare() {
-	cat << EOF > make/config.txt
-include make/unix.inc
-ALL_TARGETS := core core-examples core-headers
-PREFIX := /usr
-EOF
-
-	epatch "${FILESDIR}"/${P}-PIC-as-needed.patch
-	epatch "${FILESDIR}"/${P}_CVE-2006-3668.patch
-	sed -i '/= -s/d' Makefile || die "sed failed"
-	cp -f Makefile Makefile.rdy
-}
-
-src_compile() {
-	emake OFLAGS="${CFLAGS}" all || die "emake failed"
-}
-
-src_install() {
-	dobin examples/{dumbout,dumb2wav} || die "dobin failed"
-	dolib.so lib/unix/libdumb.so || die "dolib.so failed"
-
-	if use debug; then
-		dolib.so lib/unix/libdumbd.so || die "dolib.so failed"
-	fi
-
-	insinto /usr/include
-	doins include/dumb.h || die "doins failed"
-
-	dodoc readme.txt release.txt docs/*
-}
-
-pkg_postinst() {
-	elog "DUMB's core has been installed. This will enable you to convert module"
-	elog "files to PCM data (ready for sending to /dev/dsp, writing to a .wav"
-	elog "file, piping through oggenc, etc.)."
-	elog
-	elog "If you are using Allegro, you will also want to 'emerge aldumb'. This"
-	elog "provides you with a convenient API for playing module files through"
-	elog "Allegro's sound system, and also enables DUMB to integrate with"
-	elog "Allegro's datafile system so you can add modules to datafiles."
-	elog
-	elog "As a developer, when you distribute your game and write your docs, be"
-	elog "aware that 'dumb' and 'aldumb' actually come from the same download."
-	elog "People who don't use Gentoo will only have to download and install one"
-	elog "package. See readme.txt in /usr/share/doc/${PF} for details on"
-	elog "how DUMB would be compiled manually."
-}
diff --git a/media-libs/dumb/dumb-0.9.3-r2.ebuild b/media-libs/dumb/dumb-0.9.3-r2.ebuild
deleted file mode 100644
index 69829476f5c7..000000000000
--- a/media-libs/dumb/dumb-0.9.3-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/dumb-0.9.3-r2.ebuild,v 1.6 2014/03/06 10:45:04 ago Exp $
-
-EAPI=5
-inherit eutils multilib-build multilib-minimal
-
-DESCRIPTION="IT/XM/S3M/MOD player library with click removal and IT filters"
-HOMEPAGE="http://dumb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dumb/${P}.tar.gz"
-
-LICENSE="DUMB-0.9.2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86"
-IUSE="debug"
-
-RDEPEND=""
-DEPEND=""
-
-src_prepare() {
-	cat << EOF > make/config.txt
-include make/unix.inc
-ALL_TARGETS := core core-examples core-headers
-PREFIX := /usr
-EOF
-
-	epatch "${FILESDIR}"/${P}-PIC-as-needed.patch
-	epatch "${FILESDIR}"/${P}_CVE-2006-3668.patch
-	sed -i '/= -s/d' Makefile || die "sed failed"
-	cp -f Makefile Makefile.rdy
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake OFLAGS="${CFLAGS}" all
-}
-
-multilib_src_install() {
-	dolib.so lib/unix/libdumb.so
-	use debug && dolib.so lib/unix/libdumbd.so
-
-	doheader include/dumb.h
-
-	dobin examples/{dumbout,dumb2wav}
-	dodoc readme.txt release.txt docs/*
-}
-
-pkg_postinst() {
-	elog "DUMB's core has been installed. This will enable you to convert module"
-	elog "files to PCM data (ready for sending to /dev/dsp, writing to a .wav"
-	elog "file, piping through oggenc, etc.)."
-	elog
-	elog "If you are using Allegro, you will also want to 'emerge aldumb'. This"
-	elog "provides you with a convenient API for playing module files through"
-	elog "Allegro's sound system, and also enables DUMB to integrate with"
-	elog "Allegro's datafile system so you can add modules to datafiles."
-	elog
-	elog "As a developer, when you distribute your game and write your docs, be"
-	elog "aware that 'dumb' and 'aldumb' actually come from the same download."
-	elog "People who don't use Gentoo will only have to download and install one"
-	elog "package. See readme.txt in /usr/share/doc/${PF} for details on"
-	elog "how DUMB would be compiled manually."
-}
diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index f75edf9d239d..14789a6d0d6a 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.292 2015/04/29 04:42:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.293 2015/05/30 00:33:45 mrueg Exp $
+
+  30 May 2015; Manuel Rüger <mrueg@gentoo.org> -netpbm-10.51.00-r2.ebuild:
+  Remove old.
 
 *netpbm-10.70.00 (29 Apr 2015)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index f0c608b8cee0..eea40138cd0c 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX make-tarball.sh 1364 SHA256 71c361f721bd4a87e2e15a6944243706ba300fc22544386891423344e37632f6 SHA512 89b0ebfe6f5a82c3e3fc678ec4599d7281a0978c3a53437f0fbcfcb33607f8087bca1263d8a52c5b25cb1ab91a6635385cf423213464af858fc2f9663d5446a7 WHIRLPOOL f048c27757c418227649062023ec971fa2a684d4cda88a26af212531da47021d71962296e7d9031de62f5416a3be78b1b3ccc6ad32b56e55847c09c2000f3577
 AUX netpbm-10.31-build.patch 1629 SHA256 eaf363941337718390856c318c8e69114c8fb9dbcea8b07755350dbdabce6323 SHA512 53e88bd1c85aa04d60ca2de7a32e5d00d9f959f3443e0c951c0694c814f6956708d8d12427a0fa8a8f76a1613d2982c3aa9b0c6ddd12b9cad3419ced1e5bb59e WHIRLPOOL 15a6b682813bfac808ccff8e16be492fd78defd59f82d5960d9a344452d8c761ea64ebbdc460c005c7d7669a3f26aa3704850487b43f4732bccb742b15709c28
 AUX netpbm-10.51.00-pnmconvol-nooffset.patch 3930 SHA256 d9c7f70e58d50dac4998157021ac2fef92822d1abd9b9d060384b195e4f1cabb SHA512 9f9a1e9a2d7db117693648693c0152082cab1e60a075e9bd4ca67b9c042ea02549917504658d32311b116cd17901f153ece73303adabdac2cd0981ac22a1ce45 WHIRLPOOL c7a6b09c9c5e258445473d7f16e91fac9205d1f21f24e8eebe0a277908774e6670d00ee3f6aa44f6bfc6bccface76c5db6bc523f442c263306982d43cb83edb3
@@ -14,29 +11,9 @@ AUX netpbm-10.66-options-case.patch 3417 SHA256 1d286fc9da28b7cc264b6d227871e3d7
 AUX netpbm-10.66-test.patch 347 SHA256 fb95a101811a6e8b983d6f82130e511658831e6ad2e873fa4632c4049a00bac2 SHA512 bb271d77794fa8b3d5d4632e32d6bd2b5f9522853c6b96c7056fe9817da47b89153eba2653cf3a5a29f597e3fa616e1f6c810bd986651e610176d69b428afb74 WHIRLPOOL 5f59c43abf70d6bc74e6ac6050e25137421f0f3fd5e75e6fb8e77c54f2fc447f26c1a0aeb23ea70dca27bd44b11fdc88fbbd8bcbc1be338acb6f601b9fdcb943
 AUX netpbm-10.66-wordaccess_be_aligned.patch 942 SHA256 3a0c8120c69cd6f6f53dc51ec15944d17486e7d6d7a4cffc5a69fb2b94f863b1 SHA512 b3b33b0e32c7bcb126104f0f100b56cb811c1ce5051be854a93d0227d9a684e440dd9e0787dfe3f4cb12df1fef5b2e6d1ecb6c3a49d630a32595a026ae1fb482 WHIRLPOOL 2288bf481ae97df10b56d89a022b16659dadafdf0c207bc4a5ac501f029d0b4633999691f2849f8f1692be5d9370944e6e1a501dcb082482f0b8bb9cb843ea97
 AUX netpbm-10.70-system-libs.patch 1016 SHA256 1045dd7517eceaa97d4de4547502aaa9c70bb1430dec9af3da7e842a0411b915 SHA512 156e668ff209ca42dc3bf7e9b89232065d1f5ed3284885beeb67c8c9728eb7f142aceb98898c8d8e2c2a90dd9fab927a698b4372f2f3bcbf06f6df44d1a81629 WHIRLPOOL 6f70ec23d478669d50bf3716bb0d90c51f447c2ae8b3f3632edc3c6600dd696db92ae98d3d94912c0405b9fa97fcd0dfda3aeaa6e49cb88712275e33c43d6de6
-DIST netpbm-10.51.00-libpng-1.5.patch.bz2 8120 SHA256 260a5f0e9834e7e1aa5c2dcc292695aa43b5aa198af1cb33e5705f7cac10da7b SHA512 3bebffb798e72e5ff872b482d43dffbd174496d1ca46e88bcb3c19f2b94cdfe2037aa1f19a22a40996503ccc03929bd28570722874a0c74265b083fbc66b24c4 WHIRLPOOL cbf1efd16ac7acef1fa318454f24afbd7f68eded7343168783ce8fd5dd389b9d97e7a9237cf4d6315cdeba462c9d84fb7011ddfa2df592b1fe15f4462ca0d623
-DIST netpbm-10.51.00.tar.xz 1834148 SHA256 6d7bb30d1d0e7f6a23b55c6f03bbb20b539909ad84281dc944b1072656dc1d0e SHA512 07b621bfebbd051a80eff09886bc2b3b4f82b01fa9087d6a76ed70a042493b69fb3295d471640a4576101ba19352a57eadf69c5721d9cc416d25ff563ee07c76 WHIRLPOOL 25cbfbdd575fe1c032ce1bb700181175b1386d481990e516ce62d953b1d37091c32ca2016c487d4963af1b8c79ec04953e59181334d2a53b9d5701acedabdf2a
 DIST netpbm-10.66.00.tar.xz 2575356 SHA256 7fe94f38e139be194e9e384e8d9c9747f2fe08c18295bba93c55a41c5bbf63fc SHA512 44348eb1155353d5cd5a2ce025bc6d9301cc3239acea6b68418c14432f4bd61fc5a8669bb51b3e86b96abaf5b02cc20115c662e40fa5b41aee202b0c2ae605af WHIRLPOOL fa937fccd2da9068a268d6a5729c8093baacc3025ab2382902611dadab985247fdacf3433f6e15407b081478b93b772237c41363f37340ea6c93c169357dd0cf
 DIST netpbm-10.70.00.tar.xz 2621612 SHA256 1268cb6801790619f6d057b964305355011dfe66247f2b71fe9978cdd7af7d93 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4 WHIRLPOOL 8810a2e8d4ed6a834d6fbc2861079b4e2664f85ff2548d00f95a9c26f92d02dcebcb8d1b9c26226caba067accc41eabbe1211322607de77d61827b34a8b4c82a
-EBUILD netpbm-10.51.00-r2.ebuild 4876 SHA256 64ba1ded0af46f473325f4331d9c2f0bd4a01b01d2a9b13cfbd10100f6716cf1 SHA512 8a8a70195e352b5c975a74f060c6d412c781f4162aa00746c71e803bbb95c95c0487d1394b72099b52fd5b03cabb3fc13726b283905aad20028372d0f3e08537 WHIRLPOOL ad468b638a5d9ba18bf753a7cd69d1cacced523ec1ae0bece3f040f388cc1681ce40bfdb2f1109b8d5f6585eeb72a475685d78084891d8a56dd6da02ed829ba0
 EBUILD netpbm-10.66.00.ebuild 5751 SHA256 72a7de874b63ffd99b50dac4509259dac135e2c0780bc566e834b341bc68ec44 SHA512 aacd7095ec5505cd4ef1f91bc4efb36dde14e254363246f2bbeecf5fd13dba34530c202d658fc00b73faa31824207f348df2523555878d918ad35097e336f8d4 WHIRLPOOL 1cb2e39487e83ceab1810e74367533b212a8a3446b841445b4605143987edc0b19ba6b62889b9fc9fdf0d53216c4e773ec323d67300076a942e50533d2869d1b
 EBUILD netpbm-10.70.00.ebuild 5451 SHA256 fa7f90b1f23e7300555101ee08c34d2becc8f2b814bd1de0ce1ae106eb55efda SHA512 e54ae5588ef077a20e031934f44c044df043bef5d96c8f9a2e52035f81cde938c0cf0dae7540d9f33baa21ec46dee0124e830a6b49baf6191fbac77c1cb836b2 WHIRLPOOL d0d739b391d7553fd876ab8bad3d3c8df731c1eec2d4aeb930f2063eff29f01146e09fdfab7bd302de41c9934b68bb183184f5cd02dace0c5a93b89191082533
-MISC ChangeLog 41144 SHA256 7058caae14c72208873f168c67baed488de929cd873af1537435037fbdc6cdd4 SHA512 67d427f8279be254ae864ff17de8942ac545e70651f3bc993f0069a719e4ad48cf0013f38458cec9763a14e34c71ef5b9dbcfc1fb40c55befa9448f2289d6eef WHIRLPOOL 9c0d3307249dea0929b903b992de5017e612c202c8e388b052c922e9e3ba0018c9b1b0ee64997fc9f3bc044139773b36ea856ebcd84daf013989ced2007b0dd2
+MISC ChangeLog 41234 SHA256 3aa5c5084b494810e4b3ec97a07241c7ca05b576f23137752bee9436ef5a4f24 SHA512 88e408bfb6ed6234e110b417b4a2d29d19e155ff42da92fee69daf2c1d0f43723d51c861a28c732a40dd287b977b78f9e0d43ebc7f0f6c251e067df61f22c033 WHIRLPOOL 899417e8214057c6e16d9e2bcefed3958977eb43fc37608d0ecebf109ed8fa06726c16f643603dd862e701df8118d7c5fe4134ffd97351a1564b35c204e0bc3f
 MISC metadata.xml 261 SHA256 e04079912e263782a8c0e4f115e49ff3694535ff2efef7b7fff85cf8d100102b SHA512 e7bcb8f689bd7da37e414a3f33b125d52a5ec0d376e821edd58d352ffb502098fbe8b7d24c0eb073822e41a55c280f84558ca4314dd37ac20adcf6471bd712af WHIRLPOOL 9aa2223d48bacfa917affeb56dc180becb54fc612e69ce6d26496d45cc42fd1050e2a40c77957ee7f37b3e2665adc0c95f08b60fab1787d3292905f0a4c8092a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJVQGFAAAoJEPGu1DbS6WIAgzwP+wXw7POp88d+zrmkgQA+uUAv
-TfAI8J49RbsuKebNcL4qgfSJdQxR1pHgI+UbYwDvxKNgVR6CGVWqdKXReqobqiAQ
-VaBrAd+1djtdntmmX3asNaEbFMF4j6+DgeV8wtrJnatF/ELdCDBhhcRUUB8asb8l
-1COzf3y5Ov83u7LhYgcXrNvk7LGHQ4EKFF4i/dR3K8O33gTkUU1v0IkEuIER/Nn8
-p3yBBwocS67AWGCA5xHdMFzweSGmkt1poXKtcyey7jWhuVDa047ixuT57q/zsLVW
-KYuJQ2e++3SPsk+u95P6LUqoV0FIpjcHX5RZysPwUsfzoj7gRrH0yIAfSOO7Z8pf
-SoBtTJqWdrpGLy/3gKjz59Tywsi5Sspo5TH6tEsKYXSTpOVRk7RwheeGkWmFEv9Z
-tlTiZHI6uFbMy1mvVSY/sogDmuGBGws19SuhH7M0Uc0G5sHM8BP2MwPwKbbUZJke
-pw0DMGZITQIq0JqPpFtXR0RIBdWL3T7MKgMR/M1cKYn9zxOHbtrAQLfm7X/nxoAt
-4tQ/lqleQ0kBHADzekUESvTasfwE5r9HEe5CSA6dGwe10nd048B4bLW6CQ7leSiN
-FJuCUQxTa+weVx48WpzRILj0IqOtDY03OE2YjsTeLkvlHDpnvGYPAfN3wTp7TKQS
-8Bb6XNhIiWFSPisCJIz5
-=ENX1
------END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/netpbm-10.51.00-r2.ebuild b/media-libs/netpbm/netpbm-10.51.00-r2.ebuild
deleted file mode 100644
index f59c04a4dee8..000000000000
--- a/media-libs/netpbm/netpbm-10.51.00-r2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.51.00-r2.ebuild,v 1.6 2013/08/27 15:32:09 kensington Exp $
-
-EAPI="3"
-
-inherit toolchain-funcs eutils multilib
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	mirror://gentoo/${P}-libpng-1.5.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="jbig jpeg jpeg2k png rle svga tiff X xml zlib"
-
-RDEPEND="jbig? ( media-libs/jbigkit )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper )
-	png? ( >=media-libs/libpng-1.4:0 )
-	rle? ( media-libs/urt )
-	svga? ( media-libs/svgalib )
-	tiff? ( >=media-libs/tiff-3.5.5:0 )
-	xml? ( dev-libs/libxml2 )
-	zlib? ( sys-libs/zlib )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	sys-devel/flex"
-
-maint_pkg_create() {
-	local base="/usr/local/src"
-	local srcdir="${base}/netpbm/release_number"
-	if [[ -d ${srcdir} ]] ; then
-		cd "${T}" || die
-
-		ebegin "Exporting ${srcdir}/${PV} to netpbm-${PV}"
-		svn export -q ${srcdir}/${PV} netpbm-${PV}
-		eend $? || return 1
-
-		ebegin "Creating netpbm-${PV}.tar.xz"
-		tar cf - netpbm-${PV} | xz > netpbm-${PV}.tar.xz
-		eend $?
-
-		einfo "Tarball now ready at: ${T}/netpbm-${PV}.tar.xz"
-	else
-		einfo "You need to run:"
-		einfo " cd ${base}"
-		einfo " svn co https://netpbm.svn.sourceforge.net/svnroot/netpbm"
-		die "need svn checkout dir"
-	fi
-}
-pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} && ! -e ${DISTDIR}/${P}.tar.xz ]] && maint_pkg_create ; }
-
-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 '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
-		*)         echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
-	esac
-}
-netpbm_config() {
-	if use $1 ; then
-		[[ $2 != "!" ]] && echo -l${2:-$1}
-	else
-		echo NONE
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/netpbm-10.31-build.patch
-	epatch "${FILESDIR}"/${P}-ppmtompeg-free.patch
-	epatch "${FILESDIR}"/${P}-pnmconvol-nooffset.patch #338230
-	epatch "${WORKDIR}"/${P}-libpng-1.5.patch #355025
-	epatch "${FILESDIR}"/${P}-underlinking.patch #367405
-
-	# make sure we use system urt
-	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
-	rm -rf urt
-
-	# take care of the importinc stuff ourselves by only doing it once
-	# at the top level and having all subdirs use that one set #149843
-	sed -i \
-		-e '/^importinc:/s|^|importinc:\nmanual_|' \
-		-e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
-		common.mk || die
-	sed -i \
-		-e '/%.c/s: importinc$::' \
-		common.mk lib/Makefile lib/util/Makefile || die
-
-	# avoid ugly depend.mk warnings
-	touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
-}
-
-src_configure() {
-	cat config.mk.in - >> config.mk <<-EOF
-	# Misc crap
-	BUILD_FIASCO = N
-	SYMLINK = ln -sf
-
-	# Toolchain options
-	CC = $(tc-getCC) -Wall
-	LD = \$(CC)
-	CC_FOR_BUILD = $(tc-getBUILD_CC)
-	LD_FOR_BUILD = \$(CC_FOR_BUILD)
-	AR = $(tc-getAR)
-	RANLIB = $(tc-getRANLIB)
-
-	STRIPFLAG =
-	CFLAGS_SHLIB = -fPIC
-
-	LDRELOC = \$(LD) -r
-	LDSHLIB = $(netpbm_ldshlib)
-	LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
-	LINKERISCOMPILER = Y
-	NETPBMLIBSUFFIX = $(netpbm_libsuffix)
-	NETPBMLIBTYPE = $(netpbm_libtype)
-
-	# 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)
-	XML2_LIBS = $(netpbm_config xml xml2)
-	JBIGLIB = -ljbig
-	JBIGHDR_DIR = $(netpbm_config jbig "!")
-	JASPERLIB = -ljasper
-	JASPERHDR_DIR = $(netpbm_config jpeg2k "!")
-	URTLIB = $(netpbm_config rle)
-	URTHDR_DIR =
-	X11LIB = $(netpbm_config X X11)
-	X11HDR_DIR =
-	EOF
-	# cannot chain the die with the heredoc above as bash-3
-	# has a parser bug in that setup #282902
-	[ $? -eq 0 ] || die "writing config.mk failed"
-}
-
-src_compile() {
-	emake -j1 pm_config.h version.h manual_importinc || die #149843
-	emake || die
-}
-
-src_install() {
-	# Subdir make targets like to use `mkdir` all over the place
-	# without any actual dependencies, thus the -j1.
-	emake -j1 package pkgdir="${D}"/usr || die
-
-	[[ $(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/bin/{doc.url,manweb} || die
-	rm -r "${D}"/usr/man/web || die
-	rm -r "${D}"/usr/link || die
-	rm "${D}"/usr/{README,VERSION,config_template,pkginfo} || die
-	dodir /usr/share
-	mv "${D}"/usr/man "${D}"/usr/share/ || die
-	mv "${D}"/usr/misc "${D}"/usr/share/netpbm || die
-
-	dodoc README
-	cd doc
-	dodoc HISTORY Netpbm.programming USERDOC
-	dohtml -r .
-}
diff --git a/media-libs/speex/ChangeLog b/media-libs/speex/ChangeLog
index e8d6327b037d..6f89c688c082 100644
--- a/media-libs/speex/ChangeLog
+++ b/media-libs/speex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/speex
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/ChangeLog,v 1.117 2015/03/03 09:06:58 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/ChangeLog,v 1.118 2015/05/30 00:32:40 mrueg Exp $
+
+  30 May 2015; Manuel Rüger <mrueg@gentoo.org> -speex-1.2_rc1-r1.ebuild,
+  -speex-1.2_rc1.ebuild:
+  Remove old.
 
   03 Mar 2015; Yixun Lan <dlan@gentoo.org> speex-1.2_rc1-r2.ebuild:
   add arm64 support, tested on A53 board
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index 9fc5ee50ef6a..29624bca462e 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -1,8 +1,6 @@
 AUX speex-1.2_rc1-configure.patch 874 SHA256 205aa8a4ba729f015535b084f8932c19f5efaa35f81df8b8dc807201fb40c922 SHA512 da82194b7022f06bafc1a19049328ebb3e8baf53aa17463edeb1d973cdbab782ae5d0d2cbb6bc59994bb3eeceba388bf874ea7fa9c5c531b6165bd366d02761f WHIRLPOOL 0d686618332029c32249079ec96f65d098f25664e7ee7bda50047cc0fb53ea6a97417b14b2dafd9aeea6f4263300116b9ea93a9827e427e702e0842d9a3abcde
 AUX speex-1.2_rc1-r1-configure.patch 1153 SHA256 8dde6cee655d622b31d49bdae09fe77975d993543c35ad6cdbc065210268cdf0 SHA512 4cc6ca75ca85861e37fa4084d5614c941ec31459d2c2770264f024c2143cb305a6c63df1b9fd62a14c9f68e45254cd880cc5dd7094fc593f34378a23d2318f84 WHIRLPOOL 08e555ea40e87c8afbf9152922c261ea6b442809b7e2a32fb9f9b6ab899658a628346289510920f7987c299e52513c49d7f16949f0e01605fd5b78c5155a34a1
 DIST speex-1.2rc1.tar.gz 1061882 SHA256 342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6 SHA512 bdf1ddb2d60496ab220b94c1bec7a43f267fc964fdbb5cc9f24b71b9b571f237f5ce98c1d74b02699d71a95281f4694ff464ebec25e3b135244e5b3099cb1813 WHIRLPOOL c984f04a9c78332509b76ef98ff0eb84b8b4b8755d02890c5de41501325c2055e42243eaed2671e0087c8ca2cdea5967e5113c3d85a53f3704a8d8a3cfc487cb
-EBUILD speex-1.2_rc1-r1.ebuild 1350 SHA256 360cb2084cb3b23de7735b8b84b6cb8e1c53d98ed0f3fc0bde67631307694479 SHA512 f00d991ad9d8fb7491d61e3eac177cbe7e8195ced603d402267b2639cf3b69541bd4a7e3526d10d374b1b004def726118d84697708e87bca9eca1632ff8970b9 WHIRLPOOL 138d95d7355c6e88c07bbbb99e7c7dae4cedc4442a2d77b94535bc743d3f105697b5b3e316b09e948dac6c37b6886d61424c187a2fcff732c61954798ca140d1
 EBUILD speex-1.2_rc1-r2.ebuild 1699 SHA256 c2fcdd9d8d04d2313923aaef528460d7f33fa0f9abdd6e3943f64e7c12359189 SHA512 9112f2f81b214a0840fdcc6c6db86fd7136e349a3294b41decb450f3a5945d3a05051a7e6f2d0947aa0f6f50148a6276b71b942bdd3010f640f78ea93112086a WHIRLPOOL a70afc9be726c86fe2510f6e99418be5955c6da9145596e593f22e5bd49c09afd8e08d802236d772d8d10c2182bc3da1385768403689ea57d41a025673282a92
-EBUILD speex-1.2_rc1.ebuild 1210 SHA256 0fb19a231a279132f5fd888529f014343352bfd06ffcef3da37a5fa96d12c4e1 SHA512 f984f08c56c37698d03ca9e1f42edbb9fe86f9c5dae841f313381e413c0c081c23b2fdc82f68ae1e1473f872245a183848b24da760de6b8f79e084601ee252ab WHIRLPOOL 1c4c409dd1bef8b495d06351ba0f3b932d2da6e77bfc19e9f66fc98a05ce11bf942cc660c82ecc1f707fceaa2f7fd937fdad096a827ce2bb319cfbd431c5e847
-MISC ChangeLog 15137 SHA256 e4b6477ac8401b1f05065cd4b4c3831b4efbffa5452bf0f2785a51aa5f80fb41 SHA512 4c16a93c484d0ad3353a1e89276a26621301f8ee2416cf1824b5affd9f8a16d5fc80a3329402a53b6978471c6d8a54b35930e6b6534e565ef545433d8e3ebd13 WHIRLPOOL 8a37119ea70a61ce5f4349c98b23259297b6f8cd16218330db0b4e946e55cafcfd091729a50b5ba251944f25cfa607b70f7c907852fd5c0dcf0720537b3c5437
+MISC ChangeLog 15252 SHA256 8cae4721492a479ba7e7034d1d6706272d2c06c47c53a3b08ed4f27ff128da21 SHA512 1c2ccb6c0d7a6a1ce4d15810acc0fff48f484eb20fae6cb3726ad70c5761c517c2079bbfe456afdc74822a14d870d8b12d6ee967005de3cadae2d44dd494ba54 WHIRLPOOL cb8c34bd6fa9f801f1df04bc0763175cc548e39e4da02688c8c29789161216dafbcb83344bc96db7e470a7065cc993f57093a29c3fc50017e43d1d503e287922
 MISC metadata.xml 235 SHA256 adcdef35c3985341d05dca7917e54c21bdc022ea809a599359c3d366d2980a04 SHA512 cde79bcf8c88d1dd280d44530ff1869953454167b76eb3bf8ce399733b1aec1e899b2acb8c5baaf56c4e014862309cea035dab97087cf5418032072bb8a35e61 WHIRLPOOL de33255c58d8d64290a406f8f2a89ebbc7c8df04c21b958c8d3e1614d8cb7259860780fff383530c925e88f623f2f7c5127cc4ff6a5f7a12c8d57af80ba7f6c8
diff --git a/media-libs/speex/speex-1.2_rc1-r1.ebuild b/media-libs/speex/speex-1.2_rc1-r1.ebuild
deleted file mode 100644
index 46e03071259b..000000000000
--- a/media-libs/speex/speex-1.2_rc1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.2_rc1-r1.ebuild,v 1.7 2015/01/29 18:00:48 mgorny Exp $
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-MY_P=${P/_} ; MY_P=${MY_P/_p/.}
-
-DESCRIPTION="Audio compression format designed for speech"
-HOMEPAGE="http://www.speex.org/"
-SRC_URI="http://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="ogg cpu_flags_x86_sse static-libs"
-
-RDEPEND="ogg? ( media-libs/libogg:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PF}-configure.patch
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467012
-
-	sed -i \
-		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
-		libspeex/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-lfs-flags
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable ogg)
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-
-	prune_libtool_files
-}
diff --git a/media-libs/speex/speex-1.2_rc1.ebuild b/media-libs/speex/speex-1.2_rc1.ebuild
deleted file mode 100644
index 282a98682e69..000000000000
--- a/media-libs/speex/speex-1.2_rc1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.2_rc1.ebuild,v 1.13 2015/01/29 18:00:48 mgorny Exp $
-
-EAPI=2
-inherit autotools eutils flag-o-matic
-
-MY_P=${P/_} ; MY_P=${MY_P/_p/.}
-
-DESCRIPTION="Audio compression format designed for speech"
-HOMEPAGE="http://www.speex.org"
-SRC_URI="http://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="ogg cpu_flags_x86_sse static-libs"
-
-RDEPEND="ogg? ( media-libs/libogg )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-configure.patch
-
-	sed -i \
-		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
-		libspeex/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-lfs-flags
-
-	econf \
-		$(use_enable static-libs static) \
-		--disable-dependency-tracking \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable ogg)
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install || die
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}