eapi5: define subslot and use slot deps. cosmetics.

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

3 files changed, 29 insertions, 23 deletions

diff --git a/dev-ml/ocamlsdl/ChangeLog b/dev-ml/ocamlsdl/ChangeLog
index b53bbce0d743..428d2a4534ee 100644
--- a/dev-ml/ocamlsdl/ChangeLog
+++ b/dev-ml/ocamlsdl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/ocamlsdl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ChangeLog,v 1.23 2013/03/03 14:44:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ChangeLog,v 1.24 2013/03/03 14:48:44 aballier Exp $
+
+  03 Mar 2013; Alexis Ballier <aballier@gentoo.org> ocamlsdl-0.9.1.ebuild:
+  eapi5: define subslot and use slot deps. cosmetics.
 
   03 Mar 2013; Alexis Ballier <aballier@gentoo.org> -ocamlsdl-0.8.0.ebuild,
   -ocamlsdl-0.9.0.ebuild:
diff --git a/dev-ml/ocamlsdl/Manifest b/dev-ml/ocamlsdl/Manifest
index 0ad553e3e80a..2deb75ea2554 100644
--- a/dev-ml/ocamlsdl/Manifest
+++ b/dev-ml/ocamlsdl/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA256
 
 DIST ocamlsdl-0.9.1.tar.gz 226085 SHA256 abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f SHA512 8be444a3a4d1b56919c7a28fb607cbd33446f8cf30de3768a9926f23f86690d98ebb8ce6f2fb28c167ea76ac138b670283c5c93d72ea2565aa49a0dc92de181a WHIRLPOOL f9bf44f6d63626bbae3621100b7ed19ad6eaf392f1e9d2ef39440b17ac279b92a5156bff9cf432e3241fd5ec2419a7f002602405d13d6fb1b0bdbcd0baf233d8
-EBUILD ocamlsdl-0.9.1.ebuild 1358 SHA256 c9c42a44a0d89a0598519b9ee11e731b49080e29db9eaffce528dcb832facd8e SHA512 63c7579c80914788b3b22cb52b60578262b9223412c5b338a6a2f237ac789686c9de04fa5787473ff6158af0c0b184b0054d36e9dfa1d3ab52e682d67f007ecb WHIRLPOOL e90c7a06474d13a4ba554e4281261d932930f330524f18858cfd15596503eadcb614076b9981f20584ddf65e3014ffeb86b936d4c6a7c381f7dc28d51b337a9d
-MISC ChangeLog 3000 SHA256 ee471dfe371b55d8fb73d6182c8073d93ac605516571cf7bcab6fdea066f48f3 SHA512 1d9b46fd132decefc889fd06d0380308d2b26f79a11cffc736a860cfdfe6eb5b15b234d5238400bcaf75768f760f47e82f139ee2bad96c0d5f94149d238de1ed WHIRLPOOL 4b6d460ebbdeeb5c4cf5771b0cb5588b85b6af6ff447452d080327986b3adc36e3d16c93e323c3024544bca39280618c1cce5ba57564b3388bdb75abe918e237
+EBUILD ocamlsdl-0.9.1.ebuild 1362 SHA256 18c8e64193d850478ce05dfeb06c228b80f8d6ff65353f701ba28d9bf19e6f39 SHA512 c2d410b58f4c669d64219d826cf7925022fa5b4518fe5538d60595ab1d94d600069ba33c0f4dfd13f72554e108107cc6936c68e5345bfb6625c5c69e2622c03b WHIRLPOOL 772b947eb742c24540d1c159d0af4df207a391a0b91e15452e6a84ee476f0fa175693d9139cf48071c5d301ca81947be06a4a2690f005eb91d7d188b0ea1dd90
+MISC ChangeLog 3130 SHA256 22a8f3858e29c1bd354d7f35668cadfecd02d192957dbb07e0f86441f73288b5 SHA512 b649f7069c5a30fe2ca8e851142a7f8c23c95a357b0f30ebb5c2c881d67f0acccc8ad3618d509da70db5090c96d516239c8d2031e71659290c72492e9168788c WHIRLPOOL 2ddbd6c9fbf48427245794c2ced77a4716e6ddccbf120a5179d0fa47672fe663ad2ebb5fe07820458224a88e98fac68a1225c22fcacec2f076a312759c3458de
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEzYeAACgkQvFcC4BYPU0oxuQCdHdfaq0kyS5HCqwN2syaEI7SY
-DqsAmgIVGJuvA6yYBAzUtAhybCE1dKVt
-=KiDZ
+iEYEAREIAAYFAlEzYs0ACgkQvFcC4BYPU0pejgCgy9J750rQObHShhWmu+QcZZKg
+bfoAoMSDtB8ykwV0yv86dYGpUcasX9N3
+=upYt
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild b/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
index 8081a7105f27..b70eda7b3b02 100644
--- a/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
+++ b/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
@@ -1,6 +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/ocamlsdl/ocamlsdl-0.9.1.ebuild,v 1.3 2012/11/20 20:51:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild,v 1.4 2013/03/03 14:48:44 aballier Exp $
+
+EAPI=5
 
 inherit findlib
 
@@ -10,18 +12,21 @@ HOMEPAGE="http://ocamlsdl.sourceforge.net"
 SRC_URI="mirror://sourceforge/ocamlsdl/${P}.tar.gz"
 LICENSE="LGPL-2"
 
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ppc x86"
 IUSE="doc opengl truetype" #noimage nomixer
 
-DEPEND=">=dev-lang/ocaml-3.04
->=media-libs/libsdl-1.2
-opengl? ( >=dev-ml/lablgl-0.98 )
->=media-libs/sdl-mixer-1.2
->=media-libs/sdl-image-1.2
-truetype? ( >=media-libs/sdl-ttf-2.0 )"
-
-src_compile() {
+RDEPEND="
+	>=dev-lang/ocaml-3.04:=
+	>=media-libs/libsdl-1.2
+	opengl? ( >=dev-ml/lablgl-0.98:= )
+	>=media-libs/sdl-mixer-1.2
+	>=media-libs/sdl-image-1.2
+	truetype? ( >=media-libs/sdl-ttf-2.0 )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
 	myconf=""
 	if use opengl; then
 		destdir=`ocamlfind printconf destdir`
@@ -40,18 +45,16 @@ src_compile() {
 	#use nomixer && myconf="${myconf} --without-sdl-mixer"
 
 	econf $myconf \
-		`use_enable truetype sdl-ttf` \
-		|| die
-	emake all || die
+		`use_enable truetype sdl-ttf`
 }
 
 src_install() {
 	findlib_src_install
 
-	dodoc AUTHORS NEWS README || die
-	doinfo doc/*.info* || die
+	dodoc AUTHORS NEWS README
+	doinfo doc/*.info*
 
 	if use doc; then
-		dohtml doc/html/* || die
+		dohtml doc/html/*
 	fi
 }