Version bump to newest upstream release WITH Daniel Drake <dsd@gentoo.org> coming in with a brand new gtk2 patch for it, Thanks to him and Tristen for testing in bug #52447

7 files changed, 19 insertions, 99 deletions

diff --git a/media-sound/easytag/ChangeLog b/media-sound/easytag/ChangeLog
index 71c52ca7a6bd..6578240f90e0 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.27 2004/05/15 06:08:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.28 2004/06/02 19:26:10 seemant Exp $
+
+*easytag-0.31 (02 Jun 2004)
+
+  02 Jun 2004; Seemant Kulleen <seemant@gentoo.org> +easytag-0.31.ebuild,
+  -easytag-0.31_pre2-r3.ebuild, -easytag-0.31_pre2-r4.ebuild:
+  Version bump to newest upstream release WITH Daniel Drake <dsd@gentoo.org>
+  coming in with a brand new gtk2 patch for it, Thanks to him and Tristen for
+  testing in bug #52447
 
 *easytag-0.31_pre2-r5 (14 May 2004)
 
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 61d301208bd2..b53c7aeaec11 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,6 +1,7 @@
 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 4500c6656a085af5bf277c9fc1c49506 easytag-0.31.ebuild 1542
 MD5 d95b90398b93de5e2d507c14797dec2e easytag-0.31_pre2-r5.ebuild 1833
 MD5 ef36d31b38cb8d0347fb92ca1ed2afa7 ChangeLog 5749
 MD5 b8ca490eb4cbf24dca497d295311e4ac metadata.xml 317
@@ -10,4 +11,5 @@ MD5 fde1835ab2e1a7d45eb477ee62304485 files/digest-easytag-0.31_pre2-r4 142
 MD5 30027265b3c7207c7552c25791996864 files/digest-easytag-0.31_pre2-r5 142
 MD5 0dc3e112a9f2e10861c7608a584f9423 files/digest-easytag-0.30d 349
 MD5 a767d8be7a9435927acebb4b1ca9df4c files/easytag-0.30.2-fix-configure.patch 648
+MD5 d81b9befdf36f2e2bdc8ef1e26d450cb files/digest-easytag-0.31 138
 MD5 5630250004c7a1257a3a170ab8bb749f files/easytag-0.30.2-gcc2.patch 11999
diff --git a/media-sound/easytag/easytag-0.31_pre2-r4.ebuild b/media-sound/easytag/easytag-0.31.ebuild
index fe8a83ced4da..1bf6ea5bde52 100644
--- a/media-sound/easytag/easytag-0.31_pre2-r4.ebuild
+++ b/media-sound/easytag/easytag-0.31.ebuild
@@ -1,19 +1,16 @@
 # 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-r4.ebuild,v 1.1 2004/05/04 21:55:41 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-0.31.ebuild,v 1.1 2004/06/02 19:26:10 seemant Exp $
 
 inherit eutils
 
 IUSE="nls oggvorbis flac gtk2"
 
-MY_PV=${PV/1_pre/0.}
-MY_P=${PN}-${MY_PV}
-DSD_PATCH=${MY_P}-dsd5.patch.bz2
-S=${WORKDIR}/${MY_P}
+DSD_PATCH=${P}-dsd1.patch.bz2
 DESCRIPTION="EasyTAG mp3/ogg ID3 tag editor"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	gtk2? http://www.reactivated.net/patches/easytag-0.30/${DSD_PATCH}"
 HOMEPAGE="http://easytag.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	gtk2? http://www.reactivated.net/patches/${PN}/${PV}/${DSD_PATCH}"
 
 RDEPEND=">=media-libs/id3lib-3.8.2
 	gtk2? ( =x11-libs/gtk+-2.4* )
@@ -22,16 +19,14 @@ RDEPEND=">=media-libs/id3lib-3.8.2
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
 DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7*
