Remove old.

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

32 files changed, 59 insertions, 1410 deletions

diff --git a/media-sound/gigedit/ChangeLog b/media-sound/gigedit/ChangeLog
index 7e651509e9d7..248239c48d29 100644
--- a/media-sound/gigedit/ChangeLog
+++ b/media-sound/gigedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/gigedit
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gigedit/ChangeLog,v 1.6 2012/05/05 08:20:42 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gigedit/ChangeLog,v 1.7 2015/05/06 09:44:05 mrueg Exp $
+
+  06 May 2015; Manuel Rüger <mrueg@gentoo.org> -files/gigedit-0.1.1-gcc43.patch,
+  -gigedit-0.1.1.ebuild:
+  Remove old.
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> gigedit-0.2.0.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -26,4 +30,3 @@
   27 Jan 2008; Alexis Ballier <aballier@gentoo.org> +metadata.xml,
   +gigedit-0.1.1.ebuild:
   Initial import, ebuild by me
-
diff --git a/media-sound/gigedit/Manifest b/media-sound/gigedit/Manifest
index 2b49993de102..d56bd8c91989 100644
--- a/media-sound/gigedit/Manifest
+++ b/media-sound/gigedit/Manifest
@@ -1,19 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX gigedit-0.1.1-gcc43.patch 691 RMD160 f84b0943c06e25419792aa166c649124895037f9 SHA1 9a6417bbccc7d3437dd958308d1af468f9275b87 SHA256 4ab56a3609883e454db5f43bb8e1c92ed7e0634e9b9cf64a0d38dd06d3601927
-DIST gigedit-0.1.1.tar.gz 829456 RMD160 e9ccfc623125b4b54947647a652f64758db25cce SHA1 0691dcc646e241fa2ddf4e0606a998a777e68286 SHA256 7ffea08f6e406ef1ab1f0d123fee63d053daa3b8488d4c5e3e3b7c4882fb3bf8
-DIST gigedit-0.2.0.tar.gz 810112 RMD160 21936eebef5ad7002cf12ce5017e23ead7c88bc5 SHA1 a08051238c57e2237c15f2116b35ed36ddbead2a SHA256 e7e73a1c896eea8483ff5d4e340054271ce41330b0dd7e15ee62369cbd63365e
-EBUILD gigedit-0.1.1.ebuild 815 RMD160 675faeef42041c947f15c78fe89f26dc2f2375e8 SHA1 d69b3b93c35444e7631c2ba0a3b4b559aefee1f2 SHA256 e3f8911e08d500a09db414fdcc47d5d3596202222260da8bdc77b08a8bbb7bbb
-EBUILD gigedit-0.2.0.ebuild 828 RMD160 b21e59317c54ba429e64bafedc30b956da5a0c2f SHA1 29610ecc9c3917da81bf6622253c452465e4d59a SHA256 face3fe15395293cc2e1a162749a487d1b781385bb731fa7c54aa99d25760a2b
-MISC ChangeLog 983 RMD160 c8c95f2c6885208731a8e8e78a5cfccce96e0ebd SHA1 6564453e751da675a388362b7463028686700719 SHA256 76679a706bc8ee37073410e784963e07503aa07c0b0b745911475fe7151288cf
-MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iJwEAQEIAAYFAk+k4xMACgkQfXuS5UK5QB2mTgP9Gm1A6g4Xsi4SbDQYrNd5xtwM
-iBqC9Hq6PvCheOFVQdZfqLdiQrfbRqRRxlDlXLAmKy5snr8PqLjiOAChW1QTMDRE
-6KgAdadt3hlewRqZV5NSVuEfIZvN0TjHFJWCYr4tHQ++4NqyHkGGYa/aYytzuaz/
-A0EjtxGHtE/KCP0s4WI=
-=RV27
------END PGP SIGNATURE-----
+DIST gigedit-0.2.0.tar.gz 810112 SHA256 e7e73a1c896eea8483ff5d4e340054271ce41330b0dd7e15ee62369cbd63365e
+EBUILD gigedit-0.2.0.ebuild 828 SHA256 face3fe15395293cc2e1a162749a487d1b781385bb731fa7c54aa99d25760a2b SHA512 4e67efbbcde86bea803dae492aef0a766bbbeb31bd876858c8a370f7d447d662899f2e9fd72b55875f8f4d45ef267a97673cb60941a6127d6a9b7f9c06d30709 WHIRLPOOL 0b2b8b586a022f40355b62788a440df1e830bb324aa4f4f8036c05fcfd1df01dad68b0ded05ce0ba9563d5c54531f2eb46119e575ab37adfac51d060267d3ee9
+MISC ChangeLog 1103 SHA256 bf0197dbd11818a75c570adab861b9e0badbbeb0c1c75899a83df2b64569837f SHA512 38e8b663e90e4b82e838dcac6e3a30b7e5c765e57aa097279da43fa7113483e754ab193d9476bd6cb56a662c351394981f7a26c3f954cca14d9059caf5bcd5b6 WHIRLPOOL 5260367f163accfad99a1aca8bc23ea067e2c07f061b5431af08611e49a51b84ecb7c251e71259084df6da3f4a5647ae4a22f7035408a376bab1924a149c31e2
+MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
diff --git a/media-sound/gigedit/files/gigedit-0.1.1-gcc43.patch b/media-sound/gigedit/files/gigedit-0.1.1-gcc43.patch
deleted file mode 100644
index d5fbf2c23a1f..000000000000
--- a/media-sound/gigedit/files/gigedit-0.1.1-gcc43.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: gigedit-0.1.1/src/gigedit/mainwindow.cpp
-===================================================================
---- gigedit-0.1.1.orig/src/gigedit/mainwindow.cpp
-+++ gigedit-0.1.1/src/gigedit/mainwindow.cpp
-@@ -18,6 +18,7 @@
-  */
- 
- #include <iostream>
-+#include <cstring>
- 
- #include <gtkmm/filechooserdialog.h>
- #include <gtkmm/messagedialog.h>
-Index: gigedit-0.1.1/src/gigedit/paramedit.cpp
-===================================================================
---- gigedit-0.1.1.orig/src/gigedit/paramedit.cpp
-+++ gigedit-0.1.1/src/gigedit/paramedit.cpp
-@@ -18,6 +18,7 @@
-  */
- 
- #include "paramedit.h"
-+#include <cstring>
- 
- namespace {
-     const char* const controlChangeTexts[] = {
diff --git a/media-sound/gigedit/gigedit-0.1.1.ebuild b/media-sound/gigedit/gigedit-0.1.1.ebuild
deleted file mode 100644
index 1298b9faf7f7..000000000000
--- a/media-sound/gigedit/gigedit-0.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gigedit/gigedit-0.1.1.ebuild,v 1.3 2011/03/28 18:23:18 angelos Exp $
-
-EAPI=3
-inherit eutils
-
-DESCRIPTION="An instrument editor for gig files"
-HOMEPAGE="http://www.linuxsampler.org/"
-SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=media-sound/linuxsampler-0.5
-	dev-cpp/gtkmm:2.4
-	>=media-libs/libgig-3.2.0
-	>=media-libs/libsndfile-1.0.2"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-}
-
-src_compile() {
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-sound/mp3splt-gtk/ChangeLog b/media-sound/mp3splt-gtk/ChangeLog
index 8bcbe179be4f..6156f73fe1d5 100644
--- a/media-sound/mp3splt-gtk/ChangeLog
+++ b/media-sound/mp3splt-gtk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/mp3splt-gtk
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt-gtk/ChangeLog,v 1.41 2014/09/06 19:37:28 sping Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt-gtk/ChangeLog,v 1.42 2015/05/06 09:42:28 mrueg Exp $
+
+  06 May 2015; Manuel Rüger <mrueg@gentoo.org> -mp3splt-gtk-0.5.9.ebuild:
+  Remove old.
 
 *mp3splt-gtk-0.9.1a-r1 (06 Sep 2014)
 
diff --git a/media-sound/mp3splt-gtk/Manifest b/media-sound/mp3splt-gtk/Manifest
index 1f0563385306..24f235010d56 100644
--- a/media-sound/mp3splt-gtk/Manifest
+++ b/media-sound/mp3splt-gtk/Manifest
@@ -1,27 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX mp3splt-gtk-0.7-disable-docs.patch 1437 SHA256 18b04f85044e1adc5466fb5965e63b4ea7593eb0c0686ce725558bf1de4705d6 SHA512 115447d6f9dca43d0e2ca9442fc0286e94afe2c1ff49a225d138712b2fb86a88ebabe1c81e8d9cf37450407df1f0b26f0072f40ef4b49773720ead06cd72636c WHIRLPOOL eefe1ccc32b82c966b917b9b73c9900a2c9a5dbcfe00b90bdd97ab51ad60d9ceb3e8567fce700c6442836a34afd73b47f96144c8b2d4b290c4dc3686d2a6dbac
 AUX mp3splt-gtk-0.7.0.930-gtk.patch 1413 SHA256 bc8cebdeabdc06a6bab7c95bd0ab929504401bbb04ddc912ddbe7c304d90ff6b SHA512 e174d47f3b7c0782e4e36b03b61e5ffd1f68e3e8f0d9eb54f9d6f4c23b323585ce7bed0fa3129a8bb2e9693956aaa4fa26afa896c71afb3a28500585c6240dac WHIRLPOOL 62065e05e4d18de509cb399580737fbdc9793383772ba3f3bba0be74e742fa69f6fd6e50365a02cd0c33f67425bc05d833130168dfeeaf3430e19c61a33ac3d6
 AUX mp3splt-gtk-0.8.2-automake-1.13.patch 1692 SHA256 757fdba93aef77961af031f829d867f7f58d0fbe758747f83836622e2983b4b8 SHA512 4f2dac824f430e84e69856be0ad13e30a7d69376d573f4bb872a338da4d7fde20e3668e723f32a7dadb594a7f5783e5463470079865a97efe893a99122d2cf21 WHIRLPOOL 0444360f93f2fde35f94aed92ea2c5d66151701b5d43400cd649c923f82238400022f075da4958a490eb2d56acd74b604b1b84c9ec25b20a427bb9451d6de4dd
 AUX mp3splt-gtk-0.8.2-desktop-file.patch 756 SHA256 564cf60a377b4fec1b440607ef4d48520a8ceb96b15c7e9eb8da50c859512460 SHA512 dc3ea5e6bc6c3fee3ea9f426a1900eae56837cac8f0a967a917730425f9be9741587c2fcdb39f4fd91d672f772b95635952700e68ea89d681a366afbf12968a5 WHIRLPOOL 944d3abe74adc43ccd088a2f49f73eaf5c41eee90355a2484ba0fdc479f2844ec4c5cfcd77ff551c5538d5ca3fe658f3e0a2a9f51c58492a8030dbaf8816f3b0
-DIST mp3splt-gtk-0.5.9.tar.gz 304691 SHA256 6742caf7f79246d1b06d2dd9fb53c9d7d9df97508dcd6dc716e6f679ef2905b3 SHA512 b5eb711d1ee1cbabf56ac4decfa719c0b0340e5cd5e297c80478c6ac5d0b2e479258160278629549a0335bece03abf8a46c9d667b2ef818732aa694adb4c4eb9 WHIRLPOOL c4a82b8488e39c84426446de55920d7a793ac94cc01a78f94bc2a9ea3216d733164084051da622755b6d3714228f4361912b75ce3cbdaf2b2d4aa9ef894d3b48
 DIST mp3splt-gtk-0.7.3.tar.gz 1166328 SHA256 7300383453ca8d3268776163e2afb9b03a0d907d2f29ec6fc1826b41679d4e1c SHA512 070d9aabfe3eed77f596051b2a750dff3a36f1a37e233d6d6498dae4688a48770a87730b3c2e9c1c775a28e834590d84027030fd6f994ffa890c685c9f8bd809 WHIRLPOOL e0b42f51a552d0b372054b5a55d6f1e9e3ee35f20363999bfcb7a34436515a831f3b20b4ca40723cd5614b63e405e46530621d16167954c986f320f8876b9cc0
 DIST mp3splt-gtk-0.9.1.tar.gz 1079894 SHA256 3c9db4b6ec26cd55c91b7fe30b8b6236555b95012cd8abdc4c949e6ae45c8194 SHA512 7596e8341b8cd5f0592f310665bd178d04e8c46b43e51a2df4fb0d6acac64e5be66aeb58f072acbbf9597578c5126f28eb3734e8d24e020669db7b2b94ef6a65 WHIRLPOOL ce701110d5c855c1872ca1c83aa7e13c8e95c307e9cea43545a9d77017dac1c13c7bddaaf129ba00ef6be8f2f4a1a3aae57e29df7b3361830a54643d0bfa85fc
 DIST mp3splt-gtk-0.9.1a.tar.gz 1079260 SHA256 5fc242870f1690a2e27b5bea8b13bb4f7ede1e4cb212f9d9bccd9502a734f718 SHA512 9eea51063350d7644a96150332a3e88a35ba5e94bda07043d03dc93fe1b6ff656e55f8d7e564248d54004e44e0f9f4677c63a456a8a65a18be63417e47b524aa WHIRLPOOL 75e7c3c87d60fd0d4dead656cab4560dc13a69c70a18de776127875fff6804e92c7311d60f88a9115d7bbfab66d22718e6de334480e7faab9017f94a03131afd
 DIST mp3splt-gtk-0.9.tar.gz 1061200 SHA256 6262cf61f74bfb1cac5d5bdf6c3ad41fece221f7fb66032ae633835044aecff5 SHA512 0966e08fb8aef75feb6d3ffea7377ce39376739b1c6d97cb5729e627829d99e0b56011d625cfea26c76a39f7a2ff2a941fef92b4ab85a9c83f99ef1c55c6a87f WHIRLPOOL 14d64a728364139fabfe4851886fc0bdc98121f2ef8c8642f9d30b37cfdf143b3e8434aaac600fda0c80d38afdb8f13a2423e53904cc0cf446d187193d426bf4
-EBUILD mp3splt-gtk-0.5.9.ebuild 1300 SHA256 2d3de8a2f7beae6c37815f7fef141bed443d199cadb9fe94c02b21585f10fa28 SHA512 293c56ebecae15b76bd02d74469d64b8d1ce297576e9bae25326e3dac40415cbc00f9aef3b94e09289dd9c025ab1e158d6c366e9477126e3a43cd3c80c6e2a6a WHIRLPOOL a2e0e1540c8a9ff2d067b1917f699340e86275b1c3def86637ae2a2f3570379760511ac21ad196bdcf2ed37757ae512c55f2dd49ba1582ac9e634c33a784ea5a
 EBUILD mp3splt-gtk-0.7.3.ebuild 1643 SHA256 632f8d1da8f959cb01a2a233f79540c02c057cf0bb7631941c2ca158ee74861a SHA512 c0b81f2759f727f676a35c7f771f1b524e19240239d536f9c9cb78edeb1aa7090270976f117e02e178d24a96540838379b93d5061fd10de3521be863f6d8dd98 WHIRLPOOL 74664dd70afe8ed9dc1da34014ed27a11f4b32e1ca33c2c390fbee713080b984aae58f9e98668054c571f44d1875bf6d31f8cfda44d3ade80b38783f27b4b819
 EBUILD mp3splt-gtk-0.9.1.ebuild 1535 SHA256 6a219c5789381492ab3f8ba5bea255d1d9f05e674eb54e3acf01d1df0b3cf802 SHA512 293e9634a2256623bb86d118237f5bf9cbbf3c657e60cd412b2c407ad919246b3d490313d1346622d7cc670729b13cc841894a9e58aa8acf83d7cf77f01577e9 WHIRLPOOL 1eebeac0049d67b2c3c514377b9aab6d0fc29b1b02b6a0a900638804c2afec7a5bd6408da7450036f893a8dd26efc3efce915633458496ecb8fa3ac5a86125dd
 EBUILD mp3splt-gtk-0.9.1a-r1.ebuild 1581 SHA256 fa49ac9bae9aac7f2de89f55ab414eeffe4b972486c65c477e9f4cb57e5df63c SHA512 7c1212e9e4027bf12bc2bdb186f7c476100247d0f543306acef94e002f34ef044650ac412ce80ca5c37cefa8d057b97540dd17f66453e61fa79ca486cbdd7330 WHIRLPOOL fc223c00193e2db4d95a7e17fa74d6b1fa0d32f85e997d14543061e42994c9c3fdb5b1d1959244659111dd5f5b743e6645099ff92d0d26c60a0741ce55939245
 EBUILD mp3splt-gtk-0.9.1a.ebuild 1537 SHA256 9f9feeaad80adf98b36661cfc3102def2f8a9a6916f1a76ca7a132476678ef72 SHA512 e99279d221966b7ef60c7949d340752123ea4b7998a1dc51f682604ea9462937dc371cbf3e610e18b1bfed90ea9c50737d03d8072a8f7a716f257cfdda03906c WHIRLPOOL e72f4f30a707e82a4c55428fe49f0c6d300de43bde8eea867cf2cdd7cf2bdb801c09f584ed806e90cecc2e8b0e8c7b6c17ea37f1969fff97da34b0167cb74f8a
 EBUILD mp3splt-gtk-0.9.ebuild 1541 SHA256 81f6ea7b76d91601951f145a1efbb4e37d7679d129810543560ebfb49902f90f SHA512 380c6c6101beb69063667ad7bd33e18bd45d6835ddcf21c423849f7ba9aab7acea2f3fd8c54b514aa6803fb0ebb1a0d1065b6a32a419396c184d659affe800e5 WHIRLPOOL 252b893716f532b368c1241f7d897fc3eb231f2f65f5e1e094ab3457e4a55e3a76365632b865b5577c932ce7ec2299a03fb5712921020516227ee6b4eb411471
-MISC ChangeLog 6158 SHA256 7e3b9776151789e178535391a112a65a7edfd3206e7af8d97b60371d2b04029c SHA512 41e8773db2915f9f80c7821ff0fa8b58e34118d4d1c4ee1cf369ebccde5e236727ff0aef81c64577bb62fe97bd3c22b490b371e9d1964536da0d11fb9711c63c WHIRLPOOL 0fc95713241c6ec3f20802a72d2be262dc1d8c1119d7b62f3c78d61a5445144bf62386954f985eb1c35af4a58b05f3ad724a2cbaa2e5171b6aba05051b548ba1
+MISC ChangeLog 6248 SHA256 7abc48468088f7610f5135281d298ae451003a8c4c2a21cc7f21d6aed4ed4b83 SHA512 89483853f57276c715ac2ff0ff3fa52a63692363828924b134963ba85dc018ccb3b5a57e3bd8386a480a04b31d3fb5441e7a5f31af73b67b9b498490338f3705 WHIRLPOOL 49508811f8ae42a38d27f433f1dbbd00837818cfb4c38240f74d403d9d32e62bafa2d58f2f410cb76064e5148be9045ead721f61a0fc7f612c61437fe8911d8b
 MISC metadata.xml 456 SHA256 9f9f9850d89bbf3730cc288e9c0dda30e23a2fb79aed5ac69d2f9e1a7ff055cf SHA512 c3fd9c071fa4be397f50e7ce0f9fd20cbf74761c977fb0b226b6ad45ffc18b71dc3cd8562fe370d2a4e05d5c8e4c67320f539fd6a601260828248f351973da43 WHIRLPOOL 215efeae1038d7a27aae2e64e6098bfa4011e5201ecd6418b7300d4d93d4b149a2663ffd2faef3338c085a66e70127e8908304c68783ac00091e05f2ef84a533
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlQLYoQACgkQsAvGakAaFgAIAgCgib0Oc28kCR73VimctZjXvUe1
-ffIAoLLt+xfIeJlZPGD4uxkfWPvebeGQ
-=HrOx
------END PGP SIGNATURE-----
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.5.9.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.5.9.ebuild
deleted file mode 100644
index 007fdf904079..000000000000
--- a/media-sound/mp3splt-gtk/mp3splt-gtk-0.5.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt-gtk/mp3splt-gtk-0.5.9.ebuild,v 1.7 2014/08/10 21:08:53 slyfox Exp $
-
-EAPI=2
-inherit autotools multilib
-
-DESCRIPTION="a GTK+ based utility to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net"
-SRC_URI="mirror://sourceforge/mp3splt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="audacious gstreamer nls"
-
-RDEPEND=">=x11-libs/gtk+-2.6:2
-	<media-libs/libmp3splt-0.7.3
-	audacious? ( media-sound/audacious )
-	gstreamer? ( media-libs/gst-plugins-base:0.10 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	if use audacious; then
-		sed -i \
-			-e 's:@AUDACIOUS_LIBS@:-laudclient &:' \
-			src/Makefile.am || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	use nls || myconf+=" --disable-nls"
-	use audacious || myconf+=" --disable-audacious"
-	use gstreamer || myconf+=" --disable-gstreamer"
-
-	econf \
-		--disable-dependency-tracking \
-		--with-mp3splt-libraries=/usr/$(get_libdir) \
-		--with-mp3splt-includes=/usr/include/libmp3splt \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-sound/mp3splt/ChangeLog b/media-sound/mp3splt/ChangeLog
index 79ed26b6c719..d537736de2df 100644
--- a/media-sound/mp3splt/ChangeLog
+++ b/media-sound/mp3splt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mp3splt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/ChangeLog,v 1.67 2015/01/16 09:49:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/ChangeLog,v 1.68 2015/05/06 09:45:56 mrueg Exp $
+
+  06 May 2015; Manuel Rüger <mrueg@gentoo.org> -mp3splt-2.2.8.ebuild,
+  -mp3splt-2.4.3.ebuild, -mp3splt-2.6.1.ebuild, -mp3splt-2.6.ebuild:
+  Remove old.
 
   16 Jan 2015; Raúl Porcel <armin76@gentoo.org> mp3splt-2.6.1a.ebuild:
   sparc stable wrt #514880
diff --git a/media-sound/mp3splt/Manifest b/media-sound/mp3splt/Manifest
index b2779a707eec..52a6de1ef3cf 100644
--- a/media-sound/mp3splt/Manifest
+++ b/media-sound/mp3splt/Manifest
@@ -1,22 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST mp3splt-2.2.8.tar.gz 218621 SHA256 e5581d953fad596cb6fb22f220414e8aa69cb5324aa123a6b7b9b7a2142225d8 SHA512 9fe3ac02eb201de357fb56d5266ca47cdc6ec30a1714c842f9129089346d0d86472a6fd1fbdf89196eb8a7fbe741b930200c199362d504bd023e240d3b103a2b WHIRLPOOL 1067000dd479f5794b5281f2e0729fbac6ca19ce596648cb10713729ceaede19cb1913bd3cb08116bb0af247c670fcd0400daa5202769c469ab2d320f3c931f4
-DIST mp3splt-2.4.3.tar.gz 238250 SHA256 cbc1287872d2f17bc00c3cb1f76062203c932a006930e22214fba3c0b6a5ab71 SHA512 e10a2760db114bafe7011fc02d4444ab57ce13f11209c025f39f9a0ae5adfce819148dad37eb84c64c93222d7aab26858d74e15078e5f3812b3536be09897627 WHIRLPOOL 585567098ecbdc496e0c4306b4a3b25b90960d9d2a1cc7470cd98c7217bdb7b43b051d708550610f870d20a1cc334979a6d8dca7638355b9c2dbfdc3e79ca69b
-DIST mp3splt-2.6.1.tar.gz 260472 SHA256 783a903fafbcf47f06673136a78b78d32a8e616a6ae06b79b459a32090dd14f7 SHA512 a6012ac3cded4291feff509b05697f1b60bd094021b675df367e9a35c581a94cb339dccbb415db4386036f3ee3eac9b36a05e2e8f753e8a6375bb1db81959ea9 WHIRLPOOL e3f2db8a9b6810dc788304746600d14d4121a2269d57056d1a0841c5b98847294148f9b4c696ef1ba0350ba650827d122a54090030b78d9ec4505d5a36ae95e6
 DIST mp3splt-2.6.1a.tar.gz 260476 SHA256 9cd24b7483bbca7bf4a1c306fbf2afc2bb111defd0d88e9d87f642c1b519bb50 SHA512 5c0f6a56e09c0b33f83360bc4ea5d4c9398fa6ec9bc39e7e9ab34b0ff19e46ddacbbc69ff51953ee399f1a172f2d634c57c256abdfe51def593e5f981490cc17 WHIRLPOOL a511c8627afcce86ec290c76628520b0f520c94445ee13bf8ad1c47ab344c485035ab9061f2bfa6522a4a19cbb232dc131f27b1b80f2b6ee2843b2c7f6de9b43
-DIST mp3splt-2.6.tar.gz 254944 SHA256 0b01ab4c8ee006dfc074a94c9c57b24b6ec962caf21516aeabec6f59b9247c64 SHA512 944030f5f9678d1583b6def6678a8544d69f4f4359f29c5a98ab0e2de4975c4761f0c5c6c1b5e29ef5afcf360a199e25ba7a5f2a3f9c09643190d388925994e3 WHIRLPOOL 83937081ce68fb0f62275e4eb12d6bd156f46f3492ac79da7a635f0f7e4ba92a86c923cc3abc5e602e63cc1d7303e72fe35dba8e1d4a11fd07ba38930172d0bd
-EBUILD mp3splt-2.2.8.ebuild 842 SHA256 9a8c22de01845fa1af93f0d1511dec92dee4f41cd15ba721916269a04c7f0853 SHA512 370fb20239c94e0df556509f4a63cb789551a1d165450d0ee0e4888ce3c94216895120f44eba2cf35a77821dd0d908b3bae3752bfc8aa900774054ee522743b2 WHIRLPOOL ff218ff6ab33c14f308d01627dc7054c65b936c4737ae2777ddf78d6cf88954e1da2d51bfdccd98b7a75c893c9f9900e130b42dc14c749388b61950f16b8593f
-EBUILD mp3splt-2.4.3.ebuild 843 SHA256 2a80e224b1f1513df6ca77b6b181111479122af153a93670a59ea95b1cb451a7 SHA512 93d39faf026d554ec76bd8863fe78f4e2003bddc936380c5c1c24bba30b8f06137c616f1e564a4312b76d0ed4f762ab3c64b148c457208975b7f26ee2e988973 WHIRLPOOL 324bb9e5b1ec389d243684aaebfae96c2d0e714c1540ddaa5c22c176abc64b1a085fb8264512307281f2e42812dc12f095a8b1228b4ed373f908e5a9daf468e0
-EBUILD mp3splt-2.6.1.ebuild 818 SHA256 a50dfb90a268c53b64697fbcbfdf6e752ed262de66c848c4750f92e27fd8177a SHA512 7b9bcb1c4fd07822f52d1e11540cdede2b7add456c043fa13eb8c668e344ce847cd4eb21987ad3fcb116586c92a6612276e6aa217d82345e6bb7e3e127a628cc WHIRLPOOL 1511ced808d57df643ad923acd2f97d7552aa8e17efaa6bc784be90c1af0d724e26005ca9bfece02432890402f27ce2c743a2aa4dd749c3203cdcf1d7c2571f9
 EBUILD mp3splt-2.6.1a.ebuild 818 SHA256 7e2fac78297d809aa6c0365c0122d42d5bb51bbfab4c5b5cdbcfa9cd74083128 SHA512 e4869bdf6334bf2088755ecf7e85a8e1e4bc540ca91b6f9ecaeaca56d80b158db0fc825fcb04576471f63a24195006ed5bec68e4b22da11182931ff3f664b2be WHIRLPOOL 7a97fe4f5651681d0dee1e58bff30a3b9548f2ad75fd235fa02186f508bf275eb31c4e4ccacd11a1f43e0e3117d2ce76217e33057f11357fb5584eb0f19cf539
-EBUILD mp3splt-2.6.ebuild 813 SHA256 928fb4129c537996f402c7931224799e5c0daa5196444031505e551ee9cab4e0 SHA512 6e2144a4db8982a530d205efb200610e8a50ded635fdfaff9b46a4cc41726be1ce7a63cbba65bf42c595f17f8018b8bcfbfb33bcd1be32ce75d500d98e995b0d WHIRLPOOL 070999bf14e6868000c43a51bf3a098f4e5d06e34d564afe86c7bf99e38284851351f145525c069ff831c2fc3d5e58522bf5b94fee5a71b64e54e82eb32b066f
-MISC ChangeLog 8281 SHA256 e0bdf960d15cbfe52c0a14a007df96313e5f905b83b483dff1e2a01473b06484 SHA512 a14e53bad9a7add1804a5ec964bef1278508cad70e41c9a3302f0642367cf3c363c713684332671357f0760353c81551ce1c2ce0dc6101528bd0c6f457cf4685 WHIRLPOOL 7b24f6f5afee54596ecfbc63ef4c996e459bfb2f620fd8480f0da443b56d3ff8da5c1575c36b78b17fa91a35d6964fd710a61577d4349b881d7f63f959f5b334
+MISC ChangeLog 8434 SHA256 c0953bdd2f67ea4472440bccc6f38cebc62061335c674121c6f4c230f8ddc211 SHA512 0dfefc1effc98b098b91e662f3bf3a0f2ebc11e319cc8c3f824104a287a1a4adb3527f879ed0aa5a6867e33f3695b4bc1edd26959d50617898aa533572f6ec41 WHIRLPOOL 8a215a27547b3eb037468424a0cf59925e29c23c6337fda9b63bab9d51c0b84e6d04e413e2ba362bf713616e8986912c9d558f32b0b5f24d65411e8295c96fd2
 MISC metadata.xml 255 SHA256 8f9bd1c478e1ea27c1c4d4a19a402da9c930c3d3b109af8c7e357ac16c97f285 SHA512 4fca6dea8f19a87a0f964c82ae22056278549823e97d75d65053211667a4ac7142df1a0c5a866aaa4a482a253b1f6c769d87b4dea3e926532267b37d5c7b0e2f WHIRLPOOL f08a4a0c5de1fb8a728806e160bbb7966d16418e29dc655f6714eec374a789d41874bb40bfbf25c0347439d318954a291fd919471b43f92b1902ce9f47352ffd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlS43rkACgkQuQc30/atMkCGbgCeKi+taFsUP1aZZsi1RarfzzSB
-rrcAoLMkPe8pRwcjzDZFWnzDDDyIAtWl
-=d1FH
------END PGP SIGNATURE-----
diff --git a/media-sound/mp3splt/mp3splt-2.2.8.ebuild b/media-sound/mp3splt/mp3splt-2.2.8.ebuild
deleted file mode 100644
index c2174056180c..000000000000
--- a/media-sound/mp3splt/mp3splt-2.2.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-2.2.8.ebuild,v 1.6 2014/08/10 21:08:40 slyfox Exp $
-
-EAPI=2
-inherit multilib
-
-DESCRIPTION="a command line utility to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="<media-libs/libmp3splt-0.7.3"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--with-mp3splt-libraries=/usr/$(get_libdir) \
-		--with-mp3splt-includes=/usr/include/lib${PN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-sound/mp3splt/mp3splt-2.4.3.ebuild b/media-sound/mp3splt/mp3splt-2.4.3.ebuild
deleted file mode 100644
index dd34c4b60e18..000000000000
--- a/media-sound/mp3splt/mp3splt-2.4.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-2.4.3.ebuild,v 1.6 2014/08/10 21:08:40 slyfox Exp $
-
-EAPI=2
-inherit multilib
-
-DESCRIPTION="a command line utility to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libmp3splt-0.7.3"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--with-mp3splt-libraries=/usr/$(get_libdir) \
-		--with-mp3splt-includes=/usr/include/lib${PN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-sound/mp3splt/mp3splt-2.6.1.ebuild b/media-sound/mp3splt/mp3splt-2.6.1.ebuild
deleted file mode 100644
index fc5bb50adb7b..000000000000
--- a/media-sound/mp3splt/mp3splt-2.6.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-2.6.1.ebuild,v 1.3 2014/08/10 21:08:40 slyfox Exp $
-
-EAPI=4
-inherit multilib
-
-DESCRIPTION="a command line utility to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="flac"
-
-RDEPEND="~media-libs/libmp3splt-0.9.1[flac?]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_configure() {
-	econf \
-		--enable-oggsplt_symlink \
-		$(use_enable flac flacsplt_symlink) \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	default
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-sound/mp3splt/mp3splt-2.6.ebuild b/media-sound/mp3splt/mp3splt-2.6.ebuild
deleted file mode 100644
index 69c9c5682b0b..000000000000
--- a/media-sound/mp3splt/mp3splt-2.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-2.6.ebuild,v 1.6 2014/08/10 21:08:40 slyfox Exp $
-
-EAPI=4
-inherit multilib
-
-DESCRIPTION="a command line utility to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="flac"
-
-RDEPEND="~media-libs/libmp3splt-0.9.0[flac?]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_configure() {
-	econf \
-		--enable-oggsplt_symlink \
-		$(use_enable flac flacsplt_symlink) \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	default
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-sound/paprefs/ChangeLog b/media-sound/paprefs/ChangeLog
index 344985375249..5f55128043f0 100644
--- a/media-sound/paprefs/ChangeLog
+++ b/media-sound/paprefs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/paprefs
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/paprefs/ChangeLog,v 1.27 2012/05/05 08:45:42 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/paprefs/ChangeLog,v 1.28 2015/05/06 09:40:40 mrueg Exp $
+
+  06 May 2015; Manuel Rüger <mrueg@gentoo.org> -paprefs-0.9.9-r1.ebuild,
+  -paprefs-0.9.9.ebuild:
+  Remove old.
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> paprefs-0.9.9.ebuild,
   paprefs-0.9.9-r1.ebuild, paprefs-0.9.10.ebuild:
@@ -108,4 +112,3 @@
   31 Aug 2006; Diego Pettenò <flameeyes@gentoo.org> +paprefs-0.9.5.ebuild:
   Initial import, PulseAudio Preferences Dialog, masked pending testing from
   GNOME users.
-
diff --git a/media-sound/paprefs/Manifest b/media-sound/paprefs/Manifest
index 05cb2aa008da..b2e4e1b0450e 100644
--- a/media-sound/paprefs/Manifest
+++ b/media-sound/paprefs/Manifest
@@ -1,19 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST paprefs-0.9.10.tar.xz 163444 RMD160 671966ca9f5abe1bbb6518dda0ae3ab684c0a9a2 SHA1 6b88d5268a070ac8d80224434975af6c9d754e75 SHA256 261c5a67543f2d0c019894fb933949f6ee7c5e181808e1e9565f0784961eabb0
-DIST paprefs-0.9.9.tar.gz 217174 RMD160 0e48c30c1dc188c79280d6d590b15fef32ad6797 SHA1 01ade3fc8295ef2a02cd97e32b6a5e353cd97c1c SHA256 1237939f0cea478ecd51452e817e08877e914c919239fcb63aa2471a389769a9
-EBUILD paprefs-0.9.10.ebuild 988 RMD160 77953d8a83d09169f1cfd8a4b4ea9792d919eb59 SHA1 ef4c3c6db89de91c80aff033c5154d37db80c509 SHA256 f18b7e905bd51188f7c5f8f71cc658afa91e8e12b9f3d8440591c21392c65b19
-EBUILD paprefs-0.9.9-r1.ebuild 978 RMD160 88cee7de353dcb698ef592cf1ce011f045cf591e SHA1 f5f6676178b5a242e286546de1a0745384e2d291 SHA256 7258c6b25152677af16805f686834fbcdf129838d052f1db94866e9267dd38c8
-EBUILD paprefs-0.9.9.ebuild 975 RMD160 8ed4b171e9c7a448682eee696a66dcac68afdf03 SHA1 10a0db3b9f60b05081f433ac9ef1be3c298602bb SHA256 a41bad17d36561e7ebb4a8523b54bc679e8219060e053f16c29324be86d52eff
-MISC ChangeLog 3872 RMD160 e9bdff945f087afca141a0ecde6aa4cbd481d688 SHA1 162db07998a5f258dd49a510690466883e1de6a7 SHA256 65c3d9e8f8cc4f0a53226e9db89a20a904d033f11536555515bf51de7860ccc1
-MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iJwEAQEIAAYFAk+k6OwACgkQfXuS5UK5QB1++gP9EP+U71d948DpOc55lZ0AKOu+
-vPTfVVbxGJHqk1tFIOeAsGf310BxUAZNGwcj2+KwY9vEZygloVLhhSD8bgI/ALn6
-9cZWc7N9efObTlKBg6MIzuwZSVlnMUNBP8+6u8kew9UqPxUtaJt3htz5cKHnRSNo
-Kyb7R8Hjz7n62mpwtDk=
-=e0ug
------END PGP SIGNATURE-----
+DIST paprefs-0.9.10.tar.xz 163444 SHA256 261c5a67543f2d0c019894fb933949f6ee7c5e181808e1e9565f0784961eabb0
+EBUILD paprefs-0.9.10.ebuild 988 SHA256 f18b7e905bd51188f7c5f8f71cc658afa91e8e12b9f3d8440591c21392c65b19 SHA512 7d51d7a84a6a26030f332d78465092bb5f0dd79465cfae331457e65fba969bdac85843faaa6754198f877c67aae64a7c283446eb8ff3fe0084a41f620f3c14e3 WHIRLPOOL 66b683d049c10b03d98455310b7e995ad76cd93652d689c97321f91fcdb7638c22a9ec648b1e78da5f0116195483c8a7ac776436427d7889a79b5554272cb2a4
+MISC ChangeLog 3984 SHA256 42b3a16b2be0ab6e3f37fdd72fc8c9fe6b25ded479113c60c72b14d991d48df4 SHA512 6f6834227b98f74ff1f1960e6b5d23bd46aec338dcaae18e4135a77d70ed380899f8bb63c819ed0d2ec2f855cba3038bceb5f7f98911e51619b34edb28d812df WHIRLPOOL ba7b22195e734fa1260aee0a241eade624ed2a12b4573ea2fef67a58d2fe6e738495b7eeec377de5aab37d7246edf75bf7e293bc3f2a3797f5815a593af8b226
+MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
diff --git a/media-sound/paprefs/paprefs-0.9.9-r1.ebuild b/media-sound/paprefs/paprefs-0.9.9-r1.ebuild
deleted file mode 100644
index 16634d96005c..000000000000
--- a/media-sound/paprefs/paprefs-0.9.9-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/paprefs/paprefs-0.9.9-r1.ebuild,v 1.2 2012/05/05 08:45:42 mgorny Exp $
-
-EAPI=4
-
-DESCRIPTION="PulseAudio Preferences, configuration dialog for PulseAudio"
-HOMEPAGE="http://0pointer.de/lennart/projects/paprefs"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="nls"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	dev-cpp/libglademm:2.4
-	>=dev-cpp/gconfmm-2.6
-	>=dev-libs/libsigc++-2.2:2
-	media-sound/pulseaudio[glib,gnome]
-	|| ( x11-themes/tango-icon-theme x11-themes/gnome-icon-theme )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext
-		dev-util/intltool )
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-lynx \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dohtml -r doc
-	dodoc README
-}
diff --git a/media-sound/paprefs/paprefs-0.9.9.ebuild b/media-sound/paprefs/paprefs-0.9.9.ebuild
deleted file mode 100644
index 9fe81d7cee08..000000000000
--- a/media-sound/paprefs/paprefs-0.9.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/paprefs/paprefs-0.9.9.ebuild,v 1.6 2012/05/05 08:45:42 mgorny Exp $
-
-EAPI=2
-
-DESCRIPTION="PulseAudio Preferences, configuration dialog for PulseAudio"
-HOMEPAGE="http://0pointer.de/lennart/projects/paprefs"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="nls"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	dev-cpp/libglademm:2.4
-	>=dev-cpp/gconfmm-2.6
-	>=dev-libs/libsigc++-2.2:2
-	>=media-sound/pulseaudio-0.9.5[glib]
-	|| ( x11-themes/tango-icon-theme x11-themes/gnome-icon-theme )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext
-		dev-util/intltool )
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-lynx \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dohtml -r doc
-	dodoc README
-}
diff --git a/media-sound/picard/ChangeLog b/media-sound/picard/ChangeLog
index 90769a0fc5f0..70ed97e91b7d 100644
--- a/media-sound/picard/ChangeLog
+++ b/media-sound/picard/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/picard
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/ChangeLog,v 1.54 2015/04/19 09:48:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/ChangeLog,v 1.55 2015/05/06 09:44:45 mrueg Exp $
+
+  06 May 2015; Manuel Rüger <mrueg@gentoo.org> -picard-1.1.ebuild:
+  Remove old.
 
   19 Apr 2015; Pacho Ramos <pacho@gentoo.org> picard-1.3.1.ebuild:
   x86 stable wrt bug #534268
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 1c6b0a17e645..b2ce88193259 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST picard-1.1.tar.gz 1679228 SHA256 31d61aaf54c582b93f4195fa137552575d16ca7622a3b12303744485d33bce4e SHA512 75f54fbe2eab9921a5f3226e97fc7a849215e53c31aeed358c9fc939f9f2a02c9c9dd35ea46f4373eb5fd8d4dd5ebcf5210a28102c1b8aaa3f7bde140abf70d5 WHIRLPOOL 37d73767f4b0059e1fd50c5fec24b0e5d469cdc37c9d10f1bd261ac8969169dca7647aed979c789b2249164a66d1a9879205e61b633e5f25837d207ba57ce21b
 DIST picard-1.3.1.tar.gz 2047677 SHA256 f83ec4ab703134a3dbd8203a2b30c15ea87bec79c02446506e4dce1ec87f7d02 SHA512 72641e1f604cc3db339400511e1b37ce513f315e200af3ed25dd842cfa32b8b0a3b93cf60cd01b565be49f95931e7da36742efeb45a4619351acbe70edb511c5 WHIRLPOOL ace3cb441038e09888a2985e2f23149bcaa665d311a2bbd583648e17aeee4453168fc5e9df68b8fcd6acf772e1e4b4e33329643cb840f3355b2a1f420763bcb1
 DIST picard-1.3.2.tar.gz 2047760 SHA256 e728234560b82eb33d3143a53d3bbb92833455fd130f8d2083193cffceea4120 SHA512 d5613dd0b29f67a754a9449c6ebb29e4f7a519137dbcd29b03e64678ba49c75542573487c1f95047c0ab43630794fd92365a46dc9820347ffd2eae5a04e531be WHIRLPOOL 5c3cbd5860162ede0150f7e680d7732f38c875e5475fb16dfac2f6f7d51979678567fe677a2887197db963fdf1a75f1ba4f45d132e9fc0923a2d726ffe30a019
-EBUILD picard-1.1.ebuild 2186 SHA256 7c9a2994daa1a9490a14dc019e1cd3ee6c1d365fbf448708803b6705a1830695 SHA512 b4f4f0a65ef41a2eea5ed4b597357884585d4c03b27228f881f2e235caec54f24fd09aa698d1aff209d7358a966fc520b665e1f81a6efaf8f47e23296a107e02 WHIRLPOOL 63c749fe2e5691a0a11bbd93b7e6e5754c6b071ca378c0ef5b33dc4817377d54ebde34f22b67552ce79affb6cda164f45354d289b2446c034997d24298ab7969
 EBUILD picard-1.3.1.ebuild 1413 SHA256 56637a6c0d37ce880a4d294cebe617950d9742d175a69e84c5a7b2adb86b6403 SHA512 6da8c626ced4c9ce697902ce5466f26f153c2b4a105cd08a92ab276325dec5b478a749ba324bcf77612e79a6cd6a60aff9ea5b33293f9f0f0aba69295eab7173 WHIRLPOOL 52639c76119a5d9fb57e167bde10de6d5d4ca7bc46bfed1cd724297cf2c316f6829d1fe163bbffda9b6503d13225bedfbe2a1c2309d950af3335f1018c94c988
 EBUILD picard-1.3.2-r1.ebuild 1446 SHA256 d5cc7289ac3934b179e1cdab0598bc2c9f504d0b2db11cd2c592d728bc5c63b8 SHA512 4cbe2bfbf0954ca83853d6d74971919d768820cf2e0b76d4f220e8950b0c7fcd9c988f7fac29f11dfa1aef1f5883536f29e1fae7b12058b0b02ee6611f24c195 WHIRLPOOL 4fca57e847abe28c64c1aefee331b2a76e26cada2c8c0ae3d144b24979e43fbace9918a759338050bd80649166c9486a53814f0b0e8eab62a8bcd1e9ee2e1ad4
-MISC ChangeLog 8407 SHA256 e57d92d2525e1e0da7ec8c4ac3d1747b49a17a0fa700152caa4c4d5bb0025c18 SHA512 d7b6137127ea27b6b4b1690e7ce59c6a4cbf40f18fb40388ec02fd5bf40ad47671119a37ee43b5de41fe48d11f2b5174fa812978e7b798553315e853bc1e416d WHIRLPOOL c55b44f9a2c0c7099e1dd40c0f1ea66d80568913061313c1f59c551a98ad1cfa66aefca611716b05808e7a3089656fd7d8722bb8caecf597180f230197a511e8
+MISC ChangeLog 8490 SHA256 a4aedc21a880afd762c53faaf39248ca6ab9efbc923dfd564c801939df23f163 SHA512 45ce0377fc2dde7ddf1e0911a0d848c1874304a04cd363e597e2803455dd1d1f0867ec172509ff80daef4067a0d8381877a9fb0f9615cb2a3e6ae203812ae29c WHIRLPOOL 5bfc5f9383f533a451842c0c45b2b1b9346c699390284231b52b5cb706b21bbf716db51691148475d63270334e9296ba2a0b78daf7bdb02d01d1035ad6d83c53
 MISC metadata.xml 569 SHA256 c0c94318f3c727cd50656b29185eb962044af1edadaafd276bbff5fb6f12784e SHA512 0b7309841df310f9ec20f29429ef4efe36c7567f0c86b72b8796ce25bdb04ec02db4bb21dda6c41d2915abc9b411a929939823e9e0acc2e13f1951b855cf2357 WHIRLPOOL b2fb10475d77c83d497e219957c7ee0634b090a28e4fef9c18a5ca57a52440cef6c46b99d5a7c1bb4cd7292d4739ddba547f022e36303d8048846c91edc0fe10
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlUzefsACgkQCaWpQKGI+9R/dQCfR20n0hwRyXxdYx4A/ApxTMRN
-PgwAni7+9SFJMpkqUptYtm7y7eJiOm4u
-=gPWj
------END PGP SIGNATURE-----
diff --git a/media-sound/picard/picard-1.1.ebuild b/media-sound/picard/picard-1.1.ebuild
deleted file mode 100644
index 08348044475e..000000000000
--- a/media-sound/picard/picard-1.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/picard-1.1.ebuild,v 1.3 2013/01/13 11:38:09 ago Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-inherit eutils distutils
-
-MY_P="${P/_/}"
-DESCRIPTION="An improved rewrite/port of the Picard Tagger using Qt"
-HOMEPAGE="http://musicbrainz.org/doc/PicardQt"
-SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/picard/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+acoustid +cdda +ffmpeg nls"
-
-DEPEND="dev-python/PyQt4[X]
-	media-libs/mutagen
-	acoustid? ( media-libs/chromaprint[tools] )
-	cdda? ( >=media-libs/libdiscid-0.1.1 )
-	ffmpeg? (
-		virtual/ffmpeg
-		>=media-libs/libofa-0.9.2
-	)"
-RDEPEND="${DEPEND}"
-
-# doesn't work with ebuilds
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS.txt NEWS.txt"
-
-pkg_setup() {
-	if ! use acoustid && ! use ffmpeg; then
-		ewarn "The 'acoustid' and 'ffmpeg' USE flag are disabled."
-		ewarn "Acoustic fingerprinting and recognition will not be available."
-	fi
-	if ! use cdda; then
-		ewarn "The 'cdda' USE flag is disabled. CD index lookup and"
-		ewarn "identification will not be available. You can get audio CD support"
-		ewarn "by installing media-libs/libdiscid."
-	fi
-	python_pkg_setup
-}
-
-src_configure() {
-	$(PYTHON -f) setup.py config || die "setup.py config failed"
-	if ! use ffmpeg; then
-		sed -i -e "s:\(^with-avcodec\ =\ \).*:\1False:" \
-			-e "s:\(^with-libofa\ =\ \).*:\1False:" \
-			build.cfg || die "sed failed"
-	fi
-}
-
-src_compile() {
-	distutils_src_compile $(use nls || echo "--disable-locales")
-}
-
-src_install() {
-	distutils_src_install --disable-autoupdate --skip-build \
-		$(use nls || echo "--disable-locales")
-
-	doicon picard.ico
-	domenu picard.desktop
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	echo
-	ewarn "If you are upgrading Picard and it does not start"
-	ewarn "try removing Picard's settings:"
-	ewarn "	rm ~/.config/MusicBrainz/Picard.conf"
-	elog
-	elog "You should set the environment variable BROWSER to something like"
-	elog "\"firefox '%s' &\" to let python know which browser to use."
-}
diff --git a/media-sound/qtagconvert/ChangeLog b/media-sound/qtagconvert/ChangeLog
index 5852272ccc79..ab4acd24ad70 100644
--- a/media-sound/qtagconvert/ChangeLog
+++ b/media-sound/qtagconvert/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/qtagconvert
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qtagconvert/ChangeLog,v 1.4 2014/06/23 06:44:15 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qtagconvert/ChangeLog,v 1.5 2015/05/06 09:41:21 mrueg Exp $
+
+  06 May 2015; Manuel Rüger <mrueg@gentoo.org> -qtagconvert-2.0.0-r1.ebuild:
+  Remove old.
 
 *qtagconvert-2.0.0-r2 (23 Jun 2014)
 
diff --git a/media-sound/qtagconvert/Manifest b/media-sound/qtagconvert/Manifest
index 87979b84c9ff..b5813af2a196 100644
--- a/media-sound/qtagconvert/Manifest
+++ b/media-sound/qtagconvert/Manifest
@@ -1,27 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX qtagconvert-2.0.0-desktop.patch 469 SHA256 1e47cfa6c6855f1d642b0f455eb38490965d7589788ebd1f4617e79e31d2ebf0 SHA512 49c9a8fcdfe431be1e8289f94fda3d704a0b75f9b6461f03294ca30e3bc98ca65779bd7d4bf5d6a1061e668f8fd09516207d10ef0ed5e996c2bafd69a8867fe9 WHIRLPOOL bfc44e437a0effc250998bf0dc226ff0904ebf330f20af7fed1dfcb8148b2abb4ef8b0e47d8c9b45ad15d4af6c4c0bdd0cf1204eee3d73865990286a5e15e791
 DIST qtagconvert-2.0.0.tar.gz 95475 SHA256 7d76a9e377e1b21ebbf8f5a5bc7adaf7b846b5d7772c9e9ce7a633facadecc42 SHA512 dec5ac042dbe9219fceaeaa3d2aa7476ac12321157421bcd2f1dce9fb9dcabffc8c059ec86ac16b2043f168161d3b3b13c9f4e24fad469a955575d4df8733390 WHIRLPOOL f732d962ea08b0a4682499ac46d2912ae7fa62f461ac9533dc8d238b1afb4ef365a41ef6e5c7b750a71c5a4c156300168c38784d665d5ba56728f64dfa8099a6
-EBUILD qtagconvert-2.0.0-r1.ebuild 680 SHA256 35bd9601911fff207c8a2e8c6bac70d28298cabb894132d45fd43c2c80eff709 SHA512 0c3ba865fa2ad459880733dccf24f7d80fb742e3828666cfaa6f97e662212d2f93177b9921f45b5be4aa84898753cd697cb4461c80430d80d5580bff3490a154 WHIRLPOOL 5eba165ace5a181c5f09e5ed275c38304d189b62ba1cb680b74f77962fae7ef462a01ffd2b93e64176ec16e7612d20a9b8fd5834425b8b5550a95b5c64120889
 EBUILD qtagconvert-2.0.0-r2.ebuild 798 SHA256 79ab6bd4302e3fc7dfbc278a8e9a5edd1a8ae9cb4f79d3a5f9d1869e0333d7f9 SHA512 80c574cf385a6d2655e34521997226bc7bd39c4c8c8303d7301442d3c2302159fc7d23dadad205100e3b4ddd976ed641a0d8dcd4b479e821e10ef39a66ce4e1f WHIRLPOOL 54574361245ced73893a0da7a153f8b3432c536bef72e6d2897a5369f72374b3c48008698aa74c7a454a057ac92694c41893b5a7e43a5f40837d66d5ad903cb9
-MISC ChangeLog 1040 SHA256 2b0902be8cc0006f04424bc214cd4819087c8da4ea462708baf3071e41af8acc SHA512 abce9121c17bb36037890ea9748b1c4f988c07747c9b2a2034c2dce7e1a1b2f97ea440fedd5372a828849a8f0a35bf2140d5446c57f167c81ad46e1dff094651 WHIRLPOOL 5e24aa60f1fed2bc63ef675aa840f66d61f9a50ab0b29e397f6226050a0913172af03fa18b6030a67d10f921814583d79086823185b9fa4d2bfc55293afda085
+MISC ChangeLog 1128 SHA256 325fe400b12508dd92152ad2460ca487fe701d47c335941f6fa83d5d87536ade SHA512 09ba008e5494ec4b4d4d78bc644bf2a19c7fc2ad65e91a88caab8282605f51ff11de68073d28103a5f4ac0626b7dc5be3aa31751c65dbb9e4dc951d031b7aeb8 WHIRLPOOL 6a39167ae0763a33c493df56fab458031caea1edd52b15258955759a98d531c06132c8f071ede664c2363ba85566ac9dfdb89ae985b12df5e100a2ebc35e315d
 MISC metadata.xml 156 SHA256 2bc85ad7339ae0191c26e435f2da777058779a7ebf73d14658a6ea7bfcec01b2 SHA512 d9991797d488000e1b306b9d97982fb862fbb44d72d4f7560e3ab12ba2022a7abdd3a71bd971a18f562edefc6948e5d5db0972425f7ebe7208696678f1c17b45 WHIRLPOOL aa1bf1df6e2bb4c13c1eae59bfa12dcfe4b81794562c52538f037c75d706f415fed1acc302501cd5f3017b13c910cadbbb9b823a0625cd3b64b29b860259492e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQJiBAEBCABMBQJTp8y/RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7MqVD/0TGcQVb1uYmcMTaKWppG9TKMetxgZ3I7PbeWZxsFu6cij8i065EzjHqMXd
-AZW3clY34BmEdsnQWeEONwwCcQzU/7ynrXMaaNIpddZRZTCWpgFJiNVsWOuzuubF
-vIPgMf8kc+PtclGjrHqv1HBJAvg9ibIRyQg42dMr4gBCTs6B+DrvMdjukR7SJ9DI
-C2u3rBNgNsXDKhTpyoaDEthl6xLQNZRG3AmT/uDducKc1BJJc5A0lJwHGmWeyjGT
-uZc0Q7HVtQw6D4J5BI7gaRbuvduKQDbDAXAl5cA01AD5/ZQVOT23pvJT12dlPk77
-aHx3A1wXdDCEGv8qJW+r3W3VYC8CnPnyBNSb6G2l1qCbi87/PJbp9LF8Qfa2lqTT
-8arL4CRqANGOy7YwaLY+zJiRMZOrfYh/Ksq1XUHXXwqdS5O/w6NcSQWQ/CodJFbZ
-2QzsJcktMfdEDK0EjrkXtfGiFxhJDjyzeiYbpKofRfwU2jS26aDJx8KA7ZBC26bZ
-arNyQhES2XzC8k4wU71xs24D5YqoSp25MTi0U7DtfvWrIOl0s86qfUNu7tu3MiCt
-rWDrQq+1D2rDqUf2yrRUdSeVH70Pg6U7Q85jnyDDlKtmvVH588gqUnAqEdUYQVCm
-isEW2D9j0hTA7bab7FZ6pYe8AX1YTWHpj8NlIIzCJCU9g1iXNg==
-=jXTq
------END PGP SIGNATURE-----
diff --git a/media-sound/qtagconvert/qtagconvert-2.0.0-r1.ebuild b/media-sound/qtagconvert/qtagconvert-2.0.0-r1.ebuild
deleted file mode 100644
index 18a0d4d95ed9..000000000000
--- a/media-sound/qtagconvert/qtagconvert-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qtagconvert/qtagconvert-2.0.0-r1.ebuild,v 1.2 2013/03/02 22:01:49 hwoarang Exp $
-
-EAPI="2"
-
-inherit qt4-r2
-
-DESCRIPTION="Qt4 tag editor for mp3 files"
-HOMEPAGE="http://www.qt-apps.org/content/show.php/QTagConvert2?content=100481"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i "/documentation.path/s:${PN}:${PF}:" ${PN}.pro \
-		|| die "failed to fix documentation path"
-	qt4-r2_src_prepare
-}
diff --git a/media-sound/wavplay/ChangeLog b/media-sound/wavplay/ChangeLog
index 72c8c81d2426..98fa451566f0 100644
--- a/media-sound/wavplay/ChangeLog
+++ b/media-sound/wavplay/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/wavplay
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavplay/ChangeLog,v 1.16 2012/02/16 18:56:53 phajdan.jr Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavplay/ChangeLog,v 1.17 2015/05/06 09:37:57 mrueg Exp $
+
+  06 May 2015; Manuel Rüger <mrueg@gentoo.org> -files/wavplay-1.4-gcc34.patch,
+  -wavplay-1.4.ebuild:
+  Remove old.
 
   16 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> wavplay-2.0.ebuild:
   x86 stable wrt bug #397113
