Bump to EAPI 5, use PV subslot because we want to rebuild everything everytime ocaml is updated

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

3 files changed, 27 insertions, 25 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index fad8c4f39510..ce45d54e84b2 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ocaml
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.208 2012/10/07 21:33:31 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.209 2013/02/07 12:44:08 aballier Exp $
+
+  07 Feb 2013; Alexis Ballier <aballier@gentoo.org> ocaml-4.00.1.ebuild:
+  Bump to EAPI 5, use PV subslot because we want to rebuild everything
+  everytime ocaml is updated
 
 *ocaml-4.00.1 (07 Oct 2012)
 
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 439f840bda42..729fc2a21046 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -13,13 +13,13 @@ DIST ocaml-patches-4.tar.bz2 2429 SHA256 42e7120e8b682dfbef9e5f5cc95adfc67f0ca72
 EBUILD ocaml-3.11.2.ebuild 4127 SHA256 89abc74d30c03d2755623f3b9eadcb1a4b975fb9b668616f380640b6af76aeea SHA512 ac4a51bdf2e199635a2ab8fa18cab1907ef5f4357bc9695d23462d4cda4e836867a6de6c9d07f93522094ce764331d47528a6a46182fd3342a382dbae363da0c WHIRLPOOL 8b0d3bd3a359443dad4f4611af785cf857a2d3cbb8736f41fff28b7e86519036e7810fa3dbcba60fb07a4e79bb8148400b256b36a3390491151883ebb2c15132
 EBUILD ocaml-3.12.1.ebuild 4045 SHA256 924440c4a1a73ea30cd8833d85cde70f9ad95eb9ce5e13326f9b288569dd52e9 SHA512 3f6c6430eaac2020759134ea26012e2c657dd49f42fc54bbc6fff133639bdd78bfbe381d44b53281c9dd51d8a86eeaa25729b9766a12f45c2fd31a757df9ef94 WHIRLPOOL 1355f4ae0c98153efdfc95cd74a67383176d2141c5bef77cf41fd44b22901c3b5446d4aa0d7c83c7bd4d4a3fac564328a7a434051b523b64e827bd81db20d0d9
 EBUILD ocaml-4.00.0.ebuild 3982 SHA256 77df6c597358aa57ff5e8824ecfce494d1ef74df931506c21f9ba491d3afeb8e SHA512 e27a43c83c6241bdd18fb846580252dd448d19d8cc6c03bbe74e973c1416399ac7d08aa87187090e077bd6291649163fb6d2bdded632d92c34d495ad3b4441d5 WHIRLPOOL 76f2d6be1d4455f691bd43a10de531d064b89833a30351084d1fe28a2e0624769920fbcd8ef82f7f741f2c7ff28075e6b2bf14768f3002141835e4f26ef1e199
