eapi5, define subslot for ocaml rev deps, add := dep on ocaml

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 20 insertions, 17 deletions

diff --git a/dev-ml/facile/ChangeLog b/dev-ml/facile/ChangeLog
index c5ca862acb0c..722ad8b3898f 100644
--- a/dev-ml/facile/ChangeLog
+++ b/dev-ml/facile/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/facile
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/facile/ChangeLog,v 1.19 2012/10/10 13:04:33 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/facile/ChangeLog,v 1.20 2013/08/19 13:26:14 aballier Exp $
+
+  19 Aug 2013; Alexis Ballier <aballier@gentoo.org> facile-1.1.ebuild:
+  eapi5, define subslot for ocaml rev deps, add := dep on ocaml
 
   10 Oct 2012; Alexis Ballier <aballier@gentoo.org> facile-1.1.ebuild,
   +files/facile-1.1-ocaml4.patch:
diff --git a/dev-ml/facile/Manifest b/dev-ml/facile/Manifest
index b94998f87c45..e7a6310bdd66 100644
--- a/dev-ml/facile/Manifest
+++ b/dev-ml/facile/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 AUX facile-1.1-make.patch 1613 SHA256 6e1ed39d10b9dd6824ac2754570efc41d7a4c53ee339df8ebd2d3f96417b3f06 SHA512 024132dfacce666c1f52f331fe5ec9f927dbabc1742b44aa11be7ae8851c25943afea5f2f99b3e544127b5c49af7d7337d4b59c60165a777990402855100ebc0 WHIRLPOOL 7fecb858b6cb15187583a076dfb96c7ae3c5b26be93308ab7b135ca55d223d0c8ed6f1fbd115c103d1a1a233da9756498626627817f23704b8d5b008f1c1fd3f
 AUX facile-1.1-ocaml4.patch 1116 SHA256 2d5959aa885323851b9a07d47e8bb0231e9f14a36c626393dc7c33ad69b28389 SHA512 8ae9ae3e2c7519f09f10f926b2661b4e619f587c78392aed7e21cdef22d01de9769280cbddd5414b23e631074296376b3d02513b9d67369a7d37343f8d2cbef1 WHIRLPOOL 1415f8dd495b8b25ca6d9c0ab85d36d0d9e0114290e5c43138a0702d49527cd2c39dc47cd3e89c9bd723385b8cb54fdabdc1dde245e9a5b17f448f8a9b77f72f
 DIST facile-1.1.tar.gz 96343 SHA256 a87a6ba7869104f85828c19a9681758bd1d01c816581ba09ac483739ad4ae5ca SHA512 5048daa30bc0de47465f3978cc9079e29407e35f03a3e0d6656b61838e750f62370562e26b5377d30afa478974f19e962a4a3b5a4f8fbd6661bf6f6485d90565 WHIRLPOOL a3aa0b50e51042fcdb90dffb62da483730738c1ed48eadcc1a329cc2f6529a985f50efe157231cc566ca909194468fb505ced2d653f71c3c39fd85a32e2d4558
