Version bump, switched to cmake. Fixed Qt drivers bug #263450, bug #347279. Removed G4WORKDIR bug #345855.

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

12 files changed, 274 insertions, 37 deletions

diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index 171ee3563dba..bb5a868960d6 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-physics/geant
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.43 2010/11/07 21:06:38 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.44 2011/01/22 02:28:43 bicatali Exp $
+
+*geant-4.9.4 (22 Jan 2011)
+
+  22 Jan 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  geant-4.9.3_p02-r1.ebuild, files/geant-4.9.3-zlib.patch, +geant-4.9.4.ebuild,
+  +files/geant-4.9.4-datadir.patch, +files/geant-4.9.4-libdir.patch,
+  +files/geant-4.9.4-no-benchmarks.patch, +files/geant-4.9.4-no-examples.patch,
+  +files/geant-4.9.4-zlib.patch, metadata.xml:
+   Version bump, switched to cmake. Fixed Qt drivers bug #263450, bug #347279.
+  Removed G4WORKDIR bug #345855.
 
 *geant-4.9.3_p02-r1 (07 Nov 2010)
 
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 2f90109c836c..f45ef95e8bb2 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -3,29 +3,40 @@ Hash: SHA1
 
 AUX geant-4.9.2-zlib.patch 239 RMD160 790953077b7fc59d1ce7c3ed98cdb3dcc3134705 SHA1 7a0552dab08873665b8668a21a8c52841c8e5ae2 SHA256 f5ceee577afeb719718cd23887f9c1eba322077dce1f3d89bc075bacd63e5573
 AUX geant-4.9.3-respect_flags.patch 3731 RMD160 b7ab40cbda0557639605bc9d8285a48af893f3c7 SHA1 88c4cdede3a86d1c41e589ece95a7fc6d74969dc SHA256 7b877a11325a9eb8bc208473622f03189a47b42d01e6fc53836f2aa70b282739
-AUX geant-4.9.3-zlib.patch 314 RMD160 123761e6bfc0c7d386bfc4d8aab797cbfe7ac038 SHA1 50faae7e53d209c095053c2d702f8622b743e079 SHA256 14cd100d79befa083ea79f706a8feba7780252332525d67fa85f1cce13a67d72
+AUX geant-4.9.3-zlib.patch 613 RMD160 192c6ac17d47eee4c9f116ceb96850e12390455a SHA1 070e01d43cb953e5bfbbefdbdbb5433ea583c54e SHA256 9b83cd998fa08c4312f0a56c1e72f7611217b1bde4b8553fd5e6735592b6cfc1
+AUX geant-4.9.4-datadir.patch 2203 RMD160 251419f9780cda5a7eb527201da9568af34da0f1 SHA1 761b40db8d3ad73fbf4f3004f902db64c668f576 SHA256 3c97d883732299ecb008d6c114d92556a937b93966ec21fb612809b03d0a95f8
+AUX geant-4.9.4-libdir.patch 1328 RMD160 518d42f5e9263828c3f90fdbde3d1d352d4b21a8 SHA1 8bd752545466909bee69adc89850f0529ed1a4ef SHA256 36f43915868ea87f2b80c9ea360b24726389a8839ef06323e58a08fdf5833338
+AUX geant-4.9.4-no-benchmarks.patch 370 RMD160 759b19161b950963a04cb6bd7b7dadb918c7fd08 SHA1 8c1bec8775809e5e4655269ee136f294204151c6 SHA256 5ff40079b5669335b1701831fba3922b525d2fdd594704750111d7eaea45b693
+AUX geant-4.9.4-no-examples.patch 486 RMD160 7ef349c41d31041af9b5edfd3e82c5fbcfbbae6a SHA1 314a826f5671edbc237e7a960d8c944af3463560 SHA256 4ae8e7bc5790b5cb207d440bd3c05e81196528517af2f32c0e3483ed41d12d99
+AUX geant-4.9.4-zlib.patch 518 RMD160 ed28a5fec724744af90276fe362c8e29ba6503e8 SHA1 e500496f8b551c7d42572b1ab77c196c46a1f1c6 SHA256 ba553368f5b93cd7d2ce54e54e28b4e5172539644c30b9b9e8561319efc2bfea
 DIST G4ABLA.3.0.tar.gz 54909 RMD160 5a032ee8e90d00f39b67114fe257ec47001f347b SHA1 5f38676f1650a508e49d35f9405ac96984388135 SHA256 ff0b77be6b36204eeeba71099f6b7530edd80b79eb015994535bc4334bc821eb
