punt old that still used libmp4v2 to clear the mess of dlopening wrong library

Package-Manager: portage-2.2.0_alpha128/cvs/Linux x86_64

4 files changed, 13 insertions, 137 deletions

diff --git a/app-pda/gtkpod/ChangeLog b/app-pda/gtkpod/ChangeLog
index e80acf45a40d..732437d6b084 100644
--- a/app-pda/gtkpod/ChangeLog
+++ b/app-pda/gtkpod/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/gtkpod
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.113 2012/09/23 08:39:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.114 2012/09/23 12:06:55 ssuominen Exp $
+
+  23 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> -gtkpod-2.1.1-r3.ebuild,
+  -files/gtkpod-2.1.1-segfault_with_directory_creation.patch:
+  old
 
   23 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> gtkpod-2.1.2.ebuild:
   x86 stable wrt bug #433535
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index ca8141a1b78b..17da61ed95ab 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gtkpod-2.1.1-segfault_with_directory_creation.patch 1477 SHA256 f6154d9c2516b018712d9ff3b2fc2a2a1cd6855f48307834ec9ace3a66219883 SHA512 9d195212d0abb37da7604e16dcb1382473e96449f4c496e84109301a71422b3f447c6f8e6e6e55bba5f40995c614f2c438fda09d091ed3193970bf9ac93c66f7 WHIRLPOOL 2b89fc45d8ed320511826f4f33564936cbe890a07114bf223fe0be7d1585844814274859e2f343cbe46458d28516c431df98fa07123d410da597fb81752b65a1
-DIST gtkpod-2.1.1.tar.gz 3120542 SHA256 a474bb44ed42df554b02c2bd592485ee4fbe91cb9d0fe43576a63bb8b174c37a SHA512 761965a862e86ca759ad2d80ed4938c03ac9f75925061b7ff9c6275c2b6bc5c98c2ef75aa00be24f4e63c558d4516d51060a2b67c5289d85bdfa6a9766e0356b WHIRLPOOL 0e01759a79186d47e8c95a4004d8e871e5a135eba8f9ad55329c1258695be0999d081a9bfbc7fa150fc5a38526eb42b3bca9b21ad76cca394cd751cdd4c92525
 DIST gtkpod-2.1.2.tar.gz 3673800 SHA256 c3d054235bae80aa8563a441c902fa32528c2b00ba05a98066671fa3036dc1e6 SHA512 01b5b0c370451c717d7a04b592b2b986a692615d1624a267238268e19dd3baeab2f79604e700573fecce5e3822ee37a1d485965c648e2d7b1cb2ab3602742470 WHIRLPOOL f8b6b4304c07eb3e51b10c15288ba6813b6ea715ffa227fd0909acff5742548a49a2ecc999cabd67c0eca918dc4993339903bce0a8e0767298dd2b5eda48baf7
-EBUILD gtkpod-2.1.1-r3.ebuild 2287 SHA256 21298a9a0828a32217ccf68a38c4827b1b074fde00bd1707f16dc56f9685ba8b SHA512 91ed4d61bd24493efafd556efa3c0c6246c2c9e034f77101eaa64b10b13769ad47a83071398bb32949247ca38a358893b171ec520b6c59f6523a6db7f0099766 WHIRLPOOL 1f8cfe69447e091e52e0e5bf43e87fd3a68067453e8ac9c962a62bc66589dbf9e109be29f1afea15aaca38c66f53dc3a03443a190c16fe33f9e33cc6885b349f
 EBUILD gtkpod-2.1.2.ebuild 2566 SHA256 117c0b6ecee6f393d4211502d4173838e2f4b2e60519a2cc235967100a961a09 SHA512 4676b0001a61fa9488ea639f70b217846ff307e7839882e4c9c36df72f0c2e09ab4c4b6a4d7c752bd7f9121011c03059938aa15c1153a623dc54d11df3c56447 WHIRLPOOL 1896d49d64d1d0dffdd655617064d998ed42a54740a76ffd6ce369cb39ce24f4be08bfa3bfcf1f915830cb59a1fd25438652aef2a68018c3b5bda53025a765ef
-MISC ChangeLog 14584 SHA256 30196f7411b810ff0a1746a19c99c4b371199879585531d3690d7c801f8f71ce SHA512 654e11d4ae31f599da6dc1e1852a465c366a4e04d3a417d859e28c6ffde8038e950bb12272d68600c1d8308b512d2b40eccf4918fabce84979d6c3a9943844d6 WHIRLPOOL 6778fcac1a0e36feeca02440131e10dcdbb9e7c7de3edc30bd18d92b3949567242cf8b7ac378615eafb0912313a3a7d2c3e2cb6d14bdff2bb3c5276efdf10187
+MISC ChangeLog 14731 SHA256 ceef4a97b4976417d9c9c60de4fdec7f9d7df5659230e6ba0e71cda4d9fefcc1 SHA512 18be746ab5857b9f3a8a358bbf107bea87fc0aa084c8bc1944d0472493eedbe2790569a7ef546a9270a1525a6515b1ebe9c7b87fd74018d437865051b43a202a WHIRLPOOL a05db1bde834ae458af4743e211d967356e87f76158e0f702a03c27d45be029b1cf86acf1fae1c41fddf25a90e3505ae379db8522264882bfd7145845c71923f
 MISC metadata.xml 328 SHA256 0288ef4f77dee4547f748900456ff0079dece3ca0dd50e11e6d3d3d1ff9d6bf7 SHA512 5af320980dc3dc9570303c837be3758fb47d0ef3d2faa7358b68e1b9486a23d426bc4f60f323b8273f9538ca2fe3e3e29c6c4079809b413d2654856e5feaea4d WHIRLPOOL 08d7a8491935637bf7d2f510a13b8b1a1fb90700f1e5d326e6e063817652437232f5d6dc01fb29c4b7b5c5c85f4ee55d1ee27ad1b4379fb36798bdb0f59407e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBeyuUACgkQuUQtlDBCeQLcHACdFoyavbVhXY2/o9DgX2m+l1ug
-NQQAmgLyS3HXl62lRzd7xoicBXJhH8cP
-=PwGz
+iQEcBAEBCAAGBQJQXvrMAAoJEEdUh39IaPFNKR8H/j+noU/qZXmlW3dbHfp+2Hyy
+Og26l6YcAGB5A3WO1zIAeKzadYQPDmh76Nr/c85Mnbg5XDA3GnB/5Wko16w5E1aR
+Espp5vOtJa5IErlEHJ6Z4sNOUkNjtQVnPoMvGlRuyCYa0iRsQjgtfSuINRR2FLCC
+1dzeJDsfYZ1TXKlbOL1tgdd2k+RXjFIcG2Rklzxu+qwlrmGt/14Ip3jZrQsUtNVN
+fQblEh9a8WNR1Wk2CR9tQyCH35gTArR4lOFxG2JSs4um8So8AWLSejM4RWhMbDMC
+Lq57PT3ScZQD/HjmehmOJTMldVwrQ0Yg+9VsdbKC2dBn4Nwhenh5nSlBti9O3fg=
+=gxys
 -----END PGP SIGNATURE-----
diff --git a/app-pda/gtkpod/files/gtkpod-2.1.1-segfault_with_directory_creation.patch b/app-pda/gtkpod/files/gtkpod-2.1.1-segfault_with_directory_creation.patch
deleted file mode 100644
index 342f900cabb9..000000000000
--- a/app-pda/gtkpod/files/gtkpod-2.1.1-segfault_with_directory_creation.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d6ae5a468eba1b3b2aaf40ffa5ede6fce4ea7c3a Mon Sep 17 00:00:00 2001
-From: phantomjinx <p.g.richardson@phantomjinx.co.uk>
-Date: Mon, 23 Apr 2012 20:38:15 +0100
-Subject: [PATCH] Fix for double free segfault
-
-* Occurs when adding a directory
-
-* Directory names inserted into hash table, added as both key and value then
-  being freed as key and then freed as value. Second free causing the
-  segfault
-
-Fixes 3477268 (sf.net)
-Fixes FS#92
----
- libgtkpod/file.c |    7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/libgtkpod/file.c b/libgtkpod/file.c
-index 323df96..9ffe885 100644
---- a/libgtkpod/file.c
-+++ b/libgtkpod/file.c
-@@ -422,8 +422,11 @@ static void recurse_directories_internal(gchar *name, GSList **trknames, gboolea
- 
-                     if (g_hash_table_lookup(*directories_seen, nextfull))
-                         continue;
--                    else
--                        g_hash_table_insert(*directories_seen, nextfull, nextfull);
-+                    else {
-+                        // Avoid double freeing when directories_seen is destroyed
-+                        // by duplicating the nextfull string
-+                        g_hash_table_insert(*directories_seen, g_strdup(nextfull), g_strdup(nextfull));
-+                    }
- 
-                     if (descend || !g_file_test(nextfull, G_FILE_TEST_IS_DIR)) {
-                         recurse_directories_internal(nextfull, trknames, descend, directories_seen);
--- 
-1.7.4.1
-
diff --git a/app-pda/gtkpod/gtkpod-2.1.1-r3.ebuild b/app-pda/gtkpod/gtkpod-2.1.1-r3.ebuild
deleted file mode 100644
index 1ab600c78e6a..000000000000
--- a/app-pda/gtkpod/gtkpod-2.1.1-r3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.1-r3.ebuild,v 1.3 2012/06/20 08:17:39 ssuominen Exp $
-
-EAPI=4
-inherit eutils gnome2-utils
-
-DESCRIPTION="A graphical user interface to the Apple productline"
-HOMEPAGE="http://gtkpod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aac clutter curl flac gstreamer mp3 vorbis webkit"
-
-# libmp4v2.so.1 from SLOT=1 is dlopened but gtkpod has switched to
-# AtomicParsley in git for the upcoming 2.1.2 release
-COMMON_DEPEND="dev-libs/gdl:3
-	>=dev-libs/glib-2.28.5
-	>=dev-libs/libxml2-2.7.7
-	>=dev-util/anjuta-2.91
-	>=media-libs/libgpod-0.7.0
-	>=media-libs/libid3tag-0.15
-	>=x11-libs/gtk+-3.0.8:3
-	aac? (
-		media-libs/faad2
-		|| ( media-libs/libmp4v2:1 <=media-libs/libmp4v2-1.9.1:0 )
-		)
-	clutter? ( media-libs/clutter-gtk:1.0 )
-	curl? ( >=net-misc/curl-7.10 )
-	flac? ( media-libs/flac )
-	gstreamer? ( >=media-libs/gst-plugins-base-0.10.25:0.10 )
-	mp3? ( media-sound/lame )
-	vorbis? (
-		media-libs/libvorbis
-		media-sound/vorbis-tools
-		)
-	webkit? ( >=net-libs/webkit-gtk-1.3:3 )"
-RDEPEND="${COMMON_DEPEND}
-	gstreamer? ( media-plugins/gst-plugins-meta:0.10 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/os-headers"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-segfault_with_directory_creation.patch #414753
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable webkit plugin-coverweb) \
-		$(use_enable clutter plugin-clarity) \
-		$(use_enable gstreamer plugin-media-player) \
-		$(use_with curl) \
-		$(use_with vorbis ogg) \
-		$(use_with flac) \
-		$(use_with aac faad)
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF}/html \
-		figuresdir=/usr/share/doc/${PF}/html/figures \
-		install
-
-	dodoc AUTHORS ChangeLog NEWS README TODO TROUBLESHOOTING
-
-	find "${D}" -name '*.la' -exec rm -f {} +
-	rm -f "${D}"/usr/share/gtkpod/data/{AUTHORS,COPYING}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}