[gentoo-commits] repo/gentoo:master commit in: sys-libs/tdb/files/, sys-libs/tdb/

[gentoo-commits] repo/gentoo:master commit in: sys-libs/tdb/files/, sys-libs/tdb/

[Sam James]

commit:     910d028c7514d9547c1d6a716546eadc9707d86b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 04:01:02 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 04:31:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=910d028c

sys-libs/tdb: fix runtime w/ clang 16

Closes: https://bugs.gentoo.org/870043
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../tdb/files/tdb-1.4.7-configure-clang16.patch    | 26 ++++++++++++++++++++++
 .../tdb/{tdb-1.4.7.ebuild => tdb-1.4.7-r1.ebuild}  |  8 +++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/sys-libs/tdb/files/tdb-1.4.7-configure-clang16.patch b/sys-libs/tdb/files/tdb-1.4.7-configure-clang16.patch
new file mode 100644
index 000000000000..9d3e485da57c
--- /dev/null
+++ b/sys-libs/tdb/files/tdb-1.4.7-configure-clang16.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/870043
+https://gitlab.com/samba-team/samba/-/merge_requests/2807
+https://src.fedoraproject.org/rpms/libtdb/blob/rawhide/f/libtdb-waf18-c99.patch
+
+Avoid calling lib_func without a prototype.
+
+This commit mirrors the change in commit f4c0a750d4adebcf2342a44e85f04526c34
+("WAF: Fix detection of linker features")
+to buildtools/wafsamba/samba_conftests.py.  It fixes the check for rpath
+support with compilers in strict C99 mode.
+
+Submitted upstream: <https://gitlab.com/samba-team/samba/-/merge_requests/2807>
+
+--- a/buildtools/wafsamba/samba_waf18.py
++++ b/buildtools/wafsamba/samba_waf18.py
+@@ -209,7 +209,8 @@ def CHECK_LIBRARY_SUPPORT(conf, rpath=False, version_script=False, msg=None):
+         lib_node.parent.mkdir()
+         lib_node.write('int lib_func(void) { return 42; }\n', 'w')
+         main_node = bld.srcnode.make_node('main.c')
+-        main_node.write('int main(void) {return !(lib_func() == 42);}', 'w')
++        main_node.write('int lib_func(void);\n'
++                        'int main(void) {return !(lib_func() == 42);}', 'w')
+         linkflags = []
+         if version_script:
+             script = bld.srcnode.make_node('ldscript')
+

diff --git a/sys-libs/tdb/tdb-1.4.7.ebuild b/sys-libs/tdb/tdb-1.4.7-r1.ebuild
similarity index 93%
rename from sys-libs/tdb/tdb-1.4.7.ebuild
rename to sys-libs/tdb/tdb-1.4.7-r1.ebuild
index 395a57071e4e..791b32c1f197 100644
--- a/sys-libs/tdb/tdb-1.4.7.ebuild
+++ b/sys-libs/tdb/tdb-1.4.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
@@ -28,6 +28,10 @@ BDEPEND="${PYTHON_DEPS}
 
 WAF_BINARY="${S}/buildtools/bin/waf"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.7-configure-clang16.patch
+)
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 	export PYTHONHASHSEED=1

[gentoo-commits] repo/gentoo:master commit in: sys-libs/tdb/files/, sys-libs/tdb/

[Ben Kohler]

commit:     3e5771acd9408b174b1393e81993907001f1a732
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 17:24:13 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 18:07:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e5771ac

sys-libs/tdb: drop 1.4.7-r1

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-libs/tdb/Manifest                              |  1 -
 .../tdb/files/tdb-1.4.7-configure-clang16.patch    | 26 --------
 sys-libs/tdb/tdb-1.4.7-r1.ebuild                   | 75 ----------------------
 3 files changed, 102 deletions(-)

diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index e452caa9bab1..f5c2ceb76f6f 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -1,3 +1,2 @@
-DIST tdb-1.4.7.tar.gz 741714 BLAKE2B ec2f991bbaa61d46f16b7a68a4e47a2f690cda261dd0e9fd9708e51ad64eefeb54ac8b1102cde6935916f840d3c89d7a2903f58175cceb78ea4ef889e82ddbc6 SHA512 2b5b20c299b60545943f106d854b6e0d4a559e16f08a7ed62fe57ee962bebc888c2e663bd5fef907aace05b316826fe8fbbf3f323b6d3427531e59ffe47d48e4
 DIST tdb-1.4.8.tar.gz 742791 BLAKE2B dc2705cb16ee59f4d5bf25602032b25fd5338caa890db19939996a40cd19c4c999f9a74786d5754dbbd1de54d818541cf56844beeb33008aaee507d5dfcdba85 SHA512 763beebe923aa04303cbb91ce5970e6bbd13546888cff75ea9ab025afff3ef88fee539ae173fc2fb7ec661b6c337b0c2da361ce3d318f51ef6627bdb3fe6ca63
 DIST tdb-1.4.9.tar.gz 746608 BLAKE2B 2cdcf636b9ef5445d48ca2aab79d4ffd137a8409b6d7b1fcdbcd28797d4bbe617f768a5ef92a14c4ae6dddfc37576f5d411cf4d67edeb4319f46a1a15ffd94ee SHA512 6b0109075826b8630f6b5a7e7ade2fcff95c5d05338340af78219422610947c520707b3e484ff13fbd40bbfffe13977976e8ddcb1be7b13e13ac78b4e3ec06c2

diff --git a/sys-libs/tdb/files/tdb-1.4.7-configure-clang16.patch b/sys-libs/tdb/files/tdb-1.4.7-configure-clang16.patch
deleted file mode 100644
index 9d3e485da57c..000000000000
--- a/sys-libs/tdb/files/tdb-1.4.7-configure-clang16.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/870043
-https://gitlab.com/samba-team/samba/-/merge_requests/2807
-https://src.fedoraproject.org/rpms/libtdb/blob/rawhide/f/libtdb-waf18-c99.patch
-
-Avoid calling lib_func without a prototype.
-
-This commit mirrors the change in commit f4c0a750d4adebcf2342a44e85f04526c34
-("WAF: Fix detection of linker features")
-to buildtools/wafsamba/samba_conftests.py.  It fixes the check for rpath
-support with compilers in strict C99 mode.
-
-Submitted upstream: <https://gitlab.com/samba-team/samba/-/merge_requests/2807>
-
---- a/buildtools/wafsamba/samba_waf18.py
-+++ b/buildtools/wafsamba/samba_waf18.py
-@@ -209,7 +209,8 @@ def CHECK_LIBRARY_SUPPORT(conf, rpath=False, version_script=False, msg=None):
-         lib_node.parent.mkdir()
-         lib_node.write('int lib_func(void) { return 42; }\n', 'w')
-         main_node = bld.srcnode.make_node('main.c')
--        main_node.write('int main(void) {return !(lib_func() == 42);}', 'w')
-+        main_node.write('int lib_func(void);\n'
-+                        'int main(void) {return !(lib_func() == 42);}', 'w')
-         linkflags = []
-         if version_script:
-             script = bld.srcnode.make_node('ldscript')
-

diff --git a/sys-libs/tdb/tdb-1.4.7-r1.ebuild b/sys-libs/tdb/tdb-1.4.7-r1.ebuild
deleted file mode 100644
index 55c2e9844937..000000000000
--- a/sys-libs/tdb/tdb-1.4.7-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-inherit waf-utils multilib-minimal python-single-r1
-
-DESCRIPTION="Simple database API"
-HOMEPAGE="https://tdb.samba.org/"
-SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/libcrypt
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.2
-"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.7-configure-clang16.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	export PYTHONHASHSEED=1
-}
-
-src_prepare() {
-	default
-	python_fix_shebang .
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local extra_opts=()
-	if ! multilib_is_native_abi || ! use python ; then
-		extra_opts+=( --disable-python )
-	fi
-
-	waf-utils_src_configure "${extra_opts[@]}"
-}
-
-multilib_src_compile() {
-	# need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
-	unset MAKEOPTS
-	waf-utils_src_compile
-}
-
-multilib_src_test() {
-	# the default src_test runs 'make test' and 'make check', letting
-	# the tests fail occasionally (reason: unknown)
-	emake check
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-	use python && python_optimize
-}