7 files changed, 22 insertions, 65 deletions
diff --git a/media-sound/easytag/ChangeLog b/media-sound/easytag/ChangeLog
index addb46643809..db00b8e48ec4 100644
--- a/media-sound/easytag/ChangeLog
+++ b/media-sound/easytag/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/easytag
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.75 2005/12/26 14:33:16 lu_zero Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.76 2006/01/02 15:40:47 dsd Exp $
+
+*easytag-1.99.11 (02 Jan 2006)
+
+  02 Jan 2006; Daniel Drake <dsd@gentoo.org> -easytag-1.0-r1.ebuild,
+  -easytag-1.99.9.ebuild, +easytag-1.99.11.ebuild:
+  Version bump thanks to Pietro Franchi <knefas@gmail.com> in bug #116291.
+  Apple/MP4 support is available once again through USE=aac, and beware that
+  you now need USE=mp3 to be able to tag MP3 files.
 
   26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> easytag-1.0-r1.ebuild,
   easytag-1.1.ebuild, easytag-1.99.7.ebuild:
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index bd4296fe2db1..318ff327b2ac 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,13 +1,11 @@
-MD5 8bf3613bd7b778df46a417f9de19c3f0 ChangeLog 12200
-MD5 d93296541e91aed0d64a386009406ba1 easytag-1.0-r1.ebuild 1219
+MD5 a953fbdb309e3cc8c987cecdac99fa2b ChangeLog 12553
 MD5 27d8f207317562fb0afca9ef447287b1 easytag-1.1.ebuild 1174
 MD5 05f08c4a939b397d4e08ff659021a8f1 easytag-1.99.10.ebuild 1241
+MD5 96c5ef5deaf773f228db1b4edb0f1377 easytag-1.99.11.ebuild 1314
 MD5 1677028bba1bd7ce506297943ac00f64 easytag-1.99.7.ebuild 1240
-MD5 898596764300bc5f2b42995253b41b1c easytag-1.99.9.ebuild 1270
-MD5 bed011d8cb53800acb92633c0341a526 files/digest-easytag-1.0-r1 65
 MD5 bfafbbfb1a845e93498456dafa59b9ca files/digest-easytag-1.1 65
 MD5 027c00012f6264123b2e36f38931446f files/digest-easytag-1.99.10 69
+MD5 a9e9be4f4719bc7a601a06fc4ca78d59 files/digest-easytag-1.99.11 69
 MD5 ebff0425ede09fdd1218fee1fc3b0daa files/digest-easytag-1.99.7 68
-MD5 06108156dd5eb758f4ceabc882bc6a98 files/digest-easytag-1.99.9 68
 MD5 86777318233983d77338c33ab4bf266b files/easytag-ape-fix.patch 684
 MD5 79119f45cab878d56945e1c66e22550c metadata.xml 402
diff --git a/media-sound/easytag/easytag-1.0-r1.ebuild b/media-sound/easytag/easytag-1.0-r1.ebuild
deleted file mode 100644
index 572c1069d297..000000000000
--- a/media-sound/easytag/easytag-1.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-1.0-r1.ebuild,v 1.9 2005/12/26 14:33:16 lu_zero Exp $
-
-inherit eutils gnuconfig
-
-DESCRIPTION="EasyTAG mp3/ogg ID3 tag editor"
-HOMEPAGE="http://easytag.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="nls vorbis flac"
-
-RDEPEND=">=media-libs/id3lib-3.8.2
-	=x11-libs/gtk+-1.2*
-	flac? ( >=media-libs/flac-1.1.0 >=media-libs/libvorbis-1.0 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/easytag-ape-fix.patch
-	gnuconfig_update
-}
-
-src_compile() {
-	econf \
-		$(use_enable vorbis ogg) \
-		$(use_enable nls) \
-		$(use_enable flac) \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	einstall \
-		sysdir=${D}/usr/share/applets/Multimedia \
-		GNOME_SYSCONFDIR=${D}/etc \
-		|| die
-
-	dodoc ChangeLog NEWS README TODO THANKS USERS-GUIDE
-}
-
-pkg_postinst() {
-	einfo "This version of EasyTAG is GTK+ 1.2 based only. GTK+ 2.4 support is"
-	einfo "available in the easytag-1.99.x releases (to become 2.0)."
-}
diff --git a/media-sound/easytag/easytag-1.99.9.ebuild b/media-sound/easytag/easytag-1.99.11.ebuild
index 6e692a3d1903..3d21653ab7c3 100644
--- a/media-sound/easytag/easytag-1.99.9.ebuild
+++ b/media-sound/easytag/easytag-1.99.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-1.99.9.ebuild,v 1.1 2005/11/04 00:57:33 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-1.99.11.ebuild,v 1.1 2006/01/02 15:40:48 dsd Exp $
 
 DESCRIPTION="EasyTAG mp3/ogg ID3 tag editor"
 HOMEPAGE="http://easytag.sourceforge.net/"
@@ -8,17 +8,18 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="nls vorbis flac aac"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE="nls vorbis flac aac mp3"
 
-RDEPEND=">=media-libs/id3lib-3.8.2
-	>=x11-libs/gtk+-2.4.1
+RDEPEND=">=x11-libs/gtk+-2.4.1
+	mp3? ( >=media-libs/id3lib-3.8.2 )
 	flac? ( >=media-libs/flac-1.1.0 >=media-libs/libvorbis-1.0 )
 	vorbis? ( >=media-libs/libvorbis-1.0 )
-	aac? ( >=media-video/mpeg4ip-1.3 )"
+	aac? ( media-libs/libmp4v2 )"
 
 src_compile() {
 	econf \
+		$(use_enable mp3) \
 		$(use_enable vorbis ogg) \
 		$(use_enable nls) \
 		$(use_enable flac) \
diff --git a/media-sound/easytag/files/digest-easytag-1.0-r1 b/media-sound/easytag/files/digest-easytag-1.0-r1
deleted file mode 100644
index 681725911a7a..000000000000
--- a/media-sound/easytag/files/digest-easytag-1.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2edda10af47a52c7f74c77fa0b45cd38 easytag-1.0.tar.bz2 1068173
diff --git a/media-sound/easytag/files/digest-easytag-1.99.11 b/media-sound/easytag/files/digest-easytag-1.99.11
new file mode 100644
index 000000000000..3ea05f8d214d
--- /dev/null
+++ b/media-sound/easytag/files/digest-easytag-1.99.11
@@ -0,0 +1 @@
+MD5 0f05f08fde3b33c8aabfb3b18ec334fa easytag-1.99.11.tar.bz2 1350246
diff --git a/media-sound/easytag/files/digest-easytag-1.99.9 b/media-sound/easytag/files/digest-easytag-1.99.9
deleted file mode 100644
index bdd6dce99432..000000000000
--- a/media-sound/easytag/files/digest-easytag-1.99.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d14548bed4e421fb830d7ddcf183690c easytag-1.99.9.tar.bz2 1329877