Stop using deprecated kde-functions.eclass.

(Portage version: 2.2_rc61/cvs/Linux x86_64)

3 files changed, 11 insertions, 62 deletions

diff --git a/media-radio/svxlink/ChangeLog b/media-radio/svxlink/ChangeLog
index 958c60cc31b7..80725593e102 100644
--- a/media-radio/svxlink/ChangeLog
+++ b/media-radio/svxlink/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-radio/svxlink
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/ChangeLog,v 1.13 2009/12/03 11:58:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/ChangeLog,v 1.14 2009/12/28 16:21:24 ssuominen Exp $
+
+  28 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> svxlink-090426.ebuild:
+  Stop using deprecated kde-functions.eclass.
 
   03 Dec 2009; Markus Meier <maekke@gentoo.org> svxlink-090426.ebuild:
   amd64 love, requested in bug #292700
diff --git a/media-radio/svxlink/svxlink-080730.ebuild b/media-radio/svxlink/svxlink-080730.ebuild
deleted file mode 100644
index 5d39a8c0d07c..000000000000
--- a/media-radio/svxlink/svxlink-080730.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/svxlink-080730.ebuild,v 1.4 2009/07/23 21:55:32 vostorga Exp $
-
-EAPI=1
-
-inherit kde-functions
-
-DESCRIPTION="Multi Purpose Voice Services System, including Qtel for EchoLink"
-HOMEPAGE="http://svxlink.sourceforge.net/"
-SRC_URI="mirror://sourceforge/svxlink/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="dev-lang/tcl
-	media-sound/gsm
-	x11-libs/qt:3
-	dev-libs/libsigc++:1.2
-	>=media-libs/spandsp-0.0.6_pre2
-	dev-libs/popt"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-fix-Makefile.diff"
-	epatch "${FILESDIR}/${P}--as-needed.patch"
-	epatch "${FILESDIR}/${P}-spandsp-0.0.6_pre2.patch"
-	epatch "${FILESDIR}/${P}-gcc44.patch"
-	epatch "${FILESDIR}/${P}-glibc210.patch"
-}
-
-src_compile() {
-	set-kdedir
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake \
-		INSTALL_ROOT="${D}" \
-		install || die "emake install failed"
-}
diff --git a/media-radio/svxlink/svxlink-090426.ebuild b/media-radio/svxlink/svxlink-090426.ebuild
index 0aa54bbcbeda..e7d56e7029f7 100644
--- a/media-radio/svxlink/svxlink-090426.ebuild
+++ b/media-radio/svxlink/svxlink-090426.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/media-radio/svxlink/svxlink-090426.ebuild,v 1.3 2009/12/03 11:58:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/svxlink-090426.ebuild,v 1.4 2009/12/28 16:21:24 ssuominen Exp $
 
-EAPI=1
-
-inherit kde-functions multilib
+EAPI=2
+inherit multilib qt3
 
 DESCRIPTION="Multi Purpose Voice Services System, including Qtel for EchoLink"
 HOMEPAGE="http://svxlink.sourceforge.net/"
@@ -25,22 +24,15 @@ RDEPEND="dev-lang/tcl
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
 	epatch "${FILESDIR}/${PN}-080730--as-needed.patch"
 	epatch "${FILESDIR}/${P}-gcc44.patch"
 
 	sed -i -e "s:/lib:/$(get_libdir):g" makefile.cfg || die
 }
 
-src_compile() {
-	set-kdedir
-	emake -j1 || die "emake failed"
-}
-
 src_install() {
-	emake -j1 \
-		INSTALL_ROOT="${D}" \
-		install || die "emake install failed"
+	emake INSTALL_ROOT="${D}" install || die
 }