Include "load from txt" patch from Fedora wrt #329575 by Leonid Podolny.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 79 insertions, 2 deletions

diff --git a/media-sound/easytag/ChangeLog b/media-sound/easytag/ChangeLog
index 67d7df2896dc..b82c8faefb6d 100644
--- a/media-sound/easytag/ChangeLog
+++ b/media-sound/easytag/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/easytag
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.148 2010/07/04 09:27:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.149 2010/07/29 23:16:04 ssuominen Exp $
+
+*easytag-2.1.6-r4 (29 Jul 2010)
+
+  29 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +easytag-2.1.6-r4.ebuild, +files/easytag-2.1.6-load-from-txt.patch:
+  Include "load from txt" patch from Fedora wrt #329575 by Leonid Podolny.
 
   04 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
   easytag-2.1.6-r3.ebuild:
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 5ce056f52c82..658bda5ed594 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,7 +1,9 @@
 AUX easytag-2.1.6-cddb.patch 7503 RMD160 8d5aaefc465593f554e807ad100b086681b3d05a SHA1 482326252e7605be8974e407dd8aff67ad02950c SHA256 4d50c084f470c65443f3eece466877eb715e62ff9eead438bb5ba7ef3a713b29
 AUX easytag-2.1.6-desktop_entry.patch 597 RMD160 cc464e16a6a1da22b7766dd9cec19eb0e20b4c69 SHA1 79baeb3493a1f9524af0d0acf8c0bb15db3db9ba SHA256 13ee1ba610bf2e4456a2ef08ee9e1d608b50ba2f6fac75303eb6086b8d4b09f0
+AUX easytag-2.1.6-load-from-txt.patch 422 RMD160 217d6f06913646329027299f979eff014b45d128 SHA1 5337a876c1c756761a16fc8616b87436665600c3 SHA256 75334d9db830feea82bcaf1c48d5dc4b57748172d5e1b2c0da3131e5e262616d
 AUX easytag-2.1.6-new_libmp4v2.patch 1836 RMD160 83c740bea8eeb83697feac1084ffbf5001e39e75 SHA1 f99cd267255ec857ff731533339cfdae58f30a57 SHA256 040486232845b5b076877eb307029cbd399f2536743f3e570bf32fc97b469242
 DIST easytag-2.1.6.tar.bz2 3304019 RMD160 2ba568b34762e538e26582d9ce648114b7ee5274 SHA1 e2d378d63d872d16a33b45515858cdfab7755645 SHA256 9b051126cc7e82a7ea14e8b9bd32738e8b13a81a968d5f768eef7615bbcdb6d9
 EBUILD easytag-2.1.6-r3.ebuild 1552 RMD160 eb9691e4ffe7953ec45cbadf84097e1ce3c47871 SHA1 b4873f3b34f7d82e7035c10a0a342e4753469cff SHA256 5fc6c4b94e622f611041fe3598c214402eafb78e6e506666dbeb0cc4944d0001
-MISC ChangeLog 21708 RMD160 29e8e7a7b70472ef370b6fe53667a5ab1ca82c77 SHA1 b67bec56476c0941b7040b26fc1d741860a2a588 SHA256 ceffec0515893549dae49d46eaebb33dab5753c1b5d80b4bf56d24c9bb9a5d2c
+EBUILD easytag-2.1.6-r4.ebuild 1602 RMD160 06b2c3c12da6c3bf1aafa5938c6dd0a704ab9bf7 SHA1 141f53e0170eae807ad487de09f0d98002559473 SHA256 d07839690e50bebc5d8dbd6783b5f6cbb4ec85decc13606f5d158d2845622c1d
+MISC ChangeLog 21941 RMD160 9a63ce580cc0176693cce3958f15ea3b063d9d77 SHA1 2335cdfe7755388cff93091a334cd4924e0ea153 SHA256 4537288ab933acd30d90d0e788c48219113d8d54e907ca600a737274a74ef43b
 MISC metadata.xml 331 RMD160 c18921949ccecab234d37aca6bb8500bf9d25790 SHA1 07f082e3c3e93916060e22eb54dcf621dd373718 SHA256 d63548a690cf8c407c50fd4bf11c67b85d8d3c7128d1a5448bda539210975e0b
diff --git a/media-sound/easytag/easytag-2.1.6-r4.ebuild b/media-sound/easytag/easytag-2.1.6-r4.ebuild
new file mode 100644
index 000000000000..29b7deec1d88
--- /dev/null
+++ b/media-sound/easytag/easytag-2.1.6-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-2.1.6-r4.ebuild,v 1.1 2010/07/29 23:16:04 ssuominen Exp $
+
+EAPI=2
+inherit eutils fdo-mime
+
+DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
+HOMEPAGE="http://easytag.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac mp3 mp4 speex vorbis wavpack"
+
+RDEPEND=">=x11-libs/gtk+-2.12:2
+	mp3? ( >=media-libs/id3lib-3.8.3-r7
+		media-libs/libid3tag )
+	flac? ( media-libs/flac
+		media-libs/libvorbis )
+	mp4? ( >=media-libs/libmp4v2-1.9.0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	speex? ( media-libs/speex
+		media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-desktop_entry.patch \
+		"${FILESDIR}"/${P}-new_libmp4v2.patch \
+		"${FILESDIR}"/${P}-cddb.patch \
+		"${FILESDIR}"/${P}-load-from-txt.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable mp3) \
+		$(use_enable mp3 id3v23) \
+		$(use_enable vorbis ogg) \
+		$(use_enable flac) \
+		$(use_enable mp4) \
+		$(use_enable wavpack) \
+		$(use_enable speex)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ChangeLog README THANKS TODO USERS-GUIDE
+}
+
+pkg_postinst() { fdo-mime_desktop_database_update; }
+pkg_postrm() { fdo-mime_desktop_database_update; }
diff --git a/media-sound/easytag/files/easytag-2.1.6-load-from-txt.patch b/media-sound/easytag/files/easytag-2.1.6-load-from-txt.patch
new file mode 100644
index 000000000000..ed86e58b6b2b
--- /dev/null
+++ b/media-sound/easytag/files/easytag-2.1.6-load-from-txt.patch
@@ -0,0 +1,14 @@
+http://cvs.fedoraproject.org/viewvc/rpms/easytag/devel/easytag-2.1.6-load-from-txt.patch?view=log
+http://bugs.gentoo.org/329575
+
+--- src/misc.c
++++ src/misc.c
+@@ -3327,7 +3327,7 @@ void Load_Filename_Set_Filenames (void)
+         g_free(list_text);
+     }
+ 
+-    g_free(currentPath);
++    gtk_tree_path_free(currentPath);
+ 
+     Browser_List_Refresh_Whole_List();
+     ET_Display_File_Data_To_UI(ETCore->ETFileDisplayed);