gentoo auto-resync : 11:10:2022 - 13:38:21

4 files changed, 32 insertions, 23 deletions

diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 0698c9b70dcb..20d651a69e2e 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -11,7 +11,7 @@ EBUILD libomp-13.0.1.ebuild 3907 BLAKE2B 46ed471cb355b70f78b59faeffbcc5148d47a3b
 EBUILD libomp-14.0.6-r1.ebuild 3917 BLAKE2B 23460d17ef5b7e107d8be1bd1c37028d69fda2e151e7d8f7f0c6d23dc00336f5a503a4e8e692b4203f3e4219fde6f96f9d30d4c7fed0348066f8c603636cc39b SHA512 aa9e9985a1941fe5c33b998d81bfdd838dbe965d5c82e20e366d2cf7a08db24feb2f3f7633740bea45a3685049d1593df6465b8c785b9a87c197402f559b26ca
 EBUILD libomp-15.0.2.ebuild 3387 BLAKE2B c61c0fc5f15d2743dadada477d545632aa2f9fcafe87eb5430759388777622e1c75f01450b9a73bc8c2dbe0ec30ca06704b15ea9de44d3b85b7667e656dbb988 SHA512 96ed59bda11b08894843c0bb0ecc55a8556b0da4c28027ac5097f3e2358f15c8dbb2aa18cc19236bc0b6f75d3d55d21c2608d7aec207fddaf2da6f8532fa9d7a
 EBUILD libomp-15.0.3.9999.ebuild 3339 BLAKE2B 4fb077e0f5195f1c2fef3691aba3e8b674d340df9f3d1de8c9962a03267662bcf55a43af75db6e3ab5121de6c129c7f7514c127ec27c3b940cb2fbbf619788d4 SHA512 49aa1cb488a8e428892dd3b74a82462206e9c11e139b5b9b8e2edca496279c274f81ece0dcb9e71eea43c4e6f99ca4aacd5bdc48e4595743b7f98e7a1f7ae3d9
-EBUILD libomp-16.0.0.9999.ebuild 3428 BLAKE2B d6fccc25e17fc6284c9825380c2ef44d2bcf097a8e2f6688f30a945c7897a1ce3e6356c7daecc2a190caf6fb8519d9b90b038c356f1bf0d345a32137c38bc3b6 SHA512 9a3b80bb956a7da6af1b77db07fb9f55ac2dc65e621761ab52bcd1a8aa3dcbe285e2e134984f02e69692bab608d1ebac25e815367cb5c388c929100bfc5f15d2
+EBUILD libomp-16.0.0.9999.ebuild 3483 BLAKE2B c8915d21a00fdbfed5676a0ef0958cb0a4044f8d72dce5efffd336f72c151b288c58d14c54c1cc866089d7db9181265e040dcaf793252394fd50b2c4428e759a SHA512 af497a32eb79e93dddae5c1ba475d0c8a9aa1a14101f00144d0eccdb08cb2982b47550d20ecb26a9e84cbab4c7db1c82d330b39d982b0f14053ceb4fbd7c2230
 EBUILD libomp-16.0.0_pre20221006.ebuild 3428 BLAKE2B d6fccc25e17fc6284c9825380c2ef44d2bcf097a8e2f6688f30a945c7897a1ce3e6356c7daecc2a190caf6fb8519d9b90b038c356f1bf0d345a32137c38bc3b6 SHA512 9a3b80bb956a7da6af1b77db07fb9f55ac2dc65e621761ab52bcd1a8aa3dcbe285e2e134984f02e69692bab608d1ebac25e815367cb5c388c929100bfc5f15d2
-EBUILD libomp-16.0.0_pre20221010.ebuild 3428 BLAKE2B d6fccc25e17fc6284c9825380c2ef44d2bcf097a8e2f6688f30a945c7897a1ce3e6356c7daecc2a190caf6fb8519d9b90b038c356f1bf0d345a32137c38bc3b6 SHA512 9a3b80bb956a7da6af1b77db07fb9f55ac2dc65e621761ab52bcd1a8aa3dcbe285e2e134984f02e69692bab608d1ebac25e815367cb5c388c929100bfc5f15d2
-MISC metadata.xml 908 BLAKE2B c200fb1c93ae8fbd3963b2b575586fbe8f6df2308a2babbe3da77c2cf59c3fa43f938849d47df2ef4acf381f247848c363a20cf33ad763be169764cbe43c4bb4 SHA512 3cde603a2de523c21fbf288d459d76c697f2291d3dc3dac47e70781a910b4d524442d3076d8541818f2d43c3c6477af75d5f0cb76c4fbe0b4567a11d67edb056
+EBUILD libomp-16.0.0_pre20221010.ebuild 3483 BLAKE2B c8915d21a00fdbfed5676a0ef0958cb0a4044f8d72dce5efffd336f72c151b288c58d14c54c1cc866089d7db9181265e040dcaf793252394fd50b2c4428e759a SHA512 af497a32eb79e93dddae5c1ba475d0c8a9aa1a14101f00144d0eccdb08cb2982b47550d20ecb26a9e84cbab4c7db1c82d330b39d982b0f14053ceb4fbd7c2230
+MISC metadata.xml 963 BLAKE2B fdea4545db21492049061b85eaa7038965183e10aceae7c41daadc1ce10e7e1bcb2e86344659787ee244360b50b51c99e1a348d3acd2185dac80097541a00dd7 SHA512 c279f8e9c2463dc3f6e02856e520105d6f3321b633439bfe7409bfd6e7e43f1450053dc4f6663492caf7077caf3f4ab0f5cf0161631639e3aefa9ff985dc476f
diff --git a/sys-libs/libomp/libomp-16.0.0.9999.ebuild b/sys-libs/libomp/libomp-16.0.0.9999.ebuild
index dca2bf97647b..bc1e59029b71 100644
--- a/sys-libs/libomp/libomp-16.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-16.0.0.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..11} )
-inherit flag-o-matic cmake-multilib linux-info llvm llvm.org python-any-r1
+inherit flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="https://openmp.llvm.org"
@@ -13,12 +13,16 @@ LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0/${LLVM_SOABI}"
 KEYWORDS=""
 IUSE="
