Fix old style Qt4 depend

Package-Manager: portage-2.2_rc59/cvs/Linux x86_64

3 files changed, 3 insertions, 74 deletions

diff --git a/media-sound/qtscrobbler/Manifest b/media-sound/qtscrobbler/Manifest
index 942f02ac9603..f0ad1a22c42e 100644
--- a/media-sound/qtscrobbler/Manifest
+++ b/media-sound/qtscrobbler/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST qtscrob-0.8.tar.bz2 126583 RMD160 e37c9bb69943f00375ec51c67b49c5b774fca257 SHA1 9f8305a2775183b063d0bdd6ca8b202c17bb1e12 SHA256 2d52dcff4b50ca5c75ba3c309e087ab80ecf2d6e3f1cd2f5acbcb55c4de915ec
 DIST qtscrob-0.9.tar.bz2 132657 RMD160 3f4e1a80ef15cf9ca09ed505306cc114f9f35a2d SHA1 d1dc679b58e60abaa966c4c28f20ed1800c621d8 SHA256 33b1b9ebab49a6e048357cb11e0111238d3ff273cf2778b3625a5c7eb2c32960
-EBUILD qtscrobbler-0.8-r1.ebuild 1436 RMD160 783de674fe05eedc7f7cd0618b8763bf3da6ce36 SHA1 29ab2263dea74f87bacf1d00ccef744b4e5fcdb1 SHA256 6525b0ff3ab1c460d08560629f96a819cfd791c6499c7040a2798d02c02bcd9c
-EBUILD qtscrobbler-0.9.ebuild 1430 RMD160 06eb1a8c99ddc78203da3a6012fa1d3769c2c3fa SHA1 365cc239661016b4d0c3b1ac9271c5115ceec291 SHA256 438858914893e3ff82a46ed1f6151fced4024da2ee92078cf508a0fbe119490a
+EBUILD qtscrobbler-0.9.ebuild 1397 RMD160 e5dff6f4e9bc869d992d6f3ea20fe74599a62573 SHA1 7921b42c600b928ef1c7edd63e85332211f1370d SHA256 7813720420cbf21a81f3cb7d933bc6cfe5f866b69562cfbd56e466645c67f3e1
 MISC ChangeLog 922 RMD160 fcfcdb22e752315fd6b963fb3f042500d6cd65f5 SHA1 06fa116ca5b66b0dcc3469bbc453a9ba85e86032 SHA256 e4cb5f591f44d38ca34b66517a04f685eb34a10c62cd4084499ec46606723b63
 MISC metadata.xml 230 RMD160 e4eadb1f04df0059db1cfcf2be4b985b7dbad5a9 SHA1 d04586124a91e94d252da19ffcba5d67d2dabe0c SHA256 28eeba781d0d677392552603cc8bad4bee83475ac5cb70459b5e007cde761342
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkm9aKIACgkQkKaRLQcq0GID9ACeMK523tZaO6Q9A2duQbtVNN6/
-KQsAn33DujI9RimJwRQO64YUaWbuVcSn
-=h9KS
------END PGP SIGNATURE-----
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.8-r1.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.8-r1.ebuild
deleted file mode 100644
index 7d3e56d1a196..000000000000
--- a/media-sound/qtscrobbler/qtscrobbler-0.8-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qtscrobbler/qtscrobbler-0.8-r1.ebuild,v 1.2 2008/08/08 20:59:32 beandog Exp $
-
-EAPI=1
-inherit eutils qt4
-
-MY_PN="qtscrob"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Updates a last.fm profile using information from a supported portable music player"
-HOMEPAGE="http://qtscrob.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli +qt4"
-
-DEPEND="net-misc/curl
-	qt4? ( || ( x11-libs/qt-gui:4 >=x11-libs/qt-4.3:4 ) )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	# Makefile for cli prog does not read CFLAGS env var.
-	# This sed fixes this.
-	cd "${S}/src/cli"
-	sed -i -e "s:CFLAGS =.*:CFLAGS = \$(INCLUDE) `curl-config --cflags` ${CFLAGS}:" Makefile
-}
-
-src_compile() {
-	if use cli; then
-		cd "${S}/src/cli"
-		emake || die "emake cli failed"
-	fi
-	if use qt4; then
-		cd "${S}/src/qt"
-		qmake "${MY_PN}.pro" || die "qmake qt4 gui failed"
-		emake || die "emake qt4 gui failed"
-	fi
-}
-
-src_install() {
-	if use cli; then
-		cd "${S}/src/cli"
-		newbin scrobble-cli qtscrobbler-cli
-	fi
-	if use qt4; then
-		cd "${S}/src/qt"
-		newbin qtscrob qtscrobbler
-		newicon resources/icons/128.png qtscrobbler.png
-		make_desktop_entry qtscrobbler QtScrobbler
-	fi
-	cd "${S}"
-	dodoc AUTHORS CHANGELOG README
-}
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.9.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.9.ebuild
index 847a22cf901a..7c67c2cf3fb0 100644
--- a/media-sound/qtscrobbler/qtscrobbler-0.9.ebuild
+++ b/media-sound/qtscrobbler/qtscrobbler-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qtscrobbler/qtscrobbler-0.9.ebuild,v 1.2 2009/03/15 20:44:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qtscrobbler/qtscrobbler-0.9.ebuild,v 1.3 2009/12/17 18:40:35 ssuominen Exp $
 
 EAPI=1
 inherit eutils qt4
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="cli +qt4"
 
 DEPEND="net-misc/curl
-	qt4? ( || ( x11-libs/qt-gui:4 >=x11-libs/qt-4.3:4 ) )"
+	x11-libs/qt-gui:4"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"