From d5b8f7b4596c4372216e3c808f9abc54ff29789e Mon Sep 17 00:00:00 2001
From: Guilherme Amadio <amadio@gentoo.org>
Date: Fri, 1 Dec 2023 09:59:23 +0100
Subject: sci-physics/vgm: drop C++ standard USE flags in dependencies

Signed-off-by: Guilherme Amadio <amadio@gentoo.org>
---
 sci-physics/vgm/vgm-5.0-r1.ebuild | 86 +++++++++++++++++++++++++++++++++++++++
 sci-physics/vgm/vgm-5.0.ebuild    | 86 ---------------------------------------
 sci-physics/vgm/vgm-5.1-r1.ebuild | 81 ++++++++++++++++++++++++++++++++++++
 sci-physics/vgm/vgm-5.1.ebuild    | 81 ------------------------------------
 sci-physics/vgm/vgm-5.2-r1.ebuild | 81 ++++++++++++++++++++++++++++++++++++
 sci-physics/vgm/vgm-5.2.ebuild    | 81 ------------------------------------
 sci-physics/vgm/vgm-9999.ebuild   |  4 +-
 7 files changed, 250 insertions(+), 250 deletions(-)
 create mode 100644 sci-physics/vgm/vgm-5.0-r1.ebuild
 delete mode 100644 sci-physics/vgm/vgm-5.0.ebuild
 create mode 100644 sci-physics/vgm/vgm-5.1-r1.ebuild
 delete mode 100644 sci-physics/vgm/vgm-5.1.ebuild
 create mode 100644 sci-physics/vgm/vgm-5.2-r1.ebuild
 delete mode 100644 sci-physics/vgm/vgm-5.2.ebuild

(limited to 'sci-physics')