+DIST G4EMLOW.6.19.tar.gz 14396144 RMD160 ba67b3f1ee215966adc99661a1db4a5bf09c5511 SHA1 f63e41a43a3d0c793a04dbb6cce0bdcfeedf6889 SHA256 8876defe74e4c1e9d6b58b2365a9b468ac8d996fb63fa1c6ba6240e0b185845f
 DIST G4EMLOW.6.2.tar.gz 8389172 RMD160 fa51dbb4f0e316b0e682a05c9db4c1dc29db7218 SHA1 627ca63927064f1846aa8d7e2e5c4783fe0b9610 SHA256 1affbc66d8809db0c8e450ca83a0da744e7f5b8e912ec52e93b1f24b47cbd781
 DIST G4EMLOW.6.9.tar.gz 11203887 RMD160 8306a6af7ec41ec16790df2130b4f9b437bb7d9e SHA1 d4d026f96990d4ed15a6b550b1990ba335248965 SHA256 4b84114b62a6085f5955094437f5ca8383f758ecb3e23fbfa433012b8e10b962
 DIST G4NDL.3.13.tar.gz 57034762 RMD160 243b206170d996c7b562a86e388ff4d5f8d11764 SHA1 4acc412a2f29a7a8f84ac50aeb7331c8ed2889ae SHA256 e994b873032b3d1c0bcc2679275c43354d3e1cd5091da76c8fcd4826536f17a3
+DIST G4NDL.3.14.tar.gz 58794491 RMD160 8393b5e0301526ec747da133b6972c70b8c44210 SHA1 dc8b7a5fa0fcd06a85071c1b09730de6d04362d3 SHA256 08ff1d4fb0953f2502d88f76fb9db1d4314c975564731f11c9372d0ea992cafa
+DIST G4NEUTRONXS.1.0.tar.gz 1186619 RMD160 c8ddf1d50e7fdbc3d53959bb45bb84615467f96d SHA1 9904ffccc3053cf6d48441e6a1e55fa1a3360766 SHA256 577d28b7faa41caacb001a30384028cd5e3b7018755ab94a427ce0a7feeab365
+DIST G4PII.1.2.tar.gz 3387814 RMD160 6f7553941ce2130c7f463a2ec7613c801792ccfb SHA1 65e72c1507370c0cdbc2505bb02083e04fd5667c SHA256 80e680d7343ed051bcfffd910c682cfd66980cecd1c0bc435f06c6c740a6f99d
+DIST G4PhotonEvaporation.2.1.tar.gz 7504003 RMD160 be5e5ef9db4b85f916017561cc2dfbc5a1b226d7 SHA1 56937f579e2134259963093ca735afc2b5a6ec5c SHA256 08ab657a060518c9b7aab03b17628cbb31585ee9512e0f2033f2fb0d7d9b2bc7
 DIST G4RadioactiveDecay.3.2.tar.gz 761070 RMD160 1f797977c0c66722f4b032ac546c26eaa8a9f14a SHA1 45e706e46a33e08b1706f069d15e8c2145f3410e SHA256 31dc70aa59cb86ef0dbaf96c639e0541b7569d4fc98f92064ecdc8bc4b9c839b
