Version bump to 0.31_gtk2.4_pre2

7 files changed, 29 insertions, 82 deletions

diff --git a/media-sound/easytag/ChangeLog b/media-sound/easytag/ChangeLog
index 493b3939603f..9135bcf7a8b0 100644
--- a/media-sound/easytag/ChangeLog
+++ b/media-sound/easytag/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/easytag
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.39 2004/08/18 03:36:22 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.40 2004/09/12 12:34:25 dsd Exp $
+
+*easytag-0.31-r4 (12 Sep 2004)
+
+  12 Sep 2004; Daniel Drake <dsd@gentoo.org> easytag-0.31-r1.ebuild,
+  easytag-0.31-r3.ebuild, easytag-0.31-r4.ebuild:
+  Version bump to 0.31_gtk2.4_pre2. Please don't mark any easytag GTK2 ebuilds
+  as stable on any arch until the issues are ironed out (I'll note here when
+  that is).
 
   17 Aug 2004; Tom Gall <tgall@gentoo.org> easytag-0.31-r2.ebuild:
   stable on ppc64, bug #58311
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 10b392d0fa2e..dff1a4b711f9 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,15 +1,17 @@
-MD5 c9b7f985229fbd65a2e093e035911f61 ChangeLog 7288
+MD5 f57eb722049e194dbb8b47198c3f65b2 easytag-0.31-r4.ebuild 1154
 MD5 59f7db49916260858c6d8155b5cab07c easytag-0.30d.ebuild 1590
 MD5 fdf72f69e8683590e0b3791248180165 easytag-0.31-r1.ebuild 1331
-MD5 48e87a785093c34f6afe264fff4a42f0 easytag-0.31-r2.ebuild 1505
+MD5 a81bc3dccf7103e48cc79c24f4f09a82 easytag-0.31-r3.ebuild 1547
 MD5 4eb47875043bdfcfd4d6933a26a6192b easytag-0.31.ebuild 1676
+MD5 c9b7f985229fbd65a2e093e035911f61 ChangeLog 7288
 MD5 79119f45cab878d56945e1c66e22550c metadata.xml 402
-MD5 a81bc3dccf7103e48cc79c24f4f09a82 easytag-0.31-r3.ebuild 1547
+MD5 48e87a785093c34f6afe264fff4a42f0 easytag-0.31-r2.ebuild 1505
+MD5 25444660393147e2d06a5f1378a89ec4 files/easytag-0.31_pre2-gcc2.patch 2763
 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 bc544930a43c8dd18e9023ceaa679d36 files/digest-easytag-0.31-r1 78
 MD5 eaf43037ba8c09b632e3dd43420700e3 files/digest-easytag-0.31-r2 154
-MD5 a767d8be7a9435927acebb4b1ca9df4c files/easytag-0.30.2-fix-configure.patch 648
-MD5 5630250004c7a1257a3a170ab8bb749f files/easytag-0.30.2-gcc2.patch 11999
-MD5 25444660393147e2d06a5f1378a89ec4 files/easytag-0.31_pre2-gcc2.patch 2763
 MD5 26a0532514be471e7dbb9b523a44e270 files/digest-easytag-0.31-r3 154
