dsd updated his patch again, verified to compile with gcc2 as well. Thanks to Daniel Drake <dsd@gentoo.org> for the patch and Tristan Henderson <T.Henderson@cs.ucl.ac.uk> for the gcc2 test, in bug #49968

7 files changed, 16 insertions, 76 deletions

diff --git a/media-sound/easytag/ChangeLog b/media-sound/easytag/ChangeLog
index d5d2939ddb69..ddaaab760cb3 100644
--- a/media-sound/easytag/ChangeLog
+++ b/media-sound/easytag/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/easytag
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.25 2004/04/30 01:36:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.26 2004/05/04 21:55:41 seemant Exp $
+
+*easytag-0.31_pre2-r4 (04 May 2004)
+
+  04 May 2004; Seemant Kulleen <seemant@gentoo.org> -easytag-0.30c.ebuild,
+  -easytag-0.31_pre2-r2.ebuild, +easytag-0.31_pre2-r4.ebuild:
+  dsd updated his patch again, verified to compile with gcc2 as well. Thanks to
+  Daniel Drake <dsd@gentoo.org> for the patch and Tristan Henderson
+  <T.Henderson@cs.ucl.ac.uk> for the gcc2 test, in bug #49968
 
   29 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
   easytag-0.31_pre2-r3.ebuild, files/easytag-0.31_pre2-gcc2.patch:
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index e39fad067688..3af4a810ab16 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,13 +1,11 @@
-MD5 be788633d67209bef46c6117793fc81e easytag-0.31_pre2-r2.ebuild 1876
+MD5 39f711bdbd78709ed4e438cc1f091c8e easytag-0.31_pre2-r4.ebuild 1833
 MD5 4b3530d67c2f286baea4cf70a36e57f3 easytag-0.30d.ebuild 1598
 MD5 12389512059b5b2ab253fce895914002 easytag-0.31_pre2-r3.ebuild 1873
-MD5 bb581b933b5ec0e4238fedc55168fedc easytag-0.30c.ebuild 1480
-MD5 7cc6cadd494455c83826538b06ff4b8f ChangeLog 5042
+MD5 730af8a06a0c29eaf169fb08c68107dd ChangeLog 5424
 MD5 b8ca490eb4cbf24dca497d295311e4ac metadata.xml 317
 MD5 25444660393147e2d06a5f1378a89ec4 files/easytag-0.31_pre2-gcc2.patch 2763
-MD5 dfb4c4e7aee1e1bb0711c1b60f6178fb files/digest-easytag-0.31_pre2-r2 142
 MD5 b09d2fabe3663dc7f13cfa6c9e1e4715 files/digest-easytag-0.31_pre2-r3 142
-MD5 e032b0a7fe4897ec0e7dad2ef9002639 files/digest-easytag-0.30c 278
+MD5 fde1835ab2e1a7d45eb477ee62304485 files/digest-easytag-0.31_pre2-r4 142
 MD5 0dc3e112a9f2e10861c7608a584f9423 files/digest-easytag-0.30d 349
 MD5 a767d8be7a9435927acebb4b1ca9df4c files/easytag-0.30.2-fix-configure.patch 648
 MD5 5630250004c7a1257a3a170ab8bb749f files/easytag-0.30.2-gcc2.patch 11999
