Some homegrown crash and bugfixes

6 files changed, 14 insertions, 66 deletions

diff --git a/media-sound/easytag/ChangeLog b/media-sound/easytag/ChangeLog
index 90dfc562e853..57a7e144ca5c 100644
--- a/media-sound/easytag/ChangeLog
+++ b/media-sound/easytag/ChangeLog
@@ -1,6 +1,12 @@
 # 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.43 2004/09/30 16:13:23 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.44 2004/10/16 16:35:43 dsd Exp $
+
+*easytag-0.31-r7 (16 Oct 2004)
+
+  16 Oct 2004; Daniel Drake <dsd@gentoo.org> -easytag-0.31-r4.ebuild,
+  -easytag-0.31-r6.ebuild, +easytag-0.31-r7.ebuild:
+  Some homegrown crash and bug fixes
 
   30 Sep 2004; Daniel Drake <dsd@gentoo.org> easytag-0.31-r6.ebuild:
   Fix compilation on gcc 3.4
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index c1e6464813ac..42b78b8cbaff 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,15 +1,13 @@
-MD5 cb53aa418ba9e84a213a5e8ef0c49568 easytag-0.31-r4.ebuild 1354
 MD5 59f7db49916260858c6d8155b5cab07c easytag-0.30d.ebuild 1590
-MD5 21a5d29a2d7d2e797e30a82dbbe6c462 easytag-0.31-r6.ebuild 1483
 MD5 4eb47875043bdfcfd4d6933a26a6192b easytag-0.31.ebuild 1676
-MD5 f82610f6a6a0a24038a212bc76ba70d7 ChangeLog 8116
+MD5 3481f83d30b8ae291d60429b001d9403 ChangeLog 8308
 MD5 79119f45cab878d56945e1c66e22550c metadata.xml 402
+MD5 4073b2d29ea793bd2a1b6a347873116e easytag-0.31-r7.ebuild 1497
 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 eaf43037ba8c09b632e3dd43420700e3 files/digest-easytag-0.31-r2 154
-MD5 fe4673ebf7a66c8e9b725eb95462a0c1 files/digest-easytag-0.31-r4 78
-MD5 526a97d1d69d959c47548d0306b9d280 files/digest-easytag-0.31-r6 146
+MD5 0142a6f07051709906f1be2fd82a6ca3 files/digest-easytag-0.31-r7 154
 MD5 5630250004c7a1257a3a170ab8bb749f files/easytag-0.30.2-gcc2.patch 11999
diff --git a/media-sound/easytag/easytag-0.31-r4.ebuild b/media-sound/easytag/easytag-0.31-r4.ebuild
deleted file mode 100644
index 84399fca9738..000000000000
--- a/media-sound/easytag/easytag-0.31-r4.ebuild
+++ /dev/null
@@ -1,55 +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-r4.ebuild,v 1.1 2004/09/12 12:34:25 dsd Exp $
-
-inherit eutils gnuconfig
-
-IUSE="nls oggvorbis flac"
-
-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 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd ${S}
-	use ppc64 && gnuconfig_update
-}
-
-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-r6.ebuild b/media-sound/easytag/easytag-0.31-r7.ebuild
index 06b4cb32b1ea..7a98ca64475b 100644
--- a/media-sound/easytag/easytag-0.31-r6.ebuild
+++ b/media-sound/easytag/easytag-0.31-r7.ebuild
@@ -1,6 +1,6 @@
 # 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-r6.ebuild,v 1.2 2004/09/30 16:13:23 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-0.31-r7.ebuild,v 1.1 2004/10/16 16:35:43 dsd Exp $
 
 inherit eutils gnuconfig
 
@@ -10,7 +10,7 @@ MY_P="${P}_gtk2.4_pre3"
 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/24_gcc34_compile_fix.patch"
+	http://www.reactivated.net/patches/easytag/0.31/extras/easytag-rollup-24_to_33.patch.bz2"
 
 RDEPEND=">=media-libs/id3lib-3.8.2
 	>=x11-libs/gtk+-2.4.1
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${MY_P}.tar.bz2
 	cd ${S}
-	epatch ${DISTDIR}/24_gcc34_compile_fix.patch
+	epatch ${DISTDIR}/easytag-rollup-24_to_33.patch.bz2
 	use ppc64 && gnuconfig_update
 }
 
diff --git a/media-sound/easytag/files/digest-easytag-0.31-r4 b/media-sound/easytag/files/digest-easytag-0.31-r4
deleted file mode 100644
index b5258abdb649..000000000000
--- a/media-sound/easytag/files/digest-easytag-0.31-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a7ff023832b13161f9cc7b92d119cb8a easytag-0.31_gtk2.4_pre2.tar.bz2 1062136
diff --git a/media-sound/easytag/files/digest-easytag-0.31-r6 b/media-sound/easytag/files/digest-easytag-0.31-r7
index 34e917a28dad..42b1cfa2ce87 100644
--- a/media-sound/easytag/files/digest-easytag-0.31-r6
+++ b/media-sound/easytag/files/digest-easytag-0.31-r7
@@ -1,2 +1,2 @@
 MD5 bcd25636ad909d3605a715af776ccd3c easytag-0.31_gtk2.4_pre3.tar.bz2 1090132
-MD5 19aa4fd4a0d8d7b9f265f8566501fd75 24_gcc34_compile_fix.patch 758
+MD5 b13e6b99b6716bc896891798a21566ab easytag-rollup-24_to_33.patch.bz2 4499