Don't export LD_LIBRARY_PATH or MOZILLA_FIVE_HOME at all wrt #200196, thanks to Gian Luca Dalla Tore.

Package-Manager: portage-2.1.4_rc3

7 files changed, 37 insertions, 119 deletions

diff --git a/media-sound/exaile/ChangeLog b/media-sound/exaile/ChangeLog
index 61e08c3f43e2..b61f78347ee3 100644
--- a/media-sound/exaile/ChangeLog
+++ b/media-sound/exaile/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/exaile
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/ChangeLog,v 1.30 2007/11/25 19:46:07 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/ChangeLog,v 1.31 2007/11/28 15:42:49 drac Exp $
+
+*exaile-0.2.11-r2 (28 Nov 2007)
+
+  28 Nov 2007; Samuli Suominen <drac@gentoo.org>
+  files/exaile-0.2.11-libgtkembedmoz.patch, +exaile-0.2.11-r2.ebuild:
+  Don't export LD_LIBRARY_PATH or MOZILLA_FIVE_HOME at all wrt #200196, thanks
+  to Gian Luca Dalla Tore.
 
 *exaile-0.2.11-r1 (25 Nov 2007)
 
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index 6c782d13101c..fd6c0fb372a6 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -1,27 +1,20 @@
-AUX exaile-0.2.11-libgtkembedmoz.patch 373 RMD160 800d2bfabe42e1e3c6da5e163f02e356981199f7 SHA1 9991b795822dc3f2a4b94c73b6b8760b90603c84 SHA256 b2c400df0c71b7d44f9bbabd9911379a4883abb9851a4b1bdad8ef3b5755cbe5
-MD5 be9157259835d6748d77073104bb4604 files/exaile-0.2.11-libgtkembedmoz.patch 373
-RMD160 800d2bfabe42e1e3c6da5e163f02e356981199f7 files/exaile-0.2.11-libgtkembedmoz.patch 373
-SHA256 b2c400df0c71b7d44f9bbabd9911379a4883abb9851a4b1bdad8ef3b5755cbe5 files/exaile-0.2.11-libgtkembedmoz.patch 373
+AUX exaile-0.2.11-libgtkembedmoz.patch 643 RMD160 f15512b252dd951670b91a837f86df95038e26f9 SHA1 3ad8f8d198d7ecfcea22fcba9254417d0daba13e SHA256 89ac6cb452b01bf2096deeb2dcd8d9601748a64f574b811bf3aebf5a412663d1
+MD5 ffe428c33af8f8964ad2aca9c2aec547 files/exaile-0.2.11-libgtkembedmoz.patch 643
+RMD160 f15512b252dd951670b91a837f86df95038e26f9 files/exaile-0.2.11-libgtkembedmoz.patch 643
+SHA256 89ac6cb452b01bf2096deeb2dcd8d9601748a64f574b811bf3aebf5a412663d1 files/exaile-0.2.11-libgtkembedmoz.patch 643
 DIST exaile_0.2.11.tar.gz 6241496 RMD160 4e68de57bf2ad9d11b99f7e1d193d742bd0b61dc SHA1 db90d68ca4699cc9cb7f0bccb0af039e790072b7 SHA256 ca5decfc78a9a3dbd0beaac85e6f35057ea28b7a1159656f344d9ec376855dd0
