more eapi2 updates

14 files changed, 20 insertions, 21 deletions

diff --git a/dev-ml/mlgmpidl/Manifest b/dev-ml/mlgmpidl/Manifest
index aa9c3903e..46f05d1cd 100644
--- a/dev-ml/mlgmpidl/Manifest
+++ b/dev-ml/mlgmpidl/Manifest
@@ -1,2 +1,2 @@
 DIST mlgmpidl-1.1.tgz 194002 RMD160 752c865e5355b40f9b3c9babf0c9c378cb3b4009 SHA1 ef26eaa215ccedbfc20c00614f702a06d3a70420 SHA256 8990a56f4c1ff701bb922bacf7f23b40539d123216ac5f9fe0f35967735d6fc9
-EBUILD mlgmpidl-1.1.ebuild 1306 RMD160 6864dcd9898822cc61b5bb6eb00750fef89ffb2c SHA1 d03222f5ad460e269004fa4bf6491b37fd4afc9a SHA256 eb577a14243d7de1685e17782eadaa34674bcab41860d522c547a1f1a3d0cfe7
+EBUILD mlgmpidl-1.1.ebuild 1284 RMD160 59928ced54fd2bc5206ccecd682980fec854cdd9 SHA1 703f1f30afcbbc5204c32380dd2e7ac8f19c4055 SHA256 76e596dd31b8dade9528a768532e871baf520493003c19a1a7608307ca377199
diff --git a/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild b/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild
index fefbd9c56..bde44b8de 100644
--- a/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild
+++ b/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild
@@ -23,11 +23,9 @@ RDEPEND=">=dev-lang/ocaml-3.09
 				app-text/ghostscript-gpl )"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	mv ${PN} ${PN}-${PV}
-	cd ${S}
+S="${WORKDIR}/${PN}"
 