diff --git a/media-sound/wavplay/Manifest b/media-sound/wavplay/Manifest
index cca73364571e..34a5fde0fe71 100644
--- a/media-sound/wavplay/Manifest
+++ b/media-sound/wavplay/Manifest
@@ -1,18 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX wavplay-1.4-gcc34.patch 706 RMD160 ce32a84b11fad7527cf872a3a5d3128179ce49df SHA1 13efa7ed6b4ad6b9789e6caef123c0ae3a32647b SHA256 9abfcff8bbd3e933830eb997ef4396736236d6ce627a18891b0cfdb4278e46a6
-DIST wavplay-1.4.patch 25215 RMD160 467e5700cace92b91ce6bba94ead388546bd0cfa SHA1 6a351b3477b7163e6010a44532c7742bb3e9efc6 SHA256 8d817809353a970343a739238879eab0c991ca1ce3ae3f0175f1964185c7fc3f
-DIST wavplay-1.4.tar.gz 63549 RMD160 e824ef60fd88edd317dcc4999720276343029c06 SHA1 a22d43880f64086baf1d936edc1f411dc7f8e191 SHA256 8e77d48b301fe3224006afff79a249142eeafa756e95dfbc08b1c0c873d0821f
-DIST wavplay-2.0.tar.gz 368945 RMD160 875f84a90e40a0489c1301181ce4527d4ba3a377 SHA1 7e4e158338ceb1d8b04e6da4494c04bbf72ab4ce SHA256 256ea0b581d587b482e0c928869e3896845a5299b8e124c01749b4b9edfeb552
-EBUILD wavplay-1.4.ebuild 1066 RMD160 811e2f800f1a5e85692ca72938d57c1b57d9f4a5 SHA1 7823001e213b3ebdd938c9df2c16cb069b91724e SHA256 ced72dfef4ee87341c15f5794ad27af0b1782fed6320a5d2475ce9dc604b8c93
-EBUILD wavplay-2.0.ebuild 586 RMD160 96c8334be363fde438da08b8826f6f3e5da739bc SHA1 d64877501bb513294abcf2cd2192f1cde5b3091f SHA256 60b22fbed5597f8309736f84356cad23c811f5f7b5dc4191a54a53a7f73b3bbb
-MISC ChangeLog 1878 RMD160 a7c3be89293a12e8cd096c48695a7bba0ef5fcea SHA1 4227cd3f7e8f05d1924cb307b4a47601d674efc8 SHA256 dcec9a88b128cdb4dea8ccced3f482672004f3eba681d9efca89f90dee1b9cc7
-MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk89UXwACgkQuUQtlDBCeQLt+gCfcWusj/juTj6chnwMnEp3qQU/
-LDIAn1BSdsAwGWgNHs/pneGH7zSyqauh
-=cnWl
------END PGP SIGNATURE-----
+DIST wavplay-2.0.tar.gz 368945 SHA256 256ea0b581d587b482e0c928869e3896845a5299b8e124c01749b4b9edfeb552
+EBUILD wavplay-2.0.ebuild 586 SHA256 60b22fbed5597f8309736f84356cad23c811f5f7b5dc4191a54a53a7f73b3bbb SHA512 019dc5cd2c836bad70cef3ba5110a66976018f3dd8f099ad577d4ee9d6ca1e19ba6855911e1f5c5974c8d63da81af3eb6ef60220cef9da9b8fd1228599099a53 WHIRLPOOL b2a05c94ac46238cdaaa1168ecb9693b3d6623e90cb340db0b6a561e85dd50c684dc727e6b3a4a17fa866dddee34e8b41f75eea1a1881f3f9295ef06ffe3a300
+MISC ChangeLog 1991 SHA256 95cedeb64a35b95149c4ace0e5ac28e8d4794906f68a0938e3f98cd78da4235e SHA512 a301f30a557d220cc49c329876ec8f92d99f9b8e59f5c2e555ddcb1539f12d484e5c8502cde18602b63459bce1e4c65cbd258132e7f4c373b8a8d07dfdc0a820 WHIRLPOOL 8730b559a5bd47ccf66ed3740a346fda383a3d2d49ab483ad46eabcf65ccd7e49012b895d3a3606599ac9fbe806c34af837e94ac62798da9e2aaea5638836c00
+MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
diff --git a/media-sound/wavplay/files/wavplay-1.4-gcc34.patch b/media-sound/wavplay/files/wavplay-1.4-gcc34.patch
deleted file mode 100644
index c1f6cef79273..000000000000
--- a/media-sound/wavplay/files/wavplay-1.4-gcc34.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur wavplay-1.4.orig/wavplay.h wavplay-1.4/wavplay.h
---- wavplay-1.4.orig/wavplay.h	1999-12-04 01:06:42.000000000 +0100
-+++ wavplay-1.4/wavplay.h	2004-09-06 19:57:03.741888416 +0200
-@@ -500,7 +500,7 @@
- extern int UnlockDSP(int ipc,int playrecx,ErrFunc erf);
- 
- extern WAVFILE *WavOpenForRead(const char *Pathname,ErrFunc erf);
--extern WAVFILE *WavOpenForWrite(const char *Pathname,OprMode m,UInt32 sample_rate,UInt16 bits,UInt32 samples,ErrFunc erf);
-+extern WAVFILE *WavOpenForWrite(const char *Pathname,Chan chmode,UInt32 sample_rate,UInt16 bits, UInt32 samples,ErrFunc erf);
- extern void WavReadOverrides(WAVFILE *wfile,WavPlayOpts *wavopts);
- extern int WavClose(WAVFILE *wfile,ErrFunc erf);
- 
diff --git a/media-sound/wavplay/wavplay-1.4.ebuild b/media-sound/wavplay/wavplay-1.4.ebuild
deleted file mode 100644
index 8b68cf19b427..000000000000
--- a/media-sound/wavplay/wavplay-1.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavplay/wavplay-1.4.ebuild,v 1.16 2010/04/10 02:57:12 vapier Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A command line player/recorder for wav files"
-HOMEPAGE="http://sourceforge.net/projects/wavplay/"
-SRC_URI="http://ibiblio.org/pub/linux/apps/sound/players/${P}.tar.gz
-	mirror://gentoo/${P}.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-amd64 -sparc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	epatch "${DISTDIR}"/${P}.patch
-	epatch "${FILESDIR}"/${P}-gcc34.patch
-	sed -i -e 's:ln :ln -s :' Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CP="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS}" CCFLAGS="${CXXFLAGS}" LDOPTS="${LDFLAGS}" no_x || die
-}
-
-src_install() {
-	dodir /usr/bin
-	emake INSTDIR="${D}/usr/bin" install_no_x || die
-	# the motif frontend crashes and there are nicer player
-	# for X anyway
-	# no suid root install for old packages which use strcpy
-	dodoc BUGS README
-	doman *.1
-}
diff --git a/media-sound/xmms2/ChangeLog b/media-sound/xmms2/ChangeLog
index 66ee87f8d993..46bba3f1ee9e 100644
--- a/media-sound/xmms2/ChangeLog
+++ b/media-sound/xmms2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/xmms2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.42 2015/02/25 11:12:15 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.43 2015/05/06 09:35:07 mrueg Exp $
+
+  06 May 2015; Manuel Rüger <mrueg@gentoo.org> -xmms2-0.7-r2.ebuild,
+  -xmms2-0.7-r3.ebuild, -xmms2-0.8-r1.ebuild:
+  Remove old.
 
   25 Feb 2015; Mikle Kolyada <zlogene@gentoo.org> xmms2-0.8-r2.ebuild:
   x86 stable wrt bug #539114
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 457912be5f25..212916c8b28e 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX xmms2-0.7DrNo-XsParse-3.patch 1544 SHA256 9b690bec7c5e82eb905c95f01bdc321785caf72f88308d08b78f90e231304160 SHA512 cf81d57bce79015c00421d47e966ff0561b36a2908ba34702fdb38f916101ddbd5f7d45dc002ad5e20eec6f59688ed7ce72f9c5b44aba235b0ae19b5756a72e5 WHIRLPOOL e0f98aa483ddc121a139575d230642fd3b48a2723b9859b9e41abc266fede24bc52fcca0f04c4518d6ce8d723d65bb622dc0f5a5d9c4130785157f2e19802409
 AUX xmms2-0.7DrNo-missing-protos.patch 4252 SHA256 76c5953772fa9a2108384539235cbd5127948f8f7a0a5d354faf99b7f916dcd3 SHA512 b84248ba23071bf4e268ba09668fc1099991e737a3153572e125948540aa4e37542db3bac29f3fcd8336c2e34e70cc53d057a66bb6c1b6172ef3f3570151b0e6 WHIRLPOOL c2ff6541208abecd291c0879cba2e84ba1afc1a0c0ef38315ba34dddd543fead46d423144a8710cfc3d025635f1c1ff1e7f63331aa555ef8e9ab6699612dc127
 AUX xmms2-0.7DrNo-windres-build-fix.patch 1929 SHA256 f71546af163b017678282a9ded8ec8e70ea486b95f96c68a62ad5a3edf0db39f SHA512 c96aae6e39b326a7b32e14578e193b4865e500ea702cccb467d4d4689e893ec49e6266bec321f7c40b88c866e048fe8cc52796242b194418c7a50c3c7c2f162f WHIRLPOOL a5f7f0b811466f6b88e8a97ccf84b671412d8cda8bc050576213cab42e8c62aeda4c713dd47da398ad2350ceb708e0a8d9b0efa6acae11bdec2b08189fafc2e8
