[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: f8a6bd0748def334c560e7bb4b2940812c7f55a4
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:47:31 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:47:31 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f8a6bd07

sci-physics/opticks: cmake-utils --> cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 3eabc4848..ce78c4f08 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake-utils cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda flag-o-matic python-any-r1
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -49,7 +49,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
 
# do not add the default '-O2' that results in nvcc error of
# nvcc fatal   : redefinition of argument 'optimize'
@@ -104,5 +104,5 @@ src_configure() {
-DBoost_NO_BOOST_CMAKE=ON
--target all
)
-   cmake-utils_src_configure
+   cmake_src_configure
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 4fdeac4cfeef9247f9b9df389659fc519fe907dd
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:40:36 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:40:50 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4fdeac4c

sci-physics/opticks: depend on sci-physics/opticks-okconf.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 2553f571c..c5fa6efeb 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -25,7 +25,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glfw
media-libs/glew:0
media-libs/glm"
-DEPEND="dev-libs/boost
+DEPEND="sci-physics/opticks-okconf
+   dev-libs/boost
dev-util/bcm
dev-util/plog
${PYTHON_DEPS}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: e6f4c0f069a9e3c38db9ca8b996ac1fce68ed82b
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:55:28 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:55:28 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e6f4c0f0

sci-physics/opticks: depend on media-libs/{yocto-gl,imgui}.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index c5fa6efeb..54ed0e2cf 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -24,7 +24,9 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/assimp
media-libs/glfw
media-libs/glew:0
-   media-libs/glm"
+   media-libs/glm
+   media-libs/yocto-gl
+   media-libs/imgui"
 DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 26064f9eeac998ceee6a0b2f794fdc6788725aa3
Author: Benda Xu  gentoo  org>
AuthorDate: Thu Dec  5 14:43:49 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu Dec  5 14:43:49 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=26064f9e

sci-physics/opticks: depend on sci-physics/geant[gdml].

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 54ed0e2cf..33fe5c4f2 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -26,7 +26,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glew:0
media-libs/glm
media-libs/yocto-gl
-   media-libs/imgui"
+   media-libs/imgui
+   sci-physics/geant[gdml]"
 DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 594bcf521a43878ca3b7f959341c0596a3784c5f
Author: Benda Xu  gentoo  org>
AuthorDate: Sat Dec  7 12:01:00 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Dec  7 12:01:00 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=594bcf52

sci-physics/opticks: do not look for boost cmake.

  In Gentoo, boost is built by bjam and no BoostConfig.cmake is
  provided.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 33fe5c4f2..ef177964f 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -88,7 +88,6 @@ src_prepare() {
done
 }
 
-# om-make-one
 src_configure() {
local mycmakeargs=(
-DCMAKE_MODULE_PATH="${S}"/cmake/Modules
@@ -96,6 +95,7 @@ src_configure() {
-DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
+   -DBoost_NO_BOOST_CMAKE=ON
--target all
)
cmake-utils_src_configure

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: bcd71d86e97d62fd866b0dd42d41d64dfc3ff163
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Mar 16 01:38:33 2020 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon Mar 16 01:38:33 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=bcd71d86

sci-physics/opticks: correct headers directory.

Package-Manager: Portage-2.3.88, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ef177964f..3eabc4848 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -86,6 +86,12 @@ src_prepare() {
sed '/OpticksBuildOptions/d' -i ${f}
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
 }
 
 src_configure() {

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: 1b0be9fca4a8f0a79bf2000b3bb5dd5fef76e7ba
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Dec 16 10:55:15 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Dec 16 10:55:15 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1b0be9fc

sci-physics/opticks: drop UnusedInherits

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ce78c4f08..d89bf2a82 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda python-any-r1
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: 62aa262b721a1fd4059bd652e5e86a44de6d8e86
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 12:48:47 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 12:48:47 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=62aa262b

sci-physics/opticks: remove package (2)

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/opticks/opticks-0.1.6.ebuild | 106 ---
 1 file changed, 106 deletions(-)

diff --git a/sci-physics/opticks/opticks-0.1.6.ebuild 
b/sci-physics/opticks/opticks-0.1.6.ebuild
deleted file mode 100644
index bb2abc665..0
--- a/sci-physics/opticks/opticks-0.1.6.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-toolkit
-   dev-libs/optix
-   media-libs/assimp
-   media-libs/glfw
-   media-libs/glew:0
-   media-libs/glm
-   media-libs/imgui
-   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"
-
-pkg_setup() {
-   # opticks combined build is not parallel.
-   #export MAKEOPTS="-j1"
-
-   python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # do not add the default '-O2' that results in nvcc error of
-   # nvcc fatal   : redefinition of argument 'optimize'
-   export NVCCFLAGS=
-   cuda_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} || die
-   eend $?
-   done
-   # do not install test scripts
-   ebegin "Removing test scripts installation from 
optixrap/{,tests/}CMakeLists.txt"
-   sed -e '/install(PROGRAMS/d' \
-   -e '/installcache/d' \
-   -i optixrap/CMakeLists.txt \
-   -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 || die
-   eend $?
-   ebegin "Moving glsl into share in 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 || 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} || 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 || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
-   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
-   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-   -DCOMPUTE_CAPABILITY=61
-   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
-   -DBoost_NO_BOOST_CMAKE=ON
-   )
-   cmake_src_configure
-}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: 1b0be9fca4a8f0a79bf2000b3bb5dd5fef76e7ba
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Dec 16 10:55:15 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Dec 16 10:55:15 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1b0be9fc

sci-physics/opticks: drop UnusedInherits

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ce78c4f08..d89bf2a82 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda python-any-r1
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: 62aa262b721a1fd4059bd652e5e86a44de6d8e86
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 12:48:47 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 12:48:47 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=62aa262b

sci-physics/opticks: remove package (2)

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/opticks/opticks-0.1.6.ebuild | 106 ---
 1 file changed, 106 deletions(-)

diff --git a/sci-physics/opticks/opticks-0.1.6.ebuild 
b/sci-physics/opticks/opticks-0.1.6.ebuild
deleted file mode 100644
index bb2abc665..0
--- a/sci-physics/opticks/opticks-0.1.6.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-toolkit
-   dev-libs/optix
-   media-libs/assimp
-   media-libs/glfw
-   media-libs/glew:0
-   media-libs/glm
-   media-libs/imgui
-   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"
-
-pkg_setup() {
-   # opticks combined build is not parallel.
-   #export MAKEOPTS="-j1"
-
-   python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # do not add the default '-O2' that results in nvcc error of
-   # nvcc fatal   : redefinition of argument 'optimize'
-   export NVCCFLAGS=
-   cuda_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} || die
-   eend $?
-   done
-   # do not install test scripts
-   ebegin "Removing test scripts installation from 
optixrap/{,tests/}CMakeLists.txt"
-   sed -e '/install(PROGRAMS/d' \
-   -e '/installcache/d' \
-   -i optixrap/CMakeLists.txt \
-   -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 || die
-   eend $?
-   ebegin "Moving glsl into share in 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 || 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} || 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 || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
-   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
-   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-   -DCOMPUTE_CAPABILITY=61
-   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
-   -DBoost_NO_BOOST_CMAKE=ON
-   )
-   cmake_src_configure
-}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: 1b0be9fca4a8f0a79bf2000b3bb5dd5fef76e7ba
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Dec 16 10:55:15 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Dec 16 10:55:15 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1b0be9fc

sci-physics/opticks: drop UnusedInherits

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ce78c4f08..d89bf2a82 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda python-any-r1
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: f8a6bd0748def334c560e7bb4b2940812c7f55a4
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:47:31 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:47:31 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f8a6bd07

sci-physics/opticks: cmake-utils --> cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 3eabc4848..ce78c4f08 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake-utils cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda flag-o-matic python-any-r1
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -49,7 +49,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
 
# do not add the default '-O2' that results in nvcc error of
# nvcc fatal   : redefinition of argument 'optimize'
@@ -104,5 +104,5 @@ src_configure() {
-DBoost_NO_BOOST_CMAKE=ON
--target all
)
-   cmake-utils_src_configure
+   cmake_src_configure
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: 62aa262b721a1fd4059bd652e5e86a44de6d8e86
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 12:48:47 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 12:48:47 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=62aa262b

sci-physics/opticks: remove package (2)

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/opticks/opticks-0.1.6.ebuild | 106 ---
 1 file changed, 106 deletions(-)

diff --git a/sci-physics/opticks/opticks-0.1.6.ebuild 
b/sci-physics/opticks/opticks-0.1.6.ebuild
deleted file mode 100644
index bb2abc665..0
--- a/sci-physics/opticks/opticks-0.1.6.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-toolkit
-   dev-libs/optix
-   media-libs/assimp
-   media-libs/glfw
-   media-libs/glew:0
-   media-libs/glm
-   media-libs/imgui
-   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"
-
-pkg_setup() {
-   # opticks combined build is not parallel.
-   #export MAKEOPTS="-j1"
-
-   python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # do not add the default '-O2' that results in nvcc error of
-   # nvcc fatal   : redefinition of argument 'optimize'
-   export NVCCFLAGS=
-   cuda_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} || die
-   eend $?
-   done
-   # do not install test scripts
-   ebegin "Removing test scripts installation from 
optixrap/{,tests/}CMakeLists.txt"
-   sed -e '/install(PROGRAMS/d' \
-   -e '/installcache/d' \
-   -i optixrap/CMakeLists.txt \
-   -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 || die
-   eend $?
-   ebegin "Moving glsl into share in 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 || 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} || 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 || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
-   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
-   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-   -DCOMPUTE_CAPABILITY=61
-   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
-   -DBoost_NO_BOOST_CMAKE=ON
-   )
-   cmake_src_configure
-}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 4fdeac4cfeef9247f9b9df389659fc519fe907dd
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:40:36 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:40:50 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4fdeac4c

