Fix wrapper to kill hanging processes prior to starting thanks to Heiko Baums <heiko@baums-on-web.de> in bug 178590

Package-Manager: portage-2.1.2.7

4 files changed, 23 insertions, 13 deletions

diff --git a/media-sound/lastfmplayer/ChangeLog b/media-sound/lastfmplayer/ChangeLog
index de1266cd3d6f..7cbdf2202062 100644
--- a/media-sound/lastfmplayer/ChangeLog
+++ b/media-sound/lastfmplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/lastfmplayer
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.16 2007/05/14 19:57:43 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.17 2007/05/22 19:58:35 genstef Exp $
+
+*lastfmplayer-1.1.3-r2 (22 May 2007)
+
+  22 May 2007; Stefan Schweizer <genstef@gentoo.org>
+  -lastfmplayer-1.1.3-r1.ebuild, +lastfmplayer-1.1.3-r2.ebuild:
+  Fix wrapper to kill hanging processes prior to starting thanks to Heiko
+  Baums <heiko@baums-on-web.de> in bug 178590
 
   14 May 2007; Stefan Schweizer <genstef@gentoo.org> +files/qt4.patch,
   -lastfmplayer-1.0.0.1_p2113.ebuild, lastfmplayer-1.1.3-r1.ebuild:
diff --git a/media-sound/lastfmplayer/Manifest b/media-sound/lastfmplayer/Manifest
index f9cab4bbfbbf..38f17b138db8 100644
--- a/media-sound/lastfmplayer/Manifest
+++ b/media-sound/lastfmplayer/Manifest
@@ -19,18 +19,18 @@ MD5 76b5c3df97a2529216d717016ee7ff50 files/qt4.patch 471
 RMD160 47656bb39f33013d30341e22f93287112cb97129 files/qt4.patch 471
 SHA256 a169cc2fc15046ba897a9455a9e5782dffd471930e7cb166a4022c72ed82635e files/qt4.patch 471
 DIST last.fm-1.1.3.src.tar.bz2 856755 RMD160 bfbddb23975dec3186251ebb3e1dcd4d0ad4ff9f SHA1 856e1fd0b85e689bd9553d35d9207633ce929748 SHA256 e05f9b1e177f6c4801295d33246e891690447c594b1138a292779dcef7d85cec
-EBUILD lastfmplayer-1.1.3-r1.ebuild 1954 RMD160 506dc8290cc434bca42631d33b1206c9e13d8946 SHA1 52238182800141ec0f10139bd3480a549cc8ce57 SHA256 c107d40e78c98d24e25f0337da05e44684de7573e1d906cf7e12752703952828
-MD5 d0e4a7740d7e85adb52e3f5f36cad240 lastfmplayer-1.1.3-r1.ebuild 1954
-RMD160 506dc8290cc434bca42631d33b1206c9e13d8946 lastfmplayer-1.1.3-r1.ebuild 1954
-SHA256 c107d40e78c98d24e25f0337da05e44684de7573e1d906cf7e12752703952828 lastfmplayer-1.1.3-r1.ebuild 1954
-MISC ChangeLog 3402 RMD160 423a1eeffbf7d6a261a79587fd2552ccdc17739b SHA1 2faf8b3aa84f83d3aa02cd13997852109a7a19d1 SHA256 7fb55b82c7618b5245ffa3cb477663daf2f8b4c74e484d51a2d2717ea94f9a83
-MD5 a687fd76b41a67997a4d8ff9c7823cfe ChangeLog 3402
-RMD160 423a1eeffbf7d6a261a79587fd2552ccdc17739b ChangeLog 3402
-SHA256 7fb55b82c7618b5245ffa3cb477663daf2f8b4c74e484d51a2d2717ea94f9a83 ChangeLog 3402
+EBUILD lastfmplayer-1.1.3-r2.ebuild 2180 RMD160 cd8add54a4472f4c4da57b57cf9c65c63394ef8a SHA1 f08de2a80a3e4bd41528a025f1ab2647713c2add SHA256 3888dc9e41dc1ab870bbb430bac7a30e6e0465981ba8fc16e87446034598fa74
+MD5 0b6b4dae225ba0adfbc7af38838a2ceb lastfmplayer-1.1.3-r2.ebuild 2180
+RMD160 cd8add54a4472f4c4da57b57cf9c65c63394ef8a lastfmplayer-1.1.3-r2.ebuild 2180
+SHA256 3888dc9e41dc1ab870bbb430bac7a30e6e0465981ba8fc16e87446034598fa74 lastfmplayer-1.1.3-r2.ebuild 2180
+MISC ChangeLog 3678 RMD160 3170b52647832168550b8b83d72add9f1f56426c SHA1 a8d7908ef5dcad254babc1391c45bfddc1c2b4ae SHA256 9fd935eaf71960cd899cbb19001d81bb0f4771b349a1649b2aeefcb4656e5794
+MD5 9650f58409244a9a9716e0ba1f7411fa ChangeLog 3678
+RMD160 3170b52647832168550b8b83d72add9f1f56426c ChangeLog 3678
+SHA256 9fd935eaf71960cd899cbb19001d81bb0f4771b349a1649b2aeefcb4656e5794 ChangeLog 3678
 MISC metadata.xml 251 RMD160 d7ccc9e1d41d94cb971d83931a8ece9a684f6fc6 SHA1 1a65ae8b81af34d32b85ed8a18e1df5caef40ff3 SHA256 c87b81ca4913491f67f603b92fa806fb2af4f29d1fec96891731d2ac7490cb2b
 MD5 99b44433affea389a5ec121d625af495 metadata.xml 251
 RMD160 d7ccc9e1d41d94cb971d83931a8ece9a684f6fc6 metadata.xml 251
 SHA256 c87b81ca4913491f67f603b92fa806fb2af4f29d1fec96891731d2ac7490cb2b metadata.xml 251