@@ -11,20 +8,7 @@ AUX xmms2-0.8-libav-9-p2.patch 1823 SHA256 107b2c23e71bf06c8d304808cb97fed44776c
 AUX xmms2-0.8-libav-9.patch 526 SHA256 43bcee24cb163524519d8abc07b2729e20628ef9d25ed21cadae6f6d653baff5 SHA512 2a6218fb8a27c89321c08025c110425ed1deae0f498bca9a9b306f2848c605a964aef05adcb1f3fd006786fda0b88d8a6d701c4fc8834cb7fb0fe561d8f9e5fb WHIRLPOOL 0c06b8bd2fbab37054bc3063f97ec4f8812c9ad324e9655eca8c398c2e58fc13628ffe751328efa17fd4f953b3ced177f4040a406e8c096010b1290d145dd2b4
 AUX xmms2-0.8-memset.patch 685 SHA256 dd85003c15c4ff0e122422b154d4a8fa5f3371ae3673b23a89c77848e43d47d0 SHA512 aa45c8f4e04e7b5edae131ac60baad265d2fdbc6297fc2595d2caedc0205956ae551408ea208daec857d1cb44a1698c663f8fc6dcb16d3f1a998b12380a562e4 WHIRLPOOL 78c4df892814ee857fff81b8c3357c83f932521a5f17c86999dc066e13a7dd7bd406f9521be5dd133ec93e851e7d34cbd5e30a446169543c57011137ead2f42e
 AUX xmms2-0.8DrO_o-waflib-fix-perl.patch 1649 SHA256 bea1cb2c5fe499e385851a2cc7900658266187e821f505a65d4d27393967f44b SHA512 5c7161245199381af80ca1e24edbe0da27f2f11e76a13f504e0051a8de4369d25075781d80c80f4246d21afb508306897331ecc9f5f3c32d0ade24921a829ba7 WHIRLPOOL 9bb58587dcc5588e0cd5fcb3beb95e563654106880f8e42a01d1b01d1f71e40d96a9084eea86239d03b671d2efa67dd8fab27c55f1043798e39d803eaaf2a43e
