Prefixified and keyworded amd64-linux, x86-linux

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

6 files changed, 32 insertions, 28 deletions

diff --git a/dev-ml/cairo-ocaml/ChangeLog b/dev-ml/cairo-ocaml/ChangeLog
index db907ebf2c6c..c03886afea0a 100644
--- a/dev-ml/cairo-ocaml/ChangeLog
+++ b/dev-ml/cairo-ocaml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/cairo-ocaml
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/cairo-ocaml/ChangeLog,v 1.2 2013/08/16 23:08:51 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/cairo-ocaml/ChangeLog,v 1.3 2014/01/15 23:59:30 bicatali Exp $
+
+  15 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org> cairo-ocaml-1.2.0.ebuild:
+  Prefixified and keyworded amd64-linux, x86-linux
 
   16 Aug 2013; Alexis Ballier <aballier@gentoo.org> cairo-ocaml-1.2.0.ebuild:
   eapi5, define subslot and add := deps on ocaml/lablgtk
@@ -14,4 +17,3 @@
   +files/0003-Fix-FTBFS-on-bytecode-architectures.patch,
   +files/0004-no-automagic.patch, +metadata.xml:
   Initial import
-
diff --git a/dev-ml/cairo-ocaml/Manifest b/dev-ml/cairo-ocaml/Manifest
index 8b8186c25cb5..ed902b0bf64c 100644
--- a/dev-ml/cairo-ocaml/Manifest
+++ b/dev-ml/cairo-ocaml/Manifest
@@ -6,13 +6,13 @@ AUX 0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch 742 SHA256 170ced5
 AUX 0003-Fix-FTBFS-on-bytecode-architectures.patch 1135 SHA256 df9384a54ec9570c3a7e6755acc5fb2d3500790b02b6d7be89e08fa1182b53a9 SHA512 e4550c4c9315ce3c2a16361541ad2b3acccaa6d36d922c5361d1c26e1af22491e46713fe58291b6345d832fdf78466a1937c2327acfeaeb070508fddedfdb206 WHIRLPOOL d640e31c966bd822cb48498631b23e11afec5f1dd7e8a19f87a7a0dd06f9d5156777a11ede52918e56f07b7e960626f55b22cb3895e085a889b2fd096276b9e3
 AUX 0004-no-automagic.patch 1041 SHA256 e824710ac23cf62e6c402c1511423afcc694b657723a670a4d0ce86b62b40f1a SHA512 53bfa4cbc40b3725fa40454fb6e8521f21aaf61135dd6da1ec9fd3f1df256ceec1901022aa70dabd568c0291e37008b7c122d1d654856a13fe632f3bf2c271b8 WHIRLPOOL ad14d1a64cbfff7d85aca4aaf63858de04485f904e7fb00c3eab2f2cb57a7db1efc74c5c77b4e2a0e11beb40674866eae533e2ad9e16e75d9ffcc9b820eb80f1
 DIST cairo-ocaml-1.2.0.tar.bz2 44483 SHA256 5f45aa3cc88d274d14c071402e22c5996fadf506fafa266642b3729b02d17554 SHA512 5cac319cf27b94d31e955885ae89b40342c2ae4ffd1aca7c52366f7c3679185f74e513e0c73bd01260f89da29d43bb420dadd059fa1cf5509997db8f935704b4 WHIRLPOOL c166fab0dfec6bddcc7b48b0bc69aac7b5dd8ed831755e0223e374217b2cf89dd73c3f75a4ddbdf8ca8d49b02fb04e0b85682afcae4ed91c20edeb97afdc21fd
