Migrate to EAPI 2 in order to remove built_with_use usage.

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

2 files changed, 16 insertions, 19 deletions

diff --git a/net-misc/unison/ChangeLog b/net-misc/unison/ChangeLog
index 522b407a43d6..be8082a67bc0 100644
--- a/net-misc/unison/ChangeLog
+++ b/net-misc/unison/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/unison
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.59 2008/12/04 18:48:33 darkside Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.60 2009/08/28 21:59:21 betelgeuse Exp $
+
+  28 Aug 2009; Petteri Räty <betelgeuse@gentoo.org>
+  unison-2.27.57-r1.ebuild:
+  Migrate to EAPI 2 in order to remove built_with_use usage.
 
   04 Dec 2008; Jeremy Olexa <darkside@gentoo.org> unison-2.13.16-r1.ebuild,
   unison-2.27.57-r1.ebuild:
@@ -101,6 +105,8 @@
   Adding fix for bug #115376, need a font installed with modular-x.
 
 *unison-2.12.0-r1 (21 Sep 2005)
+*unison-2.13.16 (21 Sep 2005)
+*unison-2.17.1 (21 Sep 2005)
 
   21 Sep 2005; Matthieu Sozeau <mattam@gentoo.org> +unison-2.12.0-r1.ebuild,
   -unison-2.12.0.ebuild, -unison-2.13.0.ebuild, +unison-2.13.16.ebuild,
@@ -132,6 +138,7 @@
   unison-2.13.0.ebuild:
   Make thread support configurable, minor fixes (doc flag, wrong cd).
 
+*unison-2.12.0 (12 Jul 2005)
 *unison-2.13.0 (12 Jul 2005)
 
   12 Jul 2005; Matthieu Sozeau <mattam@gentoo.org>
@@ -223,7 +230,7 @@
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
-*unison-2.9.1 (17 July 2002)
+*unison-2.9.1 (17 Jul 2002)
 
   17 July 2002; George Shapovalov <george@gentoo.org> unison-2.9.1.ebuild, files/digest-unison-2.9.1, ChangeLog :
 
diff --git a/net-misc/unison/unison-2.27.57-r1.ebuild b/net-misc/unison/unison-2.27.57-r1.ebuild
index a8ed08f28bd7..b3f203fa37bd 100644
--- a/net-misc/unison/unison-2.27.57-r1.ebuild
+++ b/net-misc/unison/unison-2.27.57-r1.ebuild
@@ -1,8 +1,8 @@
-# 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/net-misc/unison/unison-2.27.57-r1.ebuild,v 1.11 2008/12/04 18:48:33 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.27.57-r1.ebuild,v 1.12 2009/08/28 21:59:21 betelgeuse Exp $
 
-EAPI=1
+EAPI="2"
 
 inherit eutils versionator
 
@@ -14,7 +14,8 @@ LICENSE="GPL-2"
 SLOT="$(get_version_component_range 1-2 ${PV})"
 KEYWORDS="amd64 ppc sparc x86"
 
-DEPEND=">=dev-lang/ocaml-3.04
+# ocaml version so we are sure it has ocamlopt use flag
+DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
 	gtk? ( >=dev-ml/lablgtk-2.2 )"
 
 RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
@@ -28,18 +29,7 @@ SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.t
 doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
 	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
 
-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}/${P}-as-needed.patch"
 }