-MD5 6657a20eaa2d2330819948b39f61b44e files/digest-lastfmplayer-1.1.3-r1 256
-RMD160 eb29f6d2e05b76d63cf8ba7e0c56ce3e0fc013b5 files/digest-lastfmplayer-1.1.3-r1 256
-SHA256 7cf053b4971e3bd4505ef93741f9a673cd565a6ee07e6f5cc68755526a60c2cd files/digest-lastfmplayer-1.1.3-r1 256
+MD5 6657a20eaa2d2330819948b39f61b44e files/digest-lastfmplayer-1.1.3-r2 256
+RMD160 eb29f6d2e05b76d63cf8ba7e0c56ce3e0fc013b5 files/digest-lastfmplayer-1.1.3-r2 256
+SHA256 7cf053b4971e3bd4505ef93741f9a673cd565a6ee07e6f5cc68755526a60c2cd files/digest-lastfmplayer-1.1.3-r2 256
diff --git a/media-sound/lastfmplayer/files/digest-lastfmplayer-1.1.3-r1 b/media-sound/lastfmplayer/files/digest-lastfmplayer-1.1.3-r2
index 2f5b667e9411..2f5b667e9411 100644
--- a/media-sound/lastfmplayer/files/digest-lastfmplayer-1.1.3-r1
+++ b/media-sound/lastfmplayer/files/digest-lastfmplayer-1.1.3-r2
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.1.3-r1.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.1.3-r2.ebuild
index 8c7082a0c857..ef8dc8984f1f 100644
--- a/media-sound/lastfmplayer/lastfmplayer-1.1.3-r1.ebuild
+++ b/media-sound/lastfmplayer/lastfmplayer-1.1.3-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/lastfmplayer/lastfmplayer-1.1.3-r1.ebuild,v 1.3 2007/05/14 19:57:43 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.1.3-r2.ebuild,v 1.1 2007/05/22 19:58:35 genstef Exp $
 
 inherit eutils versionator
 
@@ -59,6 +59,9 @@ src_install() {
 	newicon data/icons/as.png lastfm.png
 	make_desktop_entry lastfm "Last.fm Player" lastfm.png
 
+	# make sure no hanging instance of lastfm is running
+	sed -i -e 's:exec:if ! ps aux | grep "^$USER.*last.fm.app" | grep Sl >/dev/null 2>\&1; then killall -u $USER last.fm.app >/dev/null 2>\&1; fi\nexec:' ${D}/usr/bin/lastfm
+
 	insinto /usr/share/services
 	doins ${FILESDIR}/lastfm.protocol
 }