+src_prepare() {
 	rm -R html mlgmpidl.pdf
 	mv Makefile.config.model Makefile.config
 	sed -i Makefile.config \
diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest
index 97fe01cb1..ca0758c35 100644
--- a/dev-ml/ocamlgraph/Manifest
+++ b/dev-ml/ocamlgraph/Manifest
@@ -1,3 +1,3 @@
 AUX ocamlgraph-1.2-makefile.patch 3980 RMD160 fda851982c979d4c4d667bdd803bb9a570f8e3f8 SHA1 74eec2569ad39f35fd784fc13fa16f7d37cbe3f8 SHA256 fa5ce23b1561555c07d51a75b7e2850fdb1b6abe41bc902b9d4f8f99a1473e0c
 DIST ocamlgraph-1.2.tar.gz 213426 RMD160 c5ef73069a912ba179adbad3c4e0d629cc91cd54 SHA1 087cd2720c1a3df3f6543db4ad8d81983fcddba0 SHA256 0695a91a3f2abc0f47eafdae4af8a6022154727aec00784a12362d3719ff51f2
-EBUILD ocamlgraph-1.2.ebuild 978 RMD160 a7cee4a4bfc08a9697bec9cb73b747c07a8b5df3 SHA1 cb2cdf8cb2c81ea561e9a75d03656570626c1faf SHA256 1977d3ab257ca158405a7112aba13536ab7674f7c2799fd162db86a0b5115638
+EBUILD ocamlgraph-1.2.ebuild 949 RMD160 2923685c1289b6e81b2e1d63a1de54d7e57c2b0a SHA1 eb72aa3eff8c0039a2a0139c232fd0cc3142b2c7 SHA256 23cb583058f9d059dd865578bf7ec246b5c4426264299c2219a47621cf275be1
diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.2.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.2.ebuild
index 97ae38e1c..5bc1a7559 100644
--- a/dev-ml/ocamlgraph/ocamlgraph-1.2.ebuild
+++ b/dev-ml/ocamlgraph/ocamlgraph-1.2.ebuild
@@ -25,7 +25,6 @@ src_prepare() {
 }
 
 src_compile() {
-	econf || die "econf failed"
 	emake DESTDIR="/" -j1 || die "emake failed"
 
 	if use doc; then
diff --git a/sci-mathematics/apron/Manifest b/sci-mathematics/apron/Manifest
index f62d6aa59..b3ec690df 100644
--- a/sci-mathematics/apron/Manifest
+++ b/sci-mathematics/apron/Manifest
@@ -1,3 +1,3 @@
 AUX apron-0.9.10-pkgrid_manager.patch 543 RMD160 36b7ef40e2748781a21275af0e50bfbfd0a4253e SHA1 c636f4837643b3bfe6cc2f9ee7194d9b2a756fc6 SHA256 d62e05fac7f08d2b6ac62a8e8819ce00e55605155869a7d5ad814c399020d6bf
 DIST apron-0.9.10.tgz 845879 RMD160 ddd621617adfa158ecd1b8cc3371feca29a95538 SHA1 77ac01bad0d5a0dfc702c647e1290b4bd1ff6f11 SHA256 af1f113b455d16b41bba3c3e94274edacfa5a8d8ef12fde2adc26eaa01f900ef
-EBUILD apron-0.9.10.ebuild 2386 RMD160 8380979823586038f2f24193d931680f484de4cc SHA1 c512f3691e8eedf71869c2b428c12476565e59bb SHA256 48cd14b9caae325c240bd796897064ccf65f2ec7e49a36d91a8ed0137d4071a8
+EBUILD apron-0.9.10.ebuild 2370 RMD160 37e852c26d18bf09d2c879c7f8fa186f535d44a3 SHA1 c7dd8bb188788583521e2a3c774b888be69ef329 SHA256 a2b8b0776c91c8521717bc5e612b482c4805c520d7cbdd5e45f94f377673f9b3
diff --git a/sci-mathematics/apron/apron-0.9.10.ebuild b/sci-mathematics/apron/apron-0.9.10.ebuild
index 1adf692be..284d2132b 100644
--- a/sci-mathematics/apron/apron-0.9.10.ebuild
+++ b/sci-mathematics/apron/apron-0.9.10.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: Exp $
+# $Header: $
+
+EAPI="2"
 
 inherit eutils toolchain-funcs
 
@@ -24,10 +26,7 @@ DEPEND="ocaml? ( >=dev-lang/ocaml-3.09
 				cxx? ( app-doc/doxygen ) )"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
+src_prepare() {
 	mv Makefile.config.model Makefile.config
 
 	#fix compile process
diff --git a/sci-mathematics/frama-c/Manifest b/sci-mathematics/frama-c/Manifest
index 4314b2f2a..c39d1fffb 100644
--- a/sci-mathematics/frama-c/Manifest
+++ b/sci-mathematics/frama-c/Manifest
@@ -2,4 +2,4 @@ AUX frama-c-20090901-ocamlgraph_link.patch 721 RMD160 0b78639b9f31c62575a0552c93
 AUX frama-c-20090901-varinfo_export.patch 672 RMD160 987c2ca3b627eaf500e5db8ad91ca8a81e3a1bd4 SHA1 d2cdbd2107058476b460d9986f7bb95ca5d6138e SHA256 03d8aee3083f9b35d535882124305d99964b193931eca877d45202abcf6d9186
 AUX frama-c-20090901-why_link.patch 2172 RMD160 bc971e4d99a8a8b7570fd1da8e5f751b70b4a73f SHA1 6e8d3c337715af9d94f996aa2ca5a63dbae20ae9 SHA256 0f4020d2562cf32f85e1ee605464c2e48cffa0448245999fd063b70095640357
 DIST frama-c-Beryllium-20090901.tar.gz 18162700 RMD160 b29038e948b898196947cae636eef9adbea99ed6 SHA1 17b1516e9807a9a34ab20a3413efc372549e6fed SHA256 ac420d72b9d0062dd1213a6e595a01c32d0cd5a465c8736c65a42cc717742cc9
-EBUILD frama-c-20090901.ebuild 1578 RMD160 ccc9615d90e4298233cb50e12833c7e9fc6f5d2d SHA1 438c45e919e9943d2715bf7574a88d36139d2d70 SHA256 aa2b4c7bd0e5de83884d504d10a99d9bbc399c7bedd722623845fc849e7c4925
+EBUILD frama-c-20090901.ebuild 1598 RMD160 ef53cb46cc6e2ae56e8131dee318c178d9b7b291 SHA1 5c9a95f996a433270f59a53b902aa1e9c4fb41bb SHA256 87758bc043a3403d8a759062eb89f382a2605e86000f9011c856541640e95cea
diff --git a/sci-mathematics/frama-c/frama-c-20090901.ebuild b/sci-mathematics/frama-c/frama-c-20090901.ebuild
index ceb871061..803d993e3 100644
--- a/sci-mathematics/frama-c/frama-c-20090901.ebuild
+++ b/sci-mathematics/frama-c/frama-c-20090901.ebuild
@@ -40,7 +40,7 @@ src_prepare(){
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	if use gtk; then
 		myconf="--enable-gui"
 	else
@@ -48,7 +48,9 @@ src_compile() {
 	fi
 
 	econf ${myconf} --with-whydir=no || die "econf failed"
+}
 
+src_compile() {
 	# dependencies can not be processed in parallel,
 	# this is the intended behavior.
 	emake -j1 depend || die "emake depend failed"
diff --git a/sci-mathematics/gappa/Manifest b/sci-mathematics/gappa/Manifest
index 36f905d4c..599cd7f09 100644
--- a/sci-mathematics/gappa/Manifest
+++ b/sci-mathematics/gappa/Manifest
@@ -1,2 +1,2 @@
 DIST gappa-0.12.1.tar.gz 250015 RMD160 0809d73801636ee649324f951db72c58bb74a65a SHA1 b01ba7bf5e915b5c0f25eb34ad6a52e4ede09b10 SHA256 287c9ba0186319a1e7e353fa7955ffaf1f1f13941d2605d4ca078b8f260e13cd
-EBUILD gappa-0.12.1.ebuild 1281 RMD160 e1aa7ca24242e8a4e0fed0db52452707fb3d61d2 SHA1 4fe9ac5cca5c0c1f95572ec4d88f6a0fc7a760a2 SHA256 686481381955112d30934f6d76cd474a1b381f93f606e13b60c8875dae93b981
+EBUILD gappa-0.12.1.ebuild 1252 RMD160 07b6f9ebd53577782874a19d8be3f4f9f47e56b0 SHA1 52442054367577d353e911bb0cf232e4dc74813e SHA256 32ecf0d85f3e052cb0ba4f9b3661107305ff2d8fcc5d1abec7583d2dd8cd71c6
diff --git a/sci-mathematics/gappa/gappa-0.12.1.ebuild b/sci-mathematics/gappa/gappa-0.12.1.ebuild
index feb64947a..e67f0879f 100644
--- a/sci-mathematics/gappa/gappa-0.12.1.ebuild
+++ b/sci-mathematics/gappa/gappa-0.12.1.ebuild
@@ -29,7 +29,6 @@ src_prepare() {
 }
 
 src_compile(){
-	econf || die "econf failed"
 	emake DESTDIR="/" || die "emake failed"
 
 	if use doc; then
diff --git a/sci-mathematics/gappalib-coq/Manifest b/sci-mathematics/gappalib-coq/Manifest
index 56575587c..c8b0e2260 100644
--- a/sci-mathematics/gappalib-coq/Manifest
+++ b/sci-mathematics/gappalib-coq/Manifest
@@ -1,2 +1,2 @@
 DIST gappalib-coq-0.12.tar.gz 118809 RMD160 f2df65844fb142c6287f4e95524cc08cc8e0c645 SHA1 6d9224a7d3bfcaf6cd16ad36671f7fcee6ad2d70 SHA256 0d9de0d4dd29a1992651aa5b76beb0d142f525a3c2b23453104fdfc9b71915cf
-EBUILD gappalib-coq-0.12.ebuild 857 RMD160 2a5b470c6ac044d97207ea49282c0329b3717124 SHA1 05e0409a37aa8f3b89cf760b0adeba0f8a988d7a SHA256 a7423c507e044f192930d7f5738afaccc6030103a4ffb9e8a49603c5fca7d657
+EBUILD gappalib-coq-0.12.ebuild 828 RMD160 537f8c5ffce2b4658876e8316b40b365d811c55b SHA1 806aecc2b808be07e7b96f728a9ff97de5a157bc SHA256 fb6ab0095906530434c286556ed991115f2f48dca399cdbc197dce77dde5f13a
diff --git a/sci-mathematics/gappalib-coq/gappalib-coq-0.12.ebuild b/sci-mathematics/gappalib-coq/gappalib-coq-0.12.ebuild
index 7b55ef276..90ffe93ff 100644
--- a/sci-mathematics/gappalib-coq/gappalib-coq-0.12.ebuild
+++ b/sci-mathematics/gappalib-coq/gappalib-coq-0.12.ebuild
@@ -23,7 +23,6 @@ src_prepare(){
 }
 
 src_compile(){
-	econf || die "econf failed"
 	emake DESTDIR="/" || die "emake failed"
 }
 
diff --git a/sci-mathematics/why/Manifest b/sci-mathematics/why/Manifest
index 16fd7e4ff..6fda3e99b 100644
--- a/sci-mathematics/why/Manifest
+++ b/sci-mathematics/why/Manifest
@@ -1,4 +1,4 @@
 AUX why-2.19-jessie_lib.patch 1631 RMD160 b3975a252f539a04b079b6e973332136fde464cb SHA1 2ba2c2956354c896904d0c9a2e1d6079fbb56027 SHA256 aaff9f7648438d54eec0b1e9f0ff4828aaa26558ee7d847190d7a3d6e0c4abbc
 AUX why-2.19-makefile_sandbox.patch 3025 RMD160 b8b1b178b09a7b6eda9c8aeac7f5013650fb6c84 SHA1 6bd5e80aa79a6a36d89a114696da716b92aa60df SHA256 121b67a2b46139b93be9af293615a6a04e06a00323096e8b2317a7116bbf5d84
 DIST why-2.19.tar.gz 2622629 RMD160 d1e3a099226a42b039672161ada63270e6274b46 SHA1 6139699168c6aab76d42e02029ba4c51cf2a8130 SHA256 f5eef288c25744f1c7725c1c733b3129a74cde6cf08eaa57b9705115d75499a3
-EBUILD why-2.19.ebuild 1452 RMD160 2421c53d93a304b7fd66c39b4a5a310266b68759 SHA1 ba14b16b737bf32df58fbd134a1a626e61caff0f SHA256 a20483829aca99e8506441d0336478be5ac858e911c37e78141383b080f6ddbd
+EBUILD why-2.19.ebuild 1473 RMD160 432f46e94b8a118fd04ef94863b784b4783fa910 SHA1 03b322c41488f3f55edd4ab8483ac76f5ff4473c SHA256 ff96a7de9ee0372f823912f2fd748846554e5894ee7c0c9877b8d954d8889828
diff --git a/sci-mathematics/why/why-2.19.ebuild b/sci-mathematics/why/why-2.19.ebuild
index aa882d08f..46af70f51 100644
--- a/sci-mathematics/why/why-2.19.ebuild
+++ b/sci-mathematics/why/why-2.19.ebuild
@@ -42,8 +42,11 @@ src_prepare() {
 	eautoreconf
 }
 
-src_compile(){
+src_configure() {
 	econf $(use_enable apron) PATH="/usr/bin:$PATH" || die "econf failed"
+}
+
+src_compile(){
 	emake DESTDIR="/" || die "emake failed"
 }