sci-calculators/qalculate-units: Move to EAPI=4

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

2 files changed, 14 insertions, 19 deletions

diff --git a/sci-calculators/qalculate-units/ChangeLog b/sci-calculators/qalculate-units/ChangeLog
index e0679b37409b..4ad4bd0a64e2 100644
--- a/sci-calculators/qalculate-units/ChangeLog
+++ b/sci-calculators/qalculate-units/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-calculators/qalculate-units
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-units/ChangeLog,v 1.15 2011/03/02 13:31:05 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-units/ChangeLog,v 1.16 2012/04/26 15:59:38 jlec Exp $
+
+  26 Apr 2012; Justin Lecher <jlec@gentoo.org> qalculate-units-0.9.4-r2.ebuild:
+  Move to EAPI=4
 
   02 Mar 2011; Justin Lecher <jlec@gentoo.org> qalculate-units-0.9.4-r2.ebuild:
   Correct Slots for gtk 3 introduction to tree
diff --git a/sci-calculators/qalculate-units/qalculate-units-0.9.4-r2.ebuild b/sci-calculators/qalculate-units/qalculate-units-0.9.4-r2.ebuild
index 9a46240b4e3c..4f3d38f07324 100644
--- a/sci-calculators/qalculate-units/qalculate-units-0.9.4-r2.ebuild
+++ b/sci-calculators/qalculate-units/qalculate-units-0.9.4-r2.ebuild
@@ -1,40 +1,32 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-units/qalculate-units-0.9.4-r2.ebuild,v 1.4 2011/03/02 13:31:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-units/qalculate-units-0.9.4-r2.ebuild,v 1.5 2012/04/26 15:59:38 jlec Exp $
 
-EAPI="1"
+EAPI=4
 
 inherit autotools
 
 DESCRIPTION="A GTK+ unit conversion tool"
-LICENSE="GPL-2"
 HOMEPAGE="http://qalculate.sourceforge.net/"
 SRC_URI="mirror://sourceforge/qalculate/${P}.tar.gz"
 
 SLOT="0"
+LICENSE="GPL-2"
 IUSE="nls"
 KEYWORDS="~amd64 x86"
 
-RDEPEND=">=sci-libs/libqalculate-0.9.6-r1
+RDEPEND="
+	sci-libs/libqalculate
 	x11-libs/gtk+:2
 	nls? ( sys-devel/gettext )"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-cln-config.patch
 	eautoconf
 }
 
-src_compile() {
-	econf --disable-clntest || die "Configuration failed."
-	emake || die "Compilation failed."
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "Installation failed."
-	dodoc AUTHORS ChangeLog README || die "Failed to install documentation."
+src_configure() {
+	econf --disable-clntest
 }