apply patch to stable version to fix #93907, and version bump to new version that already has the fix.

(Portage version: 2.0.51.19)

6 files changed, 93 insertions, 14 deletions

diff --git a/media-sound/tagtool/ChangeLog b/media-sound/tagtool/ChangeLog
index 57bc1457339b..fe1cb30d6df3 100644
--- a/media-sound/tagtool/ChangeLog
+++ b/media-sound/tagtool/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/tagtool
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/ChangeLog,v 1.11 2005/04/15 20:23:09 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/ChangeLog,v 1.12 2005/06/21 01:08:18 allanonjl Exp $
+
+*tagtool-0.12.2 (21 Jun 2005)
+
+  21 Jun 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/tagtool-gmodule.patch, tagtool-0.11.1.ebuild,
+  +tagtool-0.12.2.ebuild:
+  apply patch to stable version to fix #93907, and version bump to new version
+  that already has the fix.
 
 *tagtool-0.12.1 (15 Apr 2005)
 
diff --git a/media-sound/tagtool/Manifest b/media-sound/tagtool/Manifest
index f19175cbcdc2..c92849d8f99f 100644
--- a/media-sound/tagtool/Manifest
+++ b/media-sound/tagtool/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5ae905fd4032323741c755722ff90f9e tagtool-0.11.1.ebuild 1366
+MD5 77128531a37c146868c7d56e2435897e tagtool-0.12.2.ebuild 1368
+MD5 8b5f591c2d08a381855e6843e54dd878 tagtool-0.11.1.ebuild 1517
 MD5 77128531a37c146868c7d56e2435897e tagtool-0.12.1.ebuild 1368
-MD5 12cf8755ba8d1ae2244f5bc673e64c93 ChangeLog 1875
+MD5 a680c62e0c0aeff96bffb4873c992d5b ChangeLog 2151
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 283cdf9cb08cc4d819adacde98f27dda files/digest-tagtool-0.11.1 66
 MD5 0afbe723cd47379541f8742a5483764f files/digest-tagtool-0.12.1 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCYCLE06ebR+OMO78RAozIAKCJ5wNaOvYGl4T2szkrzsCzcknSzACfaXnl
-6edtTQRtr/yZWBEVSgW4e1g=
-=00jN
------END PGP SIGNATURE-----
+MD5 be7189cf1f4ede0b8b600f4071c3b65e files/digest-tagtool-0.12.2 66
+MD5 f3f316e9052ef60df0e98fb6d3732677 files/tagtool-gmodule.patch 467
diff --git a/media-sound/tagtool/files/digest-tagtool-0.12.2 b/media-sound/tagtool/files/digest-tagtool-0.12.2
new file mode 100644
index 000000000000..d8b027c5ee28
--- /dev/null
+++ b/media-sound/tagtool/files/digest-tagtool-0.12.2
@@ -0,0 +1 @@
+MD5 4d688dbbe7cd8a08a9f9faef4d1c5b27 tagtool-0.12.2.tar.gz 368758
diff --git a/media-sound/tagtool/files/tagtool-gmodule.patch b/media-sound/tagtool/files/tagtool-gmodule.patch
new file mode 100644
index 000000000000..a483351270cf
--- /dev/null
+++ b/media-sound/tagtool/files/tagtool-gmodule.patch
@@ -0,0 +1,16 @@
+--- configure.ac.old	2005-03-05 21:57:32.000000000 +0100
++++ configure.ac	2005-05-26 00:23:43.000000000 +0200
+@@ -51,9 +51,10 @@
+ 
+ 
+ dnl Check for gtk and related libraries
+-PKG_CHECK_MODULES(GTK, glib-2.0 >= 2.4.0)
+-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4.0)
+-PKG_CHECK_MODULES(GTK, libglade-2.0 >= 2.3.6)
++PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.4.0
++			gtk+-2.0 >= 2.4.0
++			libglade-2.0 >= 2.3.6
++			gmodule-2.0 >= 2.6])
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+ 
diff --git a/media-sound/tagtool/tagtool-0.11.1.ebuild b/media-sound/tagtool/tagtool-0.11.1.ebuild
index 8cfd07d7754d..18373071fd6d 100644
--- a/media-sound/tagtool/tagtool-0.11.1.ebuild
+++ b/media-sound/tagtool/tagtool-0.11.1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/tagtool-0.11.1.ebuild,v 1.3 2005/04/15 20:23:09 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/tagtool-0.11.1.ebuild,v 1.4 2005/06/21 01:08:18 allanonjl Exp $
 
+inherit eutils
 
 DESCRIPTION="Audio Tag Tool Ogg/Mp3 Tagger"
 HOMEPAGE="http://pwp.netcabo.pt/paol/tagtool/"
@@ -19,6 +20,15 @@ DEPEND=">=x11-libs/gtk+-2.4.0-r1
 	mp3? ( >=media-libs/id3lib-3.8.3-r3 )
 	vorbis? ( >=media-libs/libvorbis-1.0.1 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# fix for #93907
+	epatch ${FILESDIR}/tagtool-gmodule.patch
+	autoconf || die "autoconf failed"
+}
+
 src_compile() {
 	local myconf
 	myconf=""
diff --git a/media-sound/tagtool/tagtool-0.12.2.ebuild b/media-sound/tagtool/tagtool-0.12.2.ebuild
new file mode 100644
index 000000000000..2196a03fccd1
--- /dev/null
+++ b/media-sound/tagtool/tagtool-0.12.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/tagtool-0.12.2.ebuild,v 1.1 2005/06/21 01:08:18 allanonjl Exp $
+
+
+DESCRIPTION="Audio Tag Tool Ogg/Mp3 Tagger"
+HOMEPAGE="http://pwp.netcabo.pt/paol/tagtool/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+#-sparc: 0.10 doesn't browse files properly
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="vorbis mp3"
+
+DEPEND=">=x11-libs/gtk+-2.4.0-r1
+	>=gnome-base/libglade-2.4.0
+	mp3? ( >=media-libs/id3lib-3.8.3-r3 )
+	vorbis? ( >=media-libs/libvorbis-1.0.1 )"
+
+src_compile() {
+	local myconf
+	myconf=""
+
+	# Stupid configure thinks --enable-{mp3,vorbis} disables it.
+	# add some configure logic to prevent a dying ebuild
+	if use !mp3 && use !vorbis
+	then
+		ewarn "Vorbis or mp3 must be selected."
+		ewarn "Defaulting to mp3, please cancel this emerge"
+		ewarn "if you do not want mp3 support."
+		myconf="--disable-vorbis"
+	else
+		use mp3 || myconf="${myconf} --disable-mp3"
+		use vorbis || myconf="${myconf} --disable-vorbis"
+	fi
+
+	econf ${myconf} || die "econf failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make install \
+		DESTDIR=${D} \
+		sysdir=${D}/usr/share/applets/Multimedia \
+		GNOME_SYSCONFDIR=${D}/etc \
+		|| die "make install failed"
+
+	dodoc ChangeLog NEWS README TODO THANKS
+}