Bumped EAPI

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

4 files changed, 30 insertions, 26 deletions

diff --git a/sci-libs/galib/ChangeLog b/sci-libs/galib/ChangeLog
index 8078b710b089..a7c6ef2a595b 100644
--- a/sci-libs/galib/ChangeLog
+++ b/sci-libs/galib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/galib
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/galib/ChangeLog,v 1.8 2008/07/07 10:36:21 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/galib/ChangeLog,v 1.9 2011/06/26 10:33:03 jlec Exp $
+
+  26 Jun 2011; Justin Lecher <jlec@gentoo.org> galib-2.4.6.ebuild,
+  galib-2.4.7.ebuild, metadata.xml:
+  Bumped EAPI
 
 *galib-2.4.7 (07 Jul 2008)
 
diff --git a/sci-libs/galib/galib-2.4.6.ebuild b/sci-libs/galib/galib-2.4.6.ebuild
index db6610b0f87e..b4f600c49acf 100644
--- a/sci-libs/galib/galib-2.4.6.ebuild
+++ b/sci-libs/galib/galib-2.4.6.ebuild
@@ -1,38 +1,38 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/galib/galib-2.4.6.ebuild,v 1.5 2007/06/02 13:04:50 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/galib/galib-2.4.6.ebuild,v 1.6 2011/06/26 10:33:03 jlec Exp $
 
 inherit eutils
 
-DESCRIPTION="library for using genetic algorithms in C++ programs"
-
 MYPV="${PV//\./}"
 
+DESCRIPTION="Library for genetic algorithms in C++ programs"
 HOMEPAGE="http://lancet.mit.edu/ga/"
 SRC_URI="http://lancet.mit.edu/ga/dist/galib${MYPV}.tgz"
+
 LICENSE="GAlib"
 SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
-DEPEND=""
 
 S="${WORKDIR}/galib${MYPV}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-gcc4-gentoo.patch
+	epatch \
+		"${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-gcc4-gentoo.patch
 }
 
 src_compile() {
-	make CXXFLAGS="${CXXFLAGS}" || die "make failed"
+	emake CXXFLAGS="${CXXFLAGS}" || die "make failed"
 }
 
 src_install() {
 	dodir /usr/lib /usr/include
-	make LIB_DEST_DIR=${D}/usr/lib/ HDR_DEST_DIR=${D}/usr/include/ install || die
+	emake LIB_DEST_DIR="${D}"/usr/lib/ HDR_DEST_DIR="${D}"/usr/include/ install || die
 	dohtml -r doc/*
 	dodoc RELEASE-NOTES README
-	cp -r examples ${D}/usr/share/doc/${PF}/
+	cp -r examples "${D}"/usr/share/doc/${PF}/
 }
diff --git a/sci-libs/galib/galib-2.4.7.ebuild b/sci-libs/galib/galib-2.4.7.ebuild
index de284b823d1f..eeedc51db4cc 100644
--- a/sci-libs/galib/galib-2.4.7.ebuild
+++ b/sci-libs/galib/galib-2.4.7.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/galib/galib-2.4.7.ebuild,v 1.1 2008/07/07 10:36:21 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/galib/galib-2.4.7.ebuild,v 1.2 2011/06/26 10:33:03 jlec Exp $
 
-inherit multilib
+EAPI=4
 
-DESCRIPTION="C++ genetic algorithms library "
+inherit multilib
 
 MYPV="${PV//\./}"
 
+DESCRIPTION="Library for genetic algorithms in C++ programs"
 HOMEPAGE="http://lancet.mit.edu/ga/"
 SRC_URI="http://lancet.mit.edu/ga/dist/galib${MYPV}.tgz"
+
 LICENSE="GAlib"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
-DEPEND=""
 
 S="${WORKDIR}/galib${MYPV}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	sed -i \
 		-e 's:/include:/usr/include:' \
 		-e "s:/lib:/usr/$(get_libdir):" \
@@ -31,17 +30,18 @@ src_unpack() {
 }
 
 src_compile() {
-	emake lib || die "emake failed"
+	emake lib
 }
 
 src_install() {
 	dodir /usr/$(get_libdir)
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc RELEASE-NOTES README
+	default
+
 	if use doc; then
 		insinto /usr/share/doc/${PF}
-		doins -r doc || die "doc install failed"
+		doins -r doc/*
 	fi
+
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
 		cd examples
@@ -51,6 +51,6 @@ src_install() {
 			-e '/^INC_DIRS/d' \
 			-e '/^LIB_DIRS/d' \
 			makefile || die "sed makefile failed"
-		doins -r * || die "examples install failed"
+		doins -r *
 	fi
 }
diff --git a/sci-libs/galib/metadata.xml b/sci-libs/galib/metadata.xml
index b229aec85b8f..d369d068ffb8 100644
--- a/sci-libs/galib/metadata.xml
+++ b/sci-libs/galib/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+	<herd>sci</herd>
 </pkgmetadata>