-DIST xmms2-0.7DrNo.tar.bz2 1519973 SHA256 59c58d9380e6b002920a8dc75f0fd4629ab175b82f29b6637f7816fdc9832b2c SHA512 e991c0c5d598ccfd868b81ae932255352bd3be014f86e05f1fa782d240b7ce059054cad746cf52c8c383058feba1fdf5675c43ec6495955c06b6e5e9f949ca01 WHIRLPOOL 691446c7cd5b5fd5bcde88561cfe7102d58d5d2a863a340181863703b9369f024937eb12d00983ba2d650268823759663bebc25b3c035103ee710ea1620a9a8a
 DIST xmms2-0.8DrO_o.tar.bz2 1670726 SHA256 c77e41e7bd5788889d5a2f78331ca8c748b8721bd2e59f36c36ad4c7cae8694a SHA512 478103d80264c0cb32912e828f74d0f5b2f10fe310f530a87ebecda7ca547a69e238cd572788f90bda29494494160d459fa6d1356b4fb87c7a8f0bf02e3b75f8 WHIRLPOOL 741dd85b8c065eea799675588a8d4c389c47fa3dcf129a9fd799bb5da0ffcb1eeffa45cfaca40af7c505908818b5e7960c1a54e947f53358edeb43841f2eaa5c
