sci-libs/freesteam: Punt base.eclass

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 26 insertions, 34 deletions

diff --git a/sci-libs/freesteam/ChangeLog b/sci-libs/freesteam/ChangeLog
index be679c2a0347..355e467a0c59 100644
--- a/sci-libs/freesteam/ChangeLog
+++ b/sci-libs/freesteam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/freesteam
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/freesteam/ChangeLog,v 1.2 2012/12/15 12:44:23 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/freesteam/ChangeLog,v 1.3 2014/01/06 14:46:21 jlec Exp $
+
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> freesteam-2.0.ebuild,
+  freesteam-9999.ebuild, metadata.xml:
+  Punt base.eclass
 
 *freesteam-9999 (15 Dec 2012)
 
diff --git a/sci-libs/freesteam/freesteam-2.0.ebuild b/sci-libs/freesteam/freesteam-2.0.ebuild
index 549d7fd94482..fb329ec8c039 100644
--- a/sci-libs/freesteam/freesteam-2.0.ebuild
+++ b/sci-libs/freesteam/freesteam-2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/freesteam/freesteam-2.0.ebuild,v 1.1 2011/11/26 22:55:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/freesteam/freesteam-2.0.ebuild,v 1.2 2014/01/06 14:46:21 jlec Exp $
 
-EAPI=4
+EAPI=5
 
-inherit base multilib scons-utils toolchain-funcs
+inherit eutils multilib scons-utils toolchain-funcs
 
 DESCRIPTION="Open source implementation of IF97 steam tables"
 HOMEPAGE="http://freesteam.sourceforge.net/"
@@ -19,12 +19,10 @@ RDEPEND="sci-libs/gsl"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	local PATCHES=(
+	epatch \
 		"${FILESDIR}"/${PN}-flags.patch
 		"${FILESDIR}"/${PN}-soname-symlinks.patch
-	)
-
-	base_src_prepare
+	epatch_user
 }
 
 src_configure() {
diff --git a/sci-libs/freesteam/freesteam-9999.ebuild b/sci-libs/freesteam/freesteam-9999.ebuild
index 7e8c92250f8f..adf4a7a9d7e0 100644
--- a/sci-libs/freesteam/freesteam-9999.ebuild
+++ b/sci-libs/freesteam/freesteam-9999.ebuild
@@ -1,39 +1,29 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/freesteam/freesteam-9999.ebuild,v 1.1 2012/12/15 12:44:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/freesteam/freesteam-9999.ebuild,v 1.2 2014/01/06 14:46:21 jlec Exp $
 
-EAPI=4
+EAPI=5
 
-inherit base multilib scons-utils toolchain-funcs
-
-#if LIVE
-ESVN_REPO_URI=https://freesteam.svn.sourceforge.net/svnroot/freesteam/trunk
-inherit subversion
-#endif
+inherit eutils multilib scons-utils toolchain-funcs subversion
 
 DESCRIPTION="Open source implementation of IF97 steam tables"
 HOMEPAGE="http://freesteam.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freesteam/${P}.tar.bz2"
+SRC_URI=""
+ESVN_REPO_URI=https://freesteam.svn.sourceforge.net/svnroot/freesteam/trunk
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE=""
 
 RDEPEND="sci-libs/gsl"
 DEPEND="${RDEPEND}"
 
-#if LIVE
-KEYWORDS=
-SRC_URI=
-#endif
-
 src_prepare() {
-	local PATCHES=(
+	epatch \
 		"${FILESDIR}"/${PN}-flags.patch
-	)
-
-	base_src_prepare
+		"${FILESDIR}"/${PN}-soname-symlinks.patch
+	epatch_user
 }
 
 src_configure() {
diff --git a/sci-libs/freesteam/metadata.xml b/sci-libs/freesteam/metadata.xml
index 5cb9324943ab..46720f594169 100644
--- a/sci-libs/freesteam/metadata.xml
+++ b/sci-libs/freesteam/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
+  <maintainer>
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
 </pkgmetadata>