Prefixified and keyworded amd64-linux, x86-linux

Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

3 files changed, 23 insertions, 20 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 2b0b56880b6a..ea6f683a4fb8 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/ocaml
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.217 2013/09/14 22:52:42 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.218 2014/01/15 22:05:46 bicatali Exp $
+
+  15 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org> ocaml-4.01.0.ebuild:
+  Prefixified and keyworded amd64-linux, x86-linux
 
   14 Sep 2013; Alexis Ballier <aballier@gentoo.org> -ocaml-4.00.0.ebuild,
   -ocaml-4.00.1.ebuild, -ocaml-4.01.0_beta1.ebuild, -ocaml-4.01.0_rc1.ebuild:
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 7e33d2d40ee2..6db07fda79fe 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -14,13 +14,13 @@ DIST ocaml-patches-6.tar.bz2 2197 SHA256 7acfa3d056c2b3f7dfc3b1f96a2557d81802c83
 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.1-r1.ebuild 3685 SHA256 47bb6f84d590209bfb35b91e8b34f8c82d34138b89829fa3a7e7b648178994d5 SHA512 477398d24c1e219e1de27cd5894925b89613048c714e68e6335dcc06b5c767bae07f53752dc1be0b054b2aa6666b64cb2356948a99e14627d12e47cbdfb03f43 WHIRLPOOL ffd0761225d487f64587d8ee581ad2b961f7cc933e1ddac92ea2604c72d7732164365503ba59dab21173b8a43052432df8e8136cac1d4482c12fb85fd2ac966d
-EBUILD ocaml-4.01.0.ebuild 3672 SHA256 15524dcfbe92a2a01ddca21202d130081f5a339138eebac728dcfddd20887503 SHA512 c10bf9b0367e21b6283d70eec40e668ac3c1d723f10c62bb90e1d34a081c99068b25a916f0a59536c3ae3ebecf2dfd236cb9f8a7bb8a3d17b13efe0825e52243 WHIRLPOOL d438bd54c6370350302afe5afc776c46ba2e9954122e66ee0414c7446fb10e1a5ebb776e5e6a52c13d43a20fa4ea3b7f4d504b35b7a6b27f8e9489f0058b8586
-MISC ChangeLog 33593 SHA256 6c281a8914bb060d098eefc16ddd28749b95e9fec40f404f60254a42ad517817 SHA512 4b6fc9631c98a4aa84ad74373822e3ea7c007e8be2136cd5958f6aa2d77aca9e85dcc3bca4646169594b940b34699977acab18c0cf86d5662c0fb3adf89c62e3 WHIRLPOOL 4061963f842cbfb589e848d160ea1662e17c04d5de4e642d5ca169cb1d4d398edf602a923f79c5704be1f72085bf6f46e3ba0ab455497e0bf4385cfc3593f76c
+EBUILD ocaml-4.01.0.ebuild 3767 SHA256 0ff742fad12f542d8cfeb5c80b56101a80b137d00569a445a99cf51822f86c68 SHA512 c2cb0db8532a94300dcc977df4f2063c56304f961d1fb93959929f8746ec96b168b23157ce94b7172e5bdbe44999ca00769067fd593bcff13ba0172ac032c405 WHIRLPOOL 8a54ec43b7aaaa816abf5c2b308edb4b9a98ab660e77a0c1267ffcc81fe61b8c3880ed2107797e00f680d5a969ab0837d4d106a813b4c3fdf4293f21657f8df7
+MISC ChangeLog 33721 SHA256 0c2e2ae84701b7e27940eb90150729bbbbd6e46bf5a9b7cc1d08fd96b5018364 SHA512 d803a77cbb08b3bebcc877d3d8d303acf9ca7968a9b734edf1e3f9708b2f17d926ba47965a275590edef2f0e2f1ea942577e112d828d1f04f70d46c8df344a3b WHIRLPOOL e3765ba0036ef0dfcc30c4b5966ede828787f1c4b1af27f85b9d27c38861b92a39e718a5395bb7aed79e1c049b9a94f19f36aa3f74dcf6d21a1f894012b46d4f
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlI06LsACgkQvFcC4BYPU0pRvQCgxmr/ehshL3cV/FXRMWu2s3NE
-JLUAoLYpvNiuuIHPDLZKDvjiDmLO2dls
-=OUzM
+iEYEAREIAAYFAlLXBkIACgkQ1ycZbhPLE2D9wACeNSx+5V+cwoBkOJ8aEs/XxDjm
+FkQAn0ldEA7KbjZlH/2m2V4yFOx8sv5s
+=Prbo
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-4.01.0.ebuild b/dev-lang/ocaml/ocaml-4.01.0.ebuild
index a3b0ffe9ad32..078dd4744ec0 100644
--- a/dev-lang/ocaml/ocaml-4.01.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.01.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-4.01.0.ebuild,v 1.1 2013/09/14 22:49:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-4.01.0.ebuild,v 1.2 2014/01/15 22:05:46 bicatali Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ LICENSE="QPL-1.0 LGPL-2"
 # 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
 IUSE="emacs latex ncurses +ocamlopt tk X xemacs"
 
 DEPEND="tk? ( >=dev-lang/tk-3.3.3 )
@@ -62,10 +62,10 @@ src_configure() {
 	use X || myconf="${myconf} -no-graph"
 
 	# ocaml uses a home-brewn configure script, preventing it to use econf.
-	RAW_LDFLAGS="$(raw-ldflags)" ./configure -prefix /usr \
-		--bindir /usr/bin \
-		--libdir /usr/$(get_libdir)/ocaml \
-		--mandir /usr/share/man \
+	RAW_LDFLAGS="$(raw-ldflags)" ./configure -prefix "${EPREFIX}"/usr \
+		--bindir "${EPREFIX}"/usr/bin \
+		--libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
+		--mandir "${EPREFIX}"/usr/share/man \
 		-host "${CHOST}" \
 		-cc "$(tc-getCC)" \
 		-as "$(tc-getAS)" \
@@ -89,9 +89,9 @@ src_compile() {
 }
 
 src_install() {
-	make BINDIR="${D}"/usr/bin \
-		LIBDIR="${D}"/usr/$(get_libdir)/ocaml \
-		MANDIR="${D}"/usr/share/man \
+	make BINDIR="${ED}"/usr/bin \
+		LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
+		MANDIR="${ED}"/usr/share/man \
 		install
 
 	# Symlink the headers to the right place
@@ -102,7 +102,7 @@ src_install() {
 
 	# Create and envd entry for latex input files
 	if use latex ; then
-		echo "TEXINPUTS=/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
+		echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
 		doenvd "${T}"/99ocamldoc
 	fi
 
@@ -119,7 +119,7 @@ pkg_postinst() {
 	if has_version '>=sys-apps/portage-2.2' ; then
 		ewarn "emerge @ocaml-rebuild"
 	else
-		ewarn "emerge -1 /usr/$(get_libdir)/ocaml"
+		ewarn "emerge -1 ${EROOT%/}/usr/$(get_libdir)/ocaml"
 	fi
 	echo
 }