-EBUILD xmms2-0.7-r2.ebuild 6238 SHA256 f34a2d4c0a9c5b7a2080f2df0c28c760ec16694133ef228341dd737c097a1381 SHA512 04943258ff734a580a05dd88d71895cba226257cb8415ff891c3b0dd9be9e26b93370a74dfad7c515336f46a165fb8c46df924a93a00aeebbc5cdf9c29313166 WHIRLPOOL e4626ef4a149447e00db2764c7486449cd741146e308d3e84dde7f497d16d2a1abdbf7f4feb5c43b89429ce01978f289cfdb4248370e5770ef936d9782d7a7cd
-EBUILD xmms2-0.7-r3.ebuild 6474 SHA256 ba6ccfa218456e087abc2df3110f08d87be754a332d6a48e5e65f4dbca5371a7 SHA512 c7353700f02e09382edd671189a3835dce06705c02a8b3b72e711fd00a1926a6451b4c7772fa61fe875ce8a16fa2f8653ef27fcfadc0495161e27e659dc942a9 WHIRLPOOL 41941cf6763a525c892cda293891bf7dec97496a7388ffef406ba8a6659937c04897889e6e99e3366fda795b604ec51bfa074595f42106219f3f11106ca25929
-EBUILD xmms2-0.8-r1.ebuild 7099 SHA256 c526ec487bf0b4aa6412c1bd3c21014e8dfce00c0bfe4dab2b52a80551d90111 SHA512 303e99f8fde181c2cff9594e38df39ffc7820bb0c5f8e551d8b57359af104a90f103a7b1819d12845a4325aefa329eff44aecd9e5bfc16664078546c4795665e WHIRLPOOL ad18c79c62f61b4a9d195408c2518ed02735d09bb4b8c3cf8a73b40a2db3bfee1cbd18c460aa07182b7f3ad410dd7ff45149c25f17d7b19de3a4e73714da679f
 EBUILD xmms2-0.8-r2.ebuild 7148 SHA256 bdbf58524ecafb5a38954f52c5123049bd237d0b793d6718c0a299f620441be0 SHA512 6d3c13918a51c7c9e224f4c85aa19993bb9fbbfbf5b445f9be5e2b42653f3da501c90a64229c06ffbe99dab6066c24f2c871e11f51822934f2eb4b9fd1b261d8 WHIRLPOOL 37ef124cbdeadc7484ff9a6216607eb5c02235a22d4afc1694200bf24256c84a939f574bc10b383e3df99e28511e5ea7ef84c43fb9774c5d56d09ef364ad1a3f
