Fix qt4.3 version bug thanks to Peter Gantner (a.k.a. nephros) <gentoo@nephros.org> and Heiko Baums <heiko@baums-on-web.de> in bug 177932

Package-Manager: portage-2.1.2.7

6 files changed, 31 insertions, 137 deletions

diff --git a/media-sound/lastfmplayer/ChangeLog b/media-sound/lastfmplayer/ChangeLog
index ccba72974fef..de1266cd3d6f 100644
--- a/media-sound/lastfmplayer/ChangeLog
+++ b/media-sound/lastfmplayer/ChangeLog
@@ -1,6 +1,11 @@
 # 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.15 2007/05/01 00:09:23 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.16 2007/05/14 19:57:43 genstef Exp $
+
+  14 May 2007; Stefan Schweizer <genstef@gentoo.org> +files/qt4.patch,
+  -lastfmplayer-1.0.0.1_p2113.ebuild, lastfmplayer-1.1.3-r1.ebuild:
+  Fix qt4.3 version bug thanks to Peter Gantner (a.k.a. nephros)
+  <gentoo@nephros.org> and Heiko Baums <heiko@baums-on-web.de> in bug 177932
 
   01 May 2007; Marius Mauch <genone@gentoo.org>
   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 6d11598eb15c..f9cab4bbfbbf 100644
--- a/media-sound/lastfmplayer/Manifest
+++ b/media-sound/lastfmplayer/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 13_alsa-r1.diff 73384 RMD160 7f85545a1008183a6c84b67eb06e618ade7011db SHA1 8ae27d2a74c932a2d3ef1ae12b6a0407d297991e SHA256 5ec8a053ed07316eb345499f47aa68ec56c36f808586be610ffdbd30ea09110c
 MD5 28158673ebb7244a4b45a03824156dee files/13_alsa-r1.diff 73384
 RMD160 7f85545a1008183a6c84b67eb06e618ade7011db files/13_alsa-r1.diff 73384
@@ -17,34 +14,23 @@ AUX lastfmplayer-amd64.patch 1187 RMD160 5d965cbc1e670c0b1b0f121e78577cc9452f6ad
 MD5 98fd5b839973495daeabb4bd64331416 files/lastfmplayer-amd64.patch 1187
 RMD160 5d965cbc1e670c0b1b0f121e78577cc9452f6ad6 files/lastfmplayer-amd64.patch 1187
 SHA256 fb282c0067bf91a3d62b208a0ffe39da08cc307f84d5c3d6b6001b948bf6089a files/lastfmplayer-amd64.patch 1187
+AUX qt4.patch 471 RMD160 47656bb39f33013d30341e22f93287112cb97129 SHA1 5b36b746c12e17f48caf6fcc579dc82a13743949 SHA256 a169cc2fc15046ba897a9455a9e5782dffd471930e7cb166a4022c72ed82635e
+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
-DIST lastfmplayer-1.0.0.1_p2113.tar.bz2 1115375 RMD160 d54d82591391508d56cda1b9249982d2711fa179 SHA1 771afa4d535426ecae9e2c6d083ddbddf964816f SHA256 48f4b91004588c1de5b6e691fbe0e7696ea0b7581c41899e9b52c3082132a20c
-EBUILD lastfmplayer-1.0.0.1_p2113.ebuild 2900 RMD160 cbdbe249dde15d8baf26538b02ad879559a295d5 SHA1 2ebca4e8522221e57ab8e13edfeac377f94ce637 SHA256 56c18cfcd98131829b19a42d2e5a239176db59c2087fca47c480b58446369755
-MD5 c915967fe40efe90d1ab7205022457e6 lastfmplayer-1.0.0.1_p2113.ebuild 2900
-RMD160 cbdbe249dde15d8baf26538b02ad879559a295d5 lastfmplayer-1.0.0.1_p2113.ebuild 2900
-SHA256 56c18cfcd98131829b19a42d2e5a239176db59c2087fca47c480b58446369755 lastfmplayer-1.0.0.1_p2113.ebuild 2900
-EBUILD lastfmplayer-1.1.3-r1.ebuild 1923 RMD160 5f62cc8c7e58a3134a810aa0437be9f482630225 SHA1 fb2fa91fbfb491219cb1c03f168a0ee61fc16eef SHA256 869554b5dcb612e373b3eec00f3224528b87bc1525070001486d023def3a1047
-MD5 47f92aea56a5aab6fcf4d6cd25d14c2f lastfmplayer-1.1.3-r1.ebuild 1923
-RMD160 5f62cc8c7e58a3134a810aa0437be9f482630225 lastfmplayer-1.1.3-r1.ebuild 1923
-SHA256 869554b5dcb612e373b3eec00f3224528b87bc1525070001486d023def3a1047 lastfmplayer-1.1.3-r1.ebuild 1923
-MISC ChangeLog 3119 RMD160 6cc16682d73fd2448f43d23df67c16e98f6edddb SHA1 ff6f93d21355824502384160ccbd095eeeef6497 SHA256 8b4ad28a0c4205bdafc8e21e5eebc778dbbe166d3667af9d9c5ffe7b37300c2d
-MD5 7dda8a0c2d7e656ccb6e95ba56319887 ChangeLog 3119
-RMD160 6cc16682d73fd2448f43d23df67c16e98f6edddb ChangeLog 3119
-SHA256 8b4ad28a0c4205bdafc8e21e5eebc778dbbe166d3667af9d9c5ffe7b37300c2d ChangeLog 3119
+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
 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 fd123671a9e7c9d43238d7a160030201 files/digest-lastfmplayer-1.0.0.1_p2113 286