+DIST G4RadioactiveDecay.3.3.tar.gz 732628 RMD160 065769a13b45dd335a6c6bd3b265c6d0370dcf96 SHA1 877a31ddf673729aad5b5f5892333495a1803784 SHA256 7f421d6808422f9186a8a96fc1889a54af03c80a37b9f9d1d51ab359ea0264d1
 DIST PhotonEvaporation.2.0.tar.gz 7506068 RMD160 24d46b08b2ffeca5b3be186baffb650b99accc97 SHA1 df3b4994c7248da7a226c186be747c4b823d34fa SHA256 5aac0ce683ca23274a7736c8e8911d8cf32d2bf33aab33a9a23126664762d61d
 DIST RealSurface.1.0.tar.gz 1257863 RMD160 030513fe340e0cccbfe0b9ae9acb3ba6b5291ebb SHA1 9b4bd95c647dc702458eeaf89ebf62c5885e2ece SHA256 3e2d2506600d2780ed903f1f2681962e208039329347c58ba1916740679020b1
 DIST geant321_3.21.14.dfsg-8.diff.gz 41909 RMD160 4edbe5d3dd93a78198fa2d2d83770c8b85eee4de SHA1 39f48c4263f543b74eee6095c11f5ade9798f253 SHA256 785277dab1e1d3e17d60c85f3826bc67bbd6de7e6a6d40ff7af901371c4d2ce1
 DIST geant321_3.21.14.dfsg.orig.tar.gz 10922928 RMD160 253b35bd9cda82c2213ec042274f7e6ff6b9e333 SHA1 ae6f39ccc18eacd576a3493992db5da3b3d3b128 SHA256 186fe98a08ad1de39f68698a09a46e7c2f14c37b22f8f990257b0bd66215c5b4
 DIST geant4.9.2.p02.tar.gz 18822956 RMD160 1b8923c4821ca627b56919b3c1eeb3b6a09dd0e5 SHA1 007ee6d4eb4f6479f3fe46e6ecff882e3ace1e7c SHA256 4d19bb76bf956004481bc433bf4735780ccc6354d3dc53321d532fd283243078
 DIST geant4.9.3.p02.tar.gz 20009687 RMD160 3fc3ce68965666670a2cf6e7dbe93c00b305fc30 SHA1 1728ea641ecb7ff50d2f44366add3a7569967839 SHA256 9fed501a6b0fed9050655633998acb942f7be430711e08f234dd748c23037a90
+DIST geant4.9.4.tar.gz 24925493 RMD160 a52a060504b89b733061e3559ec224d04498afa8 SHA1 656c274910712275d58c957430ce07d8592828d4 SHA256 4c38333704dcbeba020716f3f8c0e00b919c0d941aecf13de440ac37ba1ac3cf
 EBUILD geant-3.21.14-r2.ebuild 1871 RMD160 6e1461269d1effe249572c7305cac14a9cf014b3 SHA1 0f5541e3c2c0d8666a0af046671e2d4524c99f38 SHA256 5445f8f12f37017e20a83516d8e2199ce9f4930432cbb8ff1353c783ce1e8ab8
