Migrate to EAPI 2 in order to remove built_with_use usage.

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

3 files changed, 26 insertions, 22 deletions

diff --git a/dev-lang/confluence/ChangeLog b/dev-lang/confluence/ChangeLog
index 713c0c8dca91..42fcbb7c3109 100644
--- a/dev-lang/confluence/ChangeLog
+++ b/dev-lang/confluence/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/confluence
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/confluence/ChangeLog,v 1.6 2008/01/06 20:19:37 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/confluence/ChangeLog,v 1.7 2009/09/19 17:12:54 betelgeuse Exp $
+
+  19 Sep 2009; Petteri Räty <betelgeuse@gentoo.org>
+  confluence-0.10.6.ebuild:
+  Migrate to EAPI 2 in order to remove built_with_use usage.
 
 *confluence-0.10.6 (06 Jan 2008)
 
diff --git a/dev-lang/confluence/Manifest b/dev-lang/confluence/Manifest
index 549398e89d5a..76101aba04bb 100644
--- a/dev-lang/confluence/Manifest
+++ b/dev-lang/confluence/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST confluence-0.10.6.tar.gz 118762 RMD160 a3aaebf4f8d4e80f72d810d60388a69877b9c26b SHA1 99c99705e6eea1739b1c93c32c03b7372231dd4f SHA256 7ab76a4183dae9f2429df5cb07b0df293c50cd947e3c051a6784561e8d3b3273
 DIST confluence-0.9.1.tar.gz 224326 RMD160 adf701cd9cbb406d18743831fe8227dc66ba4980 SHA1 3a6af3b87a41b11fa76133bff20ab023001480b0 SHA256 403de0ddd82822a170dc2b59bc93a852942b108070886f981cb86e35fbfbbb52
-EBUILD confluence-0.10.6.ebuild 2010 RMD160 55bfd914863196094346be14685ac1ee737b8ae1 SHA1 68886064129ad5d4ab7bd6970705ff6288fcec3e SHA256 f2e9558b00175726acd54e0cf5786569390c20b8544a0f481d038a5fec743d2f
+EBUILD confluence-0.10.6.ebuild 1714 RMD160 72575f1a4de89ebbbd06a21d80a2bca344bf1601 SHA1 761ba8b74c818b2fe3e22b20bc5fbd1e7986df82 SHA256 f2594097f12f1fd810a1826a5ddc1be049240c58eb8850c19bc9e7d239e8f71d
 EBUILD confluence-0.9.1.ebuild 726 RMD160 4cfd2a59d966f91733aabc36e93d2ee8d9fad3ab SHA1 ffac01d71d5e420b479945ef8498e787e667fc38 SHA256 b127ca07c67083c1e4aa0df442b460f477432d32ed7c7e7b1ba4fd1fa2ee6d6e
-MISC ChangeLog 1094 RMD160 35c6bf85ca3e776e247781d340fc3aaf6c10ddd3 SHA1 6fb475846eb3e4b87c1baf8214f9cb00b617f393 SHA256 a9447d88648f648427cf7ced58bb3a878312292de9cc2c07a3f2ff15263eeeb0
+MISC ChangeLog 1239 RMD160 f629a1bf9f631135ce5cd77b6f65d74c30e14733 SHA1 092f15f73ea4ebb77328b7bc6b1b96a79785cbb1 SHA256 199604e563641d196fde53a36826ad7e1f09f9d0cd173c9299dfbf3537eda3e8
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq1ERcACgkQcxLzpIGCsLQIrwCglhoOiC6PPh4SaIq/VeuYl7z3
+hA0AoISJy6RmNNDyBkk/q1HTrCHLu5qJ
+=9TzK
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/confluence/confluence-0.10.6.ebuild b/dev-lang/confluence/confluence-0.10.6.ebuild
index de2f69396274..debbb28b9c80 100644
--- a/dev-lang/confluence/confluence-0.10.6.ebuild
+++ b/dev-lang/confluence/confluence-0.10.6.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-lang/confluence/confluence-0.10.6.ebuild,v 1.1 2008/01/06 20:19:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/confluence/confluence-0.10.6.ebuild,v 1.2 2009/09/19 17:12:54 betelgeuse Exp $
 
-inherit eutils
+EAPI="2"
 
-EAPI="1"
+inherit eutils
 
 DESCRIPTION="a functional programming language for reactive system design (digital logic, hard-real-time software)"
 HOMEPAGE="http://www.funhdl.org/wiki/doku.php?id=confluence"
@@ -15,22 +15,12 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="+ocamlopt"
 
-RDEPEND="dev-lang/ocaml"
+# min version so we are sure we always have ocamlopt in IUSE
+RDEPEND=">=dev-lang/ocaml-3.10[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() {
 	# Install non binary stuff in share...
 	sed -i -e "s:lib/confluence:share/confluence:" Makefile || die "failed to sed the makefile"
 	sed -i -e "s:lib/confluence:share/confluence:" src/cfeval/cf.ml || die "failed to sed ml files"
@@ -53,5 +43,5 @@ src_install() {
 	emake -j1 PREFIX="${D}/usr" OCAMLLIB=`ocamlc -where` install || die "install failed"
 	echo "CF_LIB=/usr/share/confluence" > "${T}/99${PN}"
 	doenvd "${T}/99${PN}"
-	dodoc NEWS
+	dodoc NEWS || die
 }