fixed listen script #151379

(Portage version: 2.1.1)

3 files changed, 27 insertions, 15 deletions

diff --git a/media-sound/listen/ChangeLog b/media-sound/listen/ChangeLog
index 85202e778c13..5d90f7146ec1 100644
--- a/media-sound/listen/ChangeLog
+++ b/media-sound/listen/ChangeLog
@@ -1,12 +1,17 @@
 # ChangeLog for media-sound/listen
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/listen/ChangeLog,v 1.10 2006/10/13 13:15:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/listen/ChangeLog,v 1.11 2006/10/15 02:32:10 bass Exp $
+
+*listen-0.5_beta1 (12 Oct 2006)
+
+  15 Oct 2006; J. Alberto Suárez López <bass@gentoo.org>
+  files/Makefile.patch, listen-0.5_beta1.ebuild:
+  Fixed listen script #151379
+  Ready for Sexy and muscibrainz but not working yet.
 
   13 Oct 2006; Simon Stelling <blubb@gentoo.org> listen-0.5_beta1.ebuild:
   fix wrt multilib-strict and re-add ~amd64; bug 146613
 
-*listen-0.5_beta1 (12 Oct 2006)
-
   12 Oct 2006; J. Alberto Suárez López <bass@gentoo.org>
   +files/Makefile.patch, +files/check.patch, +listen-0.5_beta1.ebuild:
   new beta version #148931
diff --git a/media-sound/listen/files/Makefile.patch b/media-sound/listen/files/Makefile.patch
index 7d4d45f1f1b2..2a1e2c45f06c 100644
--- a/media-sound/listen/files/Makefile.patch
+++ b/media-sound/listen/files/Makefile.patch
@@ -1,11 +1,10 @@
---- Makefile	2006-10-03 23:01:36.000000000 +0200
-+++ Makefile.new	2006-10-03 23:17:51.000000000 +0200
-@@ -3,10 +3,10 @@
+--- Makefile	2006-09-05 11:30:51.000000000 +0200
++++ Makefile.new	2006-10-15 03:40:37.000000000 +0200
+@@ -3,10 +3,9 @@
  PO = fr fr_BR en_GB it es hu pl de pt_BR pt nl
  PREFIX ?= /usr
  
 -GTKMOZEMBED_PATH = `(pkg-config --libs-only-L mozilla-gtkmozembed 2>/dev/null || pkg-config --libs-only-L firefox-gtkmozembed 2>/dev/null) | sed -e "s/-L//"`
-+GTKMOZEMBED_PATH = `(pkg-config --libs-only-L mozilla-gtkmozembed 2>/dev/null || pkg-config --libs-only-L firefox-gtkmozembed 2>/dev/null) | sed -e "s/-L//g"`
  
  all: check mmkeys.so po-data
 -	docbook2x-man listen.1.docbook
@@ -13,7 +12,7 @@
  	@echo "Done"
  	@echo "Type: make install now"
  
-@@ -15,7 +15,7 @@
+@@ -15,7 +14,7 @@ check: 
  	@which python || ( echo "Not found." && /bin/false )
  	@./check.py
  	@echo "Checking for gtkmozembed path..."
@@ -22,12 +21,15 @@
  
  daap.py:
  	cd daap && python ./setup.py build  && cd ..
-@@ -70,7 +70,7 @@
+@@ -69,8 +68,9 @@ install: make-install-dirs install-po
+ 	install -m 644 data/img/listen.png $(DESTDIR)$(PREFIX)/share/pixmaps/
  	install -m 644 listen.desktop $(DESTDIR)$(PREFIX)/share/applications/
  	
- 	GTKMOZEMBED_PATH=$(GTKMOZEMBED_PATH) && \
+-	GTKMOZEMBED_PATH=$(GTKMOZEMBED_PATH) && \
 -	/bin/echo -e '#!/bin/sh\n\nLD_LIBRARY_PATH='$$GTKMOZEMBED_PATH' $(PREFIX)/lib/listen/listen.py "$$@"'>listen ;
-+	/bin/echo -e '#!/bin/sh\n\nLD_LIBRARY_PATH="'$$GTKMOZEMBED_PATH'" $(PREFIX)/lib/listen/listen.py "'$$@'"'>listen ;
++	echo "#!/bin/sh" > listen 
++	GTKMOZEMBED_PATH=$( pkg-config --libs-only-L mozilla-gtkmozembed 2>/dev/null || pkg-config --libs-only-L firefox-gtkmozembed 2>/dev/null | sed -e "s/-L//g" -e "s/[ ]/\,/" -e "s/[  ]//g" )
++	GTKMOZEMBED_PATH=${GTKMOZEMBED_PATH} echo "LD_LIBRARY_PATH=\"${GTKMOZEMBED_PATH}\"" "$(PREFIX)/lib/listen/listen.py \"$@\"" >> listen
  	install -m 755 listen $(DESTDIR)$(PREFIX)/bin/
  
  install-po:
diff --git a/media-sound/listen/listen-0.5_beta1.ebuild b/media-sound/listen/listen-0.5_beta1.ebuild
index 52fc2ee2a0bc..55553226ffd2 100644
--- a/media-sound/listen/listen-0.5_beta1.ebuild
+++ b/media-sound/listen/listen-0.5_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/listen/listen-0.5_beta1.ebuild,v 1.2 2006/10/13 13:15:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/listen/listen-0.5_beta1.ebuild,v 1.3 2006/10/15 02:32:10 bass Exp $
 
 inherit eutils virtualx
 
@@ -9,7 +9,8 @@ HOMEPAGE="http://listengnome.free.fr"
 SRC_URI="mirror://sourceforge/listengnome/${PN}-0.5b1.tar.gz"
 S="${WORKDIR}/${PN}-0.5b1"
 LICENSE="GPL-2"
-IUSE="aac cdr flac ipod mad vorbis musicbrainz"
+IUSE="aac cdr flac ipod mad vorbis"
+#IUSE="aac cdr flac ipod mad vorbis musicbrainz libsexy"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 
@@ -47,6 +48,7 @@ DEPEND="${RDEPEND}
 	>=media-libs/mutagen-1.6
 	dev-python/gnome-python
 	dev-python/gnome-python-extras"
+#	libsexy? ( dev-python/sexy-python )
 
 pkg_setup() {
 	if use ipod && ! built_with_use media-libs/libgpod python ; then
@@ -91,7 +93,10 @@ src_install() {
 	Xmake DESTDIR="${D}" PREFIX="/usr" install || die "Install failure"
 }
 
-pkg_install() {
-	sed -i 's/LD_LIBRARY_PATH=\([\/a-z-]*\) \([\/a-z]*\)/LD_LIBRARY_PATH="\1 \2"/' ${D}/usr/bin/listen
+pkg_postinst() {
+	echo "#!/bin/sh" > /usr/bin/listen
+	GTKMOZEMBED_PATH=$( pkg-config --libs-only-L mozilla-gtkmozembed 2>/dev/null || pkg-config --libs-only-L firefox-gtkmozembed 2>/dev/null | sed -e "s/-L//g" -e "s/[ ]/\,/" -e "s/[  ]//g" )
+	echo "LD_LIBRARY_PATH=\"${GTKMOZEMBED_PATH}\"" "/usr/lib/listen/listen.py \"\$@\"" >> /usr/bin/listen
+
 }