-EBUILD geant-4.9.2_p02.ebuild 8103 RMD160 4a841c96c389a0b3f48aa10f33a80da48a4c0860 SHA1 02b38ce5be6c82acebba4c93f8b8ea401350c864 SHA256 8f81363670e8eead217803bb9d80572bb8e4d1df5e2fe594985795bbbd6e4512
-EBUILD geant-4.9.3_p02-r1.ebuild 7924 RMD160 14eb809bad47956e92fa3f8b81fe22d7021814cb SHA1 d4dddf72efbfa0a79737bb06549b08e67ed186bb SHA256 a276692161536dd3a88db43f0210e575ab8b98c6a6e3d91cd53ac66aa1db0cea
-MISC ChangeLog 7849 RMD160 fb034278ec00b0fed161ec3f28bfb403c93e267e SHA1 d95b777ea9f64aeadde073df8ca8bb31ea8d57f3 SHA256 0b488972185740aa6f13eac253918241ca43847ffc4c6545618318fb9869a672
-MISC metadata.xml 1482 RMD160 ebd00b361cafb047cbdc56f837415621995ff330 SHA1 8962d8d1225fb4c5f1aaa5ee8b5cb089898544fe SHA256 14d3bba97c1ffb487c5f60340b1660f016f56efda9ccd185f06d12da44ef55f6
+EBUILD geant-4.9.2_p02.ebuild 8109 RMD160 466a4419f640983e61e5aff2db3d7657d7e0a5e2 SHA1 284d7cc7f92462e7723c38e3a2ff84878a01851c SHA256 a64f200cb114ce6d5a0bae5834a350dd4ced869c0d93149340b5318c4a253483
+EBUILD geant-4.9.3_p02-r1.ebuild 7972 RMD160 645a572071dc220b71c7f71096214f027a9458c4 SHA1 349b55f76b0f421cacb9ef88c1bfd7e78210bfa4 SHA256 2d794953735c7e7c1d4c430d38ac967735302324f8f477685e8462a0037fd964
+EBUILD geant-4.9.4.ebuild 2466 RMD160 435233cd8c48241da63a7c32c41e9391dba8e040 SHA1 47a7ce882540d44412bf811d68b459b687b3d2bc SHA256 b5364c2954724302a25bb7d9ec3d1f4a49437e582a95c7f4ab9f82bd3819b8cf
+MISC ChangeLog 8319 RMD160 e67246ec666dcf48235e6ea0b70a92b9ba86e4fc SHA1 c02607c4d8dd38ad009842bd1a744bbcad5469f1 SHA256 2072c2928bdb9a382b82239c5722301c840544c13f6849e4d3a192167fa998aa
+MISC metadata.xml 1565 RMD160 dbd4686e251350489039e0a90ffc1bfc26763630 SHA1 6a4436219f83cf49bd992389b3d839698dc03e2e SHA256 efd8462bb762cb2c95f1f6707555cbe111064d89e8983c9a764d66394a5de429
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAkzXFOcACgkQIiMqcbOVdxTxWgP+Ptf9P6aOUYhOouM41KxKzu7d
-WKRtBwesGjGeb0Ks6pvqMHHslCfXYi+JlW5ScCb2CX3OKDBzUiCZtUwvSANN4cl1
-0Wqf8ddH4vqs4vO7QJwMJ5iNpM+6VBcHgA1oPtYBZRi6mxRHjVkFm6j649F1xVXs
-HRSH7tnQl3Ibc29boTY=
-=Vobv
+iEYEARECAAYFAk06QOQACgkQ1ycZbhPLE2DD6QCeOgJRlqzFQcpLgqoIV14pyR0P
+IckAnRUK26A1+0yFWVhWVd9JvAkWtMmD
+=lvtc
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/geant/files/geant-4.9.3-zlib.patch b/sci-physics/geant/files/geant-4.9.3-zlib.patch
index 516a4840ae73..f047abdb31cd 100644
--- a/sci-physics/geant/files/geant-4.9.3-zlib.patch
+++ b/sci-physics/geant/files/geant-4.9.3-zlib.patch
@@ -1,7 +1,5 @@
-diff --git a/config/binmake.gmk b/config/binmake.gmk
-index 75bbaf2..c31ed3d 100644
---- a/config/binmake.gmk
-+++ b/config/binmake.gmk
+--- config/binmake.gmk.orig
++++ config/binmake.gmk
 @@ -234,7 +234,7 @@ ifdef GLOBALLIBS
               -lG4intercoms \
               -lG4global
@@ -12,3 +10,18 @@ index 75bbaf2..c31ed3d 100644
    endif
  
 
