Bugfixes for 0.31-r1 (leaks, rename dir, undefined behaviour)

4 files changed, 63 insertions, 2 deletions

diff --git a/media-sound/easytag/ChangeLog b/media-sound/easytag/ChangeLog
index f5787a069317..5cf299160585 100644
--- a/media-sound/easytag/ChangeLog
+++ b/media-sound/easytag/ChangeLog
@@ -1,12 +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.33 2004/07/03 14:17:43 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.34 2004/07/13 14:50:35 dsd Exp $
 
 *easytag-0.31-r1 (03 Jul 2004)
 
   03 Jul 2004; Daniel Drake <dsd@gentoo.org> easytag-0.31-r1.ebuild,
   metadata.xml:
-  EasyTAG 0.30_gtk2.4_pre0 - GTK2-only version - please report all bugs
+  EasyTAG 0.31_gtk2.4_pre0 - GTK2-only version - please report all bugs
 
   02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> easytag-0.31.ebuild:
   Stable x86, amd64, sparc.
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index a4fac251578b..4d18a7e5cfcd 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -4,10 +4,12 @@ MD5 46d6791df1bdb80df8456473f5324c6e easytag-0.31.ebuild 1650
 MD5 9a8e3b48615e2a2df22c80a293d1c842 easytag-0.31_pre2-r5.ebuild 1832
 MD5 1c5d3decb7075d923850b6ec53979210 ChangeLog 6607
 MD5 a46cf8baa21f01b073f90295ba23c2e8 metadata.xml 402
+MD5 7ff5f736cf58494eabe071835e95fcaa easytag-0.31-r2.ebuild 1436
 MD5 25444660393147e2d06a5f1378a89ec4 files/easytag-0.31_pre2-gcc2.patch 2763
 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 bc544930a43c8dd18e9023ceaa679d36 files/digest-easytag-0.31-r1 78
+MD5 eaf43037ba8c09b632e3dd43420700e3 files/digest-easytag-0.31-r2 154
 MD5 5630250004c7a1257a3a170ab8bb749f files/easytag-0.30.2-gcc2.patch 11999
diff --git a/media-sound/easytag/easytag-0.31-r2.ebuild b/media-sound/easytag/easytag-0.31-r2.ebuild
new file mode 100644
index 000000000000..84cc3c99dc4c
--- /dev/null
+++ b/media-sound/easytag/easytag-0.31-r2.ebuild
@@ -0,0 +1,57 @@
+# 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-r2.ebuild,v 1.1 2004/07/13 14:50:35 dsd Exp $
+
+inherit eutils
+
+IUSE="nls oggvorbis flac"
+
+MY_P="${P}_gtk2.4_pre0"
+EXTRA_PATCH="${PN}-rollup-10_to_17.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 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+
+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}
+}
+
+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/files/digest-easytag-0.31-r2 b/media-sound/easytag/files/digest-easytag-0.31-r2
new file mode 100644
index 000000000000..5c46189afccf
--- /dev/null
+++ b/media-sound/easytag/files/digest-easytag-0.31-r2
@@ -0,0 +1,2 @@
+MD5 460a7fc4c558aee33ced8445bfd053c5 easytag-0.31_gtk2.4_pre0.tar.bz2 1038800
+MD5 8a61361934f29a7467060f0c95557e09 easytag-rollup-10_to_17.patch.bz2 5152