Merge branch 'master' of https://github.com/jamesbroadhead/jamesbroadhead-gentoo-overlay

7 files changed, 0 insertions, 480 deletions

diff --git a/media-sound/kid3/ChangeLog b/media-sound/kid3/ChangeLog
deleted file mode 100644
index 42a614c..0000000
--- a/media-sound/kid3/ChangeLog
+++ /dev/null
@@ -1,212 +0,0 @@
-# ChangeLog for media-sound/kid3
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.52 2010/07/21 13:03:05 fauli Exp $
-  
-  13 Mar 2011; James Broadhead <jamesbroadhead@gmail.com> kid3-1.6.ebuild:
-  -DWITH_KDE=OFF now works, extended comment about Tunepimp w. link upstream, renamed vorbis USEflag to ogg in line with the flag description (ogg for container, vorbis for codec), cmake flags are case sensitive, fixed. Bug #357207
-
-  21 Jul 2010; Christian Faulhammer <fauli@gentoo.org> kid3-1.4.ebuild:
-  stable x86, bug 325935
-
-  21 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> kid3-1.4.ebuild:
-  Fix building with USE="flac -vorbis" wrt #325935 by Thomas Kahle.
-
-  28 Jun 2010; Markos Chandras <hwoarang@gentoo.org> kid3-1.4.ebuild:
-  Stable on amd64 wrt bug #325935
-
-  03 May 2010; Alexis Ballier <aballier@gentoo.org> kid3-1.4.ebuild:
-  keyword ~x86-fbsd
-
-*kid3-1.4 (06 Mar 2010)
-
-  06 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> +kid3-1.4.ebuild:
-  Version bump.
-
-  23 Nov 2009; Dror Levin <spatz@gentoo.org> kid3-1.3.ebuild,
-  +files/kid3-1.3-compile-without-vorbis.patch:
-  Fix compilation with USE=-vorbis, bug 294160.
-
-*kid3-1.3 (19 Nov 2009)
-
-  19 Nov 2009; Dror Levin <spatz@gentoo.org> +kid3-1.3.ebuild:
-  Version bump, bug 292753.
-
-  18 Oct 2009; Markus Meier <maekke@gentoo.org> kid3-1.2-r3.ebuild:
-  x86 stable, bug #289293
-
-  16 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> kid3-1.2-r3.ebuild:
-  amd64 stable wrt #289293
-
-*kid3-1.2-r3 (21 Aug 2009)
-
-  21 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> +kid3-1.2-r3.ebuild:
-  USE flac mp3 mp4 +musicbrainz +taglib vorbis
-
-*kid3-1.2-r2 (16 Jul 2009)
-
-  16 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> +kid3-1.2-r2.ebuild:
-  Update libmp4v2 >= 1.9.0 patch to one from upstream.
-
-*kid3-1.2-r1 (12 Jul 2009)
-
-  12 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> +kid3-1.2-r1.ebuild,
-  +files/kid3-1.2-new_libmp4v2.patch:
-  Detect and compile with libmp4v2 >= 1.9.0.
-
-  21 May 2009; Samuli Suominen <ssuominen@gentoo.org> kid3-1.2.ebuild:
-  Move to kde4-base.eclass, thanks to scarabeus.
-
-*kid3-1.2 (20 May 2009)
-
-  20 May 2009; Samuli Suominen <ssuominen@gentoo.org> +kid3-1.2.ebuild:
-  Version bump wrt #266823.
-
-  26 Dec 2008; Raúl Porcel <armin76@gentoo.org> kid3-1.0.ebuild:
-  sparc stable wrt #244022
-
-  17 Dec 2008; Markus Meier <maekke@gentoo.org> kid3-1.0.ebuild:
-  x86 stable, bug #244022
-
-  09 Dec 2008; Brent Baude <ranger@gentoo.org> kid3-1.0.ebuild,
-  kid3-1.1.ebuild:
-  Marking kid3-1.1 ~ppc64 and kid3-1.0 ppc64 for bug 244022
-
-  06 Dec 2008; Thomas Anderson <gentoofan23@gentoo.org> kid3-1.0.ebuild:
-  stable amd64, bug 244022
-
-  06 Dec 2008; nixnut <nixnut@gentoo.org> kid3-1.0.ebuild:
-  Stable on ppc wrt bug 244022
-
-  28 Oct 2008; Tomas Chvatal <scarabeus@gentoo.org> kid3-1.1.ebuild:
-  Update ebuild so it actualy works for kde3 as expected.
-
-*kid3-1.1 (27 Oct 2008)
-
-  27 Oct 2008; Tomas Chvatal (scarabeus) <scarabeus@gentoo.org>
-  +kid3-1.1.ebuild:
-  Add kid3-1.1. Enables kde4/qt4 interface based on installed kde version.
-  Currently preffers kde4 over kde3. If someone wants only nonkde interface
-  for QT4 will not work due to forcing dep in Cmake and for QT3 configure
-  violates sandbox.
-
-*kid3-1.0 (11 Jun 2008)
-
-  11 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
-  -files/kid3-0.5-configure.patch, -kid3-0.5.ebuild, -kid3-0.6.ebuild,
-  -kid3-0.7.ebuild, -kid3-0.9.ebuild, -kid3-0.10.ebuild, +kid3-1.0.ebuild:
-  Bump for #225799. Remove old. Installation of docs was breaking. Punted.
-  If you need documentation for clicking, you're not our audience :-)
-
-*kid3-0.10 (08 Dec 2007)
-
-  08 Dec 2007; Matteo Azzali <mattepiu@gentoo.org> +kid3-0.10.ebuild:
-  Version Bump.
-
-  18 Nov 2007; Alexis Ballier <aballier@gentoo.org> kid3-0.6.ebuild,
-  kid3-0.7.ebuild, kid3-0.8.1.ebuild, kid3-0.9.ebuild:
-  add a check for flac cxx use flag, FLAC++ is needed here
-
-*kid3-0.9 (23 Jun 2007)
-
-  23 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org> +kid3-0.9.ebuild:
-  Version bump as per bug 182997. Added localisation support.
-
-  13 Feb 2007; Markus Rothe <corsair@gentoo.org> kid3-0.8.1.ebuild:
-  Stable on ppc64; bug #164580
-
-  10 Feb 2007; nixnut <nixnut@gentoo.org> kid3-0.8.1.ebuild:
-  Stable on ppc wrt bug 164580
-
-  10 Feb 2007; Christian Faulhammer <opfer@gentoo.org> kid3-0.8.1.ebuild:
-  stable x86; bug #164580
-
-  10 Feb 2007; Steve Dibb <beandog@gentoo.org> kid3-0.8.1.ebuild:
-  amd64 stable, bug 164580
-
-  09 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org> kid3-0.8.1.ebuild:
-  Stable on sparc wrt #164580
-
-*kid3-0.8.1 (09 Dec 2006)
-
-  09 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
-  +kid3-0.8.1.ebuild:
-  Bump to 0.8.1; thanks to Paolo Pedroni; bug 156020
-
-*kid3-0.7 (05 Oct 2006)
-
-  05 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> +kid3-0.7.ebuild:
-  Version bump, this closes bug #112583 too.
-
-  25 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
-  -files/kid3-0.6-tunepimp04.patch, kid3-0.6.ebuild:
-  Remove musicbrainz support as per bug #140184.
-
-  21 May 2006; Diego Pettenò <flameeyes@gentoo.org>
-  +files/kid3-0.6-tunepimp04.patch, kid3-0.6.ebuild:
-  Add patch for kid3 to build with tunepimp 0.4.
-
-  06 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> kid3-0.6.ebuild:
-  Forcing KDE support on, as kid3 cannot be configured without having the KDE
-  libraries installed. Also fixes bug #111692.
-
-*kid3-0.6 (05 Nov 2005)
-
-  05 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +kid3-0.6.ebuild:
-  New version (#110998). Make kde support optional. Ad support for vorbis,
-  flac, musicbrainz.
-
-  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> kid3-0.5.ebuild:
-  Stable on ppc.
-
-  20 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> kid3-0.5.ebuild:
-  Stable ppc64 fixing my 2 month old mistake.
-
-  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> kid3-0.4.ebuild,
-  kid3-0.5.ebuild:
-  Stable amd64, sparc, x86.  Added arts to IUSE.
-
-  16 Dec 2004; Markus Rothe <corsair@gentoo.org> kid3-0.5.ebuild:
-  Stable on ppc64
-
-  28 Nov 2004; Simone Gotti <motaboy@gentoo.org>
-  +files/kid3-0.4-configure.patch, kid3-0.4.ebuild:
-  Added a patch to the configure script to honor the arts USE flag. Fixes bug
-  #70703.
-
-  28 Nov 2004; Simone Gotti <motaboy@gentoo.org>
-  +files/kid3-0.5-configure.patch, kid3-0.5.ebuild:
-  Added a patch to the configure script to honor the arts USE flag. Fixes bug
-  #70703.
-
-  01 Nov 2004; Markus Rothe <corsair@gentoo.org>
-
-  kid3-0.5.ebuild:
-  Marked ~ppc64; bug #64642
-
-*kid3-0.5 (20 Oct 2004)
-
-  20 Oct 2004; Patrick Dawson <pkdawson@gentoo.org> +kid3-0.5.ebuild:
-  version bump
-
-  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> kid3-0.4.ebuild:
-  Stable amd64 sparc.
-
-  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> kid3-0.4.ebuild:
-  Stable x86.
-
-  14 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  +files/kid3-0.4-gcc34.patch:
-  gcc-3.4 fixes provided by Patrick Dawson <pkdawson@buffalo.edu> to close bug
-  #56070. Added to ~sparc and ~amd64.
-
-  03 Jul 2004; Carsten Lohrke <carlo@gentoo.org> kid3-0.4.ebuild:
-  QA: need-kde after R/DEPEND
-
-*kid3-0.4 (28 Apr 2004)
-
-  28 Apr 2004; David Holm <dholm@gentoo.org> kid3-0.4.ebuild:
-  Added to ~ppc.
-
-  26 Apr 2004; Dominik Stadler <centic@gentoo.org> :
-  Add new ebuild for kid3, see Bug 23014.
-
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
deleted file mode 100644
index 0f287dc..0000000
--- a/media-sound/kid3/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX kid3-1.6-id3form-usability.patch 4099 SHA256 b4e0ed0668d326971d72ab13fd8ae137ee92d2693ddfbfc41913dc97bf1c462f SHA512 af3efcfcdbef6068160d91b5ec4844513e03458d56489a8eb36a4be26cbcdcdfdfd313b919ad495c36c4b620a5d2abbaba2bd6c4543d502b88b7aaa2641b71a1 WHIRLPOOL 9a349719bb0da38c2d521cd2f0870ef5128219c532a86bbc92235e7f39f076e93c5ac07fd6b0284df490112ba9ef2499e818880054ab6b15d80ef62350317ea7
-AUX kid3-id3form-understandability.patch 2201 SHA256 88b696f50315ec2382c839bc9852535813b67817e13f7bb60f2cc4fa73f1e1e1 SHA512 3614da272cdd69824ceafe6bc764fd8f0036e5fcdd8331919d610bb9190a586ab8391efc6e76575d63425c76666b3d7f4e978dc119a77303fce271da56ebc2ea WHIRLPOOL 3c7de0333463f0dbeb806fee7674d076641be5ef620797f4f704952b00d7d07d6cc96b7411f4da4d302f7d5773493bb473b42c114464c4b02b3ed365a20461ce
-DIST kid3-1.6.tar.gz 1478393 SHA256 974208d5545a9a2bb192dc1a3cfaa64f2269d4f7001d150255ce3f3a3f6723c2 SHA512 cd2acdb14b16b212187f4b4c0144e7cf4d41fa6d4c6cd1c7822e5e92393490abdb6a5071ec501051f37806538af555865cd53b830073db4f0de62242e8f84fd9 WHIRLPOOL 30647ab7b02f8ee173f59c3730c6283f93fecfd14e50c366743cb84b0801fba49b253b3c5a83c4b2d786e142818243e5cc26836ecd2b717793a853d752a7a74c
-DIST kid3-2.0.tar.gz 804587 SHA256 bdf4ff4f929d7ad6d5b0a6b2661e76ac83216ae94d84a7886f68011c3b7110cd SHA512 dc9b065316e020853b79b2d89f626e28adf4ee29ed58f8fdec844a09d1fdd40e24e7b9f4f4b66ddace7a2bac788ff9493c053e93aaa3fbb436b5dbc4528d30e1 WHIRLPOOL 21a57599757a4e1d0951cfd257dc7c71045890f44fe80b84cdb56703bb9d41b9a84e2a5e8c7fb6627ebca433efe33df2173f9b4a7ee0fbdbcfe72e6332d55da4
-EBUILD kid3-1.6-r1.ebuild 1553 SHA256 b471b168266c7faeb6e622f8136f4421e7800dfc7375d035d78f5256e81ddd40 SHA512 26432fa35267cdeb487c816823ca460a91780ac94659df8b4fa080af5d4108b0ef105d59bdd59a52874d1def6bb4e03bad5a4f8979a60e73023d90c3939ac5a8 WHIRLPOOL c13fe81c7f76f7f793f7cc4f4ce78daa30a66c16881d0744d79e5a637df537a2c1049876c6d4ef5d91af1245d26e780e6eb33e090f71c46fefb64383cc48ee8e
-EBUILD kid3-2.0-r1.ebuild 1411 SHA256 b00954194e4f0394e30b51c089242f9050bf9c6fbd73166e996925da71a7864b SHA512 21cc393fea73acffa7fa8e971d53edf782bcf748b3d73245e068dfa15318837126538c8d47b55d1f743f4f191f5319ace3c98188eef06a9bc18f6b8b8c81d38d WHIRLPOOL 2ce42fcf88b3e68e57caf36323fa0fe1e9d63199b616dbc238a8000fafe44ac5178f73e05ae25ef9ada404096f9ff422083d4f9f6adf652687464f77ec5296f5
-MISC ChangeLog 7320 SHA256 baeefa2bd202769498ebdcecc46dbcc227533894e9b86818942d3e0955ac626c SHA512 5243f3903ca073d97ebab64c46751323f852f84916b124ec24ec77e617bbe21cec0272552455034a769d44404e567f677ae35444af6a426482e606f5e42b3be2 WHIRLPOOL c52345a718b35e21a9edba120ac2b3b2a82c8d9a7647745ccd92ea6ad55da6ca821080995439a0f57f6d1a7943f42c058d3a70c56509e8cdaf36bcf190d8f77f
-MISC metadata.xml 179 SHA256 a6cc704b7ee96c5ce8f058d37447ffb4963d319e557b7fd8ff2bc63e5377d030 SHA512 a6decf1ec4b741898241e1ff31a11ff39a81ac9d680cc91a3c5d5c2ae4da94f99b6450f09e139c1ffbd865827b50da0896595af807cccbe83fd2d15ac8d09164 WHIRLPOOL 081c98a8218c74cd1121b546b7652db9b0e33579d1ca669de1209b28ac353c9bea1c1349b1252eaea126b08e98d342a4475d3b2c208a10c0ff0fa3f2d493d26a
diff --git a/media-sound/kid3/files/kid3-1.6-id3form-usability.patch b/media-sound/kid3/files/kid3-1.6-id3form-usability.patch
deleted file mode 100644
index 7702e9b..0000000
--- a/media-sound/kid3/files/kid3-1.6-id3form-usability.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- kid3/id3form.cpp	2010-12-07 20:55:43.000000000 +0100
-+++ kid3/id3form.cpp	2011-04-29 12:41:05.731664449 +0200
-@@ -273,14 +273,14 @@
- 	fileLayout->setMargin(margin);
- 	fileLayout->setSpacing(spacing);
- 
--	m_nameLabel = new QLabel(i18n("Name:"), m_fileWidget);
-+	m_nameLabel = new QLabel(i18n("Filename:"), m_fileWidget);
- 	fileLayout->addWidget(m_nameLabel, 0, 0);
- 
- 	m_nameLineEdit = new QLineEdit(m_fileWidget);
- 	fileLayout->addWidget(m_nameLineEdit, 0, 1, 1, 4);
- 	m_fileLabel->setBuddy(m_nameLineEdit);
- 
--	QLabel* formatLabel = new QLabel(i18n("Format:") + QChar(0x2191),
-+	QLabel* formatLabel = new QLabel(i18n("Set Filename from Tags:"),
- 	                                 m_fileWidget);
- 	fileLayout->addWidget(formatLabel, 1, 0);
- 
-@@ -291,16 +291,12 @@
- 	m_formatComboBox->setToolTip(FrameFormatReplacer::getToolTip());
- 	fileLayout->addWidget(m_formatComboBox, 1, 1);
- 
--	QLabel* fromTagLabel = new QLabel(i18n("From:"), m_fileWidget);
--	fileLayout->addWidget(fromTagLabel, 1, 2);
--	m_fnV1Button = new QPushButton(i18n("Tag 1"), m_fileWidget);
--	m_fnV1Button->setToolTip(i18n("Filename from Tag 1"));
-+	m_fnV1Button = new QPushButton(i18n("from Tag 1"), m_fileWidget);
- 	fileLayout->addWidget(m_fnV1Button, 1, 3);
--	QPushButton* fnV2Button = new QPushButton(i18n("Tag 2"), m_fileWidget);
--	fnV2Button->setToolTip(i18n("Filename from Tag 2"));
-+	QPushButton* fnV2Button = new QPushButton(i18n("from Tag 2"), m_fileWidget);
- 	fileLayout->addWidget(fnV2Button, 1, 4);
- 
--	QLabel* formatFromFilenameLabel = new QLabel(i18n("Format:") + QChar(0x2193),
-+	QLabel* formatFromFilenameLabel = new QLabel(i18n("Set Tags from Filename:"), 
- 	                                             m_fileWidget);
- 	fileLayout->addWidget(formatFromFilenameLabel, 2, 0);
- 
-@@ -314,12 +310,10 @@
- 	QLabel* toTagLabel = new QLabel(i18n("To:"), m_fileWidget);
- 	fileLayout->addWidget(toTagLabel, 2, 2);
- 	m_toTagV1Button =
--		new QPushButton(i18n("Tag 1"), m_fileWidget);
--	m_toTagV1Button->setToolTip(i18n("Tag 1 from Filename"));
-+		new QPushButton(i18n("to Tag 1"), m_fileWidget);
- 	fileLayout->addWidget(m_toTagV1Button, 2, 3);
- 	QPushButton* toTagV2Button =
--		new QPushButton(i18n("Tag 2"), m_fileWidget);
--	toTagV2Button->setToolTip(i18n("Tag 2 from Filename"));
-+		new QPushButton(i18n("to Tag 2"), m_fileWidget);
- 	fileLayout->addWidget(toTagV2Button, 2, 4);
- 
- 	m_tag1Button = new QToolButton(m_rightHalfVBox);
-@@ -452,7 +446,7 @@
- 	fileLayout->addMultiCellWidget(m_nameLineEdit, 0, 0, 1, 4);
- 	m_fileLabel->setBuddy(m_nameLineEdit);
- 
--	QLabel* formatLabel = new QLabel(i18n("Format:") + QChar(0x2191),
-+	QLabel* formatLabel = new QLabel(i18n("Set Filename from Tags:"),
- 	                                 m_fileWidget);
- 	fileLayout->addWidget(formatLabel, 1, 0);
- 
-@@ -466,11 +460,9 @@
- 	QLabel* fromTagLabel = new QLabel(i18n("From:"), m_fileWidget);
- 	fileLayout->addWidget(fromTagLabel, 1, 2);
- 	m_fnV1Button = new QPushButton(i18n("Tag 1"), m_fileWidget);
--	QToolTip::add(m_fnV1Button, i18n("Filename from Tag 1"));
--	fileLayout->addWidget(m_fnV1Button, 1, 3);
-+	fileLayout->addWidget(m_fnV1Button, 1, 2);
- 	QPushButton* fnV2Button = new QPushButton(i18n("Tag 2"), m_fileWidget);
--	QToolTip::add(fnV2Button, i18n("Filename from Tag 2"));
--	fileLayout->addWidget(fnV2Button, 1, 4);
-+	fileLayout->addWidget(fnV2Button, 1, 3);
- 
- 	QLabel* formatFromFilenameLabel = new QLabel(i18n("Format:") + QChar(0x2193),
- 	                                             m_fileWidget);
-@@ -487,12 +479,10 @@
- 	fileLayout->addWidget(toTagLabel, 2, 2);
- 	m_toTagV1Button =
- 		new QPushButton(i18n("Tag 1"), m_fileWidget);
--	QToolTip::add(m_toTagV1Button, i18n("Tag 1 from Filename"));
--	fileLayout->addWidget(m_toTagV1Button, 2, 3);
-+	fileLayout->addWidget(m_toTagV1Button, 2, 2);
- 	QPushButton* toTagV2Button =
- 		new QPushButton(i18n("Tag 2"), m_fileWidget);
--	QToolTip::add(toTagV2Button, i18n("Tag 2 from Filename"));
--	fileLayout->addWidget(toTagV2Button, 2, 4);
-+	fileLayout->addWidget(toTagV2Button, 2, 3);
- 
- 	m_tag1Button = new QToolButton(m_rightHalfVBox);
- 	m_tag1Button->setIconSet(*s_collapsePixmap);
diff --git a/media-sound/kid3/files/kid3-id3form-understandability.patch b/media-sound/kid3/files/kid3-id3form-understandability.patch
deleted file mode 100644
index 5a02578..0000000
--- a/media-sound/kid3/files/kid3-id3form-understandability.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- kid3/id3form.cpp	2010-11-12 16:17:37.000000000 +0000
-+++ kid3/id3form.cpp	2010-11-09 20:28:58.000000000 +0000
-@@ -276 +276 @@
--	m_nameLabel = new QLabel(i18n("Name:"), m_fileWidget);
-+	m_nameLabel = new QLabel(i18n("Filename:"), m_fileWidget);
-@@ -283 +283 @@
--	QLabel* formatLabel = new QLabel(i18n("Format:") + QChar(0x2191),
-+	QLabel* formatLabel = new QLabel(i18n("Set Filename from Tags:"),
-@@ -294,3 +294 @@
--	QLabel* fromTagLabel = new QLabel(i18n("From:"), m_fileWidget);
--	fileLayout->addWidget(fromTagLabel, 1, 2);
--	m_fnV1Button = new QPushButton(i18n("Tag 1"), m_fileWidget);
-+	m_fnV1Button = new QPushButton(i18n("from Tag 1"), m_fileWidget);
-@@ -298 +296 @@
--	QPushButton* fnV2Button = new QPushButton(i18n("Tag 2"), m_fileWidget);
-+	QPushButton* fnV2Button = new QPushButton(i18n("from Tag 2"), m_fileWidget);
-@@ -301 +299 @@
--	QLabel* formatFromFilenameLabel = new QLabel(i18n("Format:") + QChar(0x2193),
-+	QLabel* formatFromFilenameLabel = new QLabel(i18n("Set Tags from Filename:"), 
-@@ -312,2 +309,0 @@
--	QLabel* toTagLabel = new QLabel(i18n("To:"), m_fileWidget);
--	fileLayout->addWidget(toTagLabel, 2, 2);
-@@ -315 +311 @@
--		new QPushButton(i18n("Tag 1"), m_fileWidget);
-+		new QPushButton(i18n("to Tag 1"), m_fileWidget);
-@@ -318 +314 @@
--		new QPushButton(i18n("Tag 2"), m_fileWidget);
-+		new QPushButton(i18n("to Tag 2"), m_fileWidget);
-@@ -451 +447 @@
--	QLabel* formatLabel = new QLabel(i18n("Format:") + QChar(0x2191),
-+	QLabel* formatLabel = new QLabel(i18n("Set Filename from Tags:"),
-@@ -462,2 +457,0 @@
--	QLabel* fromTagLabel = new QLabel(i18n("From:"), m_fileWidget);
--	fileLayout->addWidget(fromTagLabel, 1, 2);
-@@ -465 +459 @@
--	fileLayout->addWidget(m_fnV1Button, 1, 3);
-+	fileLayout->addWidget(m_fnV1Button, 1, 2);
-@@ -467 +461 @@
--	fileLayout->addWidget(fnV2Button, 1, 4);
-+	fileLayout->addWidget(fnV2Button, 1, 3);
-@@ -480,2 +473,0 @@
--	QLabel* toTagLabel = new QLabel(i18n("To:"), m_fileWidget);
--	fileLayout->addWidget(toTagLabel, 2, 2);
-@@ -484 +476 @@
--	fileLayout->addWidget(m_toTagV1Button, 2, 3);
-+	fileLayout->addWidget(m_toTagV1Button, 2, 2);
-@@ -487 +479 @@
--	fileLayout->addWidget(toTagV2Button, 2, 4);
-+	fileLayout->addWidget(toTagV2Button, 2, 3);
diff --git a/media-sound/kid3/kid3-1.6-r1.ebuild b/media-sound/kid3/kid3-1.6-r1.ebuild
deleted file mode 100644
index 05aae49..0000000
--- a/media-sound/kid3/kid3-1.6-r1.ebuild
+++ /dev/null
@@ -1,57 +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/kid3/kid3-1.6.ebuild,v 1.2 2011/04/24 15:27:28 scarabeus Exp $
-
-EAPI=4
-KDE_LINGUAS="cs de es et fi fr it nl pl ru tr zh_TW"
-KDE_REQUIRED="always"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="A simple tag editor for KDE"
-HOMEPAGE="http://kid3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="flac mp3 mp4 musicbrainz +taglib vorbis"
-
-RDEPEND="
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2 )
-	musicbrainz? ( media-libs/musicbrainz:3
-		media-libs/tunepimp )
-	taglib? ( media-libs/taglib )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/kid3-1.6-id3form-usability.patch || die
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	# -DWITH_TUNEPIMP works, but uses the MBz RDF WebService which is deprecated
-	# Details: http://musicbrainz.org/doc/Web_Service
-	# Upstream bug report:
-	# http://sourceforge.net/tracker/?func=detail&aid=3216188&group_id=70849&atid=529221
-
-	local mycmakeargs=(
-		$(cmake-utils_use_with flac)
-		$(cmake-utils_use_with mp3 ID3LIB)
-		$(cmake-utils_use_with mp4 MP4V2)
-		$(cmake-utils_use_with musicbrainz TUNEPIMP)
-		$(cmake-utils_use_with vorbis)
-		$(cmake-utils_use_with taglib)
-		"-DWITH_KDE=ON"
-		)
-
-	kde4-base_src_configure
-}
diff --git a/media-sound/kid3/kid3-2.0-r1.ebuild b/media-sound/kid3/kid3-2.0-r1.ebuild
deleted file mode 100644
index 8e231b3..0000000
--- a/media-sound/kid3/kid3-2.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-KDE_LINGUAS="cs de es et fi fr it nl pl ru tr zh_TW"
-KDE_REQUIRED="optional"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="A simple tag editor for KDE"
-HOMEPAGE="http://kid3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="flac kde mp3 mp4 musicbrainz +taglib vorbis"
-
-RDEPEND="
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2 )
-	musicbrainz? ( media-libs/musicbrainz:3
-		media-libs/tunepimp )
-	taglib? ( media-libs/taglib )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-src_prepare() {
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	# -DWITH_TUNEPIMP works, but uses the MBz RDF WebService which is deprecated
-	# Details: http://musicbrainz.org/doc/Web_Service
-	# Upstream bug report:
-	# http://sourceforge.net/tracker/?func=detail&aid=3216188&group_id=70849&atid=529221
-
-	local mycmakeargs=(
-		$(cmake-utils_use_with flac)
-		$(cmake-utils_use_with mp3 ID3LIB)
-		$(cmake-utils_use_with kde)
-		$(cmake-utils_use_with mp4 MP4V2)
-		$(cmake-utils_use_with musicbrainz TUNEPIMP)
-		$(cmake-utils_use_with vorbis)
-		$(cmake-utils_use_with taglib)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/media-sound/kid3/metadata.xml b/media-sound/kid3/metadata.xml
deleted file mode 100644
index c19e8bd..0000000
--- a/media-sound/kid3/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>kde</herd>
-  <herd>sound</herd>
-</pkgmetadata>