-EBUILD facile-1.1.ebuild 1656 SHA256 1e102492975d0f562493322405cbaaf20c325f56ca17a16dc43e32d4d6f1cb0f SHA512 ede98752cc83f8fc579f5d2b6683f4854e7cfbaa6aff0e1782a43bf785831447cbbf8ef2a806a69ec8d053df399c1ac034a18af10827433d0c347cf04e836641 WHIRLPOOL 5a9c76fd3c14ed1b9307aa261c1d8e85b236f3ffb41fd2191e87ef36f6512d9b9ce848203711cacdd5aa7adef4ea1b7d33584046f526b84a78a7cf1b5fc1e2f9
-MISC ChangeLog 2909 SHA256 ce38dc7c0aaae832aa5ffbe1534982d5c03cd972f12cb300de3d5589558a56cb SHA512 0c4b689ae883aea9b3730e6071fdef39526bb9c7ccf92f7bfe70ec72bb6b8eb2189bc70846f6aee93fc943ffbf6997f099f8f57e599d2aee43fd29fb42251d08 WHIRLPOOL 5995e6c127ac7bc40fb17bf572716be078b702174ec718a5fdcbf3b10c8ec17b68f322875a847aa01cd0eb9f1b761a82e6870e742afbb2452b24c66916a4de54
+EBUILD facile-1.1.ebuild 1580 SHA256 08f2e594e3cd50fb3c4bf12575da24d6a0189c87388631a640ba2394e93695e5 SHA512 a2533bb09e485d6f77917a4100e3550b70e2d4f7e0b770dc20251aa78d5e1e3e5e7c855ae18f0b97464576705e07df10cf0b46507ddb16cb6ddd81ba36853b99 WHIRLPOOL 2580b557dee983833825f7e3b47eb2e44e4f4df3a28b246f710b4f00db1525d76f132defed10f9a97d2bd2abfd69222720feb874d03e557276423d675f61f4c5
+MISC ChangeLog 3045 SHA256 f8d69d09e7f67b137cbf96248fb60e1a21d5ebc008f3ee5a037400b6d0221ca4 SHA512 7657a9819aaa222e8366a40d3a6b0bc8a310a4a9a812e93507d5e738487ec385f11843dfd5bf4c7529220c2cf48584ea31962d2fcc944fa34a43c75f4af815d7 WHIRLPOOL 46b2d91545dff72600a49f528eef175dad71eab061a4dd65e0eef24aa6f20f67a2e887a432ab2e45b177788751a31b8912bbcaa5e5fbada8fb592bded25fc973
 MISC metadata.xml 172 SHA256 667504f38af7bc26d7a585a40d28365d53e5154178847ec85f44baa9ebbb91d5 SHA512 981a05d87e8e38bc1e68a71a4526b75a80e5cad0865ecd05239dd0a6a0af842c97db0c721ad323239e191b12a494265d277c47edda1d446201890335ed44b7a6 WHIRLPOOL 29552aea1796c36f754dba0ea1c87e38827034f330411c47d2af0e2e781dc3faac58f4856824ef916ca0d61768ae62df7baa40782149fed2cacd07740cdf6560
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlB1cmMACgkQvFcC4BYPU0pHswCguDweD6Bdx9Pg1ui+OBhyYnFA
-tI0AoJrr7EftiAgouiMSs+XRD8dC8UUF
-=smWu
+iEYEAREIAAYFAlISHPcACgkQvFcC4BYPU0qVBwCgzUhfff8Y1LWcQIydHAPa8p+/
+UmsAn1bMHxxgXbDt+/6nPlAVDs3fVYV1
+=90om
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/facile/facile-1.1.ebuild b/dev-ml/facile/facile-1.1.ebuild
index 7114a5c64f88..ea3b4a14c7af 100644
--- a/dev-ml/facile/facile-1.1.ebuild
+++ b/dev-ml/facile/facile-1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/facile/facile-1.1.ebuild,v 1.19 2012/10/10 13:04:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/facile/facile-1.1.ebuild,v 1.20 2013/08/19 13:26:14 aballier Exp $
 
-EAPI="2"
+EAPI=5
 
 inherit eutils
 
@@ -11,12 +11,12 @@ HOMEPAGE="http://www.recherche.enac.fr/log/facile/"
 SRC_URI="http://www.recherche.enac.fr/log/facile/distrib/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="0/${PV}"
 
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+ocamlopt"
 
-RDEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]"
+RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
 DEPEND="${RDEPEND}
 	 sys-apps/sed"
 
@@ -38,15 +38,15 @@ src_prepare() {
 
 src_configure(){
 	# This is a custom configure script and it does not support standard options
-	./configure --faciledir "${D}"$(ocamlc -where)/facile/
+	./configure --faciledir "${D}"$(ocamlc -where)/facile/ || die
 }
 
 src_test() {
-	emake check || die "emake check failed"
+	emake check
 }
 
 src_install(){
 	dodir $(ocamlc -where)
-	emake install || die "Installation failed"
-	dodoc README || die "installing docs failed"
+	emake install
+	dodoc README
 }