Add kid3 branch - maintains kde optional, musicbrainz fingerprinting

7 files changed, 480 insertions, 0 deletions

diff --git a/media-sound/kid3/ChangeLog b/media-sound/kid3/ChangeLog
new file mode 100644
index 0000000..42a614c
--- /dev/null
+++ b/media-sound/kid3/ChangeLog
@@ -0,0 +1,212 @@
+# 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
new file mode 100644
index 0000000..591fa79
--- /dev/null
+++ b/media-sound/kid3/Manifest
@@ -0,0 +1,8 @@
+AUX kid3-1.6-id3form-usability.patch 4099 RMD160 3e619374ad4fd63262cb482f164b5898c827d505 SHA1 20fcab1b77fb150e07622cb73fe8ea909876f836 SHA256 b4e0ed0668d326971d72ab13fd8ae137ee92d2693ddfbfc41913dc97bf1c462f
+AUX kid3-id3form-understandability.patch 2201 RMD160 540a49b0374ac88269b99ef67a2390dc99a463b8 SHA1 f56918aecf3461adb5c143a93d48f99a83a21a1d SHA256 88b696f50315ec2382c839bc9852535813b67817e13f7bb60f2cc4fa73f1e1e1
+DIST kid3-1.6.tar.gz 1478393 RMD160 7ad7aaf58957be112cea2b2b4962b81fdbb6b6e9 SHA1 64701fa5ee575c6f66e4d0fb70fdaf6c16e54a82 SHA256 974208d5545a9a2bb192dc1a3cfaa64f2269d4f7001d150255ce3f3a3f6723c2
+DIST kid3-2.0.tar.gz 804587 RMD160 746f585575e700e95df6fd3a48b664db9e654de6 SHA1 4e3ec0a98fbba20325fb93d2dcafb86595652c30 SHA256 bdf4ff4f929d7ad6d5b0a6b2661e76ac83216ae94d84a7886f68011c3b7110cd
+EBUILD kid3-1.6-r1.ebuild 1553 RMD160 40e710d257c03b5fb7c7ba442087ce4e63248b8e SHA1 abe93c19a7d31986753e591c7fcf8769be28e610 SHA256 b471b168266c7faeb6e622f8136f4421e7800dfc7375d035d78f5256e81ddd40
+EBUILD kid3-2.0-r1.ebuild 1411 RMD160 910cc56e6611afefff4e0cf15f9bd0279e0f2c1f SHA1 57ebdc13fad108045a086f056dac9caab1e865ab SHA256 b00954194e4f0394e30b51c089242f9050bf9c6fbd73166e996925da71a7864b
+MISC ChangeLog 7320 RMD160 52704cf1548c3d418a5c958774736c99308a8c83 SHA1 fe71ff4b23e31fc6623cc974275dd7f518e68a40 SHA256 baeefa2bd202769498ebdcecc46dbcc227533894e9b86818942d3e0955ac626c
+MISC metadata.xml 179 RMD160 224e1883835fc791f44fdef156866625e02ef60d SHA1 607ee34e3564d7e6d8e0ada382cf18c0315ba5fb SHA256 a6cc704b7ee96c5ce8f058d37447ffb4963d319e557b7fd8ff2bc63e5377d030
diff --git a/media-sound/kid3/files/kid3-1.6-id3form-usability.patch b/media-sound/kid3/files/kid3-1.6-id3form-usability.patch
new file mode 100644
index 0000000..7702e9b
--- /dev/null
+++ b/media-sound/kid3/files/kid3-1.6-id3form-usability.patch
@@ -0,0 +1,92 @@
+--- 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
new file mode 100644
index 0000000..5a02578
--- /dev/null
+++ b/media-sound/kid3/files/kid3-id3form-understandability.patch
@@ -0,0 +1,49 @@
+--- 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
new file mode 100644
index 0000000..05aae49
--- /dev/null
+++ b/media-sound/kid3/kid3-1.6-r1.ebuild
@@ -0,0 +1,57 @@
+# 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
new file mode 100644
index 0000000..8e231b3
--- /dev/null
+++ b/media-sound/kid3/kid3-2.0-r1.ebuild
@@ -0,0 +1,56 @@
+# 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
new file mode 100644
index 0000000..c19e8bd
--- /dev/null
+++ b/media-sound/kid3/metadata.xml
@@ -0,0 +1,6 @@
+<?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>