-EBUILD cairo-ocaml-1.2.0.ebuild 2205 SHA256 c4703da0ad1ffe9e750b5441ef7e6ee7c6c746ae599a66e13fae76d971cc488f SHA512 6ab9bf98cd6359615c0cf4b77e3bc8ac0d448414cf06d216ab1bbfc70dd28b8b63fbcd7e1fb6aa07090c14b79f5bfc18635254908f5802b50c2d8023d77ff3f9 WHIRLPOOL 3775f275820d6b364380a42fab1d61571323ebd9ea4d66152c6fa45ad8076d10c338a40ef9a7ea679ba3db7bd6b810a8175738e3ec03c38327f7376552f160d8
-MISC ChangeLog 731 SHA256 6e0fb07a2f99d51d2b992c00d8fae6341f29a2d7e2fd2f5c8fc1bd6cfc29f7ac SHA512 e731380b74ce6d389fd4120a9673243cecc0067502c33dac905ce86390bd17c0249da81f39f169478ab903bd935e0e13ade914b472bba17a1bc33c8cf20739eb WHIRLPOOL d0f84562c759765f966afc83f70db8891e2ed4baf28374c87aedc7f899c0ff21c87d1d691e102bf634eed6b810757d835456ff12c6bba09ac418073e39078369
+EBUILD cairo-ocaml-1.2.0.ebuild 2229 SHA256 ffdbe249c48e0c92e5066aa834761daacb618753468c55857149b62582fc91db SHA512 11e585b87b7f73b60bbd0453e069a06ec6026f8acf0e57838a331e7cbf1fd752e19a5bc233fbb1447aa99733a5b2503a070fb2db759a278f48f9ccd6073aea4c WHIRLPOOL 6f33d2ba5d260cc559ffb94495bd0b9e5ae90a099e6fe62453bf2c92a6b55cfe758cb0d300d1bea90cf8748c6451a89fc2ff64b44f4d3522a164cc4eb01e90a4
+MISC ChangeLog 863 SHA256 032691403040080c831da25033a7cfb236850132e7aeee873472ea8eb79ba711 SHA512 eda861d93868d125ccad84f8943e89129f9eb06ab8bf02c71140ea82e17805f0f4ccf2259507cfd8cbfd61698ac1318f303e255fa0574d51c19aa1349114a414 WHIRLPOOL 2434fbb361e0103826a65093c4fe3691fa8b37b9b37f2a0a3c4d239720d7413eb39378b790b6bbdcfd94a5aba6950251f7af51b3aec6cb3de995d663cf567a72
 MISC metadata.xml 477 SHA256 0be17324b5b1d0a95914c82566b110fe2a278eb4b066854e7a2755260ed92d99 SHA512 e74f55ca92d62bce79f80de1d9e961cbbbb2ade8d0b341ced8abb601618d639ddf64dab1a278e4b007eea005685ad0ece6e71f95639f5acadc7f6c16da2f41fb WHIRLPOOL fe03f90476e36d2aecede344ac4b2d9c0dbbd3412c5525d76c5597f3648c117647d55dd6cf6d554996088bdf0317fc304754b836b9124c40abee3ef8935caa41
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEUEAREIAAYFAlIOsQUACgkQvFcC4BYPU0rxJQCfUuNgo9w7+GnZJB7MFF5xRquj
-KP0Ali8LsqZvaRy2P1MxkZZ0IJEsDvg=
-=Wa4/
+iEYEAREIAAYFAlLXIOMACgkQ1ycZbhPLE2AJUgCeIAWaO0imGVcO6BTvUxMBfSGc
+zwwAn0wYfq7EwctyBv5gwncolHvl5ocK
+=H8oI
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild
index 44b9f713e718..2471ac86afd6 100644
--- a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild
+++ b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.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-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild,v 1.2 2013/08/16 23:08:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild,v 1.3 2014/01/15 23:59:30 bicatali Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://cgit.freedesktop.org/cairo-ocaml/snapshot/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples gtk pango svg"
 
 RDEPEND="dev-lang/ocaml:=
diff --git a/dev-ml/camlidl/ChangeLog b/dev-ml/camlidl/ChangeLog
index 02311f4eb27b..0490f7d1c8c3 100644
--- a/dev-ml/camlidl/ChangeLog
+++ b/dev-ml/camlidl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/camlidl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlidl/ChangeLog,v 1.7 2013/08/27 16:54:54 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlidl/ChangeLog,v 1.8 2014/01/15 23:57:22 bicatali Exp $
+
+  15 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org> camlidl-1.05-r1.ebuild:
+  Prefixified and keyworded amd64-linux, x86-linux
 
 *camlidl-1.05-r1 (27 Aug 2013)
 
@@ -31,4 +34,3 @@
   +camlidl-1.05.ebuild:
   New package for building stub code from C/C++ libraries, submitted by Bardur
   Arantsson <gentoo@scientician.net>. Fixes bug #65138.
