I have massed up the keywords and Changelog with blind rsync with my overlay. This is just a fix.

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

5 files changed, 41 insertions, 9 deletions

diff --git a/sci-physics/geant-python/Manifest b/sci-physics/geant-python/Manifest
index 6c8f29649231..42b416f77305 100644
--- a/sci-physics/geant-python/Manifest
+++ b/sci-physics/geant-python/Manifest
@@ -1,6 +1,8 @@
 AUX geant-python-4.9.5-build.patch 1026 RMD160 2bf191ddf06e7ca29ae2f2bc4d40d533ad400979 SHA1 8c365c334a9958c52ad08a2daa9e6923bec1afa9 SHA256 ef3f725aa4165374c7b3d090af3e017e14850f409def6f8e466dcb198d7a7c7e
 AUX geant-python-4.9.5-visverbose.patch 557 RMD160 752266b165007dc61dfe3e6e21804dca63c59754 SHA1 e2691a1bd095741de558e61771b9b8992c77a2fb SHA256 0955cd39ce1f8e842e2804370359a4e367b14f4791a40fd653918c32884bed8a
 DIST geant4.9.5.p01.tar.gz 28466803 RMD160 42249229a97c2eaf5ed2471a93608a1d0daa38e1 SHA1 b1b938f735a8b966621704cc77448c786777dd01 SHA256 451f8c4a29bb0dc4b923d59d77535a657f0f8a30dc6c8ef639c8b1ebdb26a10e
-EBUILD geant-python-4.9.5_p01.ebuild 2440 RMD160 631bf9815b2a7e94273be0779073b629710ffaab SHA1 b56a57f32edde7bed3fc28053968d004926523ee SHA256 74544462828f85729f743e25f50abfaca55799a031097a53dea1597136f4b41d
+DIST geant4.9.5.tar.gz 28458437 RMD160 24e78b5243aa9ec47a48bbcb6d2afb4d9fe22dbf SHA1 846b48e82c1709d77a8f490fd12b039acc1d0cf9 SHA256 b6b31752319805052fb765f89ca38a23fb299a0a5bf900daeacd1950d6c9a597
+EBUILD geant-python-4.9.5.ebuild 2547 RMD160 c2c51f8fe3ea75e2e1ede183a4f074b0d9ce5115 SHA1 4d153d98052c3460f23ad797306a6fbd983243a0 SHA256 d8dd16afc16f4a68d446059b323b3911f65e21446ce68d1356f52d55e99bec1e
+EBUILD geant-python-4.9.5_p01.ebuild 2551 RMD160 9b2bc43172a66a8771e5a408ed5f7caa0d3e4a00 SHA1 dd4a008749652cc94eaa0802dc10880aceb31742 SHA256 ed802828d7ded1628c7f269d694089a36846ed7db4e924164428e96f5457df73
 MISC ChangeLog 460 RMD160 3de792d275ff4b3c1d6e294756eb505263ba1716 SHA1 161ee847773526cd2f02da77f0b4a608fda94ca5 SHA256 34be78d8ad361a7195adec88fa31cac3d39fe3f315d838fdcf6d9b972f424e0b
 MISC metadata.xml 240 RMD160 efd4ab46b75a4f49cf759c1af44f74b7d952dfc2 SHA1 7180d1a98e53900396070713396ca66eebb913c4 SHA256 f3269ca94d60315f7e3ebf8aa24ed69d2d2c53473707c76586834f76e8ce27e3
diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index eb18e12cdcba..c9d8f6ad3eb7 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for sci-physics/geant
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.61 2012/05/20 16:27:19 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.62 2012/05/20 16:46:58 heroxbd Exp $
+
+  20 May 2012; Benda Xu <heroxbd@gentoo.org> geant-4.9.5-r1.ebuild,
+  geant-4.9.5_p01.ebuild:
+  I have massed up the keywords and Changelog with blind rsync with my overlay.
+  This is just a fix.
+
+  20 May 2012; Benda Xu <heroxbd@gentoo.org> +geant-4.9.5-r1.ebuild,
+  +files/geant-4.9.5_p01-scripts-only-dataenv.patch,
+  files/geant-4.9.5-scripts-only-dataenv.patch:
+  add back geant-4.9.5-r1.ebuild because geant-python cannot function correctly
+  with 4.9.5_p01, upstream bug http://bugzilla-geant4.kek.jp/show
+
+*geant-4.9.5_p01 (19 May 2012)
+ 
+  19 May 2012; Benda Xu <heroxbd@gentoo.org> +geant-4.9.5_p01.ebuild,
+  -geant-4.9.5-r1.ebuild, files/geant-4.9.4-zlib.patch,
+  files/geant-4.9.5-scripts-only-dataenv.patch:
+  version bump to 4.9.5_p01
+
+  19 May 2012; Benda Xu <heroxbd@gentoo.org> geant-4.9.5-r1.ebuild:
+  delete the wrong sed phrase.
+
+  18 May 2012; Benda Xu <heroxbd@gentoo.org>
+  +files/geant-4.9.5-scripts-only-dataenv.patch, geant-4.9.5-r1.ebuild:
+  keyword amd64-linux and x86-linux; handle data dir via envd; fix clhep linking
+
+  16 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> -geant-4.9.5.ebuild,
+  geant-4.9.5-r1.ebuild:
+  Fix for openinventor to use SGI OpenInventor in portage instead of SoXt, bug
+  #408187
 
 *geant-4.9.5-r1 (13 Mar 2012)
 
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 2ae53d55208e..fea19bd95b40 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -32,7 +32,7 @@ EBUILD geant-3.21.14-r2.ebuild 1885 RMD160 2022b046c7f52a4687948387cd7a084e2b0d1
 EBUILD geant-3.21.14-r3.ebuild 1719 RMD160 7158c53cb2f0e1098fd5f6d5249029fffe35cf3a SHA1 10f67d4d0c17aab06ce4f50fa3f2393a792c426b SHA256 5bb8f71e86a5f5562f0aab9f86f14937e863dffd2b9e1bb502fd5ba9a120f1b9
 EBUILD geant-4.9.2_p02.ebuild 8145 RMD160 3d1a138202fe2e3151ad684c18cec0e7a4dccbfc SHA1 d813033ebcae3ef491aae7a9a794ef63a8813d8d SHA256 02920927f1eb081a9753f7ac9c8a282d036955750796bbbd6b007fa55f6c1e26
 EBUILD geant-4.9.4_p03.ebuild 2398 RMD160 b0788b3a5e2169dcea5f373994500b21fb259026 SHA1 97bb383e9cf7631af96dc9dc9f9f09ee505318a7 SHA256 72ad2e70d0649e6dd0383273345f2099104ad0ab84ad6d3dfba25fe2cccd28c3