-MISC ChangeLog 7306 SHA256 db78757303cf0efdb00e398b8e511d8141fc26088e5768c88d21c7bc37c540b6 SHA512 dc86036c183a392c5ed146dd42b0df503261c5ccc426e3c773301eb2a9a18ebaa736316282ddc0d1fe390a01cc1b827cfa2baa9cfa7a8d8b3b522ccbddf97e53 WHIRLPOOL a01576176cc57018d4c98197b6ea54cf93eaaac97da222050a48f517bf51664328f34f73d48b8a64fb101bb00f35b4504815eb9d47184c0b862db88c3ca35778
+MISC ChangeLog 7435 SHA256 bc9dce93a11ae9f3721a4aacdfa1251ac92df5e7c7ab25086a85ed3f949608a0 SHA512 e7a1f66489437e050181df2ee22b9ed96af0de861fff4c39fb571744b17fbcf35b572c85f08c808f1ec1c635ea6f30173b078f36ea4373cfb8a6b810669f65f9 WHIRLPOOL 99ebbc5f0ffb6cd167bf0c15823dd29d34e8d755960e2df65fefb48a313b7634c2e93a1fb14f2b1481fa3dda0f94e304ba61469ba25194f74b4379f8c8b604c3
 MISC metadata.xml 2435 SHA256 f7fb6c7694bf849149c7f3f3f2aec711543d994f782b95dd75ca1759bcc1e22a SHA512 a10a9821af91f0935adb73a0c7c315178c92f8821aede4d0da3a5ea1348280d02006027c32298fcdaefbe2e888c3416881fdd65800e12e340caf73d2ae0326f4 WHIRLPOOL 1e128aaf2c232dc22ed7b02777840f2a480039dfae65e36e586ae42785295639d4ee6798061c13bf2ce085b318ae8a84327f49dd560414a248ff2993a3736fe5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iJwEAQEIAAYFAlTtrakACgkQG9wOWsQutdbCLQQAm7d+7rZ28TBCbfUkyYS5RnUV