-RMD160 f314831eaa27bc6b6b40b1a0cddcc48ba3a94a9b files/digest-lastfmplayer-1.0.0.1_p2113 286
-SHA256 38616aa5a2814055010380fd603e5e190c8494d53fcf83ac9f0a314e37aed135 files/digest-lastfmplayer-1.0.0.1_p2113 286
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGNoV46J2i8a8J4okRAkeyAKCHsB0RNU1SU6q55PFbj4FLD5gpXgCgmS50
-+smnEPc0sMQ6r++b0hYObts=
-=/Py3
------END PGP SIGNATURE-----
diff --git a/media-sound/lastfmplayer/files/digest-lastfmplayer-1.0.0.1_p2113 b/media-sound/lastfmplayer/files/digest-lastfmplayer-1.0.0.1_p2113
deleted file mode 100644
index 9876e57041c0..000000000000
--- a/media-sound/lastfmplayer/files/digest-lastfmplayer-1.0.0.1_p2113
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6fa3530528b86ae19b566fbadd0572bc lastfmplayer-1.0.0.1_p2113.tar.bz2 1115375
-RMD160 d54d82591391508d56cda1b9249982d2711fa179 lastfmplayer-1.0.0.1_p2113.tar.bz2 1115375
-SHA256 48f4b91004588c1de5b6e691fbe0e7696ea0b7581c41899e9b52c3082132a20c lastfmplayer-1.0.0.1_p2113.tar.bz2 1115375
diff --git a/media-sound/lastfmplayer/files/qt4.patch b/media-sound/lastfmplayer/files/qt4.patch
new file mode 100644
index 000000000000..84e0316e3b8f
--- /dev/null
+++ b/media-sound/lastfmplayer/files/qt4.patch
@@ -0,0 +1,11 @@
+--- last.fm-1.1.3/configure.orig	2007-05-14 21:50:43.000000000 +0200
++++ last.fm-1.1.3/configure	2007-05-14 21:50:49.000000000 +0200
+@@ -19,7 +19,7 @@
+ # QMake version 2.01a
+ # Using Qt version 4.2.2 in /opt/qt/4.2.2/lib
+ 
+-qmake -v | grep '^Using Qt version 4.2' --color=never &> /dev/null
++qmake -v | grep '^Using Qt version 4' --color=never &> /dev/null
+ 
+ if [[ $? > 0 ]]; then
+ 	      ################################################################################
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.0.0.1_p2113.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.0.0.1_p2113.ebuild
deleted file mode 100644
index 26067293433e..000000000000
--- a/media-sound/lastfmplayer/lastfmplayer-1.0.0.1_p2113.ebuild
+++ /dev/null
@@ -1,106 +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/lastfmplayer/lastfmplayer-1.0.0.1_p2113.ebuild,v 1.7 2007/05/01 00:09:23 genone Exp $
-
-inherit eutils versionator
-
-DESCRIPTION="The player allows you to listen to last.fm radio streams"
-HOMEPAGE="http://www.last.fm/help/player"
-SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug"
-
-MY_QT_DEP="=x11-libs/qt-4*"
-DEPEND="${MY_QT_DEP}"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	local qt_version=$(best_version ${MY_QT_DEP})
-
-	if ! built_with_use ${MY_QT_DEP} gif png ; then
-		eerror "It is nessary to compile ${qt_version} with gif and png USE flag" 
-		eerror
-		eerror "To do this, run the following:"
-		eerror "echo \"${MY_QT_DEP} gif png\" >> /etc/portage/package.use"
-		eerror "and reemerge by running  \"emerge -av1 ${MY_QT_DEP}\""
-		die "no gif or png support in qt"
-	fi
-
-	if use debug && ! built_with_use ${MY_QT_DEP} debug ; then
-		eerror "In order to use debug, you need to compile ${qt_version}"
-		eerror "with debug USE flag."
-		die "no debug support in qt"
-	fi
-}
-
-src_compile() {
-	if use debug ; then
-		qmake CONFIG+=debug || die "qmake failed"
-	else
-		qmake CONFIG-=debug QMAKE_TARGET=LastFM || die "qmake failed"
-	fi
-	emake -j1 qmake_all || die "emake qmake_all failed"
-	epatch ${FILESDIR}/lastfmplayer-amd64.patch
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	# Docs
-	dodoc ChangeLog HACKING README TODO
-
-	# The root at which the player, data, and cache
-	# are to be installed
-	local destination="/opt/lastfm"
-	cd bin
-
-	#Bin name
-	if ! use debug ; then
-		MY_B=LastFM
-	else
-		MY_B=LastFM_debug
-	fi
-
-	# Install the player
-	exeinto ${destination}
-	doexe ${MY_B}
-
-	# Install libraries and symlinks
-	v=( $(get_version_components ) )
-	base=libLastFMTools.so
-	one=${base}.${v[0]}
-	two=${one}.${v[1]}
-	three=${two}.${v[2]}
-	dosym ${three} ${destination}/${two}
-	dosym ${two} ${destination}/${one}
-	dosym ${one} ${destination}/${base}
-
-	insinto ${destination}
-	doins -r data extensions services ${three}
-
-	# Make a folder such that album art cache works
-	diropts -m0775 -g audio
-	dodir ${destination}/cache
-	keepdir ${destination}/cache
-
-	# Icon, menu, protcol
-	make_wrapper lastfm ./${MY_B} ${destination} ${destination}
-	newicon data/icon.png lastfm.png
-	make_desktop_entry lastfm "Last.fm Player" lastfm.png
-
-	insinto /usr/share/services
-	doins ${FILESDIR}/lastfm.protocol
-}
-
-pkg_postinst() {
-	elog "To use the Last.fm player with a mozilla based browser:"
-	elog " 1. Go to about:config in the browser"
-	elog " 2. Right-click on the page"
-	elog " 3. Select New and then String"
-	elog " 4. For the name: network.protocol-handler.app.lastfm"
-	elog " 5. For the value: /usr/bin/lastfm"
-	elog
-	elog "If you experiance awkward fonts or widgets, try running qtconfig."
-}
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.1.3-r1.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.1.3-r1.ebuild
index 66327dcd658c..8c7082a0c857 100644
--- a/media-sound/lastfmplayer/lastfmplayer-1.1.3-r1.ebuild
+++ b/media-sound/lastfmplayer/lastfmplayer-1.1.3-r1.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.2 2007/05/01 00:09:23 genone Exp $
+# $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 $
 
 inherit eutils versionator
 
@@ -22,6 +22,7 @@ DEPEND=">=x11-libs/qt-4.2
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/13_alsa-r1.diff
+	epatch ${FILESDIR}/qt4.patch
 }
 
 src_compile() {