+--- config/architecture.gmk.orig	2011-01-16 00:22:05.976079082 +0000
++++ config/architecture.gmk	2011-01-16 00:23:18.346082379 +0000
+@@ -214,8 +214,10 @@
+ else
+   LDFLAGS   += -L$(CLHEP_LIB_DIR)
+   LOADLIBS  := -l$(CLHEP_LIB) -lm
+-  ifndef G4LIB_USE_ZLIB
+-    LOADLIBS += -lz
++  ifdef G4LIB_USE_ZLIB
++    ifndef G4LIB_BUILD_ZLIB
++      LOADLIBS += -lz
++    endif
+   endif
+ endif
+ 
diff --git a/sci-physics/geant/files/geant-4.9.4-datadir.patch b/sci-physics/geant/files/geant-4.9.4-datadir.patch
new file mode 100644
index 000000000000..c691d90e8ce4
--- /dev/null
+++ b/sci-physics/geant/files/geant-4.9.4-datadir.patch
@@ -0,0 +1,43 @@
+--- cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake.orig	2011-01-22 00:49:11.096082056 +0000
++++ cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake	2011-01-22 00:53:04.746078920 +0000
+@@ -74,9 +74,9 @@
+ # Construct backward compatible variables
+ #
+ set(G4SYSTEM  "${GEANT4_SYSTEM}-${GEANT4_COMPILER}")
+-set(G4INSTALL ${GEANT4_DATADIR}/geant4-${geant4_VERSION})
++set(G4INSTALL ${GEANT4_DATADIR}/geant4)
+ set(G4INCLUDE ${GEANT4_INCLUDEDIR}/geant4)
+-set(G4LIB     ${GEANT4_LIBDIR}/geant4-${geant4_VERSION})
++set(G4LIB     ${GEANT4_LIBDIR}/geant4)
+ 
+ message(STATUS "Geant4 backwards compatible variable G4SYSTEM : ${G4SYSTEM}")
+ message(STATUS "Geant4 backwards compatible variable G4INSTALL: ${G4INSTALL}")
+@@ -125,7 +125,7 @@
+     # Install targets
+     # toolchain
+     install(DIRECTORY config
+-        DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION}
++        DESTINATION ${GEANT4_DATAROOTDIR}/geant4
+         FILES_MATCHING PATTERN "*.gmk"
+         PATTERN "CVS" EXCLUDE
+         PATTERN "scripts/" EXCLUDE)
+@@ -134,16 +134,16 @@
+     install(FILES
+         ${CMAKE_BINARY_DIR}/outputs/runtime/geant4-${geant4_VERSION}.sh
+         ${CMAKE_BINARY_DIR}/outputs/runtime/geant4-${geant4_VERSION}.csh
+-        DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION}/config
++        DESTINATION ${GEANT4_DATAROOTDIR}/geant4/config
+         PERMISSIONS 
+             OWNER_READ OWNER_WRITE OWNER_EXECUTE
+             GROUP_READ GROUP_EXECUTE
+             WORLD_READ WORLD_EXECUTE)
+ 
+     # compatibility softlink to library directory
+-    install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E make_directory \$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4-${geant4_VERSION})")
++    install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E make_directory \$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4)")
+ 
+-    install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink .. ${GEANT4_SYSTEM}-${GEANT4_COMPILER} WORKING_DIRECTORY \$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4-${geant4_VERSION})")
++    install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink .. ${GEANT4_SYSTEM}-${GEANT4_COMPILER} WORKING_DIRECTORY \$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4)")
+ 
+ endif()
+ 
diff --git a/sci-physics/geant/files/geant-4.9.4-libdir.patch b/sci-physics/geant/files/geant-4.9.4-libdir.patch
new file mode 100644
index 000000000000..8934f73acfe9
--- /dev/null
+++ b/sci-physics/geant/files/geant-4.9.4-libdir.patch
@@ -0,0 +1,35 @@
+--- CMakeLists.txt.orig	2011-01-17 06:25:14.536078940 +0000
++++ CMakeLists.txt	2011-01-21 23:50:53.406082074 +0000
+@@ -195,7 +195,7 @@
+ set(GEANT4_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set(GEANT4_EXEC_PREFIX ${GEANT4_PREFIX})
+ set(GEANT4_BINDIR ${GEANT4_EXEC_PREFIX}/bin)
+-set(GEANT4_LIBDIR ${GEANT4_PREFIX}/lib)
++set(GEANT4_LIBDIR ${GEANT4_PREFIX}/lib${LIB_SUFFIX})
+ set(GEANT4_DATAROOTDIR ${GEANT4_PREFIX}/share)
+ set(GEANT4_DATADIR ${GEANT4_DATAROOTDIR})
+ set(GEANT4_INCLUDEDIR ${GEANT4_PREFIX}/include)
+--- cmake/Modules/Geant4MacroLibraryTargets.cmake.orig	2011-01-21 23:36:09.356079013 +0000
++++ cmake/Modules/Geant4MacroLibraryTargets.cmake	2011-01-21 23:49:49.826082339 +0000
+@@ -35,8 +35,8 @@
+         # NEEDS WORK TO REMOVE HARDCODED LIB/BIN DIR
+         install(TARGETS ${G4LIBTARGET_NAME}
+             RUNTIME DESTINATION bin
+-            LIBRARY DESTINATION lib
+-            ARCHIVE DESTINATION lib)
++            LIBRARY DESTINATION lib${LIB_SUFFIX}
++            ARCHIVE DESTINATION lib${LIB_SUFFIX})
+     endif()
+ 
+     #
+@@ -59,8 +59,8 @@
+ 
+         install(TARGETS ${G4LIBTARGET_NAME}-static
+         	RUNTIME DESTINATION bin
+-	        LIBRARY DESTINATION lib
+-        	ARCHIVE DESTINATION lib)
++	        LIBRARY DESTINATION lib${LIB_SUFFIX}
++        	ARCHIVE DESTINATION lib${LIB_SUFFIX})
+     endif()
+ ENDMACRO()
+ 
diff --git a/sci-physics/geant/files/geant-4.9.4-no-benchmarks.patch b/sci-physics/geant/files/geant-4.9.4-no-benchmarks.patch
new file mode 100644
index 000000000000..8c9d47707ac4
--- /dev/null
+++ b/sci-physics/geant/files/geant-4.9.4-no-benchmarks.patch
@@ -0,0 +1,10 @@
+--- source/geometry/CMakeLists.txt.orig	2011-01-17 05:09:38.046080303 +0000
++++ source/geometry/CMakeLists.txt	2011-01-17 05:09:59.636215548 +0000
+@@ -12,7 +12,6 @@
+ #
+ #------------------------------------------------------------------------------
+ 
+-add_subdirectory(benchmarks)
+ add_subdirectory(biasing)
+ add_subdirectory(divisions)
+ add_subdirectory(magneticfield)
diff --git a/sci-physics/geant/files/geant-4.9.4-no-examples.patch b/sci-physics/geant/files/geant-4.9.4-no-examples.patch
new file mode 100644
index 000000000000..6db7b3f9017d
--- /dev/null
+++ b/sci-physics/geant/files/geant-4.9.4-no-examples.patch
@@ -0,0 +1,15 @@
+--- CMakeLists.txt.orig	2011-01-22 01:47:07.000000000 +0000
++++ CMakeLists.txt	2011-01-22 02:00:58.676084146 +0000
+@@ -209,9 +209,9 @@
+ # Install any extra files needed such as documentation and legacy Makefiles
+ #
+ # User example code
+-install(DIRECTORY examples
+-    DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION}
+-    PATTERN "CVS" EXCLUDE)
++#install(DIRECTORY examples
++#    DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION}
++#    PATTERN "CVS" EXCLUDE)
+ 
+ 
+ #
diff --git a/sci-physics/geant/files/geant-4.9.4-zlib.patch b/sci-physics/geant/files/geant-4.9.4-zlib.patch
new file mode 100644
index 000000000000..faa850e214ae
--- /dev/null
+++ b/sci-physics/geant/files/geant-4.9.4-zlib.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2011-01-17 06:25:14.536078940 +0000
++++ CMakeLists.txt	2011-01-17 06:25:26.166078780 +0000
+@@ -154,7 +154,7 @@
+ #------------------------------------------------------------------------------
+ # Optional use of system zlib library
+ #
+-#option(GEANT4_USE_SYSTEM_ZLIB "Use the system's zlib library" OFF)
++option(GEANT4_USE_SYSTEM_ZLIB "Use the system's zlib library" OFF)
+ if(GEANT4_USE_SYSTEM_ZLIB)
+     # This needs more work - use ITK's way of doing it as an example.
+     find_package(ZLIB)
diff --git a/sci-physics/geant/geant-4.9.2_p02.ebuild b/sci-physics/geant/geant-4.9.2_p02.ebuild
index 95b922091a7b..7e40b6bd237f 100644
--- a/sci-physics/geant/geant-4.9.2_p02.ebuild
+++ b/sci-physics/geant/geant-4.9.2_p02.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.2_p02.ebuild,v 1.9 2010/10/10 21:54:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.2_p02.ebuild,v 1.10 2011/01/22 02:28:43 bicatali Exp $
 
 EAPI=2
 
