Keyworded amd64-linux and x86-linux

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

4 files changed, 31 insertions, 37 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/Manifest b/sci-physics/cernlib-montecarlo/Manifest
index d2a0c4a530c2..a00ff2722359 100644
--- a/sci-physics/cernlib-montecarlo/Manifest
+++ b/sci-physics/cernlib-montecarlo/Manifest
@@ -4,26 +4,16 @@ Hash: SHA256
 AUX cernlib-montecarlo-2006-noherwig.patch 1993 SHA256 bb85c46eb9d2acaf95dad615aac3b3c08b2607aea3368f7bbadd2532d58e177d SHA512 e53794aeefdda4667bc71826b9514f44dd23fb0076cb55284ff4af0277facf5d3e1664f76dff80f975157350a02b871437230c66b49816c75730b4afed9d5ec9 WHIRLPOOL 088f7786549f24b1fcb47bdd1fd4ee98a973d7ef0a5add7f327ad84def85ddd0be38467e478aa5028e324fff26d3a50e0f7f6bb63074192a28b26d55440bd715
 DIST mclibs_2006.dfsg.2-5.diff.gz 38713 SHA256 3c0d73211ad0cbb6c8b8c2d329a93ffcd853475e3027f5bb82120c112e0d0123
 DIST mclibs_2006.dfsg.2.orig.tar.gz 7406559 SHA256 8e73ccb987cb8f930ed44eac807d4f8fd5b03d6926b2f8d62ffb6b31806acf73
-DIST mclibs_20061220+dfsg3-1.debian.tar.gz 46362 SHA256 17a9f61860237b963bc4b6240296add2bbe45cf16ce994061c3f20c33994cf73
-DIST mclibs_20061220+dfsg3.orig.tar.gz 7642494 SHA256 cb5ea19bc54a06c031c90192685748ce0f7df016bfae6b9d7d672d77a3444ce5
+DIST mclibs_20061220+dfsg3-1.debian.tar.gz 46362 SHA256 17a9f61860237b963bc4b6240296add2bbe45cf16ce994061c3f20c33994cf73 SHA512 ddb31fd218f0f051155548011415d9526e7866ec7caf7041a5f572d8064cb4f19c188724e839f445a47f490dacf0d67ef9ba871725756892e0ba1d569d575fe3 WHIRLPOOL c8db51ed7e1e78ffcdca96af3aeb388391473acc796b35af838fa60cb3129816e787dce325c8ac8be411d98ec2d1392959df97dd560ccae172c230ce2c342676
+DIST mclibs_20061220+dfsg3.orig.tar.gz 7642494 SHA256 cb5ea19bc54a06c031c90192685748ce0f7df016bfae6b9d7d672d77a3444ce5 SHA512 add98b585648994ab616d040e9a3410b0eba13ab54a812674d3940bae0effed4446b02ce6a34887841c114bc444b1b83598e2c89c22b4df8dcd3fd4c1d8aaba3 WHIRLPOOL cee4c265ae610bbc1b2a48fdc6d769848bf936c78862a298725e5ac11fc2620a18b748dcd41e8b7622cf369c2a43f9641cc67e5f902a88e2f083f7b7587a1771
 EBUILD cernlib-montecarlo-2006-r2.ebuild 1967 SHA256 19bc95ca8c11e99e8d2c37d0d1b8b6310fc1bc3443b820ac0973a9feba16b43a SHA512 dcaf92410960b83e244a853a78c92b3c8d35bba99e98a231d5ed52e96cf5f17eef76d6381a879216fdf50f7dabf006b09d78cd5b6abff2ae565c57e21f414ae8 WHIRLPOOL fcde76ab68ff823cc22fc6bf4e0949ca047532f3d9c5be77456d1bb2c02bcad8087d635cc23ef387a4c403cacbaf0eb2eb983bdd87beea4afbcda3356d7a9ca7
