sci-calculators/wcalc: Move to EAPI=4

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

5 files changed, 35 insertions, 72 deletions

diff --git a/sci-calculators/wcalc/ChangeLog b/sci-calculators/wcalc/ChangeLog
index ee03fcbd335d..f9523d193431 100644
--- a/sci-calculators/wcalc/ChangeLog
+++ b/sci-calculators/wcalc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-calculators/wcalc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/wcalc/ChangeLog,v 1.14 2010/01/01 21:47:15 fauli Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/wcalc/ChangeLog,v 1.15 2012/04/26 15:51:28 jlec Exp $
+
+  26 Apr 2012; Justin Lecher <jlec@gentoo.org> wcalc-2.2.1.ebuild,
+  -wcalc-2.3.1.ebuild, wcalc-2.4.ebuild, metadata.xml:
+  Move to EAPI=4
 
   01 Jan 2010; Christian Faulhammer <fauli@gentoo.org> wcalc-2.4.ebuild:
   Transfer Prefix keywords
diff --git a/sci-calculators/wcalc/metadata.xml b/sci-calculators/wcalc/metadata.xml
index 427518fa5507..2eadf8964f87 100644
--- a/sci-calculators/wcalc/metadata.xml
+++ b/sci-calculators/wcalc/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
   Wcalc is a very capable calculator. It has standard functions (sin,
   asin, and sinh for example, in either radians or degrees), many
   pre-defined constants (pi, e, c, etc.), support for using variables,
diff --git a/sci-calculators/wcalc/wcalc-2.2.1.ebuild b/sci-calculators/wcalc/wcalc-2.2.1.ebuild
index 0bcad8f2f2c4..0ce8d68efc46 100644
--- a/sci-calculators/wcalc/wcalc-2.2.1.ebuild
+++ b/sci-calculators/wcalc/wcalc-2.2.1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2008 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/wcalc/wcalc-2.2.1.ebuild,v 1.5 2008/01/31 07:24:24 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/wcalc/wcalc-2.2.1.ebuild,v 1.6 2012/04/26 15:51:28 jlec Exp $
+
+EAPI=4
 
 DESCRIPTION="A flexible command-line scientific calculator"
-HOMEPAGE="http://w-calc.sourceforge.net"
+HOMEPAGE="http://w-calc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/w-calc/Wcalc-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -11,23 +13,22 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="readline"
 
-DEPEND="readline? ( >=sys-libs/readline-4.3-r4 )
-	>=dev-libs/mpfr-2.1
-	dev-libs/gmp"
+DEPEND="
+	dev-libs/gmp
+	dev-libs/mpfr
+	readline? ( sys-libs/readline )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/Wcalc-${PV}
 
-src_compile() {
-	econf $(use_with readline) || die "Configuration failed."
-	emake || die "Compilation failed."
+src_configure() {
+	econf $(use_with readline)
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
+	default
 
 	# Wcalc icons
-	insinto /usr/share/pixmaps
-	newins w.png wcalc.png
-	newins Wred.png wcalc-red.png
+	newicon w.png wcalc.png
+	newicon Wred.png wcalc-red.png
 }
diff --git a/sci-calculators/wcalc/wcalc-2.3.1.ebuild b/sci-calculators/wcalc/wcalc-2.3.1.ebuild
deleted file mode 100644
index 95c5c47126bb..000000000000
--- a/sci-calculators/wcalc/wcalc-2.3.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/wcalc/wcalc-2.3.1.ebuild,v 1.2 2008/10/11 10:50:27 markusle Exp $
-
-inherit eutils autotools
-
-MYP="Wcalc-${PV}"
-DESCRIPTION="A flexible command-line scientific calculator"
-HOMEPAGE="http://w-calc.sourceforge.net"
-SRC_URI="mirror://sourceforge/w-calc/${MYP}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="readline"
-
-DEPEND="readline? ( sys-libs/readline )
-	dev-libs/mpfr
-	dev-libs/gmp"
-
-S="${WORKDIR}"/${MYP}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-parallel-build.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf $(use_with readline) || die "econf failed."
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die
-
-	# Wcalc icons
-	newicon w.png wcalc.png || die
-	newicon Wred.png wcalc-red.png || die
-}
diff --git a/sci-calculators/wcalc/wcalc-2.4.ebuild b/sci-calculators/wcalc/wcalc-2.4.ebuild
index 8700cf4fb09d..d140d162898f 100644
--- a/sci-calculators/wcalc/wcalc-2.4.ebuild
+++ b/sci-calculators/wcalc/wcalc-2.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 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/wcalc/wcalc-2.4.ebuild,v 1.3 2010/01/01 21:47:15 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/wcalc/wcalc-2.4.ebuild,v 1.4 2012/04/26 15:51:28 jlec Exp $
 
-inherit eutils
+EAPI=4
 
 DESCRIPTION="A flexible command-line scientific calculator"
-HOMEPAGE="http://w-calc.sourceforge.net"
+HOMEPAGE="http://w-calc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/w-calc/${P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -13,20 +13,20 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="readline"
 
-DEPEND="readline? ( sys-libs/readline )
+DEPEND="
+	dev-libs/gmp
 	dev-libs/mpfr
-	dev-libs/gmp"
+	readline? ( sys-libs/readline )"
+RDEPEND="${DEPEND}"
 
-src_compile() {
+src_configure() {
 	econf $(use_with readline)
-	emake || die "emake failed."
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die
+	default
 
 	# Wcalc icons
-	newicon w.png wcalc.png || die
-	newicon Wred.png wcalc-red.png || die
+	newicon w.png wcalc.png
+	newicon Wred.png wcalc-red.png
 }