diff --git a/sci-physics/geant/geant-4.9.3_p02-r1.ebuild b/sci-physics/geant/geant-4.9.3_p02-r1.ebuild
index c668f33507c2..c9e884933ed5 100644
--- a/sci-physics/geant/geant-4.9.3_p02-r1.ebuild
+++ b/sci-physics/geant/geant-4.9.3_p02-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.3_p02-r1.ebuild,v 1.1 2010/11/07 21:06:38 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.3_p02-r1.ebuild,v 1.2 2011/01/22 02:28:43 bicatali Exp $
 
-EAPI=2
+EAPI=3
 
 inherit eutils versionator toolchain-funcs
 
@@ -95,15 +95,15 @@ src_prepare() {
 }
 
 src_configure() {
-	export GEANT4_DIR="/usr/share/${PN}${PV1}"
+	export GEANT4_DIR="${EPREFIX}/usr/share/${PN}${PV1}"
 	# where to put compiled libraries;
 	# we set env var G4LIB in src_install()
 	# to avoid confusing make
-	export GEANT4_LIBDIR=/usr/$(get_libdir)/${PN}${PV1}
+	export GEANT4_LIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}${PV1}"
 	export G4INSTALL="${S}"
 	export G4WORKDIR="${S}"
-	export G4INCLUDE="${D}/usr/include/${PN}"
-	export CLHEP_BASE_DIR=/usr
+	export G4INCLUDE="${ED}/usr/include/${PN}"
+	export CLHEP_BASE_DIR="${EPREFIX}/usr"
 
 	# parse USE; just set flags of drivers to build, G4*_USE_* vars are set
 	# later automatically for G4*_BUILD_*_DRIVER