-
diff --git a/dev-ml/camlidl/Manifest b/dev-ml/camlidl/Manifest
index dda3dc499274..ab8baf1aa2a7 100644
--- a/dev-ml/camlidl/Manifest
+++ b/dev-ml/camlidl/Manifest
@@ -5,14 +5,14 @@ AUX META.camlidl 123 SHA256 5a4e43f63d770c11e489f50b5c8facb03f47b1b7f60a3d1f1c17
 AUX includes.patch 361 SHA256 b773691406b3a9d22bc21651cf3c6a5b03402110ba8e6d6564ff8d09863aecce SHA512 e76690bba23d6ac3a4ef0f15feed6826cd203c38919b8fdf043c46c6f7311eef768c9c85b9855d217e1014b0b55086c7dfcea4c132320035aeafcb8e7de2bcd3 WHIRLPOOL 0a5dd2cac9adb028cfa183b26f12f39aa7787028aaa2bda8d716eab7ed663cc367b1d32d548aa76b92676c499d20c09a168e62655820913a10910561844f490a
 AUX tests.patch 1061 SHA256 b71db8a06d633898e3ab6ec4b6254075e48feef912e160c36dfdf6f84d1ce961 SHA512 72234478b420edbebf48aaba4ab0078c35c3d8eced6634092b8ca605ba93a5791249e2f271ea656e86c62ac45561c25100a5e786f7827b8545ea4996e0f2850e WHIRLPOOL 9697ef9d3d8a039f4e2f8d93fe1368b9f77fdf8b07663473bfe3bbb6c92729c931891ad0c975e70638d361f06df45b7bb88a6958a01c2fe6c60e16fd0e1a6828
 DIST camlidl-1.05.tar.gz 100640 SHA256 857ed5bd3b2f99c62813070e1a5b4b6375e837c6815f4ad956baeb6f8c660311 SHA512 e8857aca818a06f8c861e5f55dddd7e8e3ab1efae51647534460b4f092166709d86c6de1215c792a0489d668d72064ccfb7635e9a6d3854cd5a62f74541a9d18 WHIRLPOOL ca2ef6dea1647640a7bfae5da6b76ee864e5f29190317c33e768a946fa0fc1e9ce513f83158b7d11d4b3103b2f32fb5873775c55a7e9e24b969eece639ee0db7
-EBUILD camlidl-1.05-r1.ebuild 1330 SHA256 a9b94b5964249927e526f35e44ee7b08ea28d98b02b4e20bdd14d52f499fe4ad SHA512 7d568bc34d579450d7a758a479e62b5f54014cfb2dc5aa047e78ef4683c4b6e23385db5e7b7535a150b3b1ae3520c1a9a47e6676755b3fb638f8aa19cdff1630 WHIRLPOOL 1bcfdea67e2783679786e46ff77c58b6517fc82bebf2b1e2ad183fbe523ac7402cdc63aa85b325924a2a5984e29ed3b7c934b8ee773abadb88f05b834d60472e
+EBUILD camlidl-1.05-r1.ebuild 1373 SHA256 93b68a49d7b010f7af53f1e410f1191f6cd0a91fdbc03cc872f83bb28269b2a6 SHA512 30e6f1f7d14b8eb42ef40a21d8d65ea637876c46cd9c41d7078dd9b772495fa8e1e1549447becafa0e659bebbe34c58bd5be5285db8079d7f593f493ed74ab3c WHIRLPOOL 8715da663aa93696db1ea3dd834d97e59b8daccdb2a5b03c4dea43f9d6b5119322e065f83c615b42a579da11328286904abd97dbceb273fcf624e592192102a8
 EBUILD camlidl-1.05.ebuild 1267 SHA256 1654ee869d24d7e27ac93ac1f933fda0cd1023887fa2da8e36f9eab336ca02bf SHA512 cbd881c3695fec7029e064ac913cb6dda0f4e7e59038a1a64f744185e906d81a623e13080ab1ea1b519c44ce7bbb1cb15743a7bab8447b4b4761136dfd177861 WHIRLPOOL 9254ac2e9b56313226e11adc719a79261adf1fbb3d19b41abec7e110cfc388fe1ee27c1a65ca49d65581fd581d4796abc345e14ddc962ca896a05b06bdb566b4