+MD5 fe4673ebf7a66c8e9b725eb95462a0c1 files/digest-easytag-0.31-r4 78
+MD5 5630250004c7a1257a3a170ab8bb749f files/easytag-0.30.2-gcc2.patch 11999
diff --git a/media-sound/easytag/easytag-0.31-r3.ebuild b/media-sound/easytag/easytag-0.31-r3.ebuild
deleted file mode 100644
index daa8348c516f..000000000000
--- a/media-sound/easytag/easytag-0.31-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-0.31-r3.ebuild,v 1.1 2004/08/10 21:26:21 dsd Exp $
-
-inherit eutils
-
-IUSE="nls oggvorbis flac"
-
-MY_P="${P}_gtk2.4_pre1"
-EXTRA_PATCH="${PN}-rollup-18_to_20.patch.bz2"
-DESCRIPTION="EasyTAG mp3/ogg ID3 tag editor"
-HOMEPAGE="http://easytag.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	http://www.reactivated.net/patches/easytag/0.31/extras/${EXTRA_PATCH}"
-
-RDEPEND=">=media-libs/id3lib-3.8.2
-	>=x11-libs/gtk+-2.4.1
-	flac? ( >=media-libs/flac-1.1.0 >=media-libs/libvorbis-1.0_beta4 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.59"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd ${S}
-	epatch ${DISTDIR}/${EXTRA_PATCH}
-	WANT_AUTOCONF="2.5" autoconf
-}
-
-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() {
-	einfo "This version of EasyTAG is GTK+ 2.4 based only, with no GTK+ 1.x support"
-	ewarn "GTK+ 2 support for this program is still experimental"
-	ewarn "Please report bugs to http://bugs.gentoo.org"
-}
diff --git a/media-sound/easytag/easytag-0.31-r1.ebuild b/media-sound/easytag/easytag-0.31-r4.ebuild
index e7d9f70dc088..84399fca9738 100644
--- a/media-sound/easytag/easytag-0.31-r1.ebuild
+++ b/media-sound/easytag/easytag-0.31-r4.ebuild
@@ -1,32 +1,32 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-0.31-r1.ebuild,v 1.2 2004/08/10 21:37:04 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-0.31-r4.ebuild,v 1.1 2004/09/12 12:34:25 dsd Exp $
 
-inherit eutils
+inherit eutils gnuconfig
 
 IUSE="nls oggvorbis flac"
 
-MY_P="${P}_gtk2.4_pre0"
+MY_P="${P}_gtk2.4_pre2"
 DESCRIPTION="EasyTAG mp3/ogg ID3 tag editor"
 HOMEPAGE="http://easytag.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 RDEPEND=">=media-libs/id3lib-3.8.2
 	>=x11-libs/gtk+-2.4.1
-	flac? ( >=media-libs/flac-1.1.0 >=media-libs/libvorbis-1.0_beta4 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+	flac? ( >=media-libs/flac-1.1.0 >=media-libs/libvorbis-1.0 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64"
 
 S=${WORKDIR}/${MY_P}
 
-#src_unpack() {
-#	unpack ${MY_P}.tar.bz2
-#	cd ${MY_P}
-#	pwd
-#}
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	cd ${S}
+	use ppc64 && gnuconfig_update
+}
 
 src_compile() {
 	local myconf
diff --git a/media-sound/easytag/files/digest-easytag-0.31-r1 b/media-sound/easytag/files/digest-easytag-0.31-r1
deleted file mode 100644
index 92e619a5e623..000000000000
--- a/media-sound/easytag/files/digest-easytag-0.31-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 460a7fc4c558aee33ced8445bfd053c5 easytag-0.31_gtk2.4_pre0.tar.bz2 1038800
diff --git a/media-sound/easytag/files/digest-easytag-0.31-r3 b/media-sound/easytag/files/digest-easytag-0.31-r3
deleted file mode 100644
index 6f9110681289..000000000000
--- a/media-sound/easytag/files/digest-easytag-0.31-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 33efa62a1d5d6af723d132f64ce0cd86 easytag-0.31_gtk2.4_pre1.tar.bz2 1027806
-MD5 0b2ef6f138d78d800979e0533cb38ce4 easytag-rollup-18_to_20.patch.bz2 5343
diff --git a/media-sound/easytag/files/digest-easytag-0.31-r4 b/media-sound/easytag/files/digest-easytag-0.31-r4
new file mode 100644
index 000000000000..b5258abdb649
--- /dev/null
+++ b/media-sound/easytag/files/digest-easytag-0.31-r4
@@ -0,0 +1 @@
+MD5 a7ff023832b13161f9cc7b92d119cb8a easytag-0.31_gtk2.4_pre2.tar.bz2 1062136