Keyworded amd64-linux and x86-linux

(Portage version: 2.2.01.21580-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

3 files changed, 23 insertions, 19 deletions

diff --git a/sci-physics/cernlib-montecarlo/ChangeLog b/sci-physics/cernlib-montecarlo/ChangeLog
index f97c90681d79..e278025102fa 100644
--- a/sci-physics/cernlib-montecarlo/ChangeLog
+++ b/sci-physics/cernlib-montecarlo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/cernlib-montecarlo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.18 2012/10/24 21:13:48 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.19 2013/01/17 18:53:15 bicatali Exp $
+
+  17 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  cernlib-montecarlo-2006-r3.ebuild, metadata.xml:
+  Keyworded amd64-linux and x86-linux
 
   24 Oct 2012; Ulrich Müller <ulm@gentoo.org>
   cernlib-montecarlo-2006-r2.ebuild, cernlib-montecarlo-2006-r3.ebuild:
@@ -85,4 +89,3 @@
   24 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml,
   +cernlib-montecarlo-2006.ebuild:
   Initial import.
-
diff --git a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild
index 8af196a9b065..f6beb7a72957 100644
--- a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild
+++ b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild
@@ -1,8 +1,9 @@
-# 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/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild,v 1.3 2012/10/24 21:13:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild,v 1.4 2013/01/17 18:53:15 bicatali Exp $
 
 EAPI=4
+
 inherit eutils toolchain-funcs
 
 DEB_PN=mclibs
@@ -19,7 +20,7 @@ SRC_URI="
 SLOT="0"
 LICENSE="GPL-2 LGPL-2 BSD"
 IUSE="+herwig"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	x11-libs/motif:0
@@ -35,18 +36,18 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig"
 
 src_prepare() {
-	mv ../debian .
-	cp debian/add-ons/Makefile .
+	mv ../debian . || die
+	cp debian/add-ons/Makefile . || die
 	export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck"
 	sed -i \
-		-e 's:/usr/local:/usr:g' \
-		Makefile || die "sed'ing the Makefile failed"
+		-e "s:/usr/local:${EROOT}/usr:g" \
+		Makefile || die
 
 	einfo "Applying Debian patches"
 	emake -j1 patch
 	use herwig || epatch "${FILESDIR}"/${P}-noherwig.patch
 	# since we depend on cfortran, do not use the one from cernlib
-	rm -f src/include/cfortran/cfortran.h
+	rm src/include/cfortran/cfortran.h || die
 }
 
 src_compile() {
@@ -60,8 +61,8 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" MCDOC="${D}usr/share/doc/${PF}" install
-	cd "${S}"/debian
+	emake DESTDIR="${D}" MCDOC="${ED}usr/share/doc/${PF}" install
+	cd debian
 	dodoc changelog README.* deadpool.txt copyright
 	newdoc add-ons/README README.add-ons
 }
diff --git a/sci-physics/cernlib-montecarlo/metadata.xml b/sci-physics/cernlib-montecarlo/metadata.xml
index 3b9831ca23f1..31e8fadef681 100644
--- a/sci-physics/cernlib-montecarlo/metadata.xml
+++ b/sci-physics/cernlib-montecarlo/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-physics</herd>
-	<longdescription lang="en">
+<herd>sci-physics</herd>
+<longdescription lang="en">
   This metapackage provides various Monte Carlo libraries included in
   Cernlib (both shared and static). Likely only physicists will be
   interested in these packages.
   The libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are not
   available for Gentoo: see cernlib Debian packaging for explanation.
 </longdescription>
-	<use>
-		<flag name="herwig">Build Herwig internal event generator, newer version
-    available in <pkg>sci-physics/herwig</pkg></flag>
-	</use>
+<use>
+  <flag name="herwig">Build Herwig internal event generator, newer version
+  available in <pkg>sci-physics/herwig</pkg></flag>
+</use>
 </pkgmetadata>