diff --git a/media-sound/easytag/easytag-0.30c.ebuild b/media-sound/easytag/easytag-0.30c.ebuild
deleted file mode 100644
index decc8abdeaee..000000000000
--- a/media-sound/easytag/easytag-0.30c.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-0.30c.ebuild,v 1.4 2004/04/09 16:18:40 seemant Exp $
-
-IUSE="nls oggvorbis"
-
-inherit eutils
-
-MY_PV=${PV/%[a-zA-Z]/}
-MY_P=${PN}-${MY_PV}
-MY_P2=${MY_P/-/_}
-MY_P2=${MY_P2/./}
-
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="EasyTAG mp3/ogg ID3 tag editor"
-HOMEPAGE="http://easytag.sourceforge.net/"
-SRC_URI="mirror://sourceforge/easytag/${MY_P}.tar.bz2
-	mirror://sourceforge/easytag/patch_${MY_P2}_${MY_PV/./}a.diff
-	mirror://sourceforge/easytag/patch_${MY_P2}a_${MY_PV/./}b.diff
-	mirror://sourceforge/easytag/patch_${MY_P2}b_${PV/./}.diff"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	>=media-libs/id3lib-3.8.2
-	media-libs/flac
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.0.5"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc ~alpha ~hppa ~amd64"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd ${S}
-
-	epatch ${DISTDIR}/patch_${MY_P2}_${MY_PV/./}a.diff
-	epatch ${DISTDIR}/patch_${MY_P2}a_${MY_PV/./}b.diff
-	epatch ${DISTDIR}/patch_${MY_P2}b_${PV/./}.diff
-}
-
-
-src_compile() {
-	local myconf
-
-	#use_enable breaks this
-	use oggvorbis || myconf="${myconf} --disable-ogg"
-
-	econf `use_enable nls` || die
-	emake || die
-}
-
-src_install() {
-	einstall \
-		sysdir=${D}/usr/share/applets/Multimedia \
-		GNOME_SYSCONFDIR=${D}/etc \
-		|| die
-
-	dodoc ChangeLog COPYING NEWS README TODO THANKS USERS-GUIDE
-}
diff --git a/media-sound/easytag/easytag-0.31_pre2-r2.ebuild b/media-sound/easytag/easytag-0.31_pre2-r4.ebuild
index f94345f3cf4a..fe8a83ced4da 100644
--- a/media-sound/easytag/easytag-0.31_pre2-r2.ebuild
+++ b/media-sound/easytag/easytag-0.31_pre2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-0.31_pre2-r2.ebuild,v 1.2 2004/04/22 17:01:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-0.31_pre2-r4.ebuild,v 1.1 2004/05/04 21:55:41 seemant Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ IUSE="nls oggvorbis flac gtk2"
 
 MY_PV=${PV/1_pre/0.}
 MY_P=${PN}-${MY_PV}
-DSD_PATCH=${MY_P}-dsd3.patch.bz2
+DSD_PATCH=${MY_P}-dsd5.patch.bz2
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="EasyTAG mp3/ogg ID3 tag editor"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
@@ -36,7 +36,6 @@ src_unpack() {
 
 	if use gtk2; then
 		epatch ${DISTDIR}/${DSD_PATCH}
-		epatch ${FILESDIR}/${MY_P}-gcc2.patch
 
 		export WANT_AUTOMAKE=1.7
 		export WANT_AUTOCONF=2.5
diff --git a/media-sound/easytag/files/digest-easytag-0.30c b/media-sound/easytag/files/digest-easytag-0.30c
deleted file mode 100644
index 1678f1542ded..000000000000
--- a/media-sound/easytag/files/digest-easytag-0.30c
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 9f0dfde219c0422676f21afc49cc44bf easytag-0.30.tar.bz2 1094337
-MD5 210c0e49ad524181420a481b214a5917 patch_easytag_030_030a.diff 4382
-MD5 d38d94d319471c8b051f76df71de66e9 patch_easytag_030a_030b.diff 9160
-MD5 f48e07056ebd5d4b7b960d8f787c4f12 patch_easytag_030b_030c.diff 6036
diff --git a/media-sound/easytag/files/digest-easytag-0.31_pre2-r2 b/media-sound/easytag/files/digest-easytag-0.31_pre2-r2
deleted file mode 100644
index db2aad600245..000000000000
--- a/media-sound/easytag/files/digest-easytag-0.31_pre2-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5e80c60db9eda3c3dfc79110359c0554 easytag-0.30.2.tar.bz2 1049767
-MD5 e1d6994f12712ebf1b3efb919d958535 easytag-0.30.2-dsd3.patch.bz2 169866
diff --git a/media-sound/easytag/files/digest-easytag-0.31_pre2-r4 b/media-sound/easytag/files/digest-easytag-0.31_pre2-r4
new file mode 100644
index 000000000000..3903466d85f8
--- /dev/null
+++ b/media-sound/easytag/files/digest-easytag-0.31_pre2-r4
@@ -0,0 +1,2 @@
+MD5 5e80c60db9eda3c3dfc79110359c0554 easytag-0.30.2.tar.bz2 1049767
+MD5 69fa5461705e4601ee166b704bcb6af9 easytag-0.30.2-dsd5.patch.bz2 185740