Stop using deprecated kde.eclass.

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

4 files changed, 18 insertions, 89 deletions

diff --git a/net-voip/twinkle/ChangeLog b/net-voip/twinkle/ChangeLog
index 7a4078ad1d80..5d6864ba2562 100644
--- a/net-voip/twinkle/ChangeLog
+++ b/net-voip/twinkle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-voip/twinkle
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/twinkle/ChangeLog,v 1.3 2009/10/24 12:32:30 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/twinkle/ChangeLog,v 1.4 2009/12/28 10:58:16 ssuominen Exp $
+
+  28 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> twinkle-1.4.2.ebuild:
+  Stop using deprecated kde.eclass.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> twinkle-1.4.2.ebuild:
   ppc stable #285683
diff --git a/net-voip/twinkle/Manifest b/net-voip/twinkle/Manifest
index f589c03c5370..b1054a453a01 100644
--- a/net-voip/twinkle/Manifest
+++ b/net-voip/twinkle/Manifest
@@ -1,7 +1,5 @@
 AUX twinkle-1.4.1-kdedetect.patch 892 RMD160 20a7fa1d5187c7411b27c78780b8c18ad3b52427 SHA1 31b03362954636f1770d8c8b278f2f3b1d99adc6 SHA256 82e2084a795ee9b08b0524229f28a4a44b7343273edd7fb120aaf7f0eb85f7ca
-DIST twinkle-1.4.1.tar.gz 1577865 RMD160 e8b9777b020a21c1ea0b2680db810eeea85d6af3 SHA1 a65ce2ff0176d38d1275d4367b297234fac684d3 SHA256 ea5d1eb1b1127d1bc63a33b2682f95cecbf252e81d4dba16969dd63856aa169e
 DIST twinkle-1.4.2.tar.gz 1601100 RMD160 75acf3caa4643108d2b2e8b639f476926a23e4f1 SHA1 3751ef1a69ae16072393f44c2888b0fb488089e9 SHA256 807686c7ac1b54bb0ea27ff4be362db6926d1d3d6f1802f6d359a353157e89a5
-EBUILD twinkle-1.4.1.ebuild 1575 RMD160 e2d93fcc28ba509ffd8145100f24fbcc2af958c4 SHA1 74b746f70b4f3ef482b35974adff09a3dbae4111 SHA256 3cec57a6d45b71fe109b57b83dd71c7da894075f23f86738b66e890eff5d3fd4
-EBUILD twinkle-1.4.2.ebuild 1373 RMD160 346dba7c378b35b71f001408cdbfa40d84ec0b37 SHA1 db724de7110520f24b24f164e60d09c03b06930c SHA256 061662d710315b4c7826f4d2ebe4380337e1bbf7d8e912fecb77eef06ac3803a
-MISC ChangeLog 10254 RMD160 37267c6ed2e87e576ca175a592ea7a58f9129f38 SHA1 1a442972cae919ba6ed216468638319ea1570ea0 SHA256 7609fb375a0985d0d0cb2332c58107dc5b60699af3d0239049b2ef64b13c759c
+EBUILD twinkle-1.4.2.ebuild 1174 RMD160 ba08fadd81544db4880d9758b14980731c79d306 SHA1 0ccd34957ec3d382c88d607592e7c9d820d65b36 SHA256 1d241bf0babb3bb9ec7a6fa955bc27a6d2446e1de548830ab87c01466f1ac069
+MISC ChangeLog 10370 RMD160 bdac767b6ebb9d080e9c8251049b724c6b34ede6 SHA1 1df3bb2483b3b579f2fd1a8e4acf49147990c3b4 SHA256 f81b680e0128ba4c01ca4ff6a92e77b08fb7309ab6f0d9d209b9f3f901f93519
 MISC metadata.xml 669 RMD160 3cafb4dca8f6e7e14568c5565ae604a3b997a8e4 SHA1 903267899c47c5b80eac0e07a18cf73723fef533 SHA256 e0f82424abfd4c18cfe89191c41d3e7531bb620cd78ffc1aeafcb7b7a4f853a6