@@ -114,11 +114,14 @@ src_configure() {
 	use athena              && export G4UI_BUILD_XAW_SESSION=y
 	if use qt4; then
 		export G4UI_BUILD_QT_SESSION=y
-		export QTLIBS="-L/usr/$(get_libdir)/qt4 -lQtCore -lQtGui"
-		export QTFLAGS="-I/usr/include/qt4 -I/usr/include/qt4/Qt"
-		use opengl && \
+		export G4UI_USE_QT=1
+		export QTLIBS="-L${EPREFIX}/usr/$(get_libdir)/qt4 -lQtCore -lQtGui"
+		export QTFLAGS="-I${EPREFIX}/usr/include/qt4 -I${EPREFIX}/usr/include/qt4/Qt"
+		if use opengl; then
 			export GLQTLIBS="${QTLIBS} -lQtOpenGL"
-		#export QTFLAGS="${QTFLAGS} -I/usr/include/qt4/QtOpenGL"
+			export G4VIS_USE_OPENGLQT=1
+			export G4VIS_BUILD_OPENGLQT_DRIVER=y
+		fi
 	fi
 	use dawn                && export G4VIS_BUILD_DAWN_DRIVER=y
 	use raytracerx          && export G4VIS_BUILD_RAYTRACERX_DRIVER=y
@@ -167,8 +170,7 @@ g4_create_env_script() {
 	# from make during the compile
 	export G4INSTALL=${GEANT4_DIR}
 	export G4LIB=${GEANT4_LIBDIR}
-	export G4INCLUDE=${G4INCLUDE/${D}/}
-	export G4WORKDIR=\${HOME}/${PN}${PV1}
+	export G4INCLUDE=${G4INCLUDE/${ED}/}
 
 	local g4env=99${PN}${PV1}
 	cat <<-EOF > ${g4env}
@@ -188,11 +190,12 @@ g4_create_env_script() {
 			G4ABLADATA G4NEUTRONHPCROSSSECTIONS G4REALSURFACEDATA
 	fi
 
-	# read env variables defined upto now
+	# read env variables defined up to now
 	printenv | grep ^G4 | uniq >> ${g4env}
 	# define env vars for capabilities we can build into user projects
 	printenv | uniq | \
 		sed -n -e '/^G4/s:BUILD\(.*\)_DRIVER:USE\1:gp' >> ${g4env}
+	sed -i -e '/G4WORKDIR/d' ${g4env}
 	doenvd ${g4env} || die "Installing environment scripts failed "
 }
 
@@ -246,9 +249,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Geant4 projects are by default build in \$HOME/geant4."
-	elog "If you want to change, set \$G4WORKDIR to another directory."
-
-	elog "To use Aida you have to explicitly set G4ANALYSIS_USE=y for"
+	elog "Users need to define the G4WORKDIR (\$HOME/geant4 is normally used)."
+	elog "To use AIDA you have to explicitly set G4ANALYSIS_USE=y in"
 	elog "your environment."
 }
diff --git a/sci-physics/geant/geant-4.9.4.ebuild b/sci-physics/geant/geant-4.9.4.ebuild
new file mode 100644
index 000000000000..e42d2cff05a8
--- /dev/null
+++ b/sci-physics/geant/geant-4.9.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.4.ebuild,v 1.1 2011/01/22 02:28:43 bicatali Exp $
+
+EAPI=3
+
+inherit cmake-utils versionator eutils
+
+PV1=$(get_version_component_range 1 ${PV})
+PV2=$(get_version_component_range 2 ${PV})
+PV3=$(get_version_component_range 3 ${PV})
+
+MYP=${PN}$(replace_version_separator 3 .)
+
+DESCRIPTION="Toolkit for simulation of passage of particles through matter"
+HOMEPAGE="http://geant4.cern.ch/"
+
+SRC_COM="http://geant4.cern.ch/support/source"
+SRC_URI="${SRC_COM}/${MYP}.tar.gz"
+GEANT4_DATA="G4NDL.3.14
+	G4EMLOW.6.19
+	G4RadioactiveDecay.3.3
+	G4NEUTRONXS.1.0
+	G4PII.1.2
+	G4PhotonEvaporation.2.1
+	G4ABLA.3.0
+	RealSurface.1.0"
+for d in ${GEANT4_DATA}; do
+	SRC_URI="${SRC_URI} data? ( ${SRC_COM}/${d}.tar.gz )"
+done
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="+data dawn examples gdml geant3 granular qt4 static-libs vrml zlib"
+
+RDEPEND=">=sci-physics/clhep-2.1
+	qt4? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 )
+	gdml? ( dev-libs/xerces-c )
+	geant3? ( sci-physics/geant:3 )
+	dawn? ( media-gfx/dawn )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=( "${FILESDIR}"/${P}-{no-benchmarks,zlib,libdir,datadir,no-examples}.patch )
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_enable dawn GEANT4_USE_NETWORKDAWN)
+		$(cmake-utils_use_enable gdml GEANT4_USE_GDML)
+		$(cmake-utils_use_enable geant3 GEANT4_USE_GEANT3TOGEANT4)
+		$(cmake-utils_use_enable granular GEANT4_BUILD_GRANULAR_BUILD)
+		$(cmake-utils_use_enable dawn GEANT4_USE_NETWORKVRML)
+		$(cmake-utils_use_enable qt4 GEANT4_USE_QT)
+		$(cmake-utils_use_enable zlib GEANT4_USE_SYSTEM_ZLIB)
+		$(cmake-utils_use_build static-libs STATIC_LIBS)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use data; then
+		einfo "Installing Geant4 data"
+		insinto /usr/share/geant4/data
+		pushd "${WORKDIR}" > /dev/null
+		for d in ${GEANT4_DATA}; do
+			local p=${d/.}
+			doins -r *${p/G4} || die "installing data ${d} failed"
+		done
+		popd > /dev/null
+	fi
+
+	insinto /usr/share/doc/${PF}
+	local mypv="${PV1}.${PV2}.${PV3}"
+	doins ReleaseNotes/ReleaseNotes${mypv}.html
+	[[ -e ReleaseNotes/Patch${mypv}-1.txt ]] && \
+		dodoc ReleaseNotes/Patch${mypv}-*.txt
+	use examples && doins -r examples
+}
+
+pkg_postinst() {
+	elog "Users need to define the G4WORKDIR (\$HOME/geant4 is normally used)."
+}
diff --git a/sci-physics/geant/metadata.xml b/sci-physics/geant/metadata.xml
index e546f4c90854..bd76f546c4b1 100644
--- a/sci-physics/geant/metadata.xml
+++ b/sci-physics/geant/metadata.xml
@@ -21,6 +21,7 @@
   <flag name='geant3'>Add compatibility for geant321 to geant4</flag>
   <flag name='global'>Produce a huge global library instead of small
   ones</flag>
+  <flag name='granular'>Produce many small libraries instead of global ones</flag>
   <flag name='aida'>Add support for Abstract Interfaces for Data Analysis </flag>
   <flag name='openinventor'>Add support for <pkg>media-libs/openinventor</pkg>
     SGI toolkit</flag>