From 9cd5e87a358764b664f509c2d7556a2916be918d Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Fri, 6 Nov 2020 13:50:53 +0100 Subject: [PATCH] sys-libs/tdb: update to 1.4.3 To be able to build samba 4.11, we need to update `sys-libs/tdb` to 1.4.3. --- .../portage-stable/sys-libs/tdb/ChangeLog | 150 -------- .../sys-libs/tdb/ChangeLog-2015 | 329 ------------------ .../portage-stable/sys-libs/tdb/Manifest | 2 +- .../files/add_missing_stdbool_h_include.patch | 27 -- .../sys-libs/tdb/files/tdb-1.3.7-fix.patch | 55 --- .../{tdb-1.3.15.ebuild => tdb-1.4.3.ebuild} | 26 +- 6 files changed, 15 insertions(+), 574 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/tdb/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/tdb/ChangeLog-2015 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/tdb/files/add_missing_stdbool_h_include.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/tdb/files/tdb-1.3.7-fix.patch rename sdk_container/src/third_party/portage-stable/sys-libs/tdb/{tdb-1.3.15.ebuild => tdb-1.4.3.ebuild} (63%) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/ChangeLog b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/ChangeLog deleted file mode 100644 index 92abb4747d..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/ChangeLog +++ /dev/null @@ -1,150 +0,0 @@ -# ChangeLog for sys-libs/tdb -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*tdb-1.3.7 (09 Aug 2015) -*tdb-1.3.6 (09 Aug 2015) -*tdb-1.3.0-r1 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson - +files/add_missing_stdbool_h_include.patch, +files/tdb-1.3.7-fix.patch, - +metadata.xml, +tdb-1.3.0-r1.ebuild, +tdb-1.3.6.ebuild, +tdb-1.3.7.ebuild: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson - X-Thanks: Alec Warner - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman - validation scripts - X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - - 24 Aug 2015; Justin Lecher metadata.xml: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Mike Gilbert metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - -*tdb-1.3.8 (23 Nov 2015) - - 23 Nov 2015; Lars Wendler +tdb-1.3.8.ebuild: - Bump to version 1.3.8 - - Package-Manager: portage-2.2.25 - Signed-off-by: Lars Wendler - - 23 Nov 2015; Lars Wendler -tdb-1.3.6.ebuild: - Removed old. - - Package-Manager: portage-2.2.25 - Signed-off-by: Lars Wendler - - 29 Dec 2015; Agostino Sarubbo tdb-1.3.8.ebuild: - amd64 stable wrt bug #568432 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="amd64" - Signed-off-by: Agostino Sarubbo - - 29 Dec 2015; Agostino Sarubbo tdb-1.3.8.ebuild: - x86 stable wrt bug #568432 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="x86" - Signed-off-by: Agostino Sarubbo - - 07 Jan 2016; Agostino Sarubbo tdb-1.3.8.ebuild: - ppc stable wrt bug #568432 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="ppc" - Signed-off-by: Agostino Sarubbo - - 07 Jan 2016; Agostino Sarubbo tdb-1.3.8.ebuild: - ppc64 stable wrt bug #568432 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="ppc64" - Signed-off-by: Agostino Sarubbo - - 07 Jan 2016; Markus Meier tdb-1.3.8.ebuild: - arm stable, bug #568432 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="arm" - - 08 Jan 2016; Agostino Sarubbo tdb-1.3.8.ebuild: - ia64 stable wrt bug #568432 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="ia64" - Signed-off-by: Agostino Sarubbo - - 08 Jan 2016; Agostino Sarubbo tdb-1.3.8.ebuild: - alpha stable wrt bug #568432 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="alpha" - Signed-off-by: Agostino Sarubbo - - 09 Jan 2016; Agostino Sarubbo tdb-1.3.8.ebuild: - sparc stable wrt bug #568432 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="sparc" - Signed-off-by: Agostino Sarubbo - - 12 Jan 2016; Jeroen Roovers tdb-1.3.8.ebuild: - Stable for HPPA (bug #568432). - - Package-Manager: portage-2.2.26 - RepoMan-Options: --ignore-arches - - 24 Jan 2016; Michał Górny metadata.xml: - Replace all herds with appropriate projects (GLEP 67) - - Replace all uses of herd with appropriate project maintainers, or no - maintainers in case of herds requested to be disbanded. - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - - 29 Mar 2016; Lars Wendler -tdb-1.3.0-r1.ebuild, - -tdb-1.3.7.ebuild: - Removed old. - - Package-Manager: portage-2.2.28 - Signed-off-by: Lars Wendler - diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/ChangeLog-2015 deleted file mode 100644 index 46d673ff23..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/ChangeLog-2015 +++ /dev/null @@ -1,329 +0,0 @@ -# ChangeLog for sys-libs/tdb -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v 1.86 2015/08/08 09:18:14 polynomial-c Exp $ - - 08 Aug 2015; Lars Wendler tdb-1.3.7.ebuild, - +files/tdb-1.3.7-fix.patch: - Fixed compilation with abi_x86_32 (bug #556920). - -*tdb-1.3.7 (07 Aug 2015) - - 07 Aug 2015; Lars Wendler -tdb-1.3.5.ebuild, - +tdb-1.3.7.ebuild: - Version bump. Removed old. - -*tdb-1.3.6 (16 Jun 2015) - - 16 Jun 2015; Lars Wendler -tdb-1.3.4.ebuild, - +tdb-1.3.6.ebuild: - Version bump. Removed old. - -*tdb-1.3.5 (09 Jun 2015) - - 09 Jun 2015; Lars Wendler -tdb-1.3.3.ebuild, - +tdb-1.3.5.ebuild: - Version bump. Removed old. - - 03 Mar 2015; Yixun Lan tdb-1.3.4.ebuild: - add arm64 support, tested on A53 board - - 03 Jan 2015; Michał Górny tdb-1.3.0-r1.ebuild, - tdb-1.3.3.ebuild, tdb-1.3.4.ebuild: - Add PYTHON_REQ_USE as necessary for waf. - -*tdb-1.3.4 (22 Dec 2014) - - 22 Dec 2014; Lars Wendler -tdb-1.3.2.ebuild, - +tdb-1.3.4.ebuild: - Version bump. Removed old. - -*tdb-1.3.3 (04 Dec 2014) - - 04 Dec 2014; Lars Wendler -tdb-1.3.1.ebuild, - +tdb-1.3.3.ebuild: - Version bump. Removed old. - -*tdb-1.3.2 (02 Dec 2014) - - 02 Dec 2014; Lars Wendler -tdb-1.2.10.ebuild, - -tdb-1.2.11.ebuild, -tdb-1.2.13.ebuild, +tdb-1.3.2.ebuild: - Version bump. Removed old. - - 11 Nov 2014; Mike Gilbert tdb-1.3.0-r1.ebuild, - tdb-1.3.1.ebuild: - Depend on python unconditionally at build time, bug 475370. Patch by Nikoli. - - 11 Oct 2014; Markus Meier tdb-1.3.0-r1.ebuild: - arm stable, bug #512012 - -*tdb-1.3.1 (18 Sep 2014) - - 18 Sep 2014; Lars Wendler -tdb-1.3.0.ebuild, - +tdb-1.3.1.ebuild: - Version bump. Removed old. - - 15 Sep 2014; Agostino Sarubbo tdb-1.3.0-r1.ebuild: - Stable for sparc, wrt bug #512012 - - 25 Aug 2014; Agostino Sarubbo tdb-1.3.0-r1.ebuild: - Stable for alpha, wrt bug #512012 - - 23 Aug 2014; Agostino Sarubbo tdb-1.3.0-r1.ebuild: - Stable for ia64, wrt bug #512012 - - 21 Aug 2014; Agostino Sarubbo tdb-1.3.0-r1.ebuild: - Stable for ppc64, wrt bug #512012 - - 11 Aug 2014; Patrick Lauer tdb-1.3.0-r1.ebuild: - Restrict parallel building #519164 - - 07 Aug 2014; Jeroen Roovers tdb-1.3.0-r1.ebuild: - Stable for HPPA (bug #512012). - - 28 Jul 2014; Agostino Sarubbo tdb-1.3.0-r1.ebuild: - Stable for ppc, wrt bug #512012 - - 23 Jul 2014; Agostino Sarubbo tdb-1.3.0-r1.ebuild: - Stable for x86, wrt bug #512012 - - 22 Jul 2014; Agostino Sarubbo tdb-1.3.0-r1.ebuild: - Stable for amd64, wrt bug #512912 - - 11 Jun 2014; Rémi Cardona tdb-1.3.0-r1.ebuild, - +files/add_missing_stdbool_h_include.patch: - Add patch to add missing stdbool.h include in tdb.h, see bug #511846. - -*tdb-1.3.0-r1 (11 Jun 2014) - - 11 Jun 2014; Michał Górny +tdb-1.3.0-r1.ebuild: - Enable multilib support, needed by net-fs/samba. - - 24 May 2014; Patrick Lauer metadata.xml: - Remove unneded useflags from metadata.xml - -*tdb-1.3.0 (23 May 2014) - - 23 May 2014; Lars Wendler -tdb-1.2.7-r1.ebuild, - -tdb-1.2.12-r1.ebuild, +tdb-1.3.0.ebuild: - Version bump. Removed old. - -*tdb-1.2.13 (23 Mar 2014) - - 23 Mar 2014; Lars Wendler +tdb-1.2.13.ebuild: - Version bump. - - 06 Sep 2013; Agostino Sarubbo tdb-1.2.11.ebuild: - Stable for sparc, wrt bug #478260 - - 03 Sep 2013; Agostino Sarubbo tdb-1.2.11.ebuild: - Stable for ia64, wrt bug #478260 - - 01 Sep 2013; Agostino Sarubbo tdb-1.2.11.ebuild: - Stable for alpha, wrt bug #478260 - - 25 Aug 2013; Markus Meier tdb-1.2.11.ebuild: - arm stable, bug #478260 - - 07 Aug 2013; Lars Wendler -tdb-1.2.1.ebuild, - -tdb-1.2.1-r1.ebuild, tdb-1.2.7-r1.ebuild, -tdb-1.2.9.ebuild, - tdb-1.2.10.ebuild, -tdb-1.2.12.ebuild: - Removed old versions. Dropped KEYWORDS on remaining older versions. - -*tdb-1.2.12-r1 (30 Jun 2013) - - 30 Jun 2013; Justin Lecher +tdb-1.2.12-r1.ebuild, - metadata.xml: - Bump to new python eclasses - -*tdb-1.2.12 (13 Jun 2013) - - 13 Jun 2013; Patrick Lauer +tdb-1.2.12.ebuild: - Bump - - 28 Apr 2013; Agostino Sarubbo tdb-1.2.11.ebuild: - Stable for x86, wrt bug #466284 - - 28 Apr 2013; Agostino Sarubbo tdb-1.2.11.ebuild: - Stable for amd64, wrt bug #466284 - - 25 Feb 2013; Zac Medico tdb-1.2.11.ebuild: - Add ~arm-linux and ~x86-linux keywords. - -*tdb-1.2.11 (05 Dec 2012) - - 05 Dec 2012; Patrick Lauer +tdb-1.2.11.ebuild: - Bump - - 29 Nov 2012; Jeroen Roovers tdb-1.2.10.ebuild: - Stable for HPPA (bug #444686). - - 25 Nov 2012; Anthony G. Basile tdb-1.2.10.ebuild: - stable ppc ppc64, bug #444686 - - 25 Nov 2012; Agostino Sarubbo tdb-1.2.10.ebuild: - Stable for x86, wrt bug #444686 - - 25 Nov 2012; Agostino Sarubbo tdb-1.2.10.ebuild: - Stable for amd64, wrt bug #444686 - - 29 Aug 2012; Christoph Junghans tdb-1.2.10.ebuild: - added ~amd64-linux - - 06 Jul 2012; Jeff Horelick tdb-1.2.9.ebuild: - marked x86 per bug 417107 - - 15 May 2012; Alexis Ballier tdb-1.2.10.ebuild: - keyword ~amd64-fbsd - -*tdb-1.2.10 (23 Apr 2012) - - 23 Apr 2012; Víctor Ostorga +tdb-1.2.10.ebuild: - Version bump to 1.2.10 - - 08 Mar 2012; Patrick Lauer tdb-1.2.9.ebuild: - Python dependency fix - - 08 Mar 2012; Patrick Lauer tdb-1.2.9.ebuild: - Build fix for #401291 - - 25 Feb 2012; Agostino Sarubbo tdb-1.2.9.ebuild: - Stable for amd64, wrt bug #405617 - - 11 Jul 2011; Mark Loeser tdb-1.2.7-r1.ebuild: - Stable on ppc/ppc64; bug #361055 - - 07 Jul 2011; Alexis Ballier tdb-1.2.9.ebuild: - keyword ~x86-fbsd - - 27 Jun 2011; Víctor Ostorga tdb-1.2.9.ebuild: - Adding DEPEND on app-text/docbook-xml-dtd:4.2 - -*tdb-1.2.9 (27 Jun 2011) - - 27 Jun 2011; Víctor Ostorga +tdb-1.2.9.ebuild: - Version bump to 1.2.9 , moving to waf, bug 370999 - - 25 Apr 2011; Raúl Porcel tdb-1.2.7-r1.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #361055 - - 25 Apr 2011; Thomas Kahle tdb-1.2.7-r1.ebuild: - x86 stable per bug 361055 - - 10 Apr 2011; Markus Meier tdb-1.2.7-r1.ebuild: - arm stable, bug #361055 - - 04 Apr 2011; Jeroen Roovers tdb-1.2.7-r1.ebuild: - Stable for HPPA (bug #361055). - - 02 Apr 2011; Christoph Mende tdb-1.2.7-r1.ebuild: - Removed dolib.so (bug #361621) and stable on amd64 (bug #361055) - - 01 Apr 2011; Víctor Ostorga tdb-1.2.1.ebuild, - tdb-1.2.1-r1.ebuild: - Restricting working python version to 2.x bug #360033 . Adding double - blocker to previous tdb version #314611 - -*tdb-1.2.7-r1 (18 Jan 2011) - - 18 Jan 2011; Víctor Ostorga -tdb-1.2.7.ebuild, - +tdb-1.2.7-r1.ebuild: - Set _PUBLIC_ in C file rather than header files bug #350720 patch thanks - to Rafał Mużyło - -*tdb-1.2.7 (03 Jan 2011) - - 03 Jan 2011; Víctor Ostorga +tdb-1.2.7.ebuild: - Version bump to 1.2.7 bug #350464 - - 29 Dec 2010; Víctor Ostorga tdb-1.2.1-r1.ebuild: - Improving python related code, patch thanks to Arfrever Frehtes Taifersar - Arahesis bug #316959 - - 27 Sep 2010; Mart Raudsepp tdb-1.2.1-r1.ebuild: - Marked ~mips for bug #285952 - - 18 Aug 2010; Patrick Lauer tdb-1.2.1-r1.ebuild: - Fixing manpage installation with USE -tools, fixes #333033 - -*tdb-1.2.1-r1 (14 Aug 2010) - - 14 Aug 2010; Markos Chandras +tdb-1.2.1-r1.ebuild: - Revbump to respect LDFLAGS. Thanks to Dane Smith - for the patch - - 12 Aug 2010; Joseph Jezak tdb-1.2.1.ebuild: - Marked ppc stable for bug #300158. - - 07 Jul 2010; Samuli Suominen tdb-1.2.1.ebuild: - ppc64 stable wrt #314899 - - 05 Jun 2010; Raúl Porcel tdb-1.2.1.ebuild: - alpha/arm/ia64/s390/sh/sparc stable wrt #300158 - - 19 May 2010; Jeroen Roovers tdb-1.2.1.ebuild: - Stable for HPPA (bug #300158). - - 18 May 2010; Pawel Hajdan jr tdb-1.2.1.ebuild: - x86 stable wrt bug #300158 - - 03 May 2010; Olivier Crête tdb-1.2.1.ebuild: - amd64 stable, bug #314899 - - 10 Apr 2010; Tiziano Müller tdb-1.2.1.ebuild: - Fixed bug #314453 by adding --nonet to the xsltproc call. - -*tdb-1.2.1 (09 Apr 2010) - - 09 Apr 2010; Tiziano Müller +tdb-1.2.1.ebuild: - Version bump. . - -*tdb-1.2.0-r2 (03 Apr 2010) - - 03 Apr 2010; Tiziano Müller +tdb-1.2.0-r2.ebuild: - Fixed: unnecessary inherit, static-libs installation, added tests. - -*tdb-1.2.0-r1 (11 Jan 2010) - - 11 Jan 2010; Diego E. Pettenò - +tdb-1.2.0-r1.ebuild: - Fix installation of shared objects with USE=-python. Thanks to Davide - Pesavento for reporting. - -*tdb-1.2.0 (04 Jan 2010) - - 04 Jan 2010; Patrick Lauer +tdb-1.2.0.ebuild: - Bump - - 06 Dec 2009; Diego E. Pettenò tdb-1.1.5-r1.ebuild: - Block older samba (to force uninstall). - - 30 Nov 2009; Raúl Porcel tdb-1.1.5-r1.ebuild: - Add ~arm/~ia64/~s390/~sh/~sparc wrt #285952 - - 29 Nov 2009; Tobias Klausmann tdb-1.1.5-r1.ebuild: - Keyworded on alpha, bug #285952 - - 08 Nov 2009; Joseph Jezak tdb-1.1.5-r1.ebuild: - Marked ~ppc for bug #285952. - - 04 Nov 2009; Patrick Lauer tdb-1.1.5.ebuild, - tdb-1.1.5-r1.ebuild: - Small dep fix - -*tdb-1.1.5-r1 (23 Oct 2009) - - 23 Oct 2009; Patrick Lauer +tdb-1.1.5-r1.ebuild: - Some cleanups for #288536 - - 11 Oct 2009; Petteri Räty tdb-1.1.5.ebuild: - Block tdb-1.1.5.ebuild: - Improve description - -*tdb-1.1.5 (09 Oct 2009) - - 09 Oct 2009; Patrick Lauer +tdb-1.1.5.ebuild, - +metadata.xml: - Initial commit. Ebuilds based on those provided by Marcel Greter in - #231273 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/Manifest index 6ed7578b2e..258c1460e7 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/Manifest @@ -1 +1 @@ -DIST tdb-1.3.15.tar.gz 502627 BLAKE2B 44352033c421875f02491551dd8b1aa4a821a5e0070d6a32fc4f7a61535c98114325718c673fe163ad692f797aa2e9c26ca27a69a04459ba8340bbd8caacdfc5 SHA512 553246d5e7a7c22ea1b00962ac635d608f6d2344201862e796cad3b1a20610da1f5652ec9dbcb0187867fbd25f36247fcc34e9b4b2c3488c15d7202c9fb13bbb +DIST tdb-1.4.3.tar.gz 702836 BLAKE2B 6593c3be527b383a7e8fd85b3613cf2429f6b665a7c609a56f57a6f5b41a080c1a681d712afd423c2bc1c741e06d7cd2c90949d9c5bf78ca834b18c64e23d51c SHA512 99488839e7da396f04df60412d21a7d3e09efeab52772d6cb5e9470a3dfd585d73ef2422c51cd0d8ccc123a65d455de400d5d6b24a21a2a50d3da60d9a70e67a diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/files/add_missing_stdbool_h_include.patch b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/files/add_missing_stdbool_h_include.patch deleted file mode 100644 index 756eaaeebf..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/files/add_missing_stdbool_h_include.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4e14a437963ba54987cd58b4e0705d9a6d8aea6f Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Fri, 23 May 2014 10:08:14 -0700 -Subject: [PATCH] tdb/include: include stdbool.h in tdb.h - -Commit db5bda56bf08 (tdb: add TDB_MUTEX_LOCKING support) adds a bool, but does -not include stdbool.h. This causes any build including tdb.h to fail, at least -for me with GCC 4.9.0. ---- - lib/tdb/include/tdb.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/tdb/include/tdb.h b/lib/tdb/include/tdb.h -index 5ea5e60..03e429c 100644 ---- a/lib/tdb/include/tdb.h -+++ b/lib/tdb/include/tdb.h -@@ -31,6 +31,7 @@ extern "C" { - #endif - - #include -+#include - - /** - * @defgroup tdb The tdb API --- -1.9.3 - diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/files/tdb-1.3.7-fix.patch b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/files/tdb-1.3.7-fix.patch deleted file mode 100644 index bfbd8ab70a..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/files/tdb-1.3.7-fix.patch +++ /dev/null @@ -1,55 +0,0 @@ -From patchwork Thu Jul 23 05:10:38 2015 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: tdb: Fix broken build with --disable-python -Date: Thu, 23 Jul 2015 04:10:38 -0000 -From: Martin Schwenke -X-Patchwork-Id: 11098 -Message-Id: <20150723151038.617e1c49@martins.ozlabs.org> -To: Samba Technical - -Please NACK if you don't want this pushed... :-) - -peace & happiness, -martin - - ->From c7609c35b6bdb488b74d63ebfd27838b9b8e7e2f Mon Sep 17 00:00:00 2001 -From: Martin Schwenke -Date: Thu, 23 Jul 2015 09:47:24 +1000 -Subject: [PATCH] tdb: Fix broken build with --disable-python - -With --disable-python, we should not install any python files. - -Signed-off-by: Martin Schwenke -Reviewed-by: Amitay Isaacs ---- - lib/tdb/wscript | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/lib/tdb/wscript b/lib/tdb/wscript -index 5845fa0..1822e74 100644 ---- a/lib/tdb/wscript -+++ b/lib/tdb/wscript -@@ -187,12 +187,13 @@ def build(bld): - realname='tdb.so', - cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION) - -- for env in bld.gen_python_environments(['PKGCONFIGDIR']): -- bld.SAMBA_SCRIPT('_tdb_text.py', -- pattern='_tdb_text.py', -- installdir='python') -+ if not bld.env.disable_python: -+ for env in bld.gen_python_environments(['PKGCONFIGDIR']): -+ bld.SAMBA_SCRIPT('_tdb_text.py', -+ pattern='_tdb_text.py', -+ installdir='python') - -- bld.INSTALL_FILES('${PYTHONARCHDIR}', '_tdb_text.py') -+ bld.INSTALL_FILES('${PYTHONARCHDIR}', '_tdb_text.py') - - def testonly(ctx): - '''run tdb testsuite''' --- -2.1.4 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.3.15.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.3.ebuild similarity index 63% rename from sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.3.15.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.3.ebuild index 4a82fc9d31..b6a40c88ad 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.3.15.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.3.ebuild @@ -1,26 +1,26 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 +EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" +PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_REQ_USE="threads(+)" -inherit waf-utils multilib-minimal python-single-r1 eutils +inherit waf-utils multilib-minimal python-single-r1 DESCRIPTION="A simple database API" -HOMEPAGE="http://tdb.samba.org/" -SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz" +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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="python" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} )" DEPEND=" ${RDEPEND} ${PYTHON_DEPS} @@ -28,7 +28,10 @@ DEPEND=" WAF_BINARY="${S}/buildtools/bin/waf" +RESTRICT="test" + src_prepare() { + default python_fix_shebang . multilib_copy_sources } @@ -39,8 +42,7 @@ multilib_src_configure() { extra_opts+=( --disable-python ) fi - waf-utils_src_configure \ - "${extra_opts[@]}" + waf-utils_src_configure "${extra_opts[@]}" } multilib_src_compile() {