-rdv4KBaA8H3kWA5G/qhEZrRjkeBQZA+WpiYpLNmNj1sBv7xeS92suWHkqPDJBZE+
-aCQpckYQ5hBQd/MT5A7E2TFSdmYKJRxSskSxmaw6ZQ7u+Bs13lmHhhLWV1+nnnXU
-g5C9vh3F4gjDjpsnID0=
-=Q1cM
------END PGP SIGNATURE-----
diff --git a/media-sound/xmms2/xmms2-0.7-r2.ebuild b/media-sound/xmms2/xmms2-0.7-r2.ebuild
deleted file mode 100644
index 4d71d013cbbf..000000000000
--- a/media-sound/xmms2/xmms2-0.7-r2.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.7-r2.ebuild,v 1.17 2014/08/10 21:13:03 slyfox Exp $
-
-EAPI=3
-
-inherit base eutils multilib python
-
-MY_P="${P}DrNo"
-
-DESCRIPTION="X(cross)platform Music Multiplexing System. The new generation of the XMMS player"
-HOMEPAGE="http://xmms2.org/wiki/Main_Page"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-
-IUSE="aac airplay +alsa ao asf avahi cdda curl cxx ffmpeg flac gvfs ices
-jack mac mlib-update mms +mad modplug mp3 musepack ofa oss
-perl phonehome pulseaudio python ruby
-samba +server sid speex +vorbis vocoder wavpack xml"
-
-RDEPEND="server? (
-		>=dev-db/sqlite-3.3.4
-
-		aac? ( >=media-libs/faad2-2.0 )
-		airplay? ( dev-libs/openssl )
-		alsa? ( media-libs/alsa-lib )
-		ao? ( media-libs/libao )
-		avahi? ( net-dns/avahi[mdnsresponder-compat] )
-		cdda? ( dev-libs/libcdio
-			>=media-libs/libdiscid-0.1.1
-			>=media-sound/cdparanoia-3.9.8 )
-		curl? ( >=net-misc/curl-7.15.1 )
-		ffmpeg? ( virtual/ffmpeg )
-		flac? ( media-libs/flac )
-		gvfs? ( gnome-base/gnome-vfs )
-		ices? ( media-libs/libogg
-			media-libs/libshout
-			media-libs/libvorbis )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 )
-		mac? ( media-sound/mac )
-		mms? ( virtual/ffmpeg
-			>=media-libs/libmms-0.3 )
-		modplug? ( media-libs/libmodplug )
-		mad? ( media-libs/libmad )
-		mp3? ( >=media-sound/mpg123-1.5.1 )
-		musepack? ( media-sound/musepack-tools )
-		ofa? ( media-libs/libofa )
-		pulseaudio? ( media-sound/pulseaudio )
-		samba? ( net-fs/samba[smbclient] )
-		sid? ( media-sound/sidplay
-			media-libs/resid )
-		speex? ( media-libs/speex
-			media-libs/libogg )
-		vorbis? ( media-libs/libvorbis )
-		vocoder? ( sci-libs/fftw media-libs/libsamplerate )
-		wavpack? ( media-sound/wavpack )
-		xml? ( dev-libs/libxml2 )
-	)
-
-	>=dev-libs/glib-2.12.9
-	cxx? ( >=dev-libs/boost-1.32 )
-	perl? ( >=dev-lang/perl-5.8.8 )
-	python? ( =dev-lang/python-2* )
-	ruby? ( >=dev-lang/ruby-1.8.5 ) "
-
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	python? ( dev-python/pyrex )
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}/xmms2-0.7DrNo-windres-build-fix.patch"
-	"${FILESDIR}/xmms2-0.7DrNo-missing-protos.patch")
-
-# use_enable() is taken as proto
-# $1 - useflag
-# $2 - xmms2 option/plugin name (equals to $1 if not set)
-
-xmms2_flag() {
-	[[ -z $1 ]] && eerror "!!! empty arg. usage: xmms2_flag <USEFLAG> [<xmms2_flagname>]."
-
-	local UWORD=${2:-$1}
-
-	case $1 in
-		ENABLED)
-			echo ",${UWORD}"
-			;;
-		DISABLED)
-			;;
-		*)
-			use $1 && echo ",${UWORD}"
-			;;
-	esac
-}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_configure() {
-	# ./configure alike options.
-	local waf_params="--prefix=/usr \
-			--libdir=/usr/$(get_libdir) \
-			--with-target-platform=${CHOST} \
-			--mandir=/usr/share/man \
-			--infodir=/usr/share/info \
-			--datadir=/usr/share \
-			--sysconfdir=/etc \
-			--localstatedir=/var/lib"
-
-	local optionals=""
-	local plugins=""
-	if ! use server ; then
-		waf_params+=" --without-xmms2d"
-	else
-		# some fun static mappings:
-		local option_map=(	# USE		# sorted xmms2 option flag (same, as USE if empty)
-					"avahi		avahi"
-					"ENABLED	cli"
-					"avahi		dns_sd"
-					"phonehome	et"
-					"ENABLED	launcher"
-					"mlib-update	medialib-updater"
-					"ENABLED	nycli"
-					"		perl"
-					"ENABLED	pixmaps"
-					"		python"
-					"		ruby"
-					"DISABLED	tests"
-					"DISABLED	vistest"
-					"cxx		xmmsclient++"
-					"cxx		xmmsclient++-glib"
-					"DISABLED	xmmsclient-cf"
-					"DISABLED	xmmsclient-ecore" # not in tree
-				)
-
-		local plugin_map=(	# USE		# sorted xmms2 plugin flag (same, as USE if empty)
-					"		alsa"
-					"		airplay"
-					"		ao"
-					"ffmpeg		apefile"
-					"ffmpeg		avcodec"
-					"		asf"
-					"ENABLED	asx"
-					"		cdda"
-					"DISABLED	coreaudio" # MacOS only?
-					"		curl"
-					"ENABLED	cue"
-					"avahi		daap"
-					"ENABLED	diskwrite"
-					"ENABLED	equalizer"
-					"aac		faad"
-					"ENABLED	file"
-					"		flac"
-					"ffmpeg		flv"
-					"ffmpeg		tta"
-					"DISABLED	gme" # not in tree
-					"		gvfs"
-					"ENABLED	html"
-					"		ices"
-					"ENABLED	icymetaint"
-					"ENABLED	id3v2"
-					"		jack"
-					"ENABLED	karaoke"
-					"ENABLED	m3u"
-					"		mac"
-					"		mms"
-					"		mad"
-					"DISABLED	mp4" # uses bundled patched faad2
-					"mp3		mpg123"
-					"		modplug"
-					"		musepack"
-					"DISABLED	nms" # not in tree
-					"ENABLED	normalize"
-					"ENABLED	null"
-					"ENABLED	nulstripper"
-					"		ofa"
-					"		oss"
-					"ENABLED	pls"
-					"pulseaudio	pulse"
-					"ENABLED	replaygain"
-					"xml		rss"
-					"		samba"
-					"DISABLED	sc68" #not in tree
-					"		sid"
-					"		speex"
-					"DISABLED	sun" # {Open,Net}BSD only
-					"DISABLED	tremor" # not in tree
-					"		vorbis"
-					"		vocoder"
-					"ffmpeg		tta"
-					"ENABLED	wave"
-					"DISABLED	waveout" # windows only
-					"		wavpack"
-					"xml		xspf"
-					"ENABLED	xml"
-				)
-
-		local option
-		for option in "${option_map[@]}"; do
-			optionals+=$(xmms2_flag $option)
-		done
-
-		local plugin
-		for plugin in "${plugin_map[@]}"; do
-			plugins+=$(xmms2_flag $plugin)
-		done
-	fi # ! server
-
-	# pass them explicitely even if empty as we try to avoid magic deps
-	waf_params+=" --with-optionals=${optionals:1}" # skip first ',' if yet
-	waf_params+=" --with-plugins=${plugins:1}"
-
-	./waf ${waf_params} configure || die "'waf configure' failed"
-}
-
-src_compile() {
-	./waf build || die "waf build failed"
-}
-
-src_install() {
-	./waf --without-ldconfig --destdir="${D}" install || die "'waf install' failed"
-	dodoc AUTHORS TODO README
-
-	use python && python_need_rebuild
-}
-
-pkg_postinst() {
-	elog "This version is built on experimental development code"
-	elog "If you encounter any errors report them at http://bugs.xmms2.org"
-	elog "and visit #xmms2 at irc://irc.freenode.net"
-	if use phonehome ; then
-		einfo ""
-		einfo "The phone-home client xmms2-et was activated"
-		einfo "This client sends anonymous usage-statistics to the xmms2"
-		einfo "developers which may help finding bugs"
-		einfo "Disable the phonehome useflag if you don't like that"
-	fi
-
-	use python && python_mod_optimize xmmsclient
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup xmmsclient
-}
diff --git a/media-sound/xmms2/xmms2-0.7-r3.ebuild b/media-sound/xmms2/xmms2-0.7-r3.ebuild
deleted file mode 100644
index c5e1366362bd..000000000000
--- a/media-sound/xmms2/xmms2-0.7-r3.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.7-r3.ebuild,v 1.7 2014/08/10 21:13:03 slyfox Exp $
-
-EAPI=3
-
-inherit base eutils python toolchain-funcs
-
-MY_P="${P}DrNo"
-
-DESCRIPTION="X(cross)platform Music Multiplexing System. The new generation of the XMMS player"
-HOMEPAGE="http://xmms2.org/wiki/Main_Page"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-
-IUSE="aac airplay +alsa ao asf avahi cdda curl cxx ffmpeg flac gvfs ices
-jack mac mlib-update mms +mad modplug mp3 musepack ofa oss
-perl phonehome pulseaudio python ruby
-samba +server sid speex +vorbis vocoder wavpack xml"
-
-RDEPEND="server? (
-		>=dev-db/sqlite-3.3.4
-
-		aac? ( >=media-libs/faad2-2.0 )
-		airplay? ( dev-libs/openssl )
-		alsa? ( media-libs/alsa-lib )
-		ao? ( media-libs/libao )
-		avahi? ( net-dns/avahi[mdnsresponder-compat] )
-		cdda? ( dev-libs/libcdio
-			>=media-libs/libdiscid-0.1.1
-			>=media-sound/cdparanoia-3.9.8 )
-		curl? ( >=net-misc/curl-7.15.1 )
-		ffmpeg? ( virtual/ffmpeg )
-		flac? ( media-libs/flac )
-		gvfs? ( gnome-base/gnome-vfs )
-		ices? ( media-libs/libogg
-			media-libs/libshout
-			media-libs/libvorbis )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 )
-		mac? ( media-sound/mac )
-		mms? ( virtual/ffmpeg
-			>=media-libs/libmms-0.3 )
-		modplug? ( media-libs/libmodplug )
-		mad? ( media-libs/libmad )
-		mp3? ( >=media-sound/mpg123-1.5.1 )
-		musepack? ( media-sound/musepack-tools )
-		ofa? ( media-libs/libofa )
-		pulseaudio? ( media-sound/pulseaudio )
-		samba? ( net-fs/samba[smbclient] )
-		sid? ( media-sound/sidplay
-			media-libs/resid )
-		speex? ( media-libs/speex
-			media-libs/libogg )
-		vorbis? ( media-libs/libvorbis )
-		vocoder? ( sci-libs/fftw media-libs/libsamplerate )
-		wavpack? ( media-sound/wavpack )
-		xml? ( dev-libs/libxml2 )
-	)
-
-	>=dev-libs/glib-2.12.9
-	cxx? ( >=dev-libs/boost-1.32 )
-	perl? ( >=dev-lang/perl-5.8.8 )
-	python? ( =dev-lang/python-2* )
-	ruby? ( >=dev-lang/ruby-1.8.5 ) "
-
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	python? ( dev-python/pyrex )
-	perl? ( virtual/perl-Module-Build )
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}/xmms2-0.7DrNo-windres-build-fix.patch"
-	"${FILESDIR}/xmms2-0.7DrNo-missing-protos.patch"
-	"${FILESDIR}/xmms2-0.7DrNo-XsParse-3.patch")
-
-# use_enable() is taken as proto
-# $1 - useflag
-# $2 - xmms2 option/plugin name (equals to $1 if not set)
-
-xmms2_flag() {
-	[[ -z $1 ]] && eerror "!!! empty arg. usage: xmms2_flag <USEFLAG> [<xmms2_flagname>]."
-
-	local UWORD=${2:-$1}
-
-	case $1 in
-		ENABLED)
-			echo ",${UWORD}"
-			;;
-		DISABLED)
-			;;
-		*)
-			use $1 && echo ",${UWORD}"
-			;;
-	esac
-}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_configure() {
-	# ./configure alike options.
-	local waf_params="--prefix=/usr \
-			--libdir=/usr/$(get_libdir) \
-			--with-target-platform=${CHOST} \
-			--mandir=/usr/share/man \
-			--infodir=/usr/share/info \
-			--datadir=/usr/share \
-			--sysconfdir=/etc \
-			--localstatedir=/var/lib"
-
-	local optionals=""
-	local plugins=""
-	if ! use server ; then
-		waf_params+=" --without-xmms2d"
-	else
-		# some fun static mappings:
-		local option_map=(	# USE		# sorted xmms2 option flag (same, as USE if empty)
-					"avahi		avahi"
-					"ENABLED	cli"
-					"avahi		dns_sd"
-					"phonehome	et"
-					"ENABLED	launcher"
-					"mlib-update	medialib-updater"
-					"ENABLED	nycli"
-					"		perl"
-					"ENABLED	pixmaps"
-					"		python"
-					"		ruby"
-					"DISABLED	tests"
-					"DISABLED	vistest"
-					"cxx		xmmsclient++"
-					"cxx		xmmsclient++-glib"
-					"DISABLED	xmmsclient-cf"
-					"DISABLED	xmmsclient-ecore" # not in tree
-				)
-
-		local plugin_map=(	# USE		# sorted xmms2 plugin flag (same, as USE if empty)
-					"		alsa"
-					"		airplay"
-					"		ao"
-					"ffmpeg		apefile"
-					"ffmpeg		avcodec"
-					"		asf"
-					"ENABLED	asx"
-					"		cdda"
-					"DISABLED	coreaudio" # MacOS only?
-					"		curl"
-					"ENABLED	cue"
-					"avahi		daap"
-					"ENABLED	diskwrite"
-					"ENABLED	equalizer"
-					"aac		faad"
-					"ENABLED	file"
-					"		flac"
-					"ffmpeg		flv"
-					"ffmpeg		tta"
-					"DISABLED	gme" # not in tree
-					"		gvfs"
-					"ENABLED	html"
-					"		ices"
-					"ENABLED	icymetaint"
-					"ENABLED	id3v2"
-					"		jack"
-					"ENABLED	karaoke"
-					"ENABLED	m3u"
-					"		mac"
-					"		mms"
-					"		mad"
-					"DISABLED	mp4" # uses bundled patched faad2
-					"mp3		mpg123"
-					"		modplug"
-					"		musepack"
-					"DISABLED	nms" # not in tree
-					"ENABLED	normalize"
-					"ENABLED	null"
-					"ENABLED	nulstripper"
-					"		ofa"
-					"		oss"
-					"ENABLED	pls"
-					"pulseaudio	pulse"
-					"ENABLED	replaygain"
-					"xml		rss"
-					"		samba"
-					"DISABLED	sc68" #not in tree
-					"		sid"
-					"		speex"
-					"DISABLED	sun" # {Open,Net}BSD only
-					"DISABLED	tremor" # not in tree
-					"		vorbis"
-					"		vocoder"
-					"ffmpeg		tta"
-					"ENABLED	wave"
-					"DISABLED	waveout" # windows only
-					"		wavpack"
-					"xml		xspf"
-					"ENABLED	xml"
-				)
-
-		local option
-		for option in "${option_map[@]}"; do
-			optionals+=$(xmms2_flag $option)
-		done
-
-		local plugin
-		for plugin in "${plugin_map[@]}"; do
-			plugins+=$(xmms2_flag $plugin)
-		done
-	fi # ! server
-
-	# pass them explicitely even if empty as we try to avoid magic deps
-	waf_params+=" --with-optionals=${optionals:1}" # skip first ',' if yet
-	waf_params+=" --with-plugins=${plugins:1}"
-
-	CC="$(tc-getCC)"         \
-	CPP="$(tc-getCPP)"       \
-	AR="$(tc-getAR)"         \
-	RANLIB="$(tc-getRANLIB)" \
-	CXX="$(tc-getCXX)"       \
-	    ./waf configure ${waf_params} || die "'waf configure' failed"
-}
-
-src_compile() {
-	./waf build || die "waf build failed"
-}
-
-src_install() {
-	./waf --without-ldconfig --destdir="${D}" install || die "'waf install' failed"
-	dodoc AUTHORS TODO README
-
-	use python && python_need_rebuild
-}
-
-pkg_postinst() {
-	elog "This version is built on experimental development code"
-	elog "If you encounter any errors report them at http://bugs.xmms2.org"
-	elog "and visit #xmms2 at irc://irc.freenode.net"
-	if use phonehome ; then
-		einfo ""
-		einfo "The phone-home client xmms2-et was activated"
-		einfo "This client sends anonymous usage-statistics to the xmms2"
-		einfo "developers which may help finding bugs"
-		einfo "Disable the phonehome useflag if you don't like that"
-	fi
-
-	use python && python_mod_optimize xmmsclient
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup xmmsclient
-}
diff --git a/media-sound/xmms2/xmms2-0.8-r1.ebuild b/media-sound/xmms2/xmms2-0.8-r1.ebuild
deleted file mode 100644
index 0fdcf57bef04..000000000000
--- a/media-sound/xmms2/xmms2-0.8-r1.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r1.ebuild,v 1.16 2014/08/10 21:13:03 slyfox Exp $
-
-EAPI=3
-
-inherit eutils python toolchain-funcs
-
-MY_P="${P}DrO_o"
-
-DESCRIPTION="X(cross)platform Music Multiplexing System. The new generation of the XMMS player"
-HOMEPAGE="http://xmms2.org/wiki/Main_Page"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-
-IUSE="aac airplay +alsa ao asf avahi cdda curl cxx ffmpeg flac gvfs ices
-jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa oss
-perl phonehome pulseaudio python ruby
-samba +server sid sndfile speex test +vorbis vocoder wavpack xml"
-
-RDEPEND="server? (
-		>=dev-db/sqlite-3.3.4
-
-		aac? ( >=media-libs/faad2-2.0 )
-		airplay? ( dev-libs/openssl )
-		alsa? ( media-libs/alsa-lib )
-		ao? ( media-libs/libao )
-		avahi? ( net-dns/avahi[mdnsresponder-compat] )
-		cdda? ( dev-libs/libcdio-paranoia
-			>=media-libs/libdiscid-0.1.1
-			>=media-sound/cdparanoia-3.9.8 )
-		curl? ( >=net-misc/curl-7.15.1 )
-		ffmpeg? ( virtual/ffmpeg )
-		flac? ( media-libs/flac )
-		gvfs? ( gnome-base/gnome-vfs )
-		ices? ( media-libs/libogg
-			media-libs/libshout
-			media-libs/libvorbis )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 )
-		mac? ( media-sound/mac )
-		mms? ( virtual/ffmpeg
-			>=media-libs/libmms-0.3 )
-		modplug? ( media-libs/libmodplug )
-		mad? ( media-libs/libmad )
-		mp3? ( >=media-sound/mpg123-1.5.1 )
-		musepack? ( media-sound/musepack-tools )
-		ofa? ( media-libs/libofa )
-		pulseaudio? ( media-sound/pulseaudio )
-		samba? ( net-fs/samba[smbclient] )
-		sid? ( media-sound/sidplay
-			media-libs/resid )
-		sndfile? ( media-libs/libsndfile )
-		speex? ( media-libs/speex
-			media-libs/libogg )
-		vorbis? ( media-libs/libvorbis )
-		vocoder? ( sci-libs/fftw media-libs/libsamplerate )
-		wavpack? ( media-sound/wavpack )
-		xml? ( dev-libs/libxml2 )
-	)
-
-	>=dev-libs/glib-2.12.9
-	cxx? ( >=dev-libs/boost-1.32 )
-	perl? ( >=dev-lang/perl-5.8.8 )
-	python? ( dev-lang/python )
-	ruby? ( >=dev-lang/ruby-1.8.5 ) "
-
-DEPEND="${RDEPEND}
-	dev-lang/python
-	python? ( dev-python/pyrex )
-	perl? ( virtual/perl-Module-Build )
-	virtual/pkgconfig
-	test? ( dev-util/cunit )
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-# use_enable() is taken as proto
-# $1 - useflag
-# $2 - xmms2 option/plugin name (equals to $1 if not set)
-
-xmms2_flag() {
-	[[ -z $1 ]] && eerror "!!! empty arg. usage: xmms2_flag <USEFLAG> [<xmms2_flagname>]."
-
-	local UWORD=${2:-$1}
-
-	case $1 in
-		ENABLED)
-			echo ",${UWORD}"
-			;;
-		DISABLED)
-			;;
-		*)
-			use $1 && echo ",${UWORD}"
-			;;
-	esac
-}
-
-pkg_setup() {
-	python_pkg_setup
-}
-
-src_prepare() {
-	./waf # inflate waf
-	cd .waf* || die
-	epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch
-	cd "${S}"
-	epatch "${FILESDIR}/${P}"-ffmpeg-0.11.patch #443256
-	epatch "${FILESDIR}/${P}"-libav-9-p2.patch #443256
-	epatch "${FILESDIR}/${P}"-libav-9.patch #443256
-	epatch "${FILESDIR}/${P}"-cython-0.19.1.patch
-	epatch "${FILESDIR}/${P}"-memset.patch
-
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' src/plugins/cdda/cdda.c || die
-	fi
-}
-
-src_configure() {
-	# ./configure alike options.
-	local waf_params="--prefix=/usr \
-			--libdir=/usr/$(get_libdir) \
-			--with-target-platform=${CHOST} \
-			--mandir=/usr/share/man \
-			--infodir=/usr/share/info \
-			--datadir=/usr/share \
-			--sysconfdir=/etc \
-			--localstatedir=/var/lib"
-
-	local optionals=""
-	local plugins=""
-	if ! use server ; then
-		waf_params+=" --without-xmms2d"
-	else
-		# some fun static mappings:
-		local option_map=(	# USE		# sorted xmms2 option flag (same, as USE if empty)
-					"phonehome	et"
-					"ENABLED	launcher"
-					"mlib-update	medialib-updater"
-					"ENABLED	nycli"
-					"		perl"
-					"ENABLED	pixmaps"
-					"		python"
-					"		ruby"
-					"DISABLED	tests"
-					"DISABLED	vistest"
-					"cxx		xmmsclient++"
-					"cxx		xmmsclient++-glib"
-					"DISABLED	xmmsclient-cf"
-					"DISABLED	xmmsclient-ecore" # not in tree
-
-					"test		tests"
-				)
-
-		local plugin_map=(	# USE		# sorted xmms2 plugin flag (same, as USE if empty)
-					"		alsa"
-					"		airplay"
-					"		ao"
-					"ffmpeg		apefile"
-					"ffmpeg		avcodec"
-					"		asf"
-					"ENABLED	asx"
-					"		cdda"
-					"DISABLED	coreaudio" # MacOS only?
-					"		curl"
-					"ENABLED	cue"
-					"avahi		daap"
-					"ENABLED	diskwrite"
-					"ENABLED	equalizer"
-					"aac		faad"
-					"ENABLED	file"
-					"		flac"
-					"ffmpeg		flv"
-					"ffmpeg		tta"
-					"DISABLED	gme" # not in tree
-					"		gvfs"
-					"ENABLED	html"
-					"		ices"
-					"ENABLED	icymetaint"
-					"ENABLED	id3v2"
-					"		jack"
-					"ENABLED	karaoke"
-					"ENABLED	m3u"
-					"		mac"
-					"		mms"
-					"		mad"
-					"		mp4" # bug #387961 (aac, mp3, ape can sit there)
-					"mp3		mpg123"
-					"		modplug"
-					"		musepack"
-					"DISABLED	nms" # not in tree
-					"ENABLED	normalize"
-					"ENABLED	null"
-					"ENABLED	nulstripper"
-					"		ofa"
-					"		oss"
-					"ENABLED	pls"
-					"pulseaudio	pulse"
-					"ENABLED	replaygain"
-					"xml		rss"
-					"		samba"
-					"DISABLED	sc68" #not in tree
-					"		sid"
-					"		sndfile"
-					"		speex"
-					"DISABLED	sun" # {Open,Net}BSD only
-					"DISABLED	tremor" # not in tree
-					"		vorbis"
-					"		vocoder"
-					"ffmpeg		tta"
-					"ENABLED	wave"
-					"DISABLED	waveout" # windows only
-					"		wavpack"
-					"xml		xspf"
-					"ENABLED	xml"
-				)
-
-		local option
-		for option in "${option_map[@]}"; do
-			optionals+=$(xmms2_flag $option)
-		done
-
-		local plugin
-		for plugin in "${plugin_map[@]}"; do
-			plugins+=$(xmms2_flag $plugin)
-		done
-	fi # ! server
-
-	# pass them explicitely even if empty as we try to avoid magic deps
-	waf_params+=" --with-optionals=${optionals:1}" # skip first ',' if yet
-	waf_params+=" --with-plugins=${plugins:1}"
-
-	CC="$(tc-getCC)"         \
-	CPP="$(tc-getCPP)"       \
-	AR="$(tc-getAR)"         \
-	RANLIB="$(tc-getRANLIB)" \
-	CXX="$(tc-getCXX)"       \
-	    ./waf configure ${waf_params} || die "'waf configure' failed"
-}
-
-src_compile() {
-	# waf is very keen to run tests in build phase (bug #424377) but
-	# it does not bother running tests twice, so the hack below works:
-	./waf --verbose build || ./waf --verbose build || die "waf build failed"
-}
-
-src_test() {
-	# rerun tests
-	./waf --alltests || die "waf --alltests failed"
-}
-
-src_install() {
-	./waf --without-ldconfig --destdir="${D}" install || die "'waf install' failed"
-	dodoc AUTHORS TODO README
-
-	use python && python_need_rebuild
-}
-
-pkg_postinst() {
-	elog "This version is built on experimental development code"
-	elog "If you encounter any errors report them at http://bugs.xmms2.org"
-	elog "and visit #xmms2 at irc://irc.freenode.net"
-	if use phonehome ; then
-		einfo ""
-		einfo "The phone-home client xmms2-et was activated"
-		einfo "This client sends anonymous usage-statistics to the xmms2"
-		einfo "developers which may help finding bugs"
-		einfo "Disable the phonehome useflag if you don't like that"
-	fi
-
-	use python && python_mod_optimize xmmsclient
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup xmmsclient
-}