-	debug hwloc offload ompt test
+	debug gdb-plugin hwloc offload ompt test
 	llvm_targets_AMDGPU llvm_targets_NVPTX
 "
+REQUIRED_USE="
+	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
+"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	gdb-plugin? ( ${PYTHON_DEPS} )
 	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
 	offload? (
 		virtual/libelf:=[${MULTILIB_USEDEP}]
@@ -41,7 +45,10 @@ BDEPEND="
 		virtual/pkgconfig
 	)
 	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
 		sys-devel/clang
 	)
 "
@@ -49,10 +56,6 @@ BDEPEND="
 LLVM_COMPONENTS=( openmp cmake llvm/include )
 llvm.org_set_globals
 
-python_check_deps() {
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
 kernel_pds_check() {
 	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
 		local CONFIG_CHECK="~!SCHED_PDS"
@@ -72,7 +75,9 @@ pkg_pretend() {
 
 pkg_setup() {
 	use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
+	if use gdb-plugin || use test; then
+		python-single-r1_pkg_setup
+	fi
 }
 
 multilib_src_configure() {
@@ -87,6 +92,7 @@ multilib_src_configure() {
 		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
 
 		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
 		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
 
 		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
@@ -95,8 +101,6 @@ multilib_src_configure() {
 		-DLIBOMP_INSTALL_ALIASES=OFF
 		# disable unnecessary hack copying stuff back to srcdir
 		-DLIBOMP_COPY_EXPORTS=OFF
-		# disable until upstream fixes it to use positive logic
-		-DDISABLE_OMPD_GDB_PLUGIN=ON
 	)
 
 	if use offload; then
diff --git a/sys-libs/libomp/libomp-16.0.0_pre20221010.ebuild b/sys-libs/libomp/libomp-16.0.0_pre20221010.ebuild
index dca2bf97647b..bc1e59029b71 100644
--- a/sys-libs/libomp/libomp-16.0.0_pre20221010.ebuild
+++ b/sys-libs/libomp/libomp-16.0.0_pre20221010.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..11} )
-inherit flag-o-matic cmake-multilib linux-info llvm llvm.org python-any-r1
+inherit flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="https://openmp.llvm.org"
@@ -13,12 +13,16 @@ LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0/${LLVM_SOABI}"
 KEYWORDS=""
 IUSE="
-	debug hwloc offload ompt test
+	debug gdb-plugin hwloc offload ompt test
 	llvm_targets_AMDGPU llvm_targets_NVPTX
 "
+REQUIRED_USE="
+	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
+"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	gdb-plugin? ( ${PYTHON_DEPS} )
 	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
 	offload? (
 		virtual/libelf:=[${MULTILIB_USEDEP}]
@@ -41,7 +45,10 @@ BDEPEND="
 		virtual/pkgconfig
 	)
 	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
 		sys-devel/clang
 	)
 "
@@ -49,10 +56,6 @@ BDEPEND="
 LLVM_COMPONENTS=( openmp cmake llvm/include )
 llvm.org_set_globals
 
-python_check_deps() {
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
 kernel_pds_check() {
 	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
 		local CONFIG_CHECK="~!SCHED_PDS"
@@ -72,7 +75,9 @@ pkg_pretend() {
 
 pkg_setup() {
 	use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
+	if use gdb-plugin || use test; then
+		python-single-r1_pkg_setup
+	fi
 }
 
 multilib_src_configure() {
@@ -87,6 +92,7 @@ multilib_src_configure() {
 		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
 
 		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
 		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
 
 		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
@@ -95,8 +101,6 @@ multilib_src_configure() {
 		-DLIBOMP_INSTALL_ALIASES=OFF
 		# disable unnecessary hack copying stuff back to srcdir
 		-DLIBOMP_COPY_EXPORTS=OFF
-		# disable until upstream fixes it to use positive logic
-		-DDISABLE_OMPD_GDB_PLUGIN=ON
 	)
 
 	if use offload; then
diff --git a/sys-libs/libomp/metadata.xml b/sys-libs/libomp/metadata.xml
index 63801061d848..ec501a894a66 100644
--- a/sys-libs/libomp/metadata.xml
+++ b/sys-libs/libomp/metadata.xml
@@ -10,6 +10,7 @@
 	</maintainer>
 	<use>
 		<flag name="cuda">Build CUDA offloading plugin (only with USE=offload)</flag>
+		<flag name="gdb-plugin">Build OMPD GDB plugin</flag>
 		<flag name="hwloc">Enable CPU affinity support via hwloc</flag>
 		<flag name="offload">Support offloading OpenMP using libomptarget</flag>
 		<flag name="ompt">Enable OpenMP Tools Interface support</flag>