sci-physics/opticks: depend on sci-physics/opticks-okconf.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 2553f571c..c5fa6efeb 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -25,7 +25,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glfw
media-libs/glew:0
media-libs/glm"
-DEPEND="dev-libs/boost
+DEPEND="sci-physics/opticks-okconf
+   dev-libs/boost
dev-util/bcm
dev-util/plog
${PYTHON_DEPS}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: e6f4c0f069a9e3c38db9ca8b996ac1fce68ed82b
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:55:28 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:55:28 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e6f4c0f0

sci-physics/opticks: depend on media-libs/{yocto-gl,imgui}.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index c5fa6efeb..54ed0e2cf 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -24,7 +24,9 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/assimp
media-libs/glfw
media-libs/glew:0
-   media-libs/glm"
+   media-libs/glm
+   media-libs/yocto-gl
+   media-libs/imgui"
 DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 26064f9eeac998ceee6a0b2f794fdc6788725aa3
Author: Benda Xu  gentoo  org>
AuthorDate: Thu Dec  5 14:43:49 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu Dec  5 14:43:49 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=26064f9e

sci-physics/opticks: depend on sci-physics/geant[gdml].

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 54ed0e2cf..33fe5c4f2 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -26,7 +26,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glew:0
media-libs/glm
media-libs/yocto-gl
-   media-libs/imgui"
+   media-libs/imgui
+   sci-physics/geant[gdml]"
 DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 594bcf521a43878ca3b7f959341c0596a3784c5f
Author: Benda Xu  gentoo  org>
AuthorDate: Sat Dec  7 12:01:00 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Dec  7 12:01:00 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=594bcf52

sci-physics/opticks: do not look for boost cmake.

  In Gentoo, boost is built by bjam and no BoostConfig.cmake is
  provided.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 33fe5c4f2..ef177964f 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -88,7 +88,6 @@ src_prepare() {
done
 }
 
