[gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/files/

[Michael Palimaka]

commit:     22ba0cc48b625e4b886f73d784e582653a687e9d
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Aug 20 12:59:10 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep  2 14:35:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22ba0cc4

sci-physics/geant: remove unused patches

 sci-physics/geant/files/geant-4.9.4-datadir.patch  | 43 ----------------------
 sci-physics/geant/files/geant-4.9.4-libdir.patch   | 35 ------------------
 .../geant/files/geant-4.9.4-trajectory.patch       | 11 ------
 3 files changed, 89 deletions(-)

diff --git a/sci-physics/geant/files/geant-4.9.4-datadir.patch b/sci-physics/geant/files/geant-4.9.4-datadir.patch
deleted file mode 100644
index c691d90e8ce..00000000000
--- a/sci-physics/geant/files/geant-4.9.4-datadir.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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
deleted file mode 100644
index 8934f73acfe..00000000000
--- a/sci-physics/geant/files/geant-4.9.4-libdir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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-trajectory.patch b/sci-physics/geant/files/geant-4.9.4-trajectory.patch
deleted file mode 100644
index df45ae234e5..00000000000
--- a/sci-physics/geant/files/geant-4.9.4-trajectory.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2011-04-28 01:19:54.232041312 +0200
-+++ CMakeLists.txt	2011-04-28 01:15:11.434101391 +0200
-@@ -43,6 +43,8 @@
- set(${PROJECT_NAME}_VERSION_MINOR "4")
- set(${PROJECT_NAME}_VERSION_PATCH "1")
- 
-+add_definitions(-DG4_STORE_TRAJECTORY)
-+
- #------------------------------------------------------------------------------
- # Set up path to internal set of CMake modules.
- #