-EBUILD geant-4.9.5-r1.ebuild 3039 RMD160 d82456088c500a521ce766eceedb883ba7c6cc70 SHA1 af741560438def0977d579b11f1028b7ba4b006a SHA256 26fbb0583a4f5e81519f59c9f4683ec0e00256268dbd9605b21caf2f9712e26f
-EBUILD geant-4.9.5_p01.ebuild 3033 RMD160 64317a1a51a8a9a9bba996b6d3000996d4aff774 SHA1 734779a4499fd5fae6b36a059f7061281746d0ea SHA256 1c62aafc3bf1f9a735246ce411c2a234922549e37453ac6d0d4e44e457468508
-MISC ChangeLog 11006 RMD160 0b124c6b4e23e32b65e6c27d575e4d1e147fd562 SHA1 29efe90b1c30a8e7dd5ac32e539982611f9f23e9 SHA256 2caf9d7366d9ed35dbb4adef5f4c12fab346413ff96dc4b0b7fdf2493d96ccbf
+EBUILD geant-4.9.5-r1.ebuild 3051 RMD160 1fb92013250a9f81b79c06fcc3bcdf7d2c3ed164 SHA1 ceaf06daf6e40d971712096ea62de7808a4f5d7f SHA256 d6f7e35a8b1e21333d1103918e5b2ce0c2b05cc48bd821c2104428694dcf2f08
+EBUILD geant-4.9.5_p01.ebuild 3045 RMD160 c3effd68c1be99dcf26e4183358e2e851b72e239 SHA1 424b1174dc4dc985caab7f864c9235754fac6e37 SHA256 0eb89ba5632b5025a27db108a66f2aa86fbc55577cf64ed33f1401f13a12a2d6
+MISC ChangeLog 12246 RMD160 b9b8ba6b79868a807d33090e9a8a641dd310686a SHA1 fb1cdc897997df731c5a43d6b83956a20904e566 SHA256 85b9f12cbe79b5ce20845ef89542a2d924ca0ae2f0a1a4845b0ccbdec5f6eed0
 MISC metadata.xml 1569 RMD160 b4e64715d0d29b17b7fc46da45f4ebbff41fc380 SHA1 b30f9de8adea84a688b1343115afa304d5b0de4f SHA256 532c396760c97bbf207439e4f189679bbe02fda61d33446beeebc5f855b36f63
diff --git a/sci-physics/geant/geant-4.9.5-r1.ebuild b/sci-physics/geant/geant-4.9.5-r1.ebuild
index 3a3c370f49d9..020340b382bd 100644
--- a/sci-physics/geant/geant-4.9.5-r1.ebuild
+++ b/sci-physics/geant/geant-4.9.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5-r1.ebuild,v 1.6 2012/05/20 16:27:19 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5-r1.ebuild,v 1.7 2012/05/20 16:46:58 heroxbd Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ SRC_URI="http://geant4.cern.ch/support/source/${MYP}.tar.gz"
 
 LICENSE="geant4"
 SLOT="4"
-KEYWORDS="~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+data dawn examples gdml geant3 granular motif opengl openinventor
 	raytracerx qt4 static-libs test vrml zlib"
 
diff --git a/sci-physics/geant/geant-4.9.5_p01.ebuild b/sci-physics/geant/geant-4.9.5_p01.ebuild
index e570e3865b44..0e7622f8ed52 100644
--- a/sci-physics/geant/geant-4.9.5_p01.ebuild
+++ b/sci-physics/geant/geant-4.9.5_p01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5_p01.ebuild,v 1.2 2012/05/20 16:27:19 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5_p01.ebuild,v 1.3 2012/05/20 16:46:58 heroxbd Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ SRC_URI="http://geant4.cern.ch/support/source/${MYP}.tar.gz"
 
 LICENSE="geant4"
 SLOT="4"
-KEYWORDS="~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+data dawn examples gdml geant3 granular motif opengl openinventor
 	raytracerx qt4 static-libs test vrml zlib"