-MISC ChangeLog 1373 SHA256 2ce954c6adc8beb5cb628318830a7a694a87e3b550bc163b20e71d19de71f36a SHA512 c1e573f41b8d92c2fb582cf497840b09acb91f97433f59a116c18033643be88bcdaffd3b50d0d1461d77f4f252d4b2d03897f9af065b05810c5af56d3867154f WHIRLPOOL 3cdc65a89426737bb6dad8d5bb0bfecd2eb21022cc4c86bfa351ff4e308612406a358bdda0ae8b9bd2df7410b93a44d48e5cfa181c5f6656348ceb371d2c4b36
+MISC ChangeLog 1503 SHA256 e70c88c82325aabbed5a08cc087eec223fa3b56d97b0eeeb93567b4341efe246 SHA512 4843e27b66122c6ea0c3337956a16fce51b49f07bbe0f8c723e21d3dc425f3d2d83a7a99250ed05269e90abc6f8469b5bf24f81b53749ccacc144dbd1a1bad06 WHIRLPOOL 9e21116733f5d67a2b83c54f6af6a96d6b8876dfc915d520dd5a8d4c959526df8ffa4f60515ecf85dc950d8c06878ab28680c4f17f13699c9c231a74bbf982ba
 MISC metadata.xml 157 SHA256 d14b8b08774f2a40f42d70ff40b1b4f1c4725e7095d702143a32909553eac799 SHA512 5e4a17ffdcc021c3d28f9ac71f8ec0b35a243e269281ba7db2e17845d7990221040ab16db6fa13c708f7d8db154d8d65d2d7f80f3a7dd84bc001449369738f2f WHIRLPOOL 79ae48d5df04eab0d90848c85d48c62b0e3901cc5c9a74d0b85de5becac5de0f55a3c9c719bf716bb757cfd8be306a222f247a0749fb346f6589893698b25c63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIc2d8ACgkQvFcC4BYPU0qXqQCgpiPsF/REE0IzFfzEL2Vi+vv/
-vIEAn2fR8Gg1U+iOYt+paSpPWSwWDqF/
-=uWhN
+iEYEAREIAAYFAlLXIGgACgkQ1ycZbhPLE2D9ZACggoffcc5hfMXlf9ag32aNt9Fw
+03MAoJOpsUmRkzqr5vbQh50aqc4d/ooK
+=sSFR
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/camlidl/camlidl-1.05-r1.ebuild b/dev-ml/camlidl/camlidl-1.05-r1.ebuild
index 4a8602431e37..517cd1ab0cbc 100644
--- a/dev-ml/camlidl/camlidl-1.05-r1.ebuild
+++ b/dev-ml/camlidl/camlidl-1.05-r1.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-ml/camlidl/camlidl-1.05-r1.ebuild,v 1.1 2013/08/27 16:54:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlidl/camlidl-1.05-r1.ebuild,v 1.2 2014/01/15 23:57:22 bicatali Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://caml.inria.fr/camlidl/"
 SRC_URI="http://caml.inria.fr/distrib/bazar-ocaml/${P}.tar.gz"
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt]"
 RDEPEND="${DEPEND}"
@@ -25,7 +25,7 @@ src_compile() {
 	# Use the UNIX makefile
 	libdir=`ocamlc -where`
 	sed -i -e "s|OCAMLLIB=.*|OCAMLLIB=${libdir}|" config/Makefile.unix
-	sed -i -e "s|BINDIR=.*|BINDIR=/usr/bin|" config/Makefile.unix
+	sed -i -e "s|BINDIR=.*|BINDIR=${EPREFIX}/usr/bin|" config/Makefile.unix
 	ln -s Makefile.unix config/Makefile
 
 	# Make
@@ -40,13 +40,13 @@ src_test() {
 
 src_install() {
 	libdir=`ocamlc -where`
-	dodir ${libdir}/caml
+	dodir ${libdir#${EPREFIX}}/caml
 	dodir /usr/bin
 	# Install
-	emake BINDIR="${ED}/usr/bin" OCAMLLIB="${ED}${libdir}" install
+	emake BINDIR="${ED}/usr/bin" OCAMLLIB="${D}${libdir}" install
 
 	# Add package header
-	sed -e "s/@VERSION/${P}/g" "${FILESDIR}/META.camlidl" >	"${ED}${libdir}/META.camlidl" || die
+	sed -e "s/@VERSION/${P}/g" "${FILESDIR}/META.camlidl" >	"${D}${libdir}/META.camlidl" || die
 
 	# Documentation
 	dodoc README Changes