updated to 10.2.0

4 files changed, 39 insertions, 96 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2b537d854a8..e6f923d9a8a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Wed Dec  9 19:48:54 UTC 2015
 pkgbase = geant4
 	pkgdesc = A simulation toolkit for particle physics interactions.
-	pkgver = 10.01.02
+	pkgver = 10.2.0
 	pkgrel = 1
 	url = http://geant4.cern.ch/
 	install = geant4.install
@@ -35,11 +37,11 @@ pkgbase = geant4
 	depends = glu
 	depends = soxt
 	depends = mesa
-	depends = clhep
 	optdepends = java-environment: for histogram visualizations and analysis
 	optdepends = tcsh: for C Shell support
 	optdepends = python: for G4Python support
 	optdepends = geant4-abladata: Data files for nuclear shell effects in INCL/ABLA hadronic mode
+	optdepends = geant4-ensdfstatedata: Nuclei properties from the Evaluated Nuclear Structure Data Files
 	optdepends = geant4-ledata: Data files for low energy electromagnetic processes
 	optdepends = geant4-levelgammadata: Data files for photon evaporation
 	optdepends = geant4-neutronhpdata: Neutron data files with thermal cross sections
@@ -50,12 +52,10 @@ pkgbase = geant4
 	optdepends = geant4-saiddata: Data files from evaluated cross-sections in SAID data-base
 	replaces = geant4-deb
 	options = !emptydirs
-	source = http://geant4.cern.ch/support/source/geant4.10.01.p02.tar.gz
-	source = Geant4InterfaceOptions.patch
+	source = http://geant4.cern.ch/support/source/geant4.10.02.tar.gz
 	source = geant4.install
-	md5sums = 6a7c088f684262d9f792dcaaf1cd55d1
-	md5sums = cc428f31958c6e036cb01c0220b3fd83
-	md5sums = c3652d79011cd3fab2e1081e22f9f513
+	md5sums = ce96232e6301562f483e0409a1079541
+	md5sums = 8b7f137c5f36006a8589d717059b5464
 
 pkgname = geant4
 
diff --git a/Geant4InterfaceOptions.patch b/Geant4InterfaceOptions.patch
deleted file mode 100644
index 5480f870dc7c..000000000000
--- a/Geant4InterfaceOptions.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/geant4.10.00.p02/cmake/Modules/Geant4InterfaceOptions.cmake	2014-06-19 11:56:29.000000000 +0200
-+++ Geant4InterfaceOptions.cmake	2014-10-26 19:04:58.407396452 +0100
-@@ -88,29 +88,29 @@
-   find_package(Qt5OpenGL QUIET)
-   find_package(Qt5PrintSupport QUIET)
- 
--  if(Qt5Core_FOUND
--      AND Qt5Gui_FOUND
--      AND Qt5Widgets_FOUND
--      AND Qt5OpenGL_FOUND
--      AND Qt5PrintSupport_FOUND)
--    # Compatibility
--    macro(qt4_wrap_cpp)
--      qt5_wrap_cpp(${ARGN})
--    endmacro()
--    set(Qt5_USE_FILE_IN "${PROJECT_SOURCE_DIR}/cmake/Templates/Geant4UseQt5.cmake.in")
--    set(QT_USE_FILE "${PROJECT_BINARY_DIR}/Geant4UseQt5.cmake")
--    configure_file("${Qt5_USE_FILE_IN}" "${QT_USE_FILE}" @ONLY)
--    get_target_property(QT_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} IMPORTED_LOCATION)
--    set(G4QTLIBLIST "-lQt5PrintSupport -lQt5Widgets -lQt5Gui -lQt5Core")
--    set(G4GLQTLIBLIST "-lQt5OpenGL ${G4QTLIBLIST}")
--  else()
-+#  if(Qt5Core_FOUND
-+#      AND Qt5Gui_FOUND
-+#      AND Qt5Widgets_FOUND
-+#      AND Qt5OpenGL_FOUND
-+#      AND Qt5PrintSupport_FOUND)
-+#    # Compatibility
-+#    macro(qt4_wrap_cpp)
-+#      qt5_wrap_cpp(${ARGN})
-+#    endmacro()
-+#    set(Qt5_USE_FILE_IN "${PROJECT_SOURCE_DIR}/cmake/Templates/Geant4UseQt5.cmake.in")
-+#    set(QT_USE_FILE "${PROJECT_BINARY_DIR}/Geant4UseQt5.cmake")
-+#    configure_file("${Qt5_USE_FILE_IN}" "${QT_USE_FILE}" @ONLY)
-+#    get_target_property(QT_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} IMPORTED_LOCATION)
-+#    set(G4QTLIBLIST "-lQt5PrintSupport -lQt5Widgets -lQt5Gui -lQt5Core")
-+#    set(G4GLQTLIBLIST "-lQt5OpenGL ${G4QTLIBLIST}")
-+#  else()
-     unset(Qt5Core_DIR CACHE)
-     unset(Qt5Gui_DIR CACHE)
-     unset(Qt5Widgets_DIR CACHE)
-     unset(Qt5OpenGL_DIR CACHE)
-     unset(Qt5PrintSupport_DIR CACHE)
-     find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui QtOpenGL)
--  endif()
-+#  endif()
- 
-   find_package(OpenGL REQUIRED)
- 
diff --git a/PKGBUILD b/PKGBUILD
index 94f9f0757754..3635856c0880 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Luis Sarmiento < Luis.Sarmiento-ala-nuclear.lu.se >
 pkgname='geant4'