-EBUILD exaile-0.2.11-r1.ebuild 2849 RMD160 53ecfd796b05954d6ca7ba5335e480d47e283f2e SHA1 7dd0fd8df45a7a5d342489f74e53b13f51424ce9 SHA256 b2c8264856aa20a78d4f1954786340b35eb0421bd6437ba094ae272a3ea4a7e3
-MD5 b951161b06c41d35980558580529826c exaile-0.2.11-r1.ebuild 2849
-RMD160 53ecfd796b05954d6ca7ba5335e480d47e283f2e exaile-0.2.11-r1.ebuild 2849
-SHA256 b2c8264856aa20a78d4f1954786340b35eb0421bd6437ba094ae272a3ea4a7e3 exaile-0.2.11-r1.ebuild 2849
-EBUILD exaile-0.2.11.ebuild 2756 RMD160 39edae444c8ab9d90a341c2fccff2a93db7268b2 SHA1 bbdbe70445cb351abfee330c1818f4d82bbf9424 SHA256 1caca1665a801b078fbe21640095074d55825926f5979f16df37b5c937f39202
-MD5 c0c6cbfb24db89961e1fb53bddcb6e1d exaile-0.2.11.ebuild 2756
-RMD160 39edae444c8ab9d90a341c2fccff2a93db7268b2 exaile-0.2.11.ebuild 2756
-SHA256 1caca1665a801b078fbe21640095074d55825926f5979f16df37b5c937f39202 exaile-0.2.11.ebuild 2756
-MISC ChangeLog 5017 RMD160 7b6a039a9d6a6561407c18d677afcf36c0095918 SHA1 f7508a8f4f95d1fff91df875a161b56f648624bb SHA256 5694c0459b7b192cf7cbc0425580cff7d31ced4a326f75ba8e754f06021a1563
-MD5 19559781cfc6ad339cbbfb15ac635401 ChangeLog 5017
-RMD160 7b6a039a9d6a6561407c18d677afcf36c0095918 ChangeLog 5017
-SHA256 5694c0459b7b192cf7cbc0425580cff7d31ced4a326f75ba8e754f06021a1563 ChangeLog 5017
+EBUILD exaile-0.2.11-r2.ebuild 2849 RMD160 d10d33af15b752568d104b157e2507cdda4ef0ac SHA1 f23521fefc22e003fdd359dc82ff8f31f392fce3 SHA256 053ad880bffbb3adc7373b7839961b2c5fb29da966082ede1a115ebbe934dcce
+MD5 f16c9634dfb5d4fcc699d73ac6d3dfc0 exaile-0.2.11-r2.ebuild 2849
+RMD160 d10d33af15b752568d104b157e2507cdda4ef0ac exaile-0.2.11-r2.ebuild 2849
+SHA256 053ad880bffbb3adc7373b7839961b2c5fb29da966082ede1a115ebbe934dcce exaile-0.2.11-r2.ebuild 2849
+MISC ChangeLog 5276 RMD160 2e219fa35324ef28b8a75398bc1bfbeead7bd308 SHA1 3f1c88bfc5b2b0c2861fbeedc0199fd4edd7e44e SHA256 0594d54a99946f44d5f23b3cc5f69c294e099b6bf232bf79ac346cdd2658bc99
+MD5 af8f369ee9fd2d2653e37c5eb97bdc95 ChangeLog 5276
+RMD160 2e219fa35324ef28b8a75398bc1bfbeead7bd308 ChangeLog 5276
+SHA256 0594d54a99946f44d5f23b3cc5f69c294e099b6bf232bf79ac346cdd2658bc99 ChangeLog 5276
 MISC metadata.xml 214 RMD160 3ef8a9b331ffe9433ac2b885f83a985e0f89236f SHA1 ec7c7723b21b430e43c31acc7176045413af0225 SHA256 690c22b23be5f116a9ab2986b9fdae7b4f53788c4a8fafb369f3f636a3b619ba
 MD5 97f43390489104c86df538d5759098f0 metadata.xml 214
 RMD160 3ef8a9b331ffe9433ac2b885f83a985e0f89236f metadata.xml 214
 SHA256 690c22b23be5f116a9ab2986b9fdae7b4f53788c4a8fafb369f3f636a3b619ba metadata.xml 214
