Migrate to EAPI 2 in order to nuke built_with_use.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

4 files changed, 23 insertions, 39 deletions

diff --git a/dev-ml/extlib/ChangeLog b/dev-ml/extlib/ChangeLog
index 19da3bcea87a..2e67d0b3e875 100644
--- a/dev-ml/extlib/ChangeLog
+++ b/dev-ml/extlib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/extlib
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/ChangeLog,v 1.9 2008/04/20 14:20:27 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/ChangeLog,v 1.10 2009/09/28 16:33:56 betelgeuse Exp $
+
+  28 Sep 2009; Petteri Räty <betelgeuse@gentoo.org> extlib-1.5.1.ebuild:
+  Migrate to EAPI 2 in order to nuke built_with_use.
 
   20 Apr 2008; Alexis Ballier <aballier@gentoo.org>
   -files/extlib-1.5-ExtList.remove.patch, -extlib-1.4.ebuild,
@@ -28,7 +31,7 @@
   21 Sep 2005; Matthieu Sozeau <mattam@gentoo.org> :
   Version bump (fixes #87864).
 
-*extlib-1.3 (06 Feb 2005)
+*extlib-1.4 (06 Feb 2005)
 
   06 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> -extlib-1.2.ebuild,
   +extlib-1.4.ebuild:
diff --git a/dev-ml/extlib/extlib-1.5.1.ebuild b/dev-ml/extlib/extlib-1.5.1.ebuild
index 74632c3926de..38a14ab430c5 100644
--- a/dev-ml/extlib/extlib-1.5.1.ebuild
+++ b/dev-ml/extlib/extlib-1.5.1.ebuild
@@ -1,29 +1,20 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/extlib-1.5.1.ebuild,v 1.4 2008/04/20 14:09:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/extlib-1.5.1.ebuild,v 1.5 2009/09/28 16:33:56 betelgeuse Exp $
 
-inherit findlib eutils
+EAPI="2"
 
-EAPI="1"
+inherit findlib eutils
 
 DESCRIPTION="Standard library extensions for O'Caml"
 HOMEPAGE="http://code.google.com/p/ocaml-extlib/"
 SRC_URI="http://ocaml-extlib.googlecode.com/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
-DEPEND=">=dev-lang/ocaml-3.07"
+DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="doc +ocamlopt"
 
-pkg_setup() {
-	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
-		eerror "In order to build ${PN} with native code support from ocaml"
-		eerror "You first need to have a native code ocaml compiler."
-		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
-		die "Please install ocaml with ocamlopt useflag"
-	fi
-}
-
 src_compile() {
 	emake all || die "failed to build"
 	if use ocamlopt; then
@@ -39,9 +30,9 @@ src_install () {
 	findlib_src_install
 
 	# install documentation
-	dodoc README.txt
+	dodoc README.txt || die
 
 	if use doc; then
-		dohtml doc/*
+		dohtml doc/* || die
 	fi
 }
diff --git a/dev-ml/facile/ChangeLog b/dev-ml/facile/ChangeLog
index 07f652b62380..fa7a8dffdb26 100644
--- a/dev-ml/facile/ChangeLog
+++ b/dev-ml/facile/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/facile
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/facile/ChangeLog,v 1.15 2009/01/21 23:27:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/facile/ChangeLog,v 1.16 2009/09/28 16:31:52 betelgeuse Exp $
+
+  28 Sep 2009; Petteri Räty <betelgeuse@gentoo.org> facile-1.1.ebuild:
+  Migrate to EAPI 2 in order to nuke built_with_use.
 
   21 Jan 2009; Alexis Ballier <aballier@gentoo.org> facile-1.1.ebuild:
   keyword ~x86-fbsd
diff --git a/dev-ml/facile/facile-1.1.ebuild b/dev-ml/facile/facile-1.1.ebuild
index 84da343a60d1..53121d5b6a87 100644
--- a/dev-ml/facile/facile-1.1.ebuild
+++ b/dev-ml/facile/facile-1.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/facile/facile-1.1.ebuild,v 1.15 2009/01/21 23:27:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/facile/facile-1.1.ebuild,v 1.16 2009/09/28 16:31:52 betelgeuse Exp $
 
-inherit eutils
+EAPI="2"
 
-EAPI="1"
+inherit eutils
 
 DESCRIPTION="FaCiLe is a constraint programming library on integer and integer set finite domains written in OCaml."
 HOMEPAGE="http://www.recherche.enac.fr/log/facile/"
@@ -17,23 +17,11 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+ocamlopt"
 
-RDEPEND=">=dev-lang/ocaml-3.09.3-r1"
+RDEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]"
 DEPEND="${RDEPEND}
 	 sys-apps/sed"
 
-pkg_setup() {
-	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
-		eerror "In order to build ${PN} with native code support from ocaml"
-		eerror "You first need to have a native code ocaml compiler."
-		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
-		die "Please install ocaml with ocamlopt useflag"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# Fix building on FreeBSD
 	epatch "${FILESDIR}/${P}"-make.patch
 	# Disable building native code objects if we dont have/want ocamlopt
@@ -48,10 +36,9 @@ src_unpack() {
 	fi
 }
 
-src_compile(){
+src_configure(){
 	# This is a custom configure script and it does not support standard options
 	./configure --faciledir "${D}"$(ocamlc -where)/facile/
-	emake || die "Compilation failed"
 }
 
 src_test() {