Remove KDE3 support.

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

3 files changed, 24 insertions, 39 deletions

diff --git a/net-p2p/qtella/ChangeLog b/net-p2p/qtella/ChangeLog
index 63712e03eb38..caa65bab2cf8 100644
--- a/net-p2p/qtella/ChangeLog
+++ b/net-p2p/qtella/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/qtella
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qtella/ChangeLog,v 1.32 2009/06/29 00:04:59 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qtella/ChangeLog,v 1.33 2009/11/06 22:18:14 ssuominen Exp $
+
+  06 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+  qtella-0.7.0-r1.ebuild:
+  Remove KDE3 support.
 
   28 Jun 2009; Mark Loeser <halcy0n@gentoo.org> qtella-0.7.0-r1.ebuild,
   +files/qtella-0.7.0-gcc44.patch:
diff --git a/net-p2p/qtella/Manifest b/net-p2p/qtella/Manifest
index 562f5a8aa3d9..92bd2361fc6c 100644
--- a/net-p2p/qtella/Manifest
+++ b/net-p2p/qtella/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.7.0-nokde.patch 1998 RMD160 1773a31185b8c7438181a883a441b3e1ce64b3d6 SHA1 1d54479dc7bd46f9cff6df8c0a2bb5c7d2ad50a9 SHA256 0d2802d4d709868756336193daf2a9fedee4560f219d9e069fea70acc7ff2581
 AUX qtella-0.7.0-errno.patch 439 RMD160 8266aa08434b5968f9aefca8d295b666f63b5d36 SHA1 cfbdf0b3a4f10f8e5bf321b8758e3a19447aa625 SHA256 39d7e0531c7fb0de184f9c691de9a2176f5ce7356300bc3649db29be52576e72
 AUX qtella-0.7.0-gcc41.patch 1449 RMD160 24be7ce4339e588cdcd107a0a2add626c078b361 SHA1 ce5a1fd4974919722820f6e5da5e390f0e6ee246 SHA256 a98e4a1ab667179d9124f5df58fe6b52325c52559187408d3d52f9ed00900082
 AUX qtella-0.7.0-gcc44.patch 3880 RMD160 eacb88c0f122f61a32690f8b53b4f5d41d416b6b SHA1 9c442e2e686d2e0a64b58fb0dde583b9ef46c5b7 SHA256 f495a9471f5c8e2b0c84df07123988db11cc61e9759b7aa800ac5dc2624cbd05
 DIST qtella-0.7.0-libyahoo.patch.gz 3566 RMD160 ca2f94362b9d75da3c6730e8a86cfc9bb72cdab9 SHA1 9e69fdbb36ed7b722de3aba6ff08f2a8c39009fa SHA256 f6b06583e30f6189377271545ee8d1f28dda8c4dfc60c4d1bf46a229aee0414d
 DIST qtella-0.7.0.tar.gz 672916 RMD160 e642e0974891e6e96b89d53a117326530116b0c6 SHA1 5e821177a5c12f56faa4b73513eb870e5182edd6 SHA256 d985e3ee9749016c3bbc8bd90c4c01af6533bff5c88407068b25fbe3107d597c
-EBUILD qtella-0.7.0-r1.ebuild 1254 RMD160 72e0ca60c56c3eacf553f6fddb39098f965d2d38 SHA1 657c111067427dc4aa19a170191f592c2e5948ed SHA256 41c63ce3cf391cfb5bf4a042a747bee82764ac7d1230c238ea47c8fab4946de2
-MISC ChangeLog 5366 RMD160 a5ae8f66f494c9e276715835cf2fe107a06b08d2 SHA1 641a287bca77ff0127e7053b9b698311d7e016d6 SHA256 9bec722834a3e822343e14446b22158b35ca4a0a021e3c56b045c012f8c62126
+EBUILD qtella-0.7.0-r1.ebuild 925 RMD160 5a78935747a16fabdbb6e92844ea69471ed14103 SHA1 a5a6874c0748f02fcc53e4248433dbe67e429684 SHA256 9c14faeb99d07a98d845db006b971eef2058d7c19ad6f33f16f515bdb63d3e6e
+MISC ChangeLog 5472 RMD160 12b969a2a174a13f27f0f7ac3bea8c8f42acb510 SHA1 60e3f201a8db10a1102e2c2018c31aa520636cb5 SHA256 10bfa1d74c5491e15a1fee9d566b95fec07408ba6f46bf0a50d342479daa1208
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpGtBIACgkQCRZPokWLroTU1gCglQ8xVJgbX8dc7ACC2L6lUPFw
-lHEAoKKCvCAvOpxrfHa+FVzcs5wnt62A
-=TbRI
------END PGP SIGNATURE-----
diff --git a/net-p2p/qtella/qtella-0.7.0-r1.ebuild b/net-p2p/qtella/qtella-0.7.0-r1.ebuild
index 7e373a103cd4..7e66164067b5 100644
--- a/net-p2p/qtella/qtella-0.7.0-r1.ebuild
+++ b/net-p2p/qtella/qtella-0.7.0-r1.ebuild
@@ -1,49 +1,40 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qtella/qtella-0.7.0-r1.ebuild,v 1.10 2009/06/29 00:04:59 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qtella/qtella-0.7.0-r1.ebuild,v 1.11 2009/11/06 22:18:14 ssuominen Exp $
 
-EAPI=1
-
-inherit eutils qt3 multilib
+EAPI=2
+inherit eutils multilib qt3
 
 SRC_URI="mirror://sourceforge/qtella/${P}.tar.gz
 	http://squinky.gotdns.com/${P}-libyahoo.patch.gz"
 HOMEPAGE="http://qtella.sourceforge.net/"
-DESCRIPTION="Excellent QT/KDE Gnutella Client"
+DESCRIPTION="Excellent Qt3 Gnutella Client"
 
 LICENSE="GPL-2"
-IUSE="kde"
-KEYWORDS="ppc ~sparc x86"
 SLOT="0"
+KEYWORDS="~amd64 ppc ~sparc x86"
+IUSE=""
 
-DEPEND="x11-libs/qt:3
-	kde? ( kde-base/kdelibs:3.5 )"
+DEPEND="x11-libs/qt:3"
 
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	if ! use kde; then
-		epatch "${FILESDIR}"/${PV}-nokde.patch
-	fi
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-nokde.patch
 	epatch "${FILESDIR}"/${P}-errno.patch
 	epatch "${FILESDIR}"/${P}-gcc41.patch
 	epatch "${FILESDIR}"/${P}-gcc44.patch
-	epatch "${DISTDIR}"/${P}-libyahoo.patch.gz
+	epatch "${WORKDIR}"/${P}-libyahoo.patch
+}
+
+src_configure() {
+	econf \
+		--with-kde=no
 }
 
 src_compile() {
-	local myconf
-	if use kde ; then
-		myconf="--with-kde=yes --with-kde-libs=`kde-config --expandvars --install lib` --with-kde-includes=`kde-config --expandvars --install include`"
-	else
-		myconf="--with-kde=no"
-	fi
-
-	econf ${myconf} || die "econf failed"
-	emake -j1 || die "emake failed"
+	emake -j1 || die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog THANKS
 }