-EBUILD cernlib-montecarlo-2006-r3.ebuild 1691 SHA256 a4a09ac1b026ae751c01b86374435f2249ad4cb542110a946fc0d52f962c6161 SHA512 aecb3c3b866af37f95e7caf28f57b1cfe29f9e59b545cfdefe5d769016724dd6225ea9cc5b0c4250782bf39531803153d8c433492dc021dc7c55075945586fca WHIRLPOOL ef1960aa8c2547f05a4f75ed4725d10d32f57fb35596ac015addd3e08040a9a4a7d28a7706a51b7820dae2cd69627c752963cc7d3ebf2aab93087d9975dd2a60
-MISC ChangeLog 3260 SHA256 de409f8338c0fc3c49830bd55ecdb244a25c643505c785d0f97dfadffb32628d SHA512 112293e232b18fdad44a75aacf2f9ec5d3fef7dc1be34894c620688f5fcd9bc52d1d59d26489ec2af6cc004820e8d866e836186f543c7b32bd24a9aa0f5ca2eb WHIRLPOOL 0f9d25e80b6aabab3c677f843af6473b30f6a1112836b812f289b6dbda767959548b1c3c38e61f757925a9988717f7dc2e866dac4b13c2f276e0b3ad6cd42922
-MISC metadata.xml 667 SHA256 d82203b5477f47d85acc2fe060be1d7432df0e66dea7742593f16bb0f0d42ac0 SHA512 05349ee1bd053e287011ede8b10916bae1f0fb2e4edf5232d7b3190ddcb321e21aac11a7328a89d38bf2d05e58927bb67827a83d55dd4e8f979ea0e9f9bd67e3 WHIRLPOOL ff3e34c4c47513f8db83679e44eb44df461b6b0e1d3a194dde7dc9cfbcc3cc66c5d3de875ca9eb71c5a41b56a4aa934a5633fa1d4f2c7ce9c22c4ffbc9afaf81
+EBUILD cernlib-montecarlo-2006-r3.ebuild 1711 SHA256 629ff845f40edb32f3b06a1494c22788a19ba0b33549d862bc7d393d0ba63be1 SHA512 49e452f8353269be2683e59e28d4d44983f6bb79eabeebd5130e74882e5be9d65edfabeaadd9218c4dfafc65c313cbf0db8821329d1fb58abc0270d5a8f7bc43 WHIRLPOOL 1441be1e2d9dd4586bfc72c7899b4bb977dae3a24a618f9a1ca3172e36f4562189818cb70f3bfe160dcb0127dc4ff1244246d445f4b1c1bff443a9711e784cf9
+MISC ChangeLog 3409 SHA256 566016167d3f32347d556371581188c6bdca47b8f9331398e975ed383bb2d299 SHA512 dc8d8aaf7cb1d4ab435ebcff1d6f234501053d053d6043440dd87fad6b4453ee71f60d9a51e6bc5dc32880157e4926b9c49a65981ef78bbded99fad6cba23a8c WHIRLPOOL 442fe6ad77b12c239300e23b470568822f7945229bd0c2c7eaa7b573d5602f5230958f7d666b661a16367273cd2870784c249c13517773a98b1f55ee9c4cd8cb
+MISC metadata.xml 661 SHA256 3705472cb9b8a9e777de950a83d2c367576a0d56781410489e7efb93716efd1c SHA512 ed40b1b975163c79830f24d7e1c79207bca629a3f80ac0199c073c8b2a671255bde4e6e4a793cd09f6cb0bf091fc347db2539e97b6992fb34214c30c2d2a7de7 WHIRLPOOL eeeea417bdc1594dba150243729d82d94cb5c8991ba2c4ccaca6a962cf8171372fe2b2347361b8eeff6b22df8468bd33b890df3633bdd0d4f7711214ea8ff7f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQiFoYAAoJEDxpGckxwJCBYacP/0S7EFF2L6nHys5uYZYtIDO6
-FL8MnELobDHhq8O5Kz32Hy61P8ksviFvAcL6L6w9wNE3/SdDopSRz0Q1WWvvW2Va
-7X5pvGDyCuIt6FEliQlpLlGHav8l5NeRVs/udDHgdpmeDYgRFyEEYmdHp6gdGq6J
-hgqZoRRoHt+Flf+rTQcFPxWjLGDr+c66S6QIz9A527tlIDMui+YGAmWHTlehfJaF
-MKsPL4Sn5XlN2LTjJVswUOZTOJv/mSTNP0SqFZHvaE2oX58frejmVP/ecXjEauVw
-iQUeOU4VAPbUG1VhzB+ol5TTIFH74XfbhdqbwJ4TmOfJ+QeXsUdMUF1gPW04QzNZ
-KHRQBavssy//WRy0/ir2a4oqdmFav9dD+aE5ui+m8dtL+t6EUBZyoAymuWkbT90J
-mtKes8qmlPas5svyUr4fLQ7vjMC5d+nAMsfugTzusbjK4E2nZ95BysjOn1yRIQNc
-BmWMygQ/5ya67BezwiQfGULaNIvB1tBK0hddTGKXez3+R+xwTTGLRo7af9HoehKh
-M1TmfOTkNfgTTERrW94pR5N5aTKgbs9mIYJdM1PbN78vJylCyteNq/QZy881FQ5h
-vnOzpF4YkmJgGsaBDBfAsBR6AiFWbp/FTozX4gRFPauQQSOwqVC89b52mSVftVep
-HWeuRo5woq2kgt7NvCNb
-=fcYn
+iEYEAREIAAYFAlD4SKAACgkQ1ycZbhPLE2ARbQCfZB5D1NCSPPIMGay5y/ghL2br
+kzkAoI1DdP5Bq4L1/j3Oz2KUPuxHFmau
+=hhlJ
 -----END PGP SIGNATURE-----
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>