commit: 569ec06ad3eca64cf5b7dfe2cb1c7a4fe00a47d4
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 12:45:55 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 12:45:55 2022 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=569ec06a
sci-physics/opticks: remove package
This is a mess, and needs a bump
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
profiles/package.mask | 5 --
.../opticks/files/opticks-0.0.1_cuda-helper.patch | 13 -----
.../opticks/files/opticks-0.0.1_extG4-CLHEP.patch | 20 --------
.../opticks/files/opticks-0.0.1_nvcc-flags.patch | 12 -----
.../opticks/files/opticks-0.0.1_okconf.patch | 45 -----------------
.../files/opticks-0.0.1_python-helper.patch | 48 ------------------
.../opticks/files/opticks-0.0.1_split-cmake.patch | 29 -----------
sci-physics/opticks/metadata.xml | 7 ---
...0.0.1_p20191110.ebuild => opticks-0.1.6.ebuild} | 58 +++++++++++-----------
9 files changed, 28 insertions(+), 209 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index 97bf66dcd..0063312a2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,11 +30,6 @@
#--- END OF EXAMPLES ---
-# Andrew Ammerlaan <andrewammerl...@gentoo.org> (26 Dec 2021)
-# cuda-10 is being removed from ::gentoo, mask revdeps in ::sci
-# for removal too. Removal in 90 days
-sci-physics/opticks
-
# Andrew Ammerlaan <andrewammerl...@gentoo.org (11 Jan 2022)
# Last-rite scilab in favour of scilab-bin. Scilab's java dependencies make
# a from-source ebuild very difficult since portage doesn't support gradle or
diff --git a/sci-physics/opticks/files/opticks-0.0.1_cuda-helper.patch
b/sci-physics/opticks/files/opticks-0.0.1_cuda-helper.patch
deleted file mode 100644
index 8893fb279..000000000
--- a/sci-physics/opticks/files/opticks-0.0.1_cuda-helper.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: opticks-0.0.1_p20191110/cmake/Modules/FindOpticksCUDA.cmake
-===================================================================
---- opticks-0.0.1_p20191110.orig/cmake/Modules/FindOpticksCUDA.cmake
-+++ opticks-0.0.1_p20191110/cmake/Modules/FindOpticksCUDA.cmake
-@@ -52,7 +52,7 @@ if(OpticksCUDA_FOUND)
- HELPER_CUDA_INCLUDE_DIR
- NAMES "helper_cuda.h"
- PATHS
-- "${CUDA_TOOLKIT_ROOT_DIR}/samples/common/inc"
-+ "${CUDA_TOOLKIT_ROOT_DIR}/sdk/common/inc"
-
"${CMAKE_CURRENT_LIST_DIR}/include/helper_cuda_fallback/${CUDA_VERSION}"
- )
- if(HELPER_CUDA_INCLUDE_DIR)
diff --git a/sci-physics/opticks/files/opticks-0.0.1_extG4-CLHEP.patch
b/sci-physics/opticks/files/opticks-0.0.1_extG4-CLHEP.patch
deleted file mode 100644
index 9df5373d4..000000000
--- a/sci-physics/opticks/files/opticks-0.0.1_extG4-CLHEP.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: opticks-0.0.1_p20191110/extg4/CMakeLists.txt
-===================================================================
---- opticks-0.0.1_p20191110.orig/extg4/CMakeLists.txt
-+++ opticks-0.0.1_p20191110/extg4/CMakeLists.txt
-@@ -27,6 +27,7 @@ very focussed converter classes.
-
- set(G4_VERBOSE ON)
- find_package(G4 REQUIRED MODULE)
-+find_package(CLHEP REQUIRED)
- find_package(GGeo REQUIRED CONFIG)
-
- # just for X4GDMLWrite
-@@ -143,6 +144,7 @@ set(HEADERS
- add_library( ${name} SHARED ${SOURCES} ${HEADERS} )
- target_link_libraries( ${name} PUBLIC
- Opticks::G4
-+ CLHEP
- Opticks::GGeo
- Opticks::OpticksXercesC
- )
diff --git a/sci-physics/opticks/files/opticks-0.0.1_nvcc-flags.patch
b/sci-physics/opticks/files/opticks-0.0.1_nvcc-flags.patch
deleted file mode 100644
index 4360da18b..000000000
--- a/sci-physics/opticks/files/opticks-0.0.1_nvcc-flags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: opticks-0.0.1_p20191110/cmake/Modules/OpticksCUDAFlags.cmake
-===================================================================
---- opticks-0.0.1_p20191110.orig/cmake/Modules/OpticksCUDAFlags.cmake
-+++ opticks-0.0.1_p20191110/cmake/Modules/OpticksCUDAFlags.cmake
-@@ -18,6 +18,7 @@ if(NOT (COMPUTE_CAPABILITY LESS 30))
- list(APPEND CUDA_NVCC_FLAGS "-O2")
- #list(APPEND CUDA_NVCC_FLAGS "-DVERBOSE")
- list(APPEND CUDA_NVCC_FLAGS "--use_fast_math")
-+ list(APPEND CUDA_NVCC_FLAGS $ENV{NVCCFLAGS})
-
- #list(APPEND CUDA_NVCC_FLAGS "-m64")
- #list(APPEND CUDA_NVCC_FLAGS "--disable-warnings")
diff --git a/sci-physics/opticks/files/opticks-0.0.1_okconf.patch
b/sci-physics/opticks/files/opticks-0.0.1_okconf.patch
deleted file mode 100644
index 58cedbf06..000000000
--- a/sci-physics/opticks/files/opticks-0.0.1_okconf.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: opticks-0.0.1_p20191110/cmake/Modules/OpticksBuildOptions.cmake
-===================================================================
---- opticks-0.0.1_p20191110.orig/cmake/Modules/OpticksBuildOptions.cmake
-+++ opticks-0.0.1_p20191110/cmake/Modules/OpticksBuildOptions.cmake
-@@ -26,7 +26,7 @@ RPATH setup docs
-
- #]=]
-
--
-+find_package(okconf REQUIRED CONFIG)
- #message(STATUS "OpticksBuildOptions.cmake Configuring ${name}")
- message(STATUS "Configuring ${name}")
-
-@@ -92,31 +92,6 @@ set(BUILD_SHARED_LIBS ON)
- # to check the RPATH of a library or executable use chrpath on it, eg:
chrpath $(which OKTest)
- #
-
--
--if(UNIX AND NOT APPLE)
-- if(CMAKE_INSTALL_PREFIX STREQUAL ${OPTICKS_PREFIX})
-- set(CMAKE_INSTALL_RPATH
"$ORIGIN/../lib64:$ORIGIN/../externals/lib:$ORIGIN/../externals/lib64:$ORIGIN/../externals/OptiX/lib64")
-- else()
-- message(STATUS " Below two strings differ : forced to use absolute
RPATH ")
-- message(STATUS " CMAKE_INSTALL_PREFIX : ${CMAKE_INSTALL_PREFIX} ")
-- message(STATUS " OPTICKS_PREFIX : ${OPTICKS_PREFIX} ")
-- set(ABSOLUTE_INSTALL_RPATH
-- ${OPTICKS_PREFIX}/lib64
-- ${OPTICKS_PREFIX}/externals/lib
-- ${OPTICKS_PREFIX}/externals/lib64
-- ${OPTICKS_PREFIX}/externals/OptiX/lib64
-- )
-- set(CMAKE_INSTALL_RPATH "${ABSOLUTE_INSTALL_RPATH}")
-- endif()
--
--elseif(APPLE)
--set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
--endif()
--
--
--
--
--
- include(OpticksCXXFlags)
-
-
diff --git a/sci-physics/opticks/files/opticks-0.0.1_python-helper.patch
b/sci-physics/opticks/files/opticks-0.0.1_python-helper.patch
deleted file mode 100644
index 255e0ee1a..000000000
--- a/sci-physics/opticks/files/opticks-0.0.1_python-helper.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: opticks-0.0.1_p20191110/ana/base.py
-===================================================================
---- opticks-0.0.1_p20191110.orig/ana/base.py
-+++ opticks-0.0.1_p20191110/ana/base.py
-@@ -27,7 +27,7 @@ Mostly Non-numpy basics, just numpy conf
- import numpy as np
- import os, logging, json, ctypes, subprocess, datetime, re
- from collections import OrderedDict as odict
--from opticks.ana.enum import Enum
-+from enum import Enum
-
- log = logging.getLogger(__name__)
-
-Index: opticks-0.0.1_p20191110/ana/OpticksFlags.py
-===================================================================
---- opticks-0.0.1_p20191110.orig/ana/OpticksFlags.py
-+++ opticks-0.0.1_p20191110/ana/OpticksFlags.py
-@@ -7,7 +7,7 @@ Used from optickscore/CMakeLists.txt
-
- """
- import os, re, logging, argparse
--from opticks.ana.base import json_save_
-+from base import json_save_
-
- log = logging.getLogger(__name__)
-
-Index: opticks-0.0.1_p20191110/optickscore/CMakeLists.txt
-===================================================================
---- opticks-0.0.1_p20191110.orig/optickscore/CMakeLists.txt
-+++ opticks-0.0.1_p20191110/optickscore/CMakeLists.txt
-@@ -153,7 +153,7 @@ add_custom_command(
- OUTPUT
- ${PYINI}
- COMMAND
-- enum.py ${HDR} --quiet --inipath ${PYINI}
-+ python2 ${CMAKE_CURRENT_SOURCE_DIR}/../ana/enum.py ${HDR} --quiet
--inipath ${PYINI}
- DEPENDS
- ${HDR}
- )
-@@ -167,7 +167,7 @@ add_custom_command(
- OUTPUT
- ${PYJS}
- COMMAND
-- OpticksFlags.py ${CCFL} --quiet --jsonpath ${PYJS}
-+ python2 ${CMAKE_CURRENT_SOURCE_DIR}/../ana/OpticksFlags.py ${CCFL}
--quiet --jsonpath ${PYJS}
- DEPENDS
- ${CCFL}
- )
diff --git a/sci-physics/opticks/files/opticks-0.0.1_split-cmake.patch
b/sci-physics/opticks/files/opticks-0.0.1_split-cmake.patch
deleted file mode 100644
index 213c6bd3b..000000000
--- a/sci-physics/opticks/files/opticks-0.0.1_split-cmake.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: opticks-0.0.1_p20191110/CMakeLists.txt
-===================================================================
---- opticks-0.0.1_p20191110.orig/CMakeLists.txt
-+++ opticks-0.0.1_p20191110/CMakeLists.txt
-@@ -56,12 +56,11 @@ project(${name} VERSION 0.1.0)
- include(OpticksBuildOptions)
-
- set(INTEGRATED_SUBDIRS
-- okconf
- sysrap
--#[=[
- boostrap
- npy
- optickscore
-+ yoctoglrap
- ggeo
- assimprap
- openmeshrap
-@@ -73,9 +72,9 @@ set(INTEGRATED_SUBDIRS
- oglrap
- opticksgl
- ok
-+ extg4
- cfg4
- okg4
--#]=]
- )
-
-
diff --git a/sci-physics/opticks/metadata.xml b/sci-physics/opticks/metadata.xml
deleted file mode 100644
index 7203fb853..000000000
--- a/sci-physics/opticks/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="person">
- <email>hero...@gentoo.org</email>
- </maintainer>
-</pkgmetadata>
diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
b/sci-physics/opticks/opticks-0.1.6.ebuild
similarity index 64%
rename from sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
rename to sci-physics/opticks/opticks-0.1.6.ebuild
index d89bf2a82..bb2abc665 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.1.6.ebuild
@@ -1,49 +1,49 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake cuda python-any-r1
-
-EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}";
-EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake cuda python-any-r1
DESCRIPTION="GPU Optical Photon Simulation for Particle Physics"
HOMEPAGE="https://simoncblyth.bitbucket.io";
+SRC_URI="https://bitbucket.org/simoncblyth/opticks/get/v${PV}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/simoncblyth-${PN}-b75b5929b6cf"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
-RDEPEND="dev-util/nvidia-cuda-sdk
+RDEPEND="
+ dev-util/nvidia-cuda-toolkit
dev-libs/optix
- media-gfx/openmesh
- media-libs/DualContouringSample
- media-libs/implicitmesher
media-libs/assimp
media-libs/glfw
media-libs/glew:0
media-libs/glm
- media-libs/yocto-gl
media-libs/imgui
- sci-physics/geant[gdml]"
-DEPEND="sci-physics/opticks-okconf
- dev-libs/boost
+ sci-physics/geant[gdml]
+"
+DEPEND="
+ dev-libs/boost:=
dev-util/bcm
dev-util/plog
${PYTHON_DEPS}
- ${RDEPEND}"
-PATCHES=( "${FILESDIR}"/opticks-0.0.1_split-cmake.patch
- "${FILESDIR}"/opticks-0.0.1_okconf.patch
- "${FILESDIR}"/opticks-0.0.1_cuda-helper.patch
- "${FILESDIR}"/opticks-0.0.1_extG4-CLHEP.patch
- "${FILESDIR}"/opticks-0.0.1_python-helper.patch )
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindBoost"
+ ${RDEPEND}
+"
+# PATCHES=(
+# "${FILESDIR}"/opticks-0.0.1_split-cmake.patch
+# "${FILESDIR}"/opticks-0.0.1_okconf.patch
+# "${FILESDIR}"/opticks-0.0.1_cuda-helper.patch
+# "${FILESDIR}"/opticks-0.0.1_extG4-CLHEP.patch
+# "${FILESDIR}"/opticks-0.0.1_python-helper.patch
+# )
+# CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindBoost"
pkg_setup() {
# opticks combined build is not parallel.
- export MAKEOPTS="-j1"
+ #export MAKEOPTS="-j1"
python-any-r1_pkg_setup
}
@@ -59,7 +59,7 @@ src_prepare() {
# do not install the tests
for f in $(find -path '*/tests/CMakeLists.txt'); do
ebegin "Removing installation phrase from ${f}"
- sed '/install(TARGETS/d' -i ${f}
+ sed '/install(TARGETS/d' -i ${f} || die
eend $?
done
# do not install test scripts
@@ -70,28 +70,27 @@ src_prepare() {
-i optixrap/tests/CMakeLists.txt || die
eend $?
ebegin "Removing test scripts installation from
ggeo/tests/CMakeLists.txt"
- sed -e '/install(FILES/,/)/d' -i ggeo/tests/CMakeLists.txt
+ sed -e '/install(FILES/,/)/d' -i ggeo/tests/CMakeLists.txt || die
eend $?
ebegin "Moving glsl into share in oglrap/CMakeLists.txt"
- sed -e "s,gl),share/${PN}/gl)," -i oglrap/CMakeLists.txt
+ sed -e "s,gl),share/${PN}/gl)," -i oglrap/CMakeLists.txt || die
eend $?
ebegin "Removing python bindings from sysrap/CMakeLists.txt"
- sed -e "/py\/opticks\/sysrap/d" -i sysrap/CMakeLists.txt
+ sed -e "/py\/opticks\/sysrap/d" -i sysrap/CMakeLists.txt || die
eend $?
# integrated build OpticksBuildOptions is included at the top
for f in */CMakeLists.txt; do
ebegin "Removing OpticksBuildOptions include from ${f}"
- sed '/OpticksBuildOptions/d' -i ${f}
+ sed '/OpticksBuildOptions/d' -i ${f} || die
eend $?
done
# include/Opticks instead of OpticksCore
sed -e 's,include/OpticksCore,include/Opticks,' -i
optickscore/OpticksFlags.cc \
-i npy/Types.cpp \
- -i ana/base.py \
- -i ana/enum.py
+ -i ana/base.py || die
}
src_configure() {
@@ -102,7 +101,6 @@ src_configure() {
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
-DBoost_NO_BOOST_CMAKE=ON
- --target all
)
cmake_src_configure
}
