sci-libs/beagle: Move to EAPI=4, handle static-libs, use autotools-utils.eclass

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 40 insertions, 30 deletions

diff --git a/sci-libs/beagle/ChangeLog b/sci-libs/beagle/ChangeLog
index b9869f8fa30a..964baedf03f7 100644
--- a/sci-libs/beagle/ChangeLog
+++ b/sci-libs/beagle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/beagle
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/ChangeLog,v 1.12 2010/06/23 11:24:39 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/ChangeLog,v 1.13 2012/04/26 15:40:11 jlec Exp $
+
+  26 Apr 2012; Justin Lecher <jlec@gentoo.org> beagle-3.0.3.ebuild,
+  metadata.xml:
+  Move to EAPI=4, handle static-libs, use autotools-utils.eclass
 
   23 Jun 2010; Justin Lecher <jlec@gentoo.org> -beagle-2.2.0.ebuild:
   Cleaned old version
diff --git a/sci-libs/beagle/Manifest b/sci-libs/beagle/Manifest
index 7506d130d909..2d1ba60a3194 100644
--- a/sci-libs/beagle/Manifest
+++ b/sci-libs/beagle/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX beagle-3.0.3-gcc43.patch 3096 RMD160 a94d48124a018ab76318831d9a1c2f71ff7ab643 SHA1 1c32f8e04083a19a40e315021cb12fee157866c0 SHA256 2c54696275ac9653fa30eddc1bc1640fffd5f68a7153fab896634b0b553f9487
 DIST beagle-3.0.3.tar.gz 5002994 RMD160 cda67b28e17f1bf65cd91bd26c5ac48c41f852be SHA1 f621a85c82eeef95f03ad41fe8387264cc836589 SHA256 2e481dc180bc1f665ade82f0568db4d67f4b8b3f32bc155f1358fd48630e2935
-EBUILD beagle-3.0.3.ebuild 1193 RMD160 79147fe423b5ee00c3447df0f2e290da02af2746 SHA1 2e8185f699a8abc8cfa247e550f0bd5becfc7a38 SHA256 0495b7b3673214212c4b87d15d3dcd13534465632c740647a8703af8a4c00a37
-MISC ChangeLog 2028 RMD160 fee972d03d14e263dc934ccca4ecf507d177b46c SHA1 5c6436f55737d4b5a38bf31414843b0fd1fb30da SHA256 672a873677072bfe5e036602b2448c01f37fc7ef215dcad42d7a52f49da53fde
-MISC metadata.xml 454 RMD160 f49cbf5c3fc0d4e2421361636bbe67ca600b7b4f SHA1 cc208ac1bd4ef8cecab6f6f830e6ef45834f5fb0 SHA256 b850a52bc86b8ed205bd7464d1d3b85290ebf39ddad1403cbf3f54acd48f82d1
+EBUILD beagle-3.0.3.ebuild 1197 RMD160 6d3d267641af6c8b4ba4a6bc26540a05ae709a8a SHA1 e243d06de11564ab20efda8708db51acd9368192 SHA256 bbb46897c230e0551cfb9ee614bd9deb899b053b150aa320561496d068d8f521
+MISC ChangeLog 2178 RMD160 19d6120d5e7cc5541d3c5b8b80d892b8a04924c9 SHA1 7ded8f7c27d7273f4a2decc53b7589c24432ef6a SHA256 e5006d84563fa54bc2c20ba3e74edfdc6cf65e52d3dc26b8af6aacd983363812
+MISC metadata.xml 452 RMD160 a95e05aed42adc12014861d10f75e3ffa1bbb53f SHA1 2fd90389832bb3c9184fa6c538f207426526d26b SHA256 0fd9e1aa9e39939276bf72dab0b8b8529aa002174c948c1d66f8ec93510d395c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkwh7vwACgkQgAnW8HDreRYPeQCgtk4fT2CJqMMXMgtADB726T2l
-bggAn1b8xn+rg0r0dXLuMZbxdbjWegrh
-=CjyV
+iEYEAREKAAYFAk+ZbGAACgkQgAnW8HDreRbpVACggGkLdazKkT1d+ZKMKngBNbEi
+oucAn0+XT6icFlT5/MrcwGx4Cg/aLnyR
+=ljZN
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/beagle/beagle-3.0.3.ebuild b/sci-libs/beagle/beagle-3.0.3.ebuild
index cae92ac99034..3ef6944b9b9d 100644
--- a/sci-libs/beagle/beagle-3.0.3.ebuild
+++ b/sci-libs/beagle/beagle-3.0.3.ebuild
@@ -1,8 +1,10 @@
-# 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-libs/beagle/beagle-3.0.3.ebuild,v 1.3 2010/06/23 11:23:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/beagle-3.0.3.ebuild,v 1.4 2012/04/26 15:40:11 jlec Exp $
 
-inherit eutils
+EAPI=4
+
+inherit autotools-utils
 
 DESCRIPTION="Open BEAGLE, a versatile EC/GA/GP framework"
 SRC_URI="mirror://sourceforge/beagle/${P}.tar.gz"
@@ -11,39 +13,43 @@ HOMEPAGE="http://beagle.gel.ulaval.ca/"
 SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="x86"
-IUSE="doc"
+IUSE="doc static-libs"
 
-RDEPEND="sys-libs/zlib
+RDEPEND="
+	sys-libs/zlib
 	!app-misc/beagle
 	!dev-libs/libbeagle"
 DEPEND="${DEPEND}
 	doc? ( app-doc/doxygen )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.0.3-gcc43.patch
+PATCHES=( "${FILESDIR}"/${PN}-3.0.3-gcc43.patch )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	autotools-utils_src_prepare
 	sed -e "s:@LIBS@:@LIBS@ -lpthread:" \
 		-i PACC/Threading/Makefile.in || \
 		die "Failed to fix threading libs makefile."
 }
 
+src_configure() {
+	local myeconfargs=( --enable-optimization )
+	autotools-utils_src_configure
+}
+
 src_compile() {
-	econf --enable-optimization || die "Configure failed."
-	emake || die "Make failed."
+	autotools-utils_src_compile
 
-	if use doc; then
-		make doc || die "Failed to generate docs."
-	fi
+	use doc && autotools-utils_src_compile doc
 }
 
 src_install () {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	autotools-utils_src_install
 
 	if use doc; then
 		cp -pPR examples "${D}"/usr/share/doc/${PF} || \
 			die "Failed to install examples."
-		dohtml -r refman/* || die "Failed to install manual."
+		dohtml -r refman/*
 	fi
 }
diff --git a/sci-libs/beagle/metadata.xml b/sci-libs/beagle/metadata.xml
index dce86978cdfb..47d9e0fe5467 100644
--- a/sci-libs/beagle/metadata.xml
+++ b/sci-libs/beagle/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <longdescription>
+	<herd>sci</herd>
+	<longdescription>
     Open BEAGLE is a C++ Evolutionary Computation (EC) framework. It provides an high-level software environment to do any kind of EC, with support for tree-based genetic programming, bit string and real-valued genetic algorithms, and evolution strategy.
   </longdescription>
 </pkgmetadata>