Migrate to EAPI 2 in order to remove built_with_use usage.

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

3 files changed, 28 insertions, 21 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/Manifest b/net-misc/unison/Manifest
index 09508ec9febe..b72bce3341f3 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX unison-2.27.57-as-needed.patch 432 RMD160 a6b5baf799f686764c7dc9285541cae9178c4fbd SHA1 f7566f358355b0ecb5e000101721d189363bbdc4 SHA256 0284d72f0d9de0a824c2bc2a2f78baced3b84eb15ea10e0e6576ff52cf57686d
 DIST unison-2.13.16-manual.html 196162 RMD160 cf6a9077eaee5f58381e5197b8cc14ffeb1e93b7 SHA1 c7bb5b547830a318a5dbe800d34fefb07f6f460e SHA256 52fbb03925c44c46837d919a3baebceefc723c09458ec7e95d3993f2a98f0e20
 DIST unison-2.13.16-manual.pdf 436229 RMD160 33e822129131a6da32099483a1767c4aaf615058 SHA1 0cf6d7873228c3b7dabb9419245ef05c36261028 SHA256 8f0851b5b34e2d85a6a02f5a374a7d743e5067a419fca689d14d278c951597df
@@ -6,6 +9,13 @@ DIST unison-2.27.57-manual.html 232117 RMD160 705e5cf7f82cee9f23f0c3d3e091dd6bb2
 DIST unison-2.27.57-manual.pdf 453871 RMD160 c4402abe5efe09ce5d0715d8e039898e73e9d42e SHA1 9a9565f682a38f264f5419e838f6563788d242d1 SHA256 fabda0833b4c7c39080b00ad7e945872986246df243c728c586ed97e4110e308
 DIST unison-2.27.57.tar.gz 617253 RMD160 15388e3f2b9b593aba140416216837c49e4800c0 SHA1 9892680d8bd3e3c50031451cc6e77eb5431768ea SHA256 49299ec14216a8467b2c6ba148f8145bec31fa787433f9ce3851c2d62f0035ae
 EBUILD unison-2.13.16-r1.ebuild 2697 RMD160 1ef399cde9dba97c5330434c4e705be3bd771081 SHA1 d9f2537f691e9dabfa79d37ef29f46cc560ea074 SHA256 43b75b012d0bca35f4c2f8331c5091f34924085ee83722590d4207346c9534ea
-EBUILD unison-2.27.57-r1.ebuild 2642 RMD160 9917476381ce0c33d786117c134bd7e810feba6e SHA1 553d18b01a9563f6f8064b54e8b6ead1fdfa2fa7 SHA256 8d3bd401b0430a30c7f0b1ae7597f01b8ddb1941ff17948a85d9161a97604d56
-MISC ChangeLog 8659 RMD160 85a4c2a34d9a4da2fe32dd08171936c46f6f722b SHA1 ba79e4cf6d4b797ceed8e4659f8740f22990af76 SHA256 4e09c24bee50983ccf6f7bb2948c6779d162a8798049014791e1c58bb3c800a9
+EBUILD unison-2.27.57-r1.ebuild 2331 RMD160 76764510014816140d491eb869e1b242fb4e20dc SHA1 b2b8ae21a95581d346bb346415326845e0ac6091 SHA256 55567dcd1357d8cadb8117e73ed11565e4b9dfe05329f6c427b19672f574892d
+MISC ChangeLog 8891 RMD160 8bce42db454f781396d0f4fe2528b65344c096fc SHA1 16da37074e9a300c68816c31ace8c02dd5d1badc SHA256 5d861366197aaa0072b02934ddd23741ed8ec55766fd203265c7a103c02791af
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqYUv4ACgkQcxLzpIGCsLRysQCglGdspaoHRPmkCL1gaoz+Ffwa
+/ccAoJRfBU/c6zq5fSlp3baC49HCpjV1
+=WRXd
+-----END PGP SIGNATURE-----
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"
 }