-	>=sys-devel/autoconf-2.5*
-	>=sys-apps/sed-4.0.5"
+	gtk2? ( >=sys-devel/automake-1.7 >=sys-devel/autoconf-2.5 )"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
 
 src_unpack() {
-	unpack ${MY_P}.tar.bz2
+	unpack ${P}.tar.bz2
 	cd ${S}
 
 	if use gtk2; then
@@ -42,10 +37,6 @@ src_unpack() {
 		ebegin "Remaking configure script (be patient)"
 		autoreconf &>/dev/null
 		eend $?
-	else
-		epatch ${FILESDIR}/${MY_P}-fix-configure.patch
-		export WANT_AUTOCONF=2.5
-		autoconf
 	fi
 }
 
diff --git a/media-sound/easytag/easytag-0.31_pre2-r3.ebuild b/media-sound/easytag/easytag-0.31_pre2-r3.ebuild
deleted file mode 100644
index 3651a76a3a7a..000000000000
--- a/media-sound/easytag/easytag-0.31_pre2-r3.ebuild
+++ /dev/null
@@ -1,79 +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.31_pre2-r3.ebuild,v 1.2 2004/04/30 01:36:27 eradicator Exp $
-
-inherit eutils
-
-IUSE="nls oggvorbis flac gtk2"
-
-MY_PV=${PV/1_pre/0.}
-MY_P=${PN}-${MY_PV}
-DSD_PATCH=${MY_P}-dsd4.patch.bz2
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="EasyTAG mp3/ogg ID3 tag editor"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	gtk2? http://www.reactivated.net/patches/easytag-0.30/${DSD_PATCH}"
-HOMEPAGE="http://easytag.sourceforge.net/"
-
-RDEPEND=">=media-libs/id3lib-3.8.2
-	gtk2? ( =x11-libs/gtk+-2.4* )
-	!gtk2? ( =x11-libs/gtk+-1.2* )
-	flac? ( >=media-libs/flac-1.1.0 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7*
-	>=sys-devel/autoconf-2.5*
-	>=sys-apps/sed-4.0.5"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd ${S}
-
-	if use gtk2; then
-		epatch ${DISTDIR}/${DSD_PATCH}
-		epatch ${FILESDIR}/${P}-gcc2.patch
-
-		export WANT_AUTOMAKE=1.7
-		export WANT_AUTOCONF=2.5
-		ebegin "Remaking configure script (be patient)"
-		autoreconf &>/dev/null
-		eend $?
-	else
-		epatch ${FILESDIR}/${MY_P}-fix-configure.patch
-		export WANT_AUTOCONF=2.5
-		autoconf
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	econf \
-	`use_enable oggvorbis ogg` \
-	`use_enable nls` \
-	`use_enable flac` \
-	${myconf} || die "econf failed"
-	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
-}
-
-pkg_postinst() {
-	if use gtk2; then
-		einfo "You merged with the \"gtk2\" USE flag set"
-		ewarn "GTK+ 2 support for this program is still experimental"
-		ewarn "Please report bugs to http://bugs.gentoo.org"
-	fi
-}
diff --git a/media-sound/easytag/files/digest-easytag-0.31 b/media-sound/easytag/files/digest-easytag-0.31
new file mode 100644
index 000000000000..a1afbdf36f5c
--- /dev/null
+++ b/media-sound/easytag/files/digest-easytag-0.31
@@ -0,0 +1,2 @@
+MD5 9cfb29a81f251891ec4dbae4cd39821d easytag-0.31.tar.bz2 1054585
+MD5 4fc63528e4e100d55e8b11b53f5f22ca easytag-0.31-dsd1.patch.bz2 206560
diff --git a/media-sound/easytag/files/digest-easytag-0.31_pre2-r3 b/media-sound/easytag/files/digest-easytag-0.31_pre2-r3
deleted file mode 100644
index c19859d91e6f..000000000000
--- a/media-sound/easytag/files/digest-easytag-0.31_pre2-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5e80c60db9eda3c3dfc79110359c0554 easytag-0.30.2.tar.bz2 1049767
-MD5 f7d7df1e4e4fdeb155c6f62c2fc6a023 easytag-0.30.2-dsd4.patch.bz2 182040
diff --git a/media-sound/easytag/files/digest-easytag-0.31_pre2-r4 b/media-sound/easytag/files/digest-easytag-0.31_pre2-r4
deleted file mode 100644
index 3903466d85f8..000000000000
--- a/media-sound/easytag/files/digest-easytag-0.31_pre2-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5e80c60db9eda3c3dfc79110359c0554 easytag-0.30.2.tar.bz2 1049767
-MD5 69fa5461705e4601ee166b704bcb6af9 easytag-0.30.2-dsd5.patch.bz2 185740