-EBUILD ocaml-4.00.1.ebuild 3982 SHA256 2bdeb236dc1dbad8d039714aa7ab2e7ef925a239e1c9d4f0ccd8bd414e4510fa SHA512 cfb862da54b84d5f64d84c6b4af44d9529e062b5945681ec551a5e9b80c750eefda67931058c97cd87eeea092b4086938b3cf19ce4cd2176b0b530861f03ed74 WHIRLPOOL 32a1dda92beb3242f25d7137a13a85cf2ca3ccf1968da0483c25ff15a82f4a586f0840c06d426fddb3112351ccf0dd05afb982b9db341b5a7821c14e952ea2c3
-MISC ChangeLog 32214 SHA256 79b0ab9acef12acb28146bfeedb2719b622d167c24c7f7fdf52749d50b4d27d0 SHA512 3e24b9193b4be074ddc16a14fd89d0dcbd5e8e53cfe20bc05125c28095dabd877fb66ed14f6c3b1f9664e943b4f7a9f8694e919a6defd4a94344042d2e40f471 WHIRLPOOL 21fbd7cb1668fc3159aedb72028d06dc0cd89b90eccab60774685ad28327533c9d42910861c3ec79d9e2935e95f6b22e88bf3de4f6896e83ca6a9640d80a1d99
+EBUILD ocaml-4.00.1.ebuild 3789 SHA256 f5239f25f2a1cf8e840b1dbeaa8c030dc85065f5c176c82959e918ed03591e6f SHA512 d35b3ffc9105d840a99d7708afaabdba53bff427854aae45992eacf1c7d1077821b2a54162fa76a69e3ccd973db009e0c57bd5a8f6b65a418fe1a8caea8b8655 WHIRLPOOL 0dace8edc332fc32734289a0e4a940c7fd1a41c4cef6f79a78190b45f9763bf9e9e39161ea44170c11b3eb012ac0b9d8d5e67e7bd9a4c66517c1a1a3171795a0
+MISC ChangeLog 32388 SHA256 115e76ca1cf7af13fc642efd6177264836931ae38ac5fddd18e1814ff09176d8 SHA512 72a72cfce3e8d79a9bb7c9c1115d7f844f10d14eca7defa6317da64cc41e4e3a1fb94c9f21445a0c7536a06be37191c64fa492d2955b287549ae9f9737e37c16 WHIRLPOOL 4bc872edcdb3c0bdd410213ef64d6541994762f4a70125b393f2e36fa1c00e634abc0ee8ba6a922af47917161215c16d56e1e43641a3a5034f081bb2e88b87c8
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBx9SwACgkQvFcC4BYPU0pOTQCfTR38EmQCNK6vhGHn/ZvpudOO
-bdwAoKe2wL088ilxT2EMZke8oVGp1QeZ
-=5tPn
+iEYEAREIAAYFAlEToZkACgkQvFcC4BYPU0pfJACgkXdZwVLl6L/aibivID7ld1KE
+MvMAn3x3oVNFCLx8XgyAMrJFtE7LeiOQ
+=ZZlq
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-4.00.1.ebuild b/dev-lang/ocaml/ocaml-4.00.1.ebuild
index 4c629b541117..eb3b6a3d6462 100644
--- a/dev-lang/ocaml/ocaml-4.00.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.00.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-lang/ocaml/ocaml-4.00.1.ebuild,v 1.1 2012/10/07 21:33:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-4.00.1.ebuild,v 1.2 2013/02/07 12:44:08 aballier Exp $
 
-EAPI="1"
+EAPI="5"
 
 inherit flag-o-matic eutils multilib versionator toolchain-funcs
 
@@ -14,7 +14,9 @@ SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/cristal/ocaml/ocaml-$(get_version_com
 	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="QPL-1.0 LGPL-2"
-SLOT="0"
+# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
+# so here we go with the subslot.
+SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="emacs latex ncurses +ocamlopt tk X xemacs"
 
@@ -38,13 +40,11 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
 }
 
-src_compile() {
+src_configure() {
 	export LC_ALL=C
 	local myconf=""
 
@@ -72,14 +72,16 @@ src_compile() {
 		-aspp "$(tc-getCC) -c" \
 		-partialld "$(tc-getLD) -r" \
 		--with-pthread ${myconf} || die "configure failed!"
+}
 
-	emake -j1 world || die "make world failed!"
+src_compile() {
+	emake -j1 world
 
 	# Native code generation can be disabled now
 	if use ocamlopt ; then
 		# bug #279968
-		emake -j1 opt || die "make opt failed!"
-		emake -j1 opt.opt || die "make opt.opt failed!"
+		emake -j1 opt
+		emake -j1 opt.opt
 	fi
 }
 
@@ -87,7 +89,7 @@ src_install() {
 	make BINDIR="${D}"/usr/bin \
 		LIBDIR="${D}"/usr/$(get_libdir)/ocaml \
 		MANDIR="${D}"/usr/share/man \
-		install || die "make install failed!"
+		install
 
 	# Install the compiler libs
 	dodir /usr/$(get_libdir)/ocaml/compiler-libs
@@ -99,13 +101,9 @@ src_install() {
 	dodir /usr/include
 	dosym /usr/$(get_libdir)/ocaml/caml /usr/include/
 
-	# Remove ${D} from ld.conf, as the buildsystem isn't $(DESTDIR) aware
-	dosed "s:${D}::g" /usr/$(get_libdir)/ocaml/ld.conf
-
 	dodoc Changes INSTALL README Upgrading
 
-	# Create and envd entry for latex input files (this definitely belongs into
-	# CONTENT and not in pkg_postinst.
+	# Create and envd entry for latex input files
 	if use latex ; then
 		echo "TEXINPUTS=/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
 		doenvd "${T}"/99ocamldoc
@@ -113,7 +111,7 @@ src_install() {
 
 	# Install ocaml-rebuild portage set
 	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/ocaml.conf" || die
+	doins "${FILESDIR}/ocaml.conf"
 }
 
 pkg_postinst() {