sci-libs/starparse: Add missing multilib.eclass; move to EAPI=5 and autotools-utils.eclass

Package-Manager: portage-2.2.0_alpha164

6 files changed, 31 insertions, 40 deletions

diff --git a/sci-libs/starparse/ChangeLog b/sci-libs/starparse/ChangeLog
index 8da606319..0dc4bacf2 100644
--- a/sci-libs/starparse/ChangeLog
+++ b/sci-libs/starparse/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/starparse
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Mar 2013; Justin Lecher <jlec@gentoo.org> starparse-1.0.ebuild,
+  starparse-9999_pre10.ebuild, starparse-9999.ebuild, metadata.xml:
+  Add missing multilib.eclass; move to EAPI=5 and autotools-utils.eclass
+
   08 Jan 2012; Justin Lecher <jlec@gentoo.org> starparse-9999.ebuild:
   Drop double call of emake in src_configure
 
diff --git a/sci-libs/starparse/Manifest b/sci-libs/starparse/Manifest
index bdebfd2da..96c1a5115 100644
--- a/sci-libs/starparse/Manifest
+++ b/sci-libs/starparse/Manifest
@@ -1 +1 @@
-DIST starparse-1.0.tar.bz2 5466370 RMD160 8d3421d7b6cfaa02e77c6c879577812d18fe378d SHA1 279bfea2024ba62ee35f3ac3eafb4315b8386713 SHA256 0ff25bb00c9481136bd060660340a44095902e17d75cc11d749ace597b5f4c61
+DIST starparse-1.0.tar.bz2 5466370 SHA256 0ff25bb00c9481136bd060660340a44095902e17d75cc11d749ace597b5f4c61 SHA512 47e862258281a3faa506d4eb573a2819a9f5b1cb16828c4951d5d23bbfa8877d9b737ca0b33136dcf8ae0e96ecc9d310ba65a5b7cf1fe18ab8beb092f2342e9a WHIRLPOOL 6bb9a9c5b60888045d64b8890c278c97f80b4abb95678f6db166d23c744ac106f0db3913f77e4bda958c8edf8a51f0f7bcd6a93790fe2691081ec231b2ff11cb
diff --git a/sci-libs/starparse/metadata.xml b/sci-libs/starparse/metadata.xml
index d747d72a2..4bf6dbc6b 100644
--- a/sci-libs/starparse/metadata.xml
+++ b/sci-libs/starparse/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>
-	<maintainer>
-		<email>sci@gentoo.org</email>
-	</maintainer>
+  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/starparse/starparse-1.0.ebuild b/sci-libs/starparse/starparse-1.0.ebuild
index 94ba0b17b..6e82d173d 100644
--- a/sci-libs/starparse/starparse-1.0.ebuild
+++ b/sci-libs/starparse/starparse-1.0.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=5
 
-inherit autotools
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
 
 DESCRIPTION="Library for parsing NMR star files (peak-list format) and CIF files"
 HOMEPAGE="http://burrow-owl.sourceforge.net/"
@@ -15,23 +17,12 @@ SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="guile"
+IUSE="guile static-libs"
 
 RDEPEND="guile? ( dev-scheme/guile )"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	eautoreconf
-}
-
 src_configure() {
-	econf $(use_enable guile) || die
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	local myeconfargs=( $(use_enable guile) )
+	autotools-utils_src_configure
 }
diff --git a/sci-libs/starparse/starparse-9999.ebuild b/sci-libs/starparse/starparse-9999.ebuild
index caaabff70..f97138f8e 100644
--- a/sci-libs/starparse/starparse-9999.ebuild
+++ b/sci-libs/starparse/starparse-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 AUTOTOOLS_AUTORECONF="true"
 
@@ -24,8 +24,6 @@ DEPEND="${RDEPEND}"
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
 src_configure() {
-	local myeconfargs=(
-		$(use_enable guile)
-	)
+	local myeconfargs=( $(use_enable guile) )
 	autotools-utils_src_configure
 }
diff --git a/sci-libs/starparse/starparse-9999_pre10.ebuild b/sci-libs/starparse/starparse-9999_pre10.ebuild
index 6f5777c34..874309cb5 100644
--- a/sci-libs/starparse/starparse-9999_pre10.ebuild
+++ b/sci-libs/starparse/starparse-9999_pre10.ebuild
@@ -1,29 +1,27 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EBZR_REPO_URI="http://oregonstate.edu/~benisong/software/projects/starparse/releases/1.0"
-EBZR_BOOTSTRAP="eautoreconf"
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="true"
 
-inherit autotools bzr
+inherit autotools-utils bzr
 
 DESCRIPTION="Library for parsing NMR star files (peak-list format) and CIF files"
 HOMEPAGE="http://burrow-owl.sourceforge.net/"
 #SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+EBZR_REPO_URI="http://oregonstate.edu/~benisong/software/projects/starparse/releases/1.0"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="guile"
+IUSE="guile static-libs"
 
 RDEPEND="guile? ( dev-scheme/guile )"
 DEPEND="${RDEPEND}"
 
-src_compile() {
-	econf $(use_enable guile) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+src_configure() {
+	local myeconfargs=( $(use_enable guile) )
+	autotools-utils_src_configure
 }