-# om-make-one
 src_configure() {
local mycmakeargs=(
-DCMAKE_MODULE_PATH="${S}"/cmake/Modules
@@ -96,6 +95,7 @@ src_configure() {
-DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
+   -DBoost_NO_BOOST_CMAKE=ON
--target all
)
cmake-utils_src_configure

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: bcd71d86e97d62fd866b0dd42d41d64dfc3ff163
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Mar 16 01:38:33 2020 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon Mar 16 01:38:33 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=bcd71d86

sci-physics/opticks: correct headers directory.

Package-Manager: Portage-2.3.88, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ef177964f..3eabc4848 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -86,6 +86,12 @@ src_prepare() {
sed '/OpticksBuildOptions/d' -i ${f}
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
 }
 
 src_configure() {

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 4fdeac4cfeef9247f9b9df389659fc519fe907dd
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:40:36 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:40:50 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4fdeac4c

sci-physics/opticks: depend on sci-physics/opticks-okconf.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 2553f571c..c5fa6efeb 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -25,7 +25,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glfw
media-libs/glew:0
media-libs/glm"
-DEPEND="dev-libs/boost
+DEPEND="sci-physics/opticks-okconf
+   dev-libs/boost
dev-util/bcm
dev-util/plog
${PYTHON_DEPS}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: e6f4c0f069a9e3c38db9ca8b996ac1fce68ed82b
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:55:28 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:55:28 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e6f4c0f0

sci-physics/opticks: depend on media-libs/{yocto-gl,imgui}.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index c5fa6efeb..54ed0e2cf 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -24,7 +24,9 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/assimp
media-libs/glfw
media-libs/glew:0
-   media-libs/glm"
+   media-libs/glm
+   media-libs/yocto-gl
+   media-libs/imgui"
 DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 26064f9eeac998ceee6a0b2f794fdc6788725aa3
Author: Benda Xu  gentoo  org>
AuthorDate: Thu Dec  5 14:43:49 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu Dec  5 14:43:49 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=26064f9e

sci-physics/opticks: depend on sci-physics/geant[gdml].

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 54ed0e2cf..33fe5c4f2 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -26,7 +26,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glew:0
media-libs/glm
media-libs/yocto-gl
-   media-libs/imgui"
+   media-libs/imgui
+   sci-physics/geant[gdml]"
 DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 594bcf521a43878ca3b7f959341c0596a3784c5f
Author: Benda Xu  gentoo  org>
AuthorDate: Sat Dec  7 12:01:00 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Dec  7 12:01:00 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=594bcf52

sci-physics/opticks: do not look for boost cmake.

  In Gentoo, boost is built by bjam and no BoostConfig.cmake is
  provided.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 33fe5c4f2..ef177964f 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -88,7 +88,6 @@ src_prepare() {
done
 }
 
-# om-make-one
 src_configure() {
local mycmakeargs=(
-DCMAKE_MODULE_PATH="${S}"/cmake/Modules
@@ -96,6 +95,7 @@ src_configure() {
-DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
+   -DBoost_NO_BOOST_CMAKE=ON
--target all
)
cmake-utils_src_configure

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: bcd71d86e97d62fd866b0dd42d41d64dfc3ff163
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Mar 16 01:38:33 2020 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon Mar 16 01:38:33 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=bcd71d86

sci-physics/opticks: correct headers directory.

Package-Manager: Portage-2.3.88, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ef177964f..3eabc4848 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -86,6 +86,12 @@ src_prepare() {
sed '/OpticksBuildOptions/d' -i ${f}
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
 }
 
 src_configure() {

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: 1b0be9fca4a8f0a79bf2000b3bb5dd5fef76e7ba
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Dec 16 10:55:15 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Dec 16 10:55:15 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1b0be9fc

sci-physics/opticks: drop UnusedInherits

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ce78c4f08..d89bf2a82 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda python-any-r1
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: 62aa262b721a1fd4059bd652e5e86a44de6d8e86
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 12:48:47 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 12:48:47 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=62aa262b

sci-physics/opticks: remove package (2)

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/opticks/opticks-0.1.6.ebuild | 106 ---
 1 file changed, 106 deletions(-)

diff --git a/sci-physics/opticks/opticks-0.1.6.ebuild 
b/sci-physics/opticks/opticks-0.1.6.ebuild
deleted file mode 100644
index bb2abc665..0
--- a/sci-physics/opticks/opticks-0.1.6.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-toolkit
-   dev-libs/optix
-   media-libs/assimp
-   media-libs/glfw
-   media-libs/glew:0
-   media-libs/glm
-   media-libs/imgui
-   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"
-
-pkg_setup() {
-   # opticks combined build is not parallel.
-   #export MAKEOPTS="-j1"
-
-   python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # do not add the default '-O2' that results in nvcc error of
-   # nvcc fatal   : redefinition of argument 'optimize'
-   export NVCCFLAGS=
-   cuda_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} || die
-   eend $?
-   done
-   # do not install test scripts
-   ebegin "Removing test scripts installation from 
optixrap/{,tests/}CMakeLists.txt"
-   sed -e '/install(PROGRAMS/d' \
-   -e '/installcache/d' \
-   -i optixrap/CMakeLists.txt \
-   -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 || die
-   eend $?
-   ebegin "Moving glsl into share in 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 || 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} || 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 || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
-   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
-   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-   -DCOMPUTE_CAPABILITY=61
-   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
-   -DBoost_NO_BOOST_CMAKE=ON
-   )
-   cmake_src_configure
-}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: bcd71d86e97d62fd866b0dd42d41d64dfc3ff163
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Mar 16 01:38:33 2020 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon Mar 16 01:38:33 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=bcd71d86

sci-physics/opticks: correct headers directory.

Package-Manager: Portage-2.3.88, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ef177964f..3eabc4848 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -86,6 +86,12 @@ src_prepare() {
sed '/OpticksBuildOptions/d' -i ${f}
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
 }
 
 src_configure() {

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: f8a6bd0748def334c560e7bb4b2940812c7f55a4
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:47:31 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:47:31 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f8a6bd07

sci-physics/opticks: cmake-utils --> cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 3eabc4848..ce78c4f08 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake-utils cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda flag-o-matic python-any-r1
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -49,7 +49,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
 
# do not add the default '-O2' that results in nvcc error of
# nvcc fatal   : redefinition of argument 'optimize'
@@ -104,5 +104,5 @@ src_configure() {
-DBoost_NO_BOOST_CMAKE=ON
--target all
)
-   cmake-utils_src_configure
+   cmake_src_configure
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 4fdeac4cfeef9247f9b9df389659fc519fe907dd
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:40:36 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:40:50 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4fdeac4c

sci-physics/opticks: depend on sci-physics/opticks-okconf.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 2553f571c..c5fa6efeb 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -25,7 +25,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glfw
media-libs/glew:0
media-libs/glm"
-DEPEND="dev-libs/boost
+DEPEND="sci-physics/opticks-okconf
+   dev-libs/boost
dev-util/bcm
dev-util/plog
${PYTHON_DEPS}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: e6f4c0f069a9e3c38db9ca8b996ac1fce68ed82b
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:55:28 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:55:28 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e6f4c0f0

sci-physics/opticks: depend on media-libs/{yocto-gl,imgui}.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index c5fa6efeb..54ed0e2cf 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -24,7 +24,9 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/assimp
media-libs/glfw
media-libs/glew:0
-   media-libs/glm"
+   media-libs/glm
+   media-libs/yocto-gl
+   media-libs/imgui"
 DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 26064f9eeac998ceee6a0b2f794fdc6788725aa3
Author: Benda Xu  gentoo  org>
AuthorDate: Thu Dec  5 14:43:49 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu Dec  5 14:43:49 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=26064f9e

sci-physics/opticks: depend on sci-physics/geant[gdml].

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 54ed0e2cf..33fe5c4f2 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -26,7 +26,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glew:0
media-libs/glm
media-libs/yocto-gl
-   media-libs/imgui"
+   media-libs/imgui
+   sci-physics/geant[gdml]"
 DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 594bcf521a43878ca3b7f959341c0596a3784c5f
Author: Benda Xu  gentoo  org>
AuthorDate: Sat Dec  7 12:01:00 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Dec  7 12:01:00 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=594bcf52

sci-physics/opticks: do not look for boost cmake.

  In Gentoo, boost is built by bjam and no BoostConfig.cmake is
  provided.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 33fe5c4f2..ef177964f 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -88,7 +88,6 @@ src_prepare() {
done
 }
 
-# om-make-one
 src_configure() {
local mycmakeargs=(
-DCMAKE_MODULE_PATH="${S}"/cmake/Modules
@@ -96,6 +95,7 @@ src_configure() {
-DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
+   -DBoost_NO_BOOST_CMAKE=ON
--target all
)
cmake-utils_src_configure

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: f8a6bd0748def334c560e7bb4b2940812c7f55a4
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:47:31 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:47:31 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f8a6bd07

sci-physics/opticks: cmake-utils --> cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 3eabc4848..ce78c4f08 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake-utils cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda flag-o-matic python-any-r1
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -49,7 +49,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
 
# do not add the default '-O2' that results in nvcc error of
# nvcc fatal   : redefinition of argument 'optimize'
@@ -104,5 +104,5 @@ src_configure() {
-DBoost_NO_BOOST_CMAKE=ON
--target all
)
-   cmake-utils_src_configure
+   cmake_src_configure
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: bcd71d86e97d62fd866b0dd42d41d64dfc3ff163
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Mar 16 01:38:33 2020 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon Mar 16 01:38:33 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=bcd71d86

sci-physics/opticks: correct headers directory.

Package-Manager: Portage-2.3.88, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ef177964f..3eabc4848 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -86,6 +86,12 @@ src_prepare() {
sed '/OpticksBuildOptions/d' -i ${f}
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
 }
 
 src_configure() {

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 4fdeac4cfeef9247f9b9df389659fc519fe907dd
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:40:36 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:40:50 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4fdeac4c

sci-physics/opticks: depend on sci-physics/opticks-okconf.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 2553f571c..c5fa6efeb 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -25,7 +25,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glfw
media-libs/glew:0
media-libs/glm"
-DEPEND="dev-libs/boost
+DEPEND="sci-physics/opticks-okconf
+   dev-libs/boost
dev-util/bcm
dev-util/plog
${PYTHON_DEPS}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: e6f4c0f069a9e3c38db9ca8b996ac1fce68ed82b
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:55:28 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:55:28 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e6f4c0f0

sci-physics/opticks: depend on media-libs/{yocto-gl,imgui}.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index c5fa6efeb..54ed0e2cf 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -24,7 +24,9 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/assimp
media-libs/glfw
media-libs/glew:0
-   media-libs/glm"
+   media-libs/glm
+   media-libs/yocto-gl
+   media-libs/imgui"
 DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 26064f9eeac998ceee6a0b2f794fdc6788725aa3
Author: Benda Xu  gentoo  org>
AuthorDate: Thu Dec  5 14:43:49 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu Dec  5 14:43:49 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=26064f9e

sci-physics/opticks: depend on sci-physics/geant[gdml].

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 54ed0e2cf..33fe5c4f2 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -26,7 +26,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glew:0
media-libs/glm
media-libs/yocto-gl
-   media-libs/imgui"
+   media-libs/imgui
+   sci-physics/geant[gdml]"
 DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 594bcf521a43878ca3b7f959341c0596a3784c5f
Author: Benda Xu  gentoo  org>
AuthorDate: Sat Dec  7 12:01:00 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Dec  7 12:01:00 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=594bcf52

sci-physics/opticks: do not look for boost cmake.

  In Gentoo, boost is built by bjam and no BoostConfig.cmake is
  provided.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 33fe5c4f2..ef177964f 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -88,7 +88,6 @@ src_prepare() {
done
 }
 
-# om-make-one
 src_configure() {
local mycmakeargs=(
-DCMAKE_MODULE_PATH="${S}"/cmake/Modules
@@ -96,6 +95,7 @@ src_configure() {
-DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
+   -DBoost_NO_BOOST_CMAKE=ON
--target all
)
cmake-utils_src_configure

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: 1b0be9fca4a8f0a79bf2000b3bb5dd5fef76e7ba
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Dec 16 10:55:15 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Dec 16 10:55:15 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1b0be9fc

sci-physics/opticks: drop UnusedInherits

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ce78c4f08..d89bf2a82 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda python-any-r1
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: 62aa262b721a1fd4059bd652e5e86a44de6d8e86
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 12:48:47 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 12:48:47 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=62aa262b

sci-physics/opticks: remove package (2)

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/opticks/opticks-0.1.6.ebuild | 106 ---
 1 file changed, 106 deletions(-)

diff --git a/sci-physics/opticks/opticks-0.1.6.ebuild 
b/sci-physics/opticks/opticks-0.1.6.ebuild
deleted file mode 100644
index bb2abc665..0
--- a/sci-physics/opticks/opticks-0.1.6.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-toolkit
-   dev-libs/optix
-   media-libs/assimp
-   media-libs/glfw
-   media-libs/glew:0
-   media-libs/glm
-   media-libs/imgui
-   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"
-
-pkg_setup() {
-   # opticks combined build is not parallel.
-   #export MAKEOPTS="-j1"
-
-   python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # do not add the default '-O2' that results in nvcc error of
-   # nvcc fatal   : redefinition of argument 'optimize'
-   export NVCCFLAGS=
-   cuda_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} || die
-   eend $?
-   done
-   # do not install test scripts
-   ebegin "Removing test scripts installation from 
optixrap/{,tests/}CMakeLists.txt"
-   sed -e '/install(PROGRAMS/d' \
-   -e '/installcache/d' \
-   -i optixrap/CMakeLists.txt \
-   -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 || die
-   eend $?
-   ebegin "Moving glsl into share in 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 || 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} || 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 || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
-   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
-   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-   -DCOMPUTE_CAPABILITY=61
-   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
-   -DBoost_NO_BOOST_CMAKE=ON
-   )
-   cmake_src_configure
-}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: 1b0be9fca4a8f0a79bf2000b3bb5dd5fef76e7ba
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Dec 16 10:55:15 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Dec 16 10:55:15 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1b0be9fc

sci-physics/opticks: drop UnusedInherits

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ce78c4f08..d89bf2a82 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda python-any-r1
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: f8a6bd0748def334c560e7bb4b2940812c7f55a4
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:47:31 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:47:31 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f8a6bd07

sci-physics/opticks: cmake-utils --> cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 3eabc4848..ce78c4f08 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake-utils cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda flag-o-matic python-any-r1
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -49,7 +49,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
 
# do not add the default '-O2' that results in nvcc error of
# nvcc fatal   : redefinition of argument 'optimize'
@@ -104,5 +104,5 @@ src_configure() {
-DBoost_NO_BOOST_CMAKE=ON
--target all
)
-   cmake-utils_src_configure
+   cmake_src_configure
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: 62aa262b721a1fd4059bd652e5e86a44de6d8e86
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 12:48:47 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 12:48:47 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=62aa262b

sci-physics/opticks: remove package (2)

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/opticks/opticks-0.1.6.ebuild | 106 ---
 1 file changed, 106 deletions(-)

diff --git a/sci-physics/opticks/opticks-0.1.6.ebuild 
b/sci-physics/opticks/opticks-0.1.6.ebuild
deleted file mode 100644
index bb2abc665..0
--- a/sci-physics/opticks/opticks-0.1.6.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-toolkit
-   dev-libs/optix
-   media-libs/assimp
-   media-libs/glfw
-   media-libs/glew:0
-   media-libs/glm
-   media-libs/imgui
-   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"
-
-pkg_setup() {
-   # opticks combined build is not parallel.
-   #export MAKEOPTS="-j1"
-
-   python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # do not add the default '-O2' that results in nvcc error of
-   # nvcc fatal   : redefinition of argument 'optimize'
-   export NVCCFLAGS=
-   cuda_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} || die
-   eend $?
-   done
-   # do not install test scripts
-   ebegin "Removing test scripts installation from 
optixrap/{,tests/}CMakeLists.txt"
-   sed -e '/install(PROGRAMS/d' \
-   -e '/installcache/d' \
-   -i optixrap/CMakeLists.txt \
-   -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 || die
-   eend $?
-   ebegin "Moving glsl into share in 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 || 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} || 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 || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
-   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
-   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-   -DCOMPUTE_CAPABILITY=61
-   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
-   -DBoost_NO_BOOST_CMAKE=ON
-   )
-   cmake_src_configure
-}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: bcd71d86e97d62fd866b0dd42d41d64dfc3ff163
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Mar 16 01:38:33 2020 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon Mar 16 01:38:33 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=bcd71d86

sci-physics/opticks: correct headers directory.

Package-Manager: Portage-2.3.88, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ef177964f..3eabc4848 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -86,6 +86,12 @@ src_prepare() {
sed '/OpticksBuildOptions/d' -i ${f}
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
 }
 
 src_configure() {

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: f8a6bd0748def334c560e7bb4b2940812c7f55a4
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:47:31 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:47:31 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f8a6bd07

sci-physics/opticks: cmake-utils --> cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 3eabc4848..ce78c4f08 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake-utils cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda flag-o-matic python-any-r1
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -49,7 +49,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
 
# do not add the default '-O2' that results in nvcc error of
# nvcc fatal   : redefinition of argument 'optimize'
@@ -104,5 +104,5 @@ src_configure() {
-DBoost_NO_BOOST_CMAKE=ON
--target all
)
-   cmake-utils_src_configure
+   cmake_src_configure
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 4fdeac4cfeef9247f9b9df389659fc519fe907dd
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:40:36 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:40:50 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4fdeac4c

sci-physics/opticks: depend on sci-physics/opticks-okconf.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 2553f571c..c5fa6efeb 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -25,7 +25,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glfw
media-libs/glew:0
media-libs/glm"
-DEPEND="dev-libs/boost
+DEPEND="sci-physics/opticks-okconf
+   dev-libs/boost
dev-util/bcm
dev-util/plog
${PYTHON_DEPS}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: e6f4c0f069a9e3c38db9ca8b996ac1fce68ed82b
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:55:28 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:55:28 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e6f4c0f0

sci-physics/opticks: depend on media-libs/{yocto-gl,imgui}.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index c5fa6efeb..54ed0e2cf 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -24,7 +24,9 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/assimp
media-libs/glfw
media-libs/glew:0
-   media-libs/glm"
+   media-libs/glm
+   media-libs/yocto-gl
+   media-libs/imgui"
 DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 26064f9eeac998ceee6a0b2f794fdc6788725aa3
Author: Benda Xu  gentoo  org>
AuthorDate: Thu Dec  5 14:43:49 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu Dec  5 14:43:49 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=26064f9e

sci-physics/opticks: depend on sci-physics/geant[gdml].

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 54ed0e2cf..33fe5c4f2 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -26,7 +26,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glew:0
media-libs/glm
media-libs/yocto-gl
-   media-libs/imgui"
+   media-libs/imgui
+   sci-physics/geant[gdml]"
 DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 594bcf521a43878ca3b7f959341c0596a3784c5f
Author: Benda Xu  gentoo  org>
AuthorDate: Sat Dec  7 12:01:00 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Dec  7 12:01:00 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=594bcf52

sci-physics/opticks: do not look for boost cmake.

  In Gentoo, boost is built by bjam and no BoostConfig.cmake is
  provided.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 33fe5c4f2..ef177964f 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -88,7 +88,6 @@ src_prepare() {
done
 }
 
-# om-make-one
 src_configure() {
local mycmakeargs=(
-DCMAKE_MODULE_PATH="${S}"/cmake/Modules
@@ -96,6 +95,7 @@ src_configure() {
-DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
+   -DBoost_NO_BOOST_CMAKE=ON
--target all
)
cmake-utils_src_configure

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: 1b0be9fca4a8f0a79bf2000b3bb5dd5fef76e7ba
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Dec 16 10:55:15 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Dec 16 10:55:15 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1b0be9fc

sci-physics/opticks: drop UnusedInherits

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ce78c4f08..d89bf2a82 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda python-any-r1
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: 62aa262b721a1fd4059bd652e5e86a44de6d8e86
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 12:48:47 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 12:48:47 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=62aa262b

sci-physics/opticks: remove package (2)

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/opticks/opticks-0.1.6.ebuild | 106 ---
 1 file changed, 106 deletions(-)

diff --git a/sci-physics/opticks/opticks-0.1.6.ebuild 
b/sci-physics/opticks/opticks-0.1.6.ebuild
deleted file mode 100644
index bb2abc665..0
--- a/sci-physics/opticks/opticks-0.1.6.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-toolkit
-   dev-libs/optix
-   media-libs/assimp
-   media-libs/glfw
-   media-libs/glew:0
-   media-libs/glm
-   media-libs/imgui
-   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"
-
-pkg_setup() {
-   # opticks combined build is not parallel.
-   #export MAKEOPTS="-j1"
-
-   python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # do not add the default '-O2' that results in nvcc error of
-   # nvcc fatal   : redefinition of argument 'optimize'
-   export NVCCFLAGS=
-   cuda_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} || die
-   eend $?
-   done
-   # do not install test scripts
-   ebegin "Removing test scripts installation from 
optixrap/{,tests/}CMakeLists.txt"
-   sed -e '/install(PROGRAMS/d' \
-   -e '/installcache/d' \
-   -i optixrap/CMakeLists.txt \
-   -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 || die
-   eend $?
-   ebegin "Moving glsl into share in 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 || 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} || 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 || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
-   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
-   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-   -DCOMPUTE_CAPABILITY=61
-   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
-   -DBoost_NO_BOOST_CMAKE=ON
-   )
-   cmake_src_configure
-}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: f8a6bd0748def334c560e7bb4b2940812c7f55a4
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:47:31 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:47:31 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f8a6bd07

sci-physics/opticks: cmake-utils --> cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 3eabc4848..ce78c4f08 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake-utils cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda flag-o-matic python-any-r1
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -49,7 +49,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
 
# do not add the default '-O2' that results in nvcc error of
# nvcc fatal   : redefinition of argument 'optimize'
@@ -104,5 +104,5 @@ src_configure() {
-DBoost_NO_BOOST_CMAKE=ON
--target all
)
-   cmake-utils_src_configure
+   cmake_src_configure
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: bcd71d86e97d62fd866b0dd42d41d64dfc3ff163
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Mar 16 01:38:33 2020 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon Mar 16 01:38:33 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=bcd71d86

sci-physics/opticks: correct headers directory.

Package-Manager: Portage-2.3.88, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ef177964f..3eabc4848 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -86,6 +86,12 @@ src_prepare() {
sed '/OpticksBuildOptions/d' -i ${f}
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
 }
 
 src_configure() {

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 4fdeac4cfeef9247f9b9df389659fc519fe907dd
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:40:36 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:40:50 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4fdeac4c

sci-physics/opticks: depend on sci-physics/opticks-okconf.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 2553f571c..c5fa6efeb 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -25,7 +25,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glfw
media-libs/glew:0
media-libs/glm"
-DEPEND="dev-libs/boost
+DEPEND="sci-physics/opticks-okconf
+   dev-libs/boost
dev-util/bcm
dev-util/plog
${PYTHON_DEPS}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: e6f4c0f069a9e3c38db9ca8b996ac1fce68ed82b
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:55:28 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:55:28 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e6f4c0f0

sci-physics/opticks: depend on media-libs/{yocto-gl,imgui}.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index c5fa6efeb..54ed0e2cf 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -24,7 +24,9 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/assimp
media-libs/glfw
media-libs/glew:0
-   media-libs/glm"
+   media-libs/glm
+   media-libs/yocto-gl
+   media-libs/imgui"
 DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 26064f9eeac998ceee6a0b2f794fdc6788725aa3
Author: Benda Xu  gentoo  org>
AuthorDate: Thu Dec  5 14:43:49 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu Dec  5 14:43:49 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=26064f9e

sci-physics/opticks: depend on sci-physics/geant[gdml].

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 54ed0e2cf..33fe5c4f2 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -26,7 +26,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glew:0
media-libs/glm
media-libs/yocto-gl
-   media-libs/imgui"
+   media-libs/imgui
+   sci-physics/geant[gdml]"
 DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 594bcf521a43878ca3b7f959341c0596a3784c5f
Author: Benda Xu  gentoo  org>
AuthorDate: Sat Dec  7 12:01:00 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Dec  7 12:01:00 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=594bcf52

sci-physics/opticks: do not look for boost cmake.

  In Gentoo, boost is built by bjam and no BoostConfig.cmake is
  provided.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 33fe5c4f2..ef177964f 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -88,7 +88,6 @@ src_prepare() {
done
 }
 
-# om-make-one
 src_configure() {
local mycmakeargs=(
-DCMAKE_MODULE_PATH="${S}"/cmake/Modules
@@ -96,6 +95,7 @@ src_configure() {
-DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
+   -DBoost_NO_BOOST_CMAKE=ON
--target all
)
cmake-utils_src_configure

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: bcd71d86e97d62fd866b0dd42d41d64dfc3ff163
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Mar 16 01:38:33 2020 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon Mar 16 01:38:33 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=bcd71d86

sci-physics/opticks: correct headers directory.

Package-Manager: Portage-2.3.88, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ef177964f..3eabc4848 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -86,6 +86,12 @@ src_prepare() {
sed '/OpticksBuildOptions/d' -i ${f}
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
 }
 
 src_configure() {

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: f8a6bd0748def334c560e7bb4b2940812c7f55a4
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:47:31 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:47:31 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f8a6bd07

sci-physics/opticks: cmake-utils --> cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 3eabc4848..ce78c4f08 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake-utils cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda flag-o-matic python-any-r1
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -49,7 +49,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
 
# do not add the default '-O2' that results in nvcc error of
# nvcc fatal   : redefinition of argument 'optimize'
@@ -104,5 +104,5 @@ src_configure() {
-DBoost_NO_BOOST_CMAKE=ON
--target all
)
-   cmake-utils_src_configure
+   cmake_src_configure
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 4fdeac4cfeef9247f9b9df389659fc519fe907dd
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:40:36 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:40:50 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4fdeac4c

sci-physics/opticks: depend on sci-physics/opticks-okconf.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 2553f571c..c5fa6efeb 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -25,7 +25,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glfw
media-libs/glew:0
media-libs/glm"
-DEPEND="dev-libs/boost
+DEPEND="sci-physics/opticks-okconf
+   dev-libs/boost
dev-util/bcm
dev-util/plog
${PYTHON_DEPS}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: e6f4c0f069a9e3c38db9ca8b996ac1fce68ed82b
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:55:28 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:55:28 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e6f4c0f0

sci-physics/opticks: depend on media-libs/{yocto-gl,imgui}.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index c5fa6efeb..54ed0e2cf 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -24,7 +24,9 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/assimp
media-libs/glfw
media-libs/glew:0
-   media-libs/glm"
+   media-libs/glm
+   media-libs/yocto-gl
+   media-libs/imgui"
 DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 26064f9eeac998ceee6a0b2f794fdc6788725aa3
Author: Benda Xu  gentoo  org>
AuthorDate: Thu Dec  5 14:43:49 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu Dec  5 14:43:49 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=26064f9e

sci-physics/opticks: depend on sci-physics/geant[gdml].

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 54ed0e2cf..33fe5c4f2 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -26,7 +26,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glew:0
media-libs/glm
media-libs/yocto-gl
-   media-libs/imgui"
+   media-libs/imgui
+   sci-physics/geant[gdml]"
 DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Benda XU]

commit: 594bcf521a43878ca3b7f959341c0596a3784c5f
Author: Benda Xu  gentoo  org>
AuthorDate: Sat Dec  7 12:01:00 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Dec  7 12:01:00 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=594bcf52

sci-physics/opticks: do not look for boost cmake.

  In Gentoo, boost is built by bjam and no BoostConfig.cmake is
  provided.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 33fe5c4f2..ef177964f 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -88,7 +88,6 @@ src_prepare() {
done
 }
 
-# om-make-one
 src_configure() {
local mycmakeargs=(
-DCMAKE_MODULE_PATH="${S}"/cmake/Modules
@@ -96,6 +95,7 @@ src_configure() {
-DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
+   -DBoost_NO_BOOST_CMAKE=ON
--target all
)
cmake-utils_src_configure

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: 1b0be9fca4a8f0a79bf2000b3bb5dd5fef76e7ba
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Dec 16 10:55:15 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Dec 16 10:55:15 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1b0be9fc

sci-physics/opticks: drop UnusedInherits

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild 
b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ce78c4f08..d89bf2a82 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda python-any-r1
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/

[Andrew Ammerlaan]

commit: 62aa262b721a1fd4059bd652e5e86a44de6d8e86
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 12:48:47 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 12:48:47 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=62aa262b

sci-physics/opticks: remove package (2)

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/opticks/opticks-0.1.6.ebuild | 106 ---
 1 file changed, 106 deletions(-)

diff --git a/sci-physics/opticks/opticks-0.1.6.ebuild 
b/sci-physics/opticks/opticks-0.1.6.ebuild
deleted file mode 100644
index bb2abc665..0
--- a/sci-physics/opticks/opticks-0.1.6.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-toolkit
-   dev-libs/optix
-   media-libs/assimp
-   media-libs/glfw
-   media-libs/glew:0
-   media-libs/glm
-   media-libs/imgui
-   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"
-
-pkg_setup() {
-   # opticks combined build is not parallel.
-   #export MAKEOPTS="-j1"
-
-   python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # do not add the default '-O2' that results in nvcc error of
-   # nvcc fatal   : redefinition of argument 'optimize'
-   export NVCCFLAGS=
-   cuda_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} || die
-   eend $?
-   done
-   # do not install test scripts
-   ebegin "Removing test scripts installation from 
optixrap/{,tests/}CMakeLists.txt"
-   sed -e '/install(PROGRAMS/d' \
-   -e '/installcache/d' \
-   -i optixrap/CMakeLists.txt \
-   -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 || die
-   eend $?
-   ebegin "Moving glsl into share in 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 || 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} || 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 || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
-   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
-   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-   -DCOMPUTE_CAPABILITY=61
-   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
-   -DBoost_NO_BOOST_CMAKE=ON
-   )
-   cmake_src_configure
-}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/

[Andrew Ammerlaan]

commit: cb2d8c43cb9048963f71fc3df9f2c1d00bee41d1
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:49:02 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:49:02 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=cb2d8c43

sci-physics/opticks-okconf: cmake-utils --> cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
index 1b67f2751..c880f4f8b 100644
--- a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit mercurial cmake-utils cuda
+inherit mercurial cmake cuda
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -28,7 +28,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
cuda_src_prepare
 
rm -f CMakeLists.txt* || die
@@ -42,5 +42,5 @@ src_configure() {
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
)
-   CMAKE_USE_DIR=${S}/${PN##*-} cmake-utils_src_configure
+   CMAKE_USE_DIR=${S}/${PN##*-} cmake_src_configure
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/

[Benda XU]

commit: b97d89544bcb14286919f9bed4d498b1202da646
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:39:44 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:40:50 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b97d8954

sci-physics/opticks-okconf: initial commit of 0.0.1_p20191110.

  This is included as a dependency of sci-physics/opticks.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks-okconf/metadata.xml|  7 
 .../opticks-okconf-0.0.1_p20191110.ebuild  | 42 ++
 2 files changed, 49 insertions(+)

diff --git a/sci-physics/opticks-okconf/metadata.xml 
b/sci-physics/opticks-okconf/metadata.xml
new file mode 100644
index 0..7203fb853
--- /dev/null
+++ b/sci-physics/opticks-okconf/metadata.xml
@@ -0,0 +1,7 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   hero...@gentoo.org
+   
+

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
new file mode 100644
index 0..fa0a5e70c
--- /dev/null
+++ b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mercurial cmake-utils
+
+EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
+EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
+
+DESCRIPTION="GPU Optical Photon Simulation for Particle Physics"
+HOMEPAGE="https://simoncblyth.bitbucket.io";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-util/nvidia-cuda-toolkit:=
+   dev-libs/optix"
+DEPEND="dev-util/cmake
+   dev-libs/boost
+   dev-util/bcm
+   dev-util/plog
+   ${RDEPEND}"
+
+src_prepare() {
+   cmake-utils_src_prepare
+   cuda_src_prepare
+
+   rm -f CMakeLists.txt* || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
+   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
+   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
+   -DCOMPUTE_CAPABILITY=61
+   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
+   )
+   CMAKE_USE_DIR=${S}/${PN##*-} cmake-utils_src_configure
+}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/

[Andrew Ammerlaan]

commit: cb2d8c43cb9048963f71fc3df9f2c1d00bee41d1
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:49:02 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:49:02 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=cb2d8c43

sci-physics/opticks-okconf: cmake-utils --> cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
index 1b67f2751..c880f4f8b 100644
--- a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit mercurial cmake-utils cuda
+inherit mercurial cmake cuda
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -28,7 +28,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
cuda_src_prepare
 
rm -f CMakeLists.txt* || die
@@ -42,5 +42,5 @@ src_configure() {
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
)
-   CMAKE_USE_DIR=${S}/${PN##*-} cmake-utils_src_configure
+   CMAKE_USE_DIR=${S}/${PN##*-} cmake_src_configure
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/

[Benda XU]

commit: b97d89544bcb14286919f9bed4d498b1202da646
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:39:44 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:40:50 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b97d8954

sci-physics/opticks-okconf: initial commit of 0.0.1_p20191110.

  This is included as a dependency of sci-physics/opticks.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks-okconf/metadata.xml|  7 
 .../opticks-okconf-0.0.1_p20191110.ebuild  | 42 ++
 2 files changed, 49 insertions(+)

diff --git a/sci-physics/opticks-okconf/metadata.xml 
b/sci-physics/opticks-okconf/metadata.xml
new file mode 100644
index 0..7203fb853
--- /dev/null
+++ b/sci-physics/opticks-okconf/metadata.xml
@@ -0,0 +1,7 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   hero...@gentoo.org
+   
+

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
new file mode 100644
index 0..fa0a5e70c
--- /dev/null
+++ b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mercurial cmake-utils
+
+EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
+EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
+
+DESCRIPTION="GPU Optical Photon Simulation for Particle Physics"
+HOMEPAGE="https://simoncblyth.bitbucket.io";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-util/nvidia-cuda-toolkit:=
+   dev-libs/optix"
+DEPEND="dev-util/cmake
+   dev-libs/boost
+   dev-util/bcm
+   dev-util/plog
+   ${RDEPEND}"
+
+src_prepare() {
+   cmake-utils_src_prepare
+   cuda_src_prepare
+
+   rm -f CMakeLists.txt* || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
+   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
+   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
+   -DCOMPUTE_CAPABILITY=61
+   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
+   )
+   CMAKE_USE_DIR=${S}/${PN##*-} cmake-utils_src_configure
+}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/

[Benda XU]

commit: b97d89544bcb14286919f9bed4d498b1202da646
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:39:44 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:40:50 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b97d8954

sci-physics/opticks-okconf: initial commit of 0.0.1_p20191110.

  This is included as a dependency of sci-physics/opticks.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks-okconf/metadata.xml|  7 
 .../opticks-okconf-0.0.1_p20191110.ebuild  | 42 ++
 2 files changed, 49 insertions(+)

diff --git a/sci-physics/opticks-okconf/metadata.xml 
b/sci-physics/opticks-okconf/metadata.xml
new file mode 100644
index 0..7203fb853
--- /dev/null
+++ b/sci-physics/opticks-okconf/metadata.xml
@@ -0,0 +1,7 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   hero...@gentoo.org
+   
+

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
new file mode 100644
index 0..fa0a5e70c
--- /dev/null
+++ b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mercurial cmake-utils
+
+EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
+EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
+
+DESCRIPTION="GPU Optical Photon Simulation for Particle Physics"
+HOMEPAGE="https://simoncblyth.bitbucket.io";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-util/nvidia-cuda-toolkit:=
+   dev-libs/optix"
+DEPEND="dev-util/cmake
+   dev-libs/boost
+   dev-util/bcm
+   dev-util/plog
+   ${RDEPEND}"
+
+src_prepare() {
+   cmake-utils_src_prepare
+   cuda_src_prepare
+
+   rm -f CMakeLists.txt* || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
+   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
+   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
+   -DCOMPUTE_CAPABILITY=61
+   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
+   )
+   CMAKE_USE_DIR=${S}/${PN##*-} cmake-utils_src_configure
+}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/

[Andrew Ammerlaan]

commit: cb2d8c43cb9048963f71fc3df9f2c1d00bee41d1
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:49:02 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:49:02 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=cb2d8c43

sci-physics/opticks-okconf: cmake-utils --> cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
index 1b67f2751..c880f4f8b 100644
--- a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit mercurial cmake-utils cuda
+inherit mercurial cmake cuda
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -28,7 +28,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
cuda_src_prepare
 
rm -f CMakeLists.txt* || die
@@ -42,5 +42,5 @@ src_configure() {
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
)
-   CMAKE_USE_DIR=${S}/${PN##*-} cmake-utils_src_configure
+   CMAKE_USE_DIR=${S}/${PN##*-} cmake_src_configure
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/

[Benda XU]

commit: b97d89544bcb14286919f9bed4d498b1202da646
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:39:44 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:40:50 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b97d8954

sci-physics/opticks-okconf: initial commit of 0.0.1_p20191110.

  This is included as a dependency of sci-physics/opticks.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks-okconf/metadata.xml|  7 
 .../opticks-okconf-0.0.1_p20191110.ebuild  | 42 ++
 2 files changed, 49 insertions(+)

diff --git a/sci-physics/opticks-okconf/metadata.xml 
b/sci-physics/opticks-okconf/metadata.xml
new file mode 100644
index 0..7203fb853
--- /dev/null
+++ b/sci-physics/opticks-okconf/metadata.xml
@@ -0,0 +1,7 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   hero...@gentoo.org
+   
+

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
new file mode 100644
index 0..fa0a5e70c
--- /dev/null
+++ b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mercurial cmake-utils
+
+EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
+EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
+
+DESCRIPTION="GPU Optical Photon Simulation for Particle Physics"
+HOMEPAGE="https://simoncblyth.bitbucket.io";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-util/nvidia-cuda-toolkit:=
+   dev-libs/optix"
+DEPEND="dev-util/cmake
+   dev-libs/boost
+   dev-util/bcm
+   dev-util/plog
+   ${RDEPEND}"
+
+src_prepare() {
+   cmake-utils_src_prepare
+   cuda_src_prepare
+
+   rm -f CMakeLists.txt* || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
+   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
+   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
+   -DCOMPUTE_CAPABILITY=61
+   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
+   )
+   CMAKE_USE_DIR=${S}/${PN##*-} cmake-utils_src_configure
+}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/

[Andrew Ammerlaan]

commit: cb2d8c43cb9048963f71fc3df9f2c1d00bee41d1
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:49:02 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:49:02 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=cb2d8c43

sci-physics/opticks-okconf: cmake-utils --> cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
index 1b67f2751..c880f4f8b 100644
--- a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit mercurial cmake-utils cuda
+inherit mercurial cmake cuda
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -28,7 +28,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
cuda_src_prepare
 
rm -f CMakeLists.txt* || die
@@ -42,5 +42,5 @@ src_configure() {
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
)
-   CMAKE_USE_DIR=${S}/${PN##*-} cmake-utils_src_configure
+   CMAKE_USE_DIR=${S}/${PN##*-} cmake_src_configure
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/

[Benda XU]

commit: b97d89544bcb14286919f9bed4d498b1202da646
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:39:44 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:40:50 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b97d8954

sci-physics/opticks-okconf: initial commit of 0.0.1_p20191110.

  This is included as a dependency of sci-physics/opticks.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks-okconf/metadata.xml|  7 
 .../opticks-okconf-0.0.1_p20191110.ebuild  | 42 ++
 2 files changed, 49 insertions(+)

diff --git a/sci-physics/opticks-okconf/metadata.xml 
b/sci-physics/opticks-okconf/metadata.xml
new file mode 100644
index 0..7203fb853
--- /dev/null
+++ b/sci-physics/opticks-okconf/metadata.xml
@@ -0,0 +1,7 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   hero...@gentoo.org
+   
+

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
new file mode 100644
index 0..fa0a5e70c
--- /dev/null
+++ b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mercurial cmake-utils
+
+EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
+EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
+
+DESCRIPTION="GPU Optical Photon Simulation for Particle Physics"
+HOMEPAGE="https://simoncblyth.bitbucket.io";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-util/nvidia-cuda-toolkit:=
+   dev-libs/optix"
+DEPEND="dev-util/cmake
+   dev-libs/boost
+   dev-util/bcm
+   dev-util/plog
+   ${RDEPEND}"
+
+src_prepare() {
+   cmake-utils_src_prepare
+   cuda_src_prepare
+
+   rm -f CMakeLists.txt* || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
+   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
+   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
+   -DCOMPUTE_CAPABILITY=61
+   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
+   )
+   CMAKE_USE_DIR=${S}/${PN##*-} cmake-utils_src_configure
+}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/

[Andrew Ammerlaan]

commit: cb2d8c43cb9048963f71fc3df9f2c1d00bee41d1
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:49:02 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:49:02 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=cb2d8c43

sci-physics/opticks-okconf: cmake-utils --> cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
index 1b67f2751..c880f4f8b 100644
--- a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit mercurial cmake-utils cuda
+inherit mercurial cmake cuda
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -28,7 +28,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
cuda_src_prepare
 
rm -f CMakeLists.txt* || die
@@ -42,5 +42,5 @@ src_configure() {
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
)
-   CMAKE_USE_DIR=${S}/${PN##*-} cmake-utils_src_configure
+   CMAKE_USE_DIR=${S}/${PN##*-} cmake_src_configure
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/

[Andrew Ammerlaan]

commit: cb2d8c43cb9048963f71fc3df9f2c1d00bee41d1
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:49:02 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:49:02 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=cb2d8c43

sci-physics/opticks-okconf: cmake-utils --> cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
index 1b67f2751..c880f4f8b 100644
--- a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit mercurial cmake-utils cuda
+inherit mercurial cmake cuda
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -28,7 +28,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
cuda_src_prepare
 
rm -f CMakeLists.txt* || die
@@ -42,5 +42,5 @@ src_configure() {
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
)
-   CMAKE_USE_DIR=${S}/${PN##*-} cmake-utils_src_configure
+   CMAKE_USE_DIR=${S}/${PN##*-} cmake_src_configure
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/

[Benda XU]

commit: b97d89544bcb14286919f9bed4d498b1202da646
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:39:44 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:40:50 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b97d8954

sci-physics/opticks-okconf: initial commit of 0.0.1_p20191110.

  This is included as a dependency of sci-physics/opticks.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks-okconf/metadata.xml|  7 
 .../opticks-okconf-0.0.1_p20191110.ebuild  | 42 ++
 2 files changed, 49 insertions(+)

diff --git a/sci-physics/opticks-okconf/metadata.xml 
b/sci-physics/opticks-okconf/metadata.xml
new file mode 100644
index 0..7203fb853
--- /dev/null
+++ b/sci-physics/opticks-okconf/metadata.xml
@@ -0,0 +1,7 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   hero...@gentoo.org
+   
+

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
new file mode 100644
index 0..fa0a5e70c
--- /dev/null
+++ b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mercurial cmake-utils
+
+EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
+EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
+
+DESCRIPTION="GPU Optical Photon Simulation for Particle Physics"
+HOMEPAGE="https://simoncblyth.bitbucket.io";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-util/nvidia-cuda-toolkit:=
+   dev-libs/optix"
+DEPEND="dev-util/cmake
+   dev-libs/boost
+   dev-util/bcm
+   dev-util/plog
+   ${RDEPEND}"
+
+src_prepare() {
+   cmake-utils_src_prepare
+   cuda_src_prepare
+
+   rm -f CMakeLists.txt* || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
+   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
+   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
+   -DCOMPUTE_CAPABILITY=61
+   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
+   )
+   CMAKE_USE_DIR=${S}/${PN##*-} cmake-utils_src_configure
+}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/

[Andrew Ammerlaan]

commit: cb2d8c43cb9048963f71fc3df9f2c1d00bee41d1
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:49:02 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:49:02 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=cb2d8c43

sci-physics/opticks-okconf: cmake-utils --> cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
index 1b67f2751..c880f4f8b 100644
--- a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit mercurial cmake-utils cuda
+inherit mercurial cmake cuda
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -28,7 +28,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
cuda_src_prepare
 
rm -f CMakeLists.txt* || die
@@ -42,5 +42,5 @@ src_configure() {
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
)
-   CMAKE_USE_DIR=${S}/${PN##*-} cmake-utils_src_configure
+   CMAKE_USE_DIR=${S}/${PN##*-} cmake_src_configure
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/

[Benda XU]

commit: b97d89544bcb14286919f9bed4d498b1202da646
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:39:44 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:40:50 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b97d8954

sci-physics/opticks-okconf: initial commit of 0.0.1_p20191110.

  This is included as a dependency of sci-physics/opticks.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks-okconf/metadata.xml|  7 
 .../opticks-okconf-0.0.1_p20191110.ebuild  | 42 ++
 2 files changed, 49 insertions(+)

diff --git a/sci-physics/opticks-okconf/metadata.xml 
b/sci-physics/opticks-okconf/metadata.xml
new file mode 100644
index 0..7203fb853
--- /dev/null
+++ b/sci-physics/opticks-okconf/metadata.xml
@@ -0,0 +1,7 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   hero...@gentoo.org
+   
+

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
new file mode 100644
index 0..fa0a5e70c
--- /dev/null
+++ b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mercurial cmake-utils
+
+EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
+EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
+
+DESCRIPTION="GPU Optical Photon Simulation for Particle Physics"
+HOMEPAGE="https://simoncblyth.bitbucket.io";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-util/nvidia-cuda-toolkit:=
+   dev-libs/optix"
+DEPEND="dev-util/cmake
+   dev-libs/boost
+   dev-util/bcm
+   dev-util/plog
+   ${RDEPEND}"
+
+src_prepare() {
+   cmake-utils_src_prepare
+   cuda_src_prepare
+
+   rm -f CMakeLists.txt* || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
+   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
+   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
+   -DCOMPUTE_CAPABILITY=61
+   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
+   )
+   CMAKE_USE_DIR=${S}/${PN##*-} cmake-utils_src_configure
+}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/

[Andrew Ammerlaan]

commit: cb2d8c43cb9048963f71fc3df9f2c1d00bee41d1
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:49:02 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:49:02 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=cb2d8c43

sci-physics/opticks-okconf: cmake-utils --> cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
index 1b67f2751..c880f4f8b 100644
--- a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit mercurial cmake-utils cuda
+inherit mercurial cmake cuda
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -28,7 +28,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
cuda_src_prepare
 
rm -f CMakeLists.txt* || die
@@ -42,5 +42,5 @@ src_configure() {
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
)
-   CMAKE_USE_DIR=${S}/${PN##*-} cmake-utils_src_configure
+   CMAKE_USE_DIR=${S}/${PN##*-} cmake_src_configure
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/

[Benda XU]

commit: b97d89544bcb14286919f9bed4d498b1202da646
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Dec  3 15:39:44 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Dec  3 15:40:50 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b97d8954

sci-physics/opticks-okconf: initial commit of 0.0.1_p20191110.

  This is included as a dependency of sci-physics/opticks.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-physics/opticks-okconf/metadata.xml|  7 
 .../opticks-okconf-0.0.1_p20191110.ebuild  | 42 ++
 2 files changed, 49 insertions(+)

diff --git a/sci-physics/opticks-okconf/metadata.xml 
b/sci-physics/opticks-okconf/metadata.xml
new file mode 100644
index 0..7203fb853
--- /dev/null
+++ b/sci-physics/opticks-okconf/metadata.xml
@@ -0,0 +1,7 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   hero...@gentoo.org
+   
+

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
new file mode 100644
index 0..fa0a5e70c
--- /dev/null
+++ b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mercurial cmake-utils
+
+EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
+EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
+
+DESCRIPTION="GPU Optical Photon Simulation for Particle Physics"
+HOMEPAGE="https://simoncblyth.bitbucket.io";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-util/nvidia-cuda-toolkit:=
+   dev-libs/optix"
+DEPEND="dev-util/cmake
+   dev-libs/boost
+   dev-util/bcm
+   dev-util/plog
+   ${RDEPEND}"
+
+src_prepare() {
+   cmake-utils_src_prepare
+   cuda_src_prepare
+
+   rm -f CMakeLists.txt* || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
+   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
+   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
+   -DCOMPUTE_CAPABILITY=61
+   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
+   )
+   CMAKE_USE_DIR=${S}/${PN##*-} cmake-utils_src_configure
+}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/, sci-physics/opticks/files/

[Benda XU]

commit: 811bb613d2bf8a45e9d689308fdf04a3d390
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Dec  1 04:07:27 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Dec  1 04:35:27 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=811bb613

sci-physics/opticks: initial commit of 0.0.1_p20191110.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 .../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 ++
 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 98 ++
 8 files changed, 272 insertions(+)

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
new file mode 100644
index 0..8893fb279
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_cuda-helper.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0..9df5373d4
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_extG4-CLHEP.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 0..4360da18b
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_nvcc-flags.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0..58cedbf06
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_okconf.patch
@@ -0,0 +1,45 @@
+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_

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/, sci-physics/opticks/files/

[Benda XU]

commit: 811bb613d2bf8a45e9d689308fdf04a3d390
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Dec  1 04:07:27 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Dec  1 04:35:27 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=811bb613

sci-physics/opticks: initial commit of 0.0.1_p20191110.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 .../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 ++
 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 98 ++
 8 files changed, 272 insertions(+)

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
new file mode 100644
index 0..8893fb279
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_cuda-helper.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0..9df5373d4
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_extG4-CLHEP.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 0..4360da18b
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_nvcc-flags.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0..58cedbf06
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_okconf.patch
@@ -0,0 +1,45 @@
+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_

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/, sci-physics/opticks/files/

[Benda XU]

commit: 811bb613d2bf8a45e9d689308fdf04a3d390
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Dec  1 04:07:27 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Dec  1 04:35:27 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=811bb613

sci-physics/opticks: initial commit of 0.0.1_p20191110.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 .../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 ++
 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 98 ++
 8 files changed, 272 insertions(+)

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
new file mode 100644
index 0..8893fb279
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_cuda-helper.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0..9df5373d4
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_extG4-CLHEP.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 0..4360da18b
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_nvcc-flags.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0..58cedbf06
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_okconf.patch
@@ -0,0 +1,45 @@
+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_

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/, sci-physics/opticks/files/

[Benda XU]

commit: 811bb613d2bf8a45e9d689308fdf04a3d390
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Dec  1 04:07:27 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Dec  1 04:35:27 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=811bb613

sci-physics/opticks: initial commit of 0.0.1_p20191110.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 .../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 ++
 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 98 ++
 8 files changed, 272 insertions(+)

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
new file mode 100644
index 0..8893fb279
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_cuda-helper.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0..9df5373d4
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_extG4-CLHEP.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 0..4360da18b
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_nvcc-flags.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0..58cedbf06
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_okconf.patch
@@ -0,0 +1,45 @@
+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_

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/, sci-physics/opticks/files/

[Benda XU]

commit: 811bb613d2bf8a45e9d689308fdf04a3d390
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Dec  1 04:07:27 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Dec  1 04:35:27 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=811bb613

sci-physics/opticks: initial commit of 0.0.1_p20191110.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 .../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 ++
 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 98 ++
 8 files changed, 272 insertions(+)

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
new file mode 100644
index 0..8893fb279
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_cuda-helper.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0..9df5373d4
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_extG4-CLHEP.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 0..4360da18b
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_nvcc-flags.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0..58cedbf06
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_okconf.patch
@@ -0,0 +1,45 @@
+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_

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/, sci-physics/opticks/files/

[Benda XU]

commit: 811bb613d2bf8a45e9d689308fdf04a3d390
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Dec  1 04:07:27 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Dec  1 04:35:27 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=811bb613

sci-physics/opticks: initial commit of 0.0.1_p20191110.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 .../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 ++
 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 98 ++
 8 files changed, 272 insertions(+)

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
new file mode 100644
index 0..8893fb279
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_cuda-helper.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0..9df5373d4
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_extG4-CLHEP.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 0..4360da18b
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_nvcc-flags.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0..58cedbf06
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_okconf.patch
@@ -0,0 +1,45 @@
+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_

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/, sci-physics/opticks/files/

[Benda XU]

commit: 811bb613d2bf8a45e9d689308fdf04a3d390
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Dec  1 04:07:27 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Dec  1 04:35:27 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=811bb613

sci-physics/opticks: initial commit of 0.0.1_p20191110.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 .../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 ++
 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 98 ++
 8 files changed, 272 insertions(+)

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
new file mode 100644
index 0..8893fb279
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_cuda-helper.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0..9df5373d4
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_extG4-CLHEP.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 0..4360da18b
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_nvcc-flags.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0..58cedbf06
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_okconf.patch
@@ -0,0 +1,45 @@
+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_

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/, sci-physics/opticks/files/

[Benda XU]

commit: 811bb613d2bf8a45e9d689308fdf04a3d390
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Dec  1 04:07:27 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Dec  1 04:35:27 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=811bb613

sci-physics/opticks: initial commit of 0.0.1_p20191110.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 .../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 ++
 sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 98 ++
 8 files changed, 272 insertions(+)

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
new file mode 100644
index 0..8893fb279
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_cuda-helper.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0..9df5373d4
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_extG4-CLHEP.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 0..4360da18b
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_nvcc-flags.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0..58cedbf06
--- /dev/null
+++ b/sci-physics/opticks/files/opticks-0.0.1_okconf.patch
@@ -0,0 +1,45 @@
+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_

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/files/, sci-physics/opticks/, profiles/

[Andrew Ammerlaan]

commit: 569ec06ad3eca64cf5b7dfe2cb1c7a4fe00a47d4
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 12:45:55 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 12:45:55 2022 +
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  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  (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 
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   hero...@gentoo.org
-   
-

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
+   s

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/files/, sci-physics/opticks/, profiles/

[Andrew Ammerlaan]

commit: 569ec06ad3eca64cf5b7dfe2cb1c7a4fe00a47d4
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 12:45:55 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 12:45:55 2022 +
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  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  (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 
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   hero...@gentoo.org
-   
-

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
+   s

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/files/, sci-physics/opticks/, profiles/

[Andrew Ammerlaan]

commit: 569ec06ad3eca64cf5b7dfe2cb1c7a4fe00a47d4
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 12:45:55 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 12:45:55 2022 +
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  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  (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 
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   hero...@gentoo.org
-   
-

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
+   s

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/files/, sci-physics/opticks/, profiles/

[Andrew Ammerlaan]

commit: 569ec06ad3eca64cf5b7dfe2cb1c7a4fe00a47d4
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 12:45:55 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 12:45:55 2022 +
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  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  (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 
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   hero...@gentoo.org
-   
-

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
+   s

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/files/, sci-physics/opticks/, profiles/

[Andrew Ammerlaan]

commit: 569ec06ad3eca64cf5b7dfe2cb1c7a4fe00a47d4
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 12:45:55 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 12:45:55 2022 +
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  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  (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 
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   hero...@gentoo.org
-   
-

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
+   s

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/files/, sci-physics/opticks/, profiles/

[Andrew Ammerlaan]

commit: 569ec06ad3eca64cf5b7dfe2cb1c7a4fe00a47d4
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 12:45:55 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 12:45:55 2022 +
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  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  (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 
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   hero...@gentoo.org
-   
-

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
+   s

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/files/, sci-physics/opticks/, profiles/

[Andrew Ammerlaan]

commit: 569ec06ad3eca64cf5b7dfe2cb1c7a4fe00a47d4
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 12:45:55 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 12:45:55 2022 +
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  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  (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 
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   hero...@gentoo.org
-   
-

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
+   s

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks/files/, sci-physics/opticks/, profiles/

[Andrew Ammerlaan]

commit: 569ec06ad3eca64cf5b7dfe2cb1c7a4fe00a47d4
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 12:45:55 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 12:45:55 2022 +
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  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  (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 
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   hero...@gentoo.org
-   
-

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
+   s

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/files/, sci-physics/opticks-okconf/

[Benda XU]

commit: c02c897d1474bc08ea50455fe2a1eb26232a8849
Author: Benda Xu  gentoo  org>
AuthorDate: Sat Jan  4 16:28:55 2020 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Jan  4 16:34:19 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c02c897d

sci-physics/opticks-okconf: add cuda inherit.

  Remove installation of test cases into /usr/lib.

Suggested-By: Xuewei Liu <18800136075  163.com>
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 .../opticks-okconf-0.0.1_p20191110-no_lib_install.patch  | 12 
 .../opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild |  8 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git 
a/sci-physics/opticks-okconf/files/opticks-okconf-0.0.1_p20191110-no_lib_install.patch
 
b/sci-physics/opticks-okconf/files/opticks-okconf-0.0.1_p20191110-no_lib_install.patch
new file mode 100644
index 0..89b0b7cab
--- /dev/null
+++ 
b/sci-physics/opticks-okconf/files/opticks-okconf-0.0.1_p20191110-no_lib_install.patch
@@ -0,0 +1,12 @@
+Index: opticks-okconf-0.0.1_p20191110/okconf/tests/CMakeLists.txt
+===
+--- opticks-okconf-0.0.1_p20191110.orig/okconf/tests/CMakeLists.txt
 opticks-okconf-0.0.1_p20191110/okconf/tests/CMakeLists.txt
+@@ -46,7 +46,6 @@ foreach(TEST_SOURCE ${TEST_SOURCES})
+ ) 
+ 
+ 
+-install(TARGETS ${TGT} DESTINATION lib)
+ endforeach()
+ 
+ 

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
index fa0a5e70c..1b67f2751 100644
--- a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit mercurial cmake-utils
+inherit mercurial cmake-utils cuda
 
 EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
 EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -23,6 +23,10 @@ DEPEND="dev-util/cmake
dev-util/plog
${RDEPEND}"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.0.1_p20191110-no_lib_install.patch
+)
+
 src_prepare() {
cmake-utils_src_prepare
cuda_src_prepare

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/, sci-physics/opticks-okconf/files/

[Andrew Ammerlaan]

commit: 0709867a50971336be324312cc69d660854f7a6e
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 11:54:24 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 11:54:24 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0709867a

sci-physics/opticks-okconf: delete package, it is identical to opticks

except that it doesn't work

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 ...cks-okconf-0.0.1_p20191110-no_lib_install.patch | 12 --
 sci-physics/opticks-okconf/metadata.xml|  7 
 .../opticks-okconf-0.0.1_p20191110.ebuild  | 46 --
 3 files changed, 65 deletions(-)

diff --git 
a/sci-physics/opticks-okconf/files/opticks-okconf-0.0.1_p20191110-no_lib_install.patch
 
b/sci-physics/opticks-okconf/files/opticks-okconf-0.0.1_p20191110-no_lib_install.patch
deleted file mode 100644
index 89b0b7cab..0
--- 
a/sci-physics/opticks-okconf/files/opticks-okconf-0.0.1_p20191110-no_lib_install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: opticks-okconf-0.0.1_p20191110/okconf/tests/CMakeLists.txt
-===
 opticks-okconf-0.0.1_p20191110.orig/okconf/tests/CMakeLists.txt
-+++ opticks-okconf-0.0.1_p20191110/okconf/tests/CMakeLists.txt
-@@ -46,7 +46,6 @@ foreach(TEST_SOURCE ${TEST_SOURCES})
- ) 
- 
- 
--install(TARGETS ${TGT} DESTINATION lib)
- endforeach()
- 
- 

diff --git a/sci-physics/opticks-okconf/metadata.xml 
b/sci-physics/opticks-okconf/metadata.xml
deleted file mode 100644
index 7203fb853..0
--- a/sci-physics/opticks-okconf/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   hero...@gentoo.org
-   
-

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
deleted file mode 100644
index c880f4f8b..0
--- a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mercurial cmake cuda
-
-EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
-EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
-
-DESCRIPTION="GPU Optical Photon Simulation for Particle Physics"
-HOMEPAGE="https://simoncblyth.bitbucket.io";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-util/nvidia-cuda-toolkit:=
-   dev-libs/optix"
-DEPEND="dev-util/cmake
-   dev-libs/boost
-   dev-util/bcm
-   dev-util/plog
-   ${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.0.1_p20191110-no_lib_install.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-   cuda_src_prepare
-
-   rm -f CMakeLists.txt* || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
-   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
-   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-   -DCOMPUTE_CAPABILITY=61
-   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
-   )
-   CMAKE_USE_DIR=${S}/${PN##*-} cmake_src_configure
-}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/, sci-physics/opticks-okconf/files/

[Andrew Ammerlaan]

commit: 0709867a50971336be324312cc69d660854f7a6e
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 11:54:24 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 11:54:24 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0709867a

sci-physics/opticks-okconf: delete package, it is identical to opticks

except that it doesn't work

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 ...cks-okconf-0.0.1_p20191110-no_lib_install.patch | 12 --
 sci-physics/opticks-okconf/metadata.xml|  7 
 .../opticks-okconf-0.0.1_p20191110.ebuild  | 46 --
 3 files changed, 65 deletions(-)

diff --git 
a/sci-physics/opticks-okconf/files/opticks-okconf-0.0.1_p20191110-no_lib_install.patch
 
b/sci-physics/opticks-okconf/files/opticks-okconf-0.0.1_p20191110-no_lib_install.patch
deleted file mode 100644
index 89b0b7cab..0
--- 
a/sci-physics/opticks-okconf/files/opticks-okconf-0.0.1_p20191110-no_lib_install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: opticks-okconf-0.0.1_p20191110/okconf/tests/CMakeLists.txt
-===
 opticks-okconf-0.0.1_p20191110.orig/okconf/tests/CMakeLists.txt
-+++ opticks-okconf-0.0.1_p20191110/okconf/tests/CMakeLists.txt
-@@ -46,7 +46,6 @@ foreach(TEST_SOURCE ${TEST_SOURCES})
- ) 
- 
- 
--install(TARGETS ${TGT} DESTINATION lib)
- endforeach()
- 
- 

diff --git a/sci-physics/opticks-okconf/metadata.xml 
b/sci-physics/opticks-okconf/metadata.xml
deleted file mode 100644
index 7203fb853..0
--- a/sci-physics/opticks-okconf/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   hero...@gentoo.org
-   
-

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
deleted file mode 100644
index c880f4f8b..0
--- a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mercurial cmake cuda
-
-EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
-EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
-
-DESCRIPTION="GPU Optical Photon Simulation for Particle Physics"
-HOMEPAGE="https://simoncblyth.bitbucket.io";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-util/nvidia-cuda-toolkit:=
-   dev-libs/optix"
-DEPEND="dev-util/cmake
-   dev-libs/boost
-   dev-util/bcm
-   dev-util/plog
-   ${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.0.1_p20191110-no_lib_install.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-   cuda_src_prepare
-
-   rm -f CMakeLists.txt* || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
-   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
-   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-   -DCOMPUTE_CAPABILITY=61
-   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
-   )
-   CMAKE_USE_DIR=${S}/${PN##*-} cmake_src_configure
-}

[gentoo-commits] proj/sci:master commit in: sci-physics/opticks-okconf/, sci-physics/opticks-okconf/files/

[Andrew Ammerlaan]

commit: 0709867a50971336be324312cc69d660854f7a6e
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 11:54:24 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 11:54:24 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0709867a

sci-physics/opticks-okconf: delete package, it is identical to opticks

except that it doesn't work

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 ...cks-okconf-0.0.1_p20191110-no_lib_install.patch | 12 --
 sci-physics/opticks-okconf/metadata.xml|  7 
 .../opticks-okconf-0.0.1_p20191110.ebuild  | 46 --
 3 files changed, 65 deletions(-)

diff --git 
a/sci-physics/opticks-okconf/files/opticks-okconf-0.0.1_p20191110-no_lib_install.patch
 
b/sci-physics/opticks-okconf/files/opticks-okconf-0.0.1_p20191110-no_lib_install.patch
deleted file mode 100644
index 89b0b7cab..0
--- 
a/sci-physics/opticks-okconf/files/opticks-okconf-0.0.1_p20191110-no_lib_install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: opticks-okconf-0.0.1_p20191110/okconf/tests/CMakeLists.txt
-===
 opticks-okconf-0.0.1_p20191110.orig/okconf/tests/CMakeLists.txt
-+++ opticks-okconf-0.0.1_p20191110/okconf/tests/CMakeLists.txt
-@@ -46,7 +46,6 @@ foreach(TEST_SOURCE ${TEST_SOURCES})
- ) 
- 
- 
--install(TARGETS ${TGT} DESTINATION lib)
- endforeach()
- 
- 

diff --git a/sci-physics/opticks-okconf/metadata.xml 
b/sci-physics/opticks-okconf/metadata.xml
deleted file mode 100644
index 7203fb853..0
--- a/sci-physics/opticks-okconf/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   hero...@gentoo.org
-   
-

diff --git a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild 
b/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
deleted file mode 100644
index c880f4f8b..0
--- a/sci-physics/opticks-okconf/opticks-okconf-0.0.1_p20191110.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mercurial cmake cuda
-
-EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN//-*}";
-EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
-
-DESCRIPTION="GPU Optical Photon Simulation for Particle Physics"
-HOMEPAGE="https://simoncblyth.bitbucket.io";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-util/nvidia-cuda-toolkit:=
-   dev-libs/optix"
-DEPEND="dev-util/cmake
-   dev-libs/boost
-   dev-util/bcm
-   dev-util/plog
-   ${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.0.1_p20191110-no_lib_install.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-   cuda_src_prepare
-
-   rm -f CMakeLists.txt* || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
-   -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
-   -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-   -DCOMPUTE_CAPABILITY=61
-   -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
-   )
-   CMAKE_USE_DIR=${S}/${PN##*-} cmake_src_configure
-}