diff --git a/sci-physics/vgm/vgm-5.0-r1.ebuild b/sci-physics/vgm/vgm-5.0-r1.ebuild
new file mode 100644
index 000000000000..9a728c675b8b
--- /dev/null
+++ b/sci-physics/vgm/vgm-5.0-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
+else
+	MY_PV=$(ver_rs 1- -)
+	SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
+HOMEPAGE="https://github.com/vmc-project/vgm/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc examples +geant4 +root test"
+
+# upper version bound for Geant, see https://github.com/vmc-project/vgm/issues/10
+RDEPEND="
+	sci-physics/clhep:=
+	geant4? (
+		>=sci-physics/geant-4.11
+		<sci-physics/geant-4.11.1
+	)
+	root? ( sci-physics/root:= )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[dot] )
+	test? (
+		>=sci-physics/geant-4.11[gdml]
+		sci-physics/geant4_vmc[g4root]
+	)"
+RESTRICT="
+	!geant4? ( test )
+	!root? ( test )
+	!test? ( test )
+	!examples? ( test )"
+
+DOCS=(
+	doc/README
+	doc/VGMhistory.txt
+	doc/todo.txt
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCLHEP_DIR="${EPREFIX}/usr"
+		-DWITH_EXAMPLES="$(usex examples)"
+		-DINSTALL_EXAMPLES="$(usex examples)"
+		-DWITH_GEANT4="$(usex geant4)"
+		-DWITH_ROOT="$(usex root)"
+		-DWITH_TEST="$(usex test)"
+	)
+	if use test && use root && use geant4; then
+		mycmakeargs+=( -DWITH_G4ROOT=yes )
+	else
+		mycmakeargs+=( -DWITH_G4ROOT=no )
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		doxygen packages/Doxyfile || die
+	fi
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/test || die
+	# See upstream issue: https://github.com/vmc-project/vgm/issues/5
+	sed -i 's/ ScaledSolids / /' test3_suite.sh || die
+	PATH="${BUILD_DIR}"/test:${PATH} ./test_suite.sh || die
+}
+
+src_install() {
+	cmake_src_install
+	use doc && local HTML_DOCS=( doc/html/. )
+	einstalldocs
+}
diff --git a/sci-physics/vgm/vgm-5.0.ebuild b/sci-physics/vgm/vgm-5.0.ebuild
deleted file mode 100644
index 99dabda494c5..000000000000
--- a/sci-physics/vgm/vgm-5.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
-else
-	MY_PV=$(ver_rs 1- -)
-	SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
-HOMEPAGE="https://github.com/vmc-project/vgm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc examples +geant4 +root test"
-
-# upper version bound for Geant, see https://github.com/vmc-project/vgm/issues/10
-RDEPEND="
-	sci-physics/clhep:=
-	geant4? (
-		>=sci-physics/geant-4.11[c++17]
-		<sci-physics/geant-4.11.1[c++17]
-	)
-	root? ( sci-physics/root:=[c++17] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-	test? (
-		>=sci-physics/geant-4.11[gdml]
-		sci-physics/geant4_vmc[g4root]
-	)"
-RESTRICT="
-	!geant4? ( test )
-	!root? ( test )
-	!test? ( test )
-	!examples? ( test )"
-
-DOCS=(
-	doc/README
-	doc/VGMhistory.txt
-	doc/todo.txt
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCLHEP_DIR="${EPREFIX}/usr"
-		-DWITH_EXAMPLES="$(usex examples)"
-		-DINSTALL_EXAMPLES="$(usex examples)"
-		-DWITH_GEANT4="$(usex geant4)"
-		-DWITH_ROOT="$(usex root)"
-		-DWITH_TEST="$(usex test)"
-	)
-	if use test && use root && use geant4; then
-		mycmakeargs+=( -DWITH_G4ROOT=yes )
-	else
-		mycmakeargs+=( -DWITH_G4ROOT=no )
-	fi
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		doxygen packages/Doxyfile || die
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/test || die
-	# See upstream issue: https://github.com/vmc-project/vgm/issues/5
-	sed -i 's/ ScaledSolids / /' test3_suite.sh || die
-	PATH="${BUILD_DIR}"/test:${PATH} ./test_suite.sh || die
-}
-
-src_install() {
-	cmake_src_install
-	use doc && local HTML_DOCS=( doc/html/. )
-	einstalldocs
-}
diff --git a/sci-physics/vgm/vgm-5.1-r1.ebuild b/sci-physics/vgm/vgm-5.1-r1.ebuild
new file mode 100644
index 000000000000..c3e7db7ec478
--- /dev/null
+++ b/sci-physics/vgm/vgm-5.1-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
+else
+	MY_PV=$(ver_rs 1- -)
+	SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
+HOMEPAGE="https://github.com/vmc-project/vgm/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc examples +geant4 +root test"
+
+RDEPEND="
+	sci-physics/clhep:=
+	geant4? ( >=sci-physics/geant-4.11:= )
+	root? ( sci-physics/root:= )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[dot] )
+	test? (
+		>=sci-physics/geant-4.11:=[gdml]
+		sci-physics/geant4_vmc[g4root]
+	)"
+RESTRICT="
+	!geant4? ( test )
+	!root? ( test )
+	!test? ( test )
+	!examples? ( test )"
+
+DOCS=(
+	doc/README
+	doc/VGMhistory.txt
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCLHEP_DIR="${EPREFIX}/usr"
+		-DWITH_EXAMPLES="$(usex examples)"
+		-DINSTALL_EXAMPLES="$(usex examples)"
+		-DWITH_GEANT4="$(usex geant4)"
+		-DWITH_ROOT="$(usex root)"
+		-DWITH_TEST="$(usex test)"
+	)
+	if use test && use root && use geant4; then
+		mycmakeargs+=( -DWITH_G4ROOT=yes )
+	else
+		mycmakeargs+=( -DWITH_G4ROOT=no )
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		doxygen packages/Doxyfile || die
+	fi
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/test || die
+	# See upstream issue: https://github.com/vmc-project/vgm/issues/5
+	sed -i 's/ ScaledSolids / /' test3_suite.sh || die
+	PATH="${BUILD_DIR}"/test:${PATH} ./test_suite.sh || die
+}
+
+src_install() {
+	cmake_src_install
+	use doc && local HTML_DOCS=( doc/html/. )
+	einstalldocs
+}
diff --git a/sci-physics/vgm/vgm-5.1.ebuild b/sci-physics/vgm/vgm-5.1.ebuild
deleted file mode 100644
index 5f58d81f0baf..000000000000
--- a/sci-physics/vgm/vgm-5.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
-else
-	MY_PV=$(ver_rs 1- -)
-	SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
-HOMEPAGE="https://github.com/vmc-project/vgm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc examples +geant4 +root test"
-
-RDEPEND="
-	sci-physics/clhep:=
-	geant4? ( >=sci-physics/geant-4.11:=[c++17] )
-	root? ( sci-physics/root:=[c++17] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-	test? (
-		>=sci-physics/geant-4.11:=[gdml]
-		sci-physics/geant4_vmc[g4root]
-	)"
-RESTRICT="
-	!geant4? ( test )
-	!root? ( test )
-	!test? ( test )
-	!examples? ( test )"
-
-DOCS=(
-	doc/README
-	doc/VGMhistory.txt
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCLHEP_DIR="${EPREFIX}/usr"
-		-DWITH_EXAMPLES="$(usex examples)"
-		-DINSTALL_EXAMPLES="$(usex examples)"
-		-DWITH_GEANT4="$(usex geant4)"
-		-DWITH_ROOT="$(usex root)"
-		-DWITH_TEST="$(usex test)"
-	)
-	if use test && use root && use geant4; then
-		mycmakeargs+=( -DWITH_G4ROOT=yes )
-	else
-		mycmakeargs+=( -DWITH_G4ROOT=no )
-	fi
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		doxygen packages/Doxyfile || die
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/test || die
-	# See upstream issue: https://github.com/vmc-project/vgm/issues/5
-	sed -i 's/ ScaledSolids / /' test3_suite.sh || die
-	PATH="${BUILD_DIR}"/test:${PATH} ./test_suite.sh || die
-}
-
-src_install() {
-	cmake_src_install
-	use doc && local HTML_DOCS=( doc/html/. )
-	einstalldocs
-}
diff --git a/sci-physics/vgm/vgm-5.2-r1.ebuild b/sci-physics/vgm/vgm-5.2-r1.ebuild
new file mode 100644
index 000000000000..300d057df338
--- /dev/null
+++ b/sci-physics/vgm/vgm-5.2-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
+else
+	MY_PV=$(ver_rs 1- -)
+	SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
+HOMEPAGE="https://github.com/vmc-project/vgm/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc examples +geant4 +root test"
+
+RDEPEND="
+	sci-physics/clhep:=
+	geant4? ( >=sci-physics/geant-4.11:= )
+	root? ( sci-physics/root:= )"
+DEPEND="${RDEPEND}
+	test? (
+		>=sci-physics/geant-4.11:=[gdml]
+		sci-physics/geant4_vmc[g4root]
+	)"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+"
+RESTRICT="
+	!geant4? ( test )
+	!root? ( test )
+	!test? ( test )
+	!examples? ( test )"
+
+DOCS=(
+	doc/README
+	doc/VGMhistory.txt
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCLHEP_DIR="${EPREFIX}/usr"
+		-DWITH_EXAMPLES="$(usex examples)"
+		-DINSTALL_EXAMPLES="$(usex examples)"
+		-DWITH_GEANT4="$(usex geant4)"
+		-DWITH_ROOT="$(usex root)"
+		-DWITH_TEST="$(usex test)"
+	)
+	if use test && use root && use geant4; then
+		mycmakeargs+=( -DWITH_G4ROOT=yes )
+	else
+		mycmakeargs+=( -DWITH_G4ROOT=no )
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		doxygen packages/Doxyfile || die
+	fi
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/test || die
+	PATH="${BUILD_DIR}"/test:${PATH} ./test_suite.sh || die
+}
+
+src_install() {
+	cmake_src_install
+	use doc && local HTML_DOCS=( doc/html/. )
+	einstalldocs
+}
diff --git a/sci-physics/vgm/vgm-5.2.ebuild b/sci-physics/vgm/vgm-5.2.ebuild
deleted file mode 100644
index d0dbdb3dc943..000000000000
--- a/sci-physics/vgm/vgm-5.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
-else
-	MY_PV=$(ver_rs 1- -)
-	SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
-HOMEPAGE="https://github.com/vmc-project/vgm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc examples +geant4 +root test"
-
-RDEPEND="
-	sci-physics/clhep:=
-	geant4? ( >=sci-physics/geant-4.11:=[c++17] )
-	root? ( sci-physics/root:=[c++17] )"
-DEPEND="${RDEPEND}
-	test? (
-		>=sci-physics/geant-4.11:=[gdml]
-		sci-physics/geant4_vmc[g4root]
-	)"
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-RESTRICT="
-	!geant4? ( test )
-	!root? ( test )
-	!test? ( test )
-	!examples? ( test )"
-
-DOCS=(
-	doc/README
-	doc/VGMhistory.txt
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCLHEP_DIR="${EPREFIX}/usr"
-		-DWITH_EXAMPLES="$(usex examples)"
-		-DINSTALL_EXAMPLES="$(usex examples)"
-		-DWITH_GEANT4="$(usex geant4)"
-		-DWITH_ROOT="$(usex root)"
-		-DWITH_TEST="$(usex test)"
-	)
-	if use test && use root && use geant4; then
-		mycmakeargs+=( -DWITH_G4ROOT=yes )
-	else
-		mycmakeargs+=( -DWITH_G4ROOT=no )
-	fi
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		doxygen packages/Doxyfile || die
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/test || die
-	PATH="${BUILD_DIR}"/test:${PATH} ./test_suite.sh || die
-}
-
-src_install() {
-	cmake_src_install
-	use doc && local HTML_DOCS=( doc/html/. )
-	einstalldocs
-}
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index f7524d3384d5..94069713f88b 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -24,8 +24,8 @@ IUSE="doc examples +geant4 +root test"
 
 RDEPEND="
 	sci-physics/clhep:=
-	geant4? ( sci-physics/geant:=[c++17] )
-	root? ( sci-physics/root:=[c++17] )"
+	geant4? ( sci-physics/geant:= )
+	root? ( sci-physics/root:= )"
 DEPEND="${RDEPEND}
 	test? (
 		sci-physics/geant:=[gdml]
-- 
cgit v1.2.3-65-gdbad