-pkgver=10.01.02
-_pkgver=10.01.p02
+pkgver=10.2.0
+_pkgver=10.02
 pkgrel=1
 pkgdesc="A simulation toolkit for particle physics interactions."
 depends=('cmake>=2.8.2'
@@ -33,13 +33,14 @@ depends=('cmake>=2.8.2'
          'glu'
          'soxt'
          'mesa'
-         'clhep')
+        )
 replaces=('geant4-deb')
 optdepends=('java-environment: for histogram visualizations and
 analysis'
   'tcsh: for C Shell support'
   'python: for G4Python support'
   'geant4-abladata: Data files for nuclear shell effects in INCL/ABLA hadronic mode'
+  'geant4-ensdfstatedata: Nuclei properties from the Evaluated Nuclear Structure Data Files'
   'geant4-ledata: Data files for low energy electromagnetic processes'
   'geant4-levelgammadata: Data files for photon evaporation'
   'geant4-neutronhpdata: Neutron data files with thermal cross sections'
@@ -54,52 +55,41 @@ license=('custom: http://geant4.cern.ch/license/')
 options=('!emptydirs')
 install="${pkgname}.install"
 source=("http://geant4.cern.ch/support/source/${pkgname}.${_pkgver}.tar.gz"
-  "Geant4InterfaceOptions.patch"
   "${pkgname}.install")
-md5sums=('6a7c088f684262d9f792dcaaf1cd55d1'
-         'cc428f31958c6e036cb01c0220b3fd83'
-         'c3652d79011cd3fab2e1081e22f9f513')
+md5sums=('ce96232e6301562f483e0409a1079541'
+         '8b7f137c5f36006a8589d717059b5464')
 
 ## Remove this if you want to keep an even smaller package
 ## No need to wait for compression when just installing it.
 PKGEXT='.pkg.tar'
 
-prepare() {
-  cd ${srcdir}/${pkgname}.${_pkgver}/cmake/Modules/
-#  patch -Np1 Geant4InterfaceOptions.cmake < ${srcdir}/Geant4InterfaceOptions.patch
-}
-
-## Geant4 Build Options
-## http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides/InstallationGuide/html/ch02s03.html
-
 build() {
   [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
   cd ${srcdir}/build
   env -i \
     QT_SELECT=5 \
     PATH=/usr/bin \
-    cmake -Wno-dev \
-    -DCMAKE_BUILD_TYPE=Release \
+    cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DGEANT4_BUILD_MULTITHREADED=ON \
+    -DGEANT4_INSTALL_DATA=OFF \
     -DGEANT4_USE_GDML=ON \
     -DGEANT4_USE_G3TOG4=ON \
     -DGEANT4_USE_QT=ON \
     -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 \
     -DGEANT4_USE_XM=ON \
-    -DGEANT4_BUILD_MULTITHREADED=ON \
-    -DGEANT4_USE_SYSTEM_CLHEP=ON \
     -DGEANT4_USE_OPENGL_X11=ON \
     -DGEANT4_USE_INVENTOR=ON \
     -DGEANT4_USE_RAYTRACER_X11=ON \
+    -DGEANT4_USE_SYSTEM_CLHEP=OFF \
     -DGEANT4_USE_SYSTEM_EXPAT=ON \
     -DGEANT4_USE_SYSTEM_ZLIB=ON \
+    -DCMAKE_INSTALL_LIBDIR=lib \
     ../${pkgname}.${_pkgver}
 
   make
 
-  ##  -DGEANT4_BUILD_CXXSTD=c++11 \
-  ## this presents issues with some random number generation routines.
 }
 
 package() {
@@ -111,15 +101,16 @@ package() {
 
   msg "Removing wrongly set environment variables"
 
-  variables=("G4LEDATA" \
-    "G4LEVELGAMMADATA" \
-    "G4NEUTRONHPDATA" \
-    "G4NEUTRONXSDATA" \
-    "G4PIIDATA" \
-    "G4RADIOACTIVEDATA" \
-    "G4REALSURFACEDATA" \
-    "G4SAIDXSDATA" \
-    "G4ABLADATA" )
+  variables=("G4NEUTRONHPDATA" \
+                 "G4LEDATA" \
+                 "G4LEVELGAMMADATA" \
+                 "G4RADIOACTIVEDATA" \
+                 "G4NEUTRONXSDATA" \
+                 "G4PIIDATA" \
+                 "G4REALSURFACEDATA" \
+                 "G4SAIDXSDATA" \
+                 "G4ABLADATA" \
+                 "G4ENSDFSTATEDATA")
 
   for _varname in ${variables[*]}
   do
diff --git a/geant4.install b/geant4.install
index 970c6c17090f..2b7a5d249d8d 100644
--- a/geant4.install
+++ b/geant4.install
@@ -1,15 +1,16 @@
 #!/bin/sh
 
 _init() {
-  variables=("G4LEDATA" \
-    "G4LEVELGAMMADATA" \
-    "G4NEUTRONHPDATA" \
-    "G4NEUTRONXSDATA" \
-    "G4PIIDATA" \
-    "G4RADIOACTIVEDATA" \
-    "G4REALSURFACEDATA" \
-    "G4SAIDXSDATA" \
-    "G4ABLADATA" )
+    variables=("G4NEUTRONHPDATA" \
+                   "G4LEDATA" \
+                   "G4LEVELGAMMADATA" \
+                   "G4RADIOACTIVEDATA" \
+                   "G4NEUTRONXSDATA" \
+                   "G4PIIDATA" \
+                   "G4REALSURFACEDATA" \
+                   "G4SAIDXSDATA" \
+                   "G4ABLADATA" \
+                   "G4ENSDFSTATEDATA")
 
 shell=("sh" "csh")