commit: 22741cc1427840028ffc0eeaf8012c43309d5272
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 19 21:28:08 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 19 21:49:08 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22741cc1
sci-chemistry/openbabel: use PERL_FEATURES
Signed-off-by: Sam James <sam <AT> gentoo.org>
...-9999.ebuild => openbabel-3.1.1_p20241221-r3.ebuild} | 17 ++++++++++++++---
sci-chemistry/openbabel/openbabel-9999.ebuild | 15 ++++++++++++---
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/sci-chemistry/openbabel/openbabel-9999.ebuild
b/sci-chemistry/openbabel/openbabel-3.1.1_p20241221-r3.ebuild
similarity index 94%
copy from sci-chemistry/openbabel/openbabel-9999.ebuild
copy to sci-chemistry/openbabel/openbabel-3.1.1_p20241221-r3.ebuild
index 40daa8ae6b4e..78d91ab65643 100644
--- a/sci-chemistry/openbabel/openbabel-9999.ebuild
+++ b/sci-chemistry/openbabel/openbabel-3.1.1_p20241221-r3.ebuild
@@ -3,10 +3,11 @@
EAPI=8
+GENTOO_DEPEND_ON_PERL="no"
PYTHON_COMPAT=( python3_{11..14} )
WX_GTK_VER=3.2-gtk3
-inherit cmake desktop flag-o-matic perl-functions python-r1 toolchain-funcs
wxwidgets xdg
+inherit cmake desktop flag-o-matic perl-module python-r1 toolchain-funcs
wxwidgets xdg
DESCRIPTION="Interconverts file formats used in molecular modeling"
HOMEPAGE="https://openbabel.org/ https://github.com/openbabel/openbabel/";
@@ -31,7 +32,7 @@ fi
LICENSE="GPL-2"
# See src/CMakeLists.txt for LIBRARY_VERSION
SLOT="0/7.0.0"
-IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 doc examples
+inchi json minimal openmp perl png python test wxwidgets"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 doc examples
+inchi json minimal openmp perl png python test wxwidgets
${GENTOO_PERL_USESTRING}"
RESTRICT="!test? ( test )"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
@@ -47,7 +48,10 @@ RDEPEND="
dev-libs/libxml2:2=
png? ( x11-libs/cairo )
)
- perl? ( dev-lang/perl:= )
+ perl? (
+ ${GENTOO_PERL_DEPSTRING}
+ dev-lang/perl:=
+ )
python? ( ${PYTHON_DEPS} )
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}=[X] )
"
@@ -68,6 +72,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.1.1_p2024-fix_pybind.patch
# prevent installation of examples in /usr/bin
"${FILESDIR}"/${PN}-3.1.1_p2024-fix_examples.patch
+ # cmake4-compat
+ "${FILESDIR}"/${PN}-3.1.1_p2024-cmake4.patch
)
pkg_pretend() {
@@ -158,6 +164,11 @@ src_configure() {
cmake_src_configure
}
+src_compile() {
+ # Avoid perl-module_src_compile (bug #963096)
+ cmake_src_compile
+}
+
src_test() {
local CMAKE_SKIP_TESTS=(
# https://github.com/openbabel/openbabel/issues/2766
diff --git a/sci-chemistry/openbabel/openbabel-9999.ebuild
b/sci-chemistry/openbabel/openbabel-9999.ebuild
index 40daa8ae6b4e..9e54cdf2056c 100644
--- a/sci-chemistry/openbabel/openbabel-9999.ebuild
+++ b/sci-chemistry/openbabel/openbabel-9999.ebuild
@@ -3,10 +3,11 @@
EAPI=8
+GENTOO_DEPEND_ON_PERL="no"
PYTHON_COMPAT=( python3_{11..14} )
WX_GTK_VER=3.2-gtk3
-inherit cmake desktop flag-o-matic perl-functions python-r1 toolchain-funcs
wxwidgets xdg
+inherit cmake desktop flag-o-matic perl-module python-r1 toolchain-funcs
wxwidgets xdg
DESCRIPTION="Interconverts file formats used in molecular modeling"
HOMEPAGE="https://openbabel.org/ https://github.com/openbabel/openbabel/";
@@ -31,7 +32,7 @@ fi
LICENSE="GPL-2"
# See src/CMakeLists.txt for LIBRARY_VERSION
SLOT="0/7.0.0"
-IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 doc examples
+inchi json minimal openmp perl png python test wxwidgets"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 doc examples
+inchi json minimal openmp perl png python test wxwidgets
${GENTOO_PERL_USESTRING}"
RESTRICT="!test? ( test )"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
@@ -47,7 +48,10 @@ RDEPEND="
dev-libs/libxml2:2=
png? ( x11-libs/cairo )
)
- perl? ( dev-lang/perl:= )
+ perl? (
+ ${GENTOO_PERL_DEPSTRING}
+ dev-lang/perl:=
+ )
python? ( ${PYTHON_DEPS} )
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}=[X] )
"
@@ -158,6 +162,11 @@ src_configure() {
cmake_src_configure
}
+src_compile() {
+ # Avoid perl-module_src_compile (bug #963096)
+ cmake_src_compile
+}
+
src_test() {
local CMAKE_SKIP_TESTS=(
# https://github.com/openbabel/openbabel/issues/2766
