Migrate to EAPI 2 in order to nuke built_with_use.

(Portage version: 2.2_rc40/cvs/Linux i686)

2 files changed, 13 insertions, 22 deletions

diff --git a/dev-ml/ocaml-mysql/ChangeLog b/dev-ml/ocaml-mysql/ChangeLog
index 6e2f98b497e6..5714e58b36c0 100644
--- a/dev-ml/ocaml-mysql/ChangeLog
+++ b/dev-ml/ocaml-mysql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/ocaml-mysql
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog,v 1.9 2008/04/20 14:24:21 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog,v 1.10 2009/09/28 16:54:47 betelgeuse Exp $
+
+  28 Sep 2009; Petteri Räty <betelgeuse@gentoo.org>
+  ocaml-mysql-1.0.4.ebuild:
+  Migrate to EAPI 2 in order to nuke built_with_use.
 
   20 Apr 2008; Alexis Ballier <aballier@gentoo.org>
   -files/ocaml-mysql-1.0.3-shtool.patch, -ocaml-mysql-1.0.3-r1.ebuild:
diff --git a/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild b/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild
index ca8d68648b0b..7cc21366a0e8 100644
--- a/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild
+++ b/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild
@@ -1,10 +1,10 @@
-# 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/ocaml-mysql/ocaml-mysql-1.0.4.ebuild,v 1.3 2008/04/20 14:13:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild,v 1.4 2009/09/28 16:54:47 betelgeuse Exp $
 
-inherit findlib eutils
+EAPI="2"
 
-EAPI="1"
+inherit findlib eutils
 
 IUSE="doc +ocamlopt"
 
@@ -12,7 +12,7 @@ DESCRIPTION="A package for ocaml that provides access to mysql databases."
 SRC_URI="http://raevnos.pennmush.org/code/${PN}/${P}.tar.gz"
 HOMEPAGE="http://raevnos.pennmush.org/code/ocaml-mysql/index.html"
 
-DEPEND=">=dev-lang/ocaml-3.06
+DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
 	>=virtual/mysql-4.0"
 
 RDEPEND="$DEPEND"
@@ -21,26 +21,13 @@ SLOT="0"
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ppc x86"
 
-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() {
 	epatch "${FILESDIR}/${PN}-1.0.3-head.patch"
 	epatch "${FILESDIR}/${PN}-1.0.3-shtool-r1.patch"
 }
 
 src_compile()
 {
-	econf
 	emake all || die "make failed"
 	if use ocamlopt; then
 		emake opt || die "make opt failed"
@@ -53,5 +40,5 @@ src_install()
 	emake install || die "make install failed"
 
 	use doc && dohtml -r doc/html/*
-	dodoc CHANGES README VERSION
+	dodoc CHANGES README VERSION || die
 }