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

(Portage version: 2.1.4_rc3)

6 files changed, 22 insertions, 97 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/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