diff --git a/net-voip/twinkle/twinkle-1.4.1.ebuild b/net-voip/twinkle/twinkle-1.4.1.ebuild
deleted file mode 100644
index 23a63f1e0f57..000000000000
--- a/net-voip/twinkle/twinkle-1.4.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/twinkle/twinkle-1.4.1.ebuild,v 1.1 2009/10/06 02:47:02 dragonheart Exp $
-
-EAPI=2
-ARTS_REQUIRED="never"
-inherit eutils qt3 kde autotools
-
-DESCRIPTION="a soft phone for your VOIP communcations using SIP"
-HOMEPAGE="http://www.twinklephone.com/"
-SRC_URI="http://www.xs4all.nl/~mfnboer/twinkle/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="kde arts speex ilbc zrtp kdehiddenvisibility"
-
-# Requires libqt-mt actually...  Is that *always* built, or do we need to check?
-RDEPEND=">=net-libs/ccrtp-1.6.0
-	>=dev-cpp/commoncpp2-1.6.1
-	x11-libs/qt:3
-	media-libs/libsndfile
-	dev-libs/boost
-	speex? ( media-libs/speex )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	zrtp? ( >=net-libs/libzrtpcpp-1.3.0 )
-	media-libs/alsa-lib"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	if use speex && has_version '~media-libs/speex-1.2_beta2' &&
-		! built_with_use 'media-libs/speex' 'wideband' ; then
-		eerror "You need to build media-libs/speex with USE=wideband enabled."
-		die "Speex w/o wideband-support detected."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-kdedetect.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=" \
-			$(use_with kde) \
-			$(use_with ilbc) \
-			$(use_with arts) \
-			$(use_with zrtp) \
-			$(use_with speex)"
-	set-kdedir
-	kde_src_configure myconf configure
-}
-
-src_compile() {
-	kde_src_compile make
-}
-
-src_install() {
-	kde_src_install
-	domenu twinkle.desktop
-	dodoc THANKS
-}
diff --git a/net-voip/twinkle/twinkle-1.4.2.ebuild b/net-voip/twinkle/twinkle-1.4.2.ebuild
index b4960295e94f..9ca9b1831ba3 100644
--- a/net-voip/twinkle/twinkle-1.4.2.ebuild
+++ b/net-voip/twinkle/twinkle-1.4.2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/twinkle/twinkle-1.4.2.ebuild,v 1.3 2009/10/24 12:32:30 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/twinkle/twinkle-1.4.2.ebuild,v 1.4 2009/12/28 10:58:16 ssuominen Exp $
 
 EAPI=2
-ARTS_REQUIRED="never"
-inherit eutils qt3 kde autotools
+inherit autotools eutils qt3
 
 DESCRIPTION="a soft phone for your VOIP communcations using SIP"
 HOMEPAGE="http://www.twinklephone.com/"
@@ -13,10 +12,8 @@ SRC_URI="http://www.xs4all.nl/~mfnboer/twinkle/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="kde arts speex ilbc zrtp"
+IUSE="speex ilbc zrtp"
 
-# Requires libqt-mt actually...  Is that *always* built, or do we need to check?
-# Now speex so we don't need built_with_use checks for wideband any more
 RDEPEND=">=net-libs/ccrtp-1.6.0
 	>=dev-cpp/commoncpp2-1.6.1
 	x11-libs/qt:3
@@ -26,7 +23,6 @@ RDEPEND=">=net-libs/ccrtp-1.6.0
 	ilbc? ( dev-libs/ilbc-rfc3951 )
 	zrtp? ( >=net-libs/libzrtpcpp-1.3.0 )
 	media-libs/alsa-lib"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -36,21 +32,17 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=" \
-			$(use_with kde) \
-			$(use_with ilbc) \
-			$(use_with arts) \
-			$(use_with zrtp) \
-			$(use_with speex)"
-	kde_src_configure myconf configure
-}
-
-src_compile() {
-	kde_src_compile make
+	econf \
+		--disable-dependency-tracking \
+		--without-kde \
+		$(use_with ilbc) \
+		$(use_with speex) \
+		$(use_with zrtp) \
+		--without-arts
 }
 
 src_install() {
-	kde_src_install
+	emake DESTDIR="${D}" install || die
 	domenu twinkle.desktop
-	dodoc THANKS
+	dodoc AUTHORS ChangeLog NEWS README THANKS
 }