-MD5 19be9234d7da038904eb4c799db0f6a1 files/digest-exaile-0.2.11 244
-RMD160 2c0860d3c3dd1f0649a31f1f21308441db847aba files/digest-exaile-0.2.11 244
-SHA256 9a30848606ae939498786643dc6f25b404862b370e917ba0b5e82c3463a90f65 files/digest-exaile-0.2.11 244
-MD5 19be9234d7da038904eb4c799db0f6a1 files/digest-exaile-0.2.11-r1 244
-RMD160 2c0860d3c3dd1f0649a31f1f21308441db847aba files/digest-exaile-0.2.11-r1 244
-SHA256 9a30848606ae939498786643dc6f25b404862b370e917ba0b5e82c3463a90f65 files/digest-exaile-0.2.11-r1 244
+MD5 19be9234d7da038904eb4c799db0f6a1 files/digest-exaile-0.2.11-r2 244
+RMD160 2c0860d3c3dd1f0649a31f1f21308441db847aba files/digest-exaile-0.2.11-r2 244
+SHA256 9a30848606ae939498786643dc6f25b404862b370e917ba0b5e82c3463a90f65 files/digest-exaile-0.2.11-r2 244
diff --git a/media-sound/exaile/exaile-0.2.11-r1.ebuild b/media-sound/exaile/exaile-0.2.11-r2.ebuild
index f0a7e719dd9e..7e897a975f04 100644
--- a/media-sound/exaile/exaile-0.2.11-r1.ebuild
+++ b/media-sound/exaile/exaile-0.2.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.11-r1.ebuild,v 1.1 2007/11/25 19:46:07 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.11-r2.ebuild,v 1.1 2007/11/28 15:42:49 drac Exp $
 
 inherit eutils fdo-mime multilib python
 
diff --git a/media-sound/exaile/exaile-0.2.11.ebuild b/media-sound/exaile/exaile-0.2.11.ebuild
deleted file mode 100644
index 783450c9c9dc..000000000000
--- a/media-sound/exaile/exaile-0.2.11.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.11.ebuild,v 1.1 2007/10/18 17:26:02 drac Exp $
-
-inherit eutils fdo-mime multilib python
-
-GVER=0.10
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="a media player aiming to be similar to AmaroK, but for GTK+"
-HOMEPAGE="http://www.exaile.org"
-SRC_URI="http://www.exaile.org/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="aac alsa cdparanoia equalizer flac gnome ipod libnotify libsexy
-	mad musepack nls ogg oss vorbis"
-
-RDEPEND="dev-python/dbus-python
-	>=media-libs/mutagen-1.6
-	>=dev-python/pygtk-2.10
-	|| ( >=dev-lang/python-2.5 >=dev-python/pysqlite-2.3.4-r1 )
-	|| ( >=dev-lang/python-2.5 dev-python/elementtree )
-	libnotify? ( dev-python/notify-python )
-	libsexy? ( dev-python/sexy-python )
-	gnome? ( >=dev-python/gnome-python-extras-2.14.2-r1
-		>=media-plugins/gst-plugins-gconf-${GVER}
-		>=media-plugins/gst-plugins-gnomevfs-${GVER} )
-	>=media-libs/gst-plugins-good-${GVER}
-	equalizer? ( >=media-libs/gst-plugins-bad-0.10.5 )
-	>=dev-python/gst-python-${GVER}
-	musepack? ( >=media-plugins/gst-plugins-musepack-${GVER} )
-	vorbis? ( >=media-plugins/gst-plugins-vorbis-${GVER} )
-	flac? ( >=media-plugins/gst-plugins-flac-${GVER} )
-	aac? ( >=media-plugins/gst-plugins-faad-${GVER} )
-	alsa? ( >=media-plugins/gst-plugins-alsa-${GVER} )
-	oss? ( >=media-plugins/gst-plugins-oss-${GVER} )
-	mad? ( >=media-plugins/gst-plugins-mad-${GVER} )
-	ogg? ( >=media-plugins/gst-plugins-ogg-${GVER} )
-	cdparanoia? ( >=media-plugins/gst-plugins-cdparanoia-${GVER}
-		dev-python/cddb-py )
-	ipod? ( >=media-libs/libgpod-0.4
-		>=media-plugins/gst-plugins-faad-${GVER} )"
-DEPEND="nls? ( dev-util/intltool sys-devel/gettext )"
-
-pkg_setup() {
-	local fail_a="Re-emerge media-libs/libgpod with USE python."
-	local fail_b="Re-emerge dev-lang/python with USE sqlite."
-
-	if use ipod && ! built_with_use media-libs/libgpod python; then
-		eerror "${fail_a}"
-		die "${fail_a}"
-	fi
-
-	if ! has_version ">=dev-python/pysqlite-2.3.4-r1"; then
-		if ! built_with_use ">=dev-lang/python-2.5" sqlite; then
-			eerror "${fail_b}"
-			die "${fail_b}"
-		fi
-	fi
-}
-
-src_compile() {
-	emake mmkeys.so || die "emake mmkeys.so failed."
-
-	if use nls; then
-		emake translations || die "emake translations failed."
-	fi
-}
-
-src_install() {
-	emake PREFIX="/usr" LIBDIR="/$(get_libdir)" DESTDIR="${D}" install || die "emake install failed."
-	dodoc changelog TODO
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/${PN}
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${PN}
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-sound/exaile/files/digest-exaile-0.2.11-r1 b/media-sound/exaile/files/digest-exaile-0.2.11-r1
deleted file mode 100644
index 92ac2f5b2c94..000000000000
--- a/media-sound/exaile/files/digest-exaile-0.2.11-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3dd3aa70f28f92aea496c5191cb5ce64 exaile_0.2.11.tar.gz 6241496
-RMD160 4e68de57bf2ad9d11b99f7e1d193d742bd0b61dc exaile_0.2.11.tar.gz 6241496
-SHA256 ca5decfc78a9a3dbd0beaac85e6f35057ea28b7a1159656f344d9ec376855dd0 exaile_0.2.11.tar.gz 6241496
diff --git a/media-sound/exaile/files/digest-exaile-0.2.11 b/media-sound/exaile/files/digest-exaile-0.2.11-r2
index 92ac2f5b2c94..92ac2f5b2c94 100644
--- a/media-sound/exaile/files/digest-exaile-0.2.11
+++ b/media-sound/exaile/files/digest-exaile-0.2.11-r2
diff --git a/media-sound/exaile/files/exaile-0.2.11-libgtkembedmoz.patch b/media-sound/exaile/files/exaile-0.2.11-libgtkembedmoz.patch
index 1a616ceaa9d7..14c6d9e7dd2f 100644
--- a/media-sound/exaile/files/exaile-0.2.11-libgtkembedmoz.patch
+++ b/media-sound/exaile/files/exaile-0.2.11-libgtkembedmoz.patch
@@ -1,10 +1,19 @@
---- exaile-0.2.11/Makefile.orig	2007-11-25 21:36:04.000000000 +0200
-+++ exaile-0.2.11/Makefile	2007-11-25 21:38:28.000000000 +0200
-@@ -1,6 +1,6 @@
+diff -ur exaile-0.2.11.orig/Makefile exaile-0.2.11/Makefile
+--- exaile-0.2.11.orig/Makefile	2007-10-02 19:25:55.000000000 +0300
++++ exaile-0.2.11/Makefile	2007-11-28 17:35:52.000000000 +0200
+@@ -1,6 +1,5 @@
  PREFIX ?= /usr/local
  LIBDIR ?= /lib
 -FIREFOX ?= /usr/lib/firefox
-+FIREFOX ?= $(PREFIX)$(LIBDIR)/xulrunner:$(PREFIX)$(LIBDIR)/mozilla-firefox:$(PREFIX)$(LIBDIR)/seamonkey
  
  all: compile mmkeys.so translations
  	@echo "Done"
+@@ -69,8 +68,6 @@
+ 	  /bin/echo -e \
+ 	    "#!/bin/sh\n" \
+ 	    "cd $(PREFIX)/share/exaile\n" \
+-	    "export LD_LIBRARY_PATH=\$$LD_LIBRARY_PATH:$(FIREFOX)\n" \
+-		"export MOZILLA_FIVE_HOME=$(FIREFOX)\n" \
+ 	    "exec python $(PREFIX)$(LIBDIR)/exaile/exaile.py \"\$$@\"" \
+ 	    > exaile && \
+ 	  chmod 755 exaile