[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/files/, sys-libs/db/
commit: 7e2da48dc49a0d45dc9d6bcc0553c9dd94a66b0e
Author: Sam James gentoo org>
AuthorDate: Sun Feb 12 02:02:13 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 12 02:04:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2da48d
sys-libs/db: fix configure w/ clang 16
Closes: https://bugs.gentoo.org/883413
Signed-off-by: Sam James gentoo.org>
.../{db-4.8.30-r7.ebuild => db-4.8.30-r8.ebuild} | 3 +-
.../{db-5.3.28-r8.ebuild => db-5.3.28-r9.ebuild} | 3 +-
sys-libs/db/files/db-4.8.30-clang16.patch | 281 ++
sys-libs/db/files/db-5.3.28-clang16.patch | 325 +
4 files changed, 610 insertions(+), 2 deletions(-)
diff --git a/sys-libs/db/db-4.8.30-r7.ebuild b/sys-libs/db/db-4.8.30-r8.ebuild
similarity index 98%
rename from sys-libs/db/db-4.8.30-r7.ebuild
rename to sys-libs/db/db-4.8.30-r8.ebuild
index 776ad34df993..e40d00b495fe 100644
--- a/sys-libs/db/db-4.8.30-r7.ebuild
+++ b/sys-libs/db/db-4.8.30-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -41,6 +41,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.8-libtool.patch
"${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch
"${FILESDIR}"/${PN}-4.8-wformat-security.patch
+ "${FILESDIR}"/${PN}-4.8.30-clang16.patch
)
src_prepare() {
diff --git a/sys-libs/db/db-5.3.28-r8.ebuild b/sys-libs/db/db-5.3.28-r9.ebuild
similarity index 98%
rename from sys-libs/db/db-5.3.28-r8.ebuild
rename to sys-libs/db/db-5.3.28-r9.ebuild
index 6b76da14de94..4918af5d46fe 100644
--- a/sys-libs/db/db-5.3.28-r8.ebuild
+++ b/sys-libs/db/db-5.3.28-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -56,6 +56,7 @@ PATCHES=(
# Needed when compiling with clang
"${FILESDIR}"/${PN}-5.1.29-rename-atomic-compare-exchange.patch
+ "${FILESDIR}"/${PN}-5.3.28-clang16.patch
)
src_prepare() {
diff --git a/sys-libs/db/files/db-4.8.30-clang16.patch
b/sys-libs/db/files/db-4.8.30-clang16.patch
new file mode 100644
index ..b28eb145e4a8
--- /dev/null
+++ b/sys-libs/db/files/db-4.8.30-clang16.patch
@@ -0,0 +1,281 @@
+https://bugs.gentoo.org/883413
+--- a/dist/aclocal/clock.m4
b/dist/aclocal/clock.m4
+@@ -20,12 +20,14 @@ esac
+ # existence to mean the clock really exists.
+ AC_CACHE_CHECK([for clock_gettime monotonic clock], db_cv_clock_monotonic, [
+ AC_TRY_RUN([
++#include
+ #include
+-main() {
++int main(void) {
+ struct timespec t;
+ return (clock_gettime(CLOCK_MONOTONIC, ) != 0);
+ }], db_cv_clock_monotonic=yes, db_cv_clock_monotonic=no,
+ AC_TRY_LINK([
++#include
+ #include ], [
+ struct timespec t;
+ clock_gettime(CLOCK_MONOTONIC, );
+--- a/dist/aclocal/mutex.m4
b/dist/aclocal/mutex.m4
+@@ -3,8 +3,9 @@
+ # POSIX pthreads tests: inter-process safe and intra-process only.
+ AC_DEFUN(AM_PTHREADS_SHARED, [
+ AC_TRY_RUN([
++#include
+ #include
+-main() {
++int main(void) {
+ pthread_cond_t cond;
+ pthread_mutex_t mutex;
+ pthread_condattr_t condattr;
+@@ -24,6 +25,7 @@ main() {
+ pthread_mutexattr_destroy());
+ }], [db_cv_mutex="$1"],,
+ AC_TRY_LINK([
++#include
+ #include ],[
+ pthread_cond_t cond;
+ pthread_mutex_t mutex;
+@@ -45,8 +47,9 @@ AC_TRY_LINK([
+ ], [db_cv_mutex="$1"]))])
+ AC_DEFUN(AM_PTHREADS_PRIVATE, [
+ AC_TRY_RUN([
++#include
+ #include
+-main() {
++int main(void) {
+ pthread_cond_t cond;
+ pthread_mutex_t mutex;
+ pthread_condattr_t condattr;
+@@ -64,6 +67,7 @@ main() {
+ pthread_mutexattr_destroy());
+ }], [db_cv_mutex="$1"],,
+ AC_TRY_LINK([
++#include
+ #include ],[
+ pthread_cond_t cond;
+ pthread_mutex_t mutex;
+@@ -158,6 +162,7 @@ if test "$db_cv_mutex" = no; then
+ # LWP threads: _lwp_XXX
+ if test "$db_cv_mutex" = no; then
+ AC_TRY_LINK([
++ #include
+ #include ],[
+ static lwp_mutex_t mi = SHAREDMUTEX;
+ static lwp_cond_t ci = SHAREDCV;
+@@ -174,6 +179,7 @@ if test "$db_cv_mutex" = no; then
+ LIBS="$LIBS -lthread"
+ AC_TRY_LINK([
+ #include
++ #include
+ #include ],[
+ mutex_t mutex;
+ cond_t cond;
+@@ -189,6 +195,7 @@ if test "$db_cv_mutex" = no; then
+ if test "$db_cv_mutex" = no -o "$db_cv_mutex" = ui_only; then
+ AC_TRY_LINK([
+ #include
++ #include
+ #include ],[
+ mutex_t mutex;
+ cond_t cond;
+@@ -213,7 +220,7 @@ if test "$db_cv_mutex" = no; then
+ # x86/gcc: FreeBSD, NetBSD, BSD/OS, Linux
+ AC_TRY_COMPILE(,[
+ #if (defined(i386) || defined(__i386__)) && defined(__GNUC__)
+- exit(0);
++ return 0;
+
[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/files/
commit: 69cfcf33d6be8d80c19a9aabbf2d7317d1062ccc
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Tue Jan 10 16:34:15 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Jan 14 19:15:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69cfcf33
sys-libs/db: remove unused patches
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29051
Signed-off-by: Sam James gentoo.org>
.../files/db-18.1.25-sqlite-configure-path.patch | 11 ---
sys-libs/db/files/db-18.1.25-test-link.patch | 38 --
sys-libs/db/files/db-18.1.40-fix-docs.patch| 19 ---
.../db/files/db-6.1.19-sqlite-configure-path.patch | 10 --
.../db/files/db-6.2.38-bashism-configure.patch | 11 ---
5 files changed, 89 deletions(-)
diff --git a/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch
b/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch
deleted file mode 100644
index 83fe2d66765e..
--- a/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/dist/aclocal/sql.m4
-+++ b/dist/aclocal/sql.m4
-@@ -99,7 +99,7 @@
- if test "$db_cv_debug" = "yes"; then
- CPPFLAGS="$CPPFLAGS -g"
- fi
--(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking
$ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\"
--enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline
--enable-editline=$with_editline" && cat build_config.h >> config.h) || exit 1
-+(cd sql && eval "\$SHELL $sqlite_dir/configure --disable-option-checking
$ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\"
--enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline
--enable-editline=$with_editline" && cat build_config.h >> config.h) || exit 1
-
- # Configure JDBC if --enable-jdbc
- if test "$db_cv_jdbc" != "no"; then
diff --git a/sys-libs/db/files/db-18.1.25-test-link.patch
b/sys-libs/db/files/db-18.1.25-test-link.patch
deleted file mode 100644
index 5fb6d5fae7e9..
--- a/sys-libs/db/files/db-18.1.25-test-link.patch
+++ /dev/null
@@ -1,38 +0,0 @@
a/test/tcl/parallel.tcl
-+++ b/test/tcl/parallel.tcl
-@@ -296,17 +296,26 @@
- [eval glob -nocomplain
{$dir/$buildpath/db_{reptest,repsite,replicate}$EXE}] \
- $destdir/$buildpath}
- }
-+ catch {
-+ set l [eval glob {$dir/.libs}
{$dir/db_{checkpoint,deadlock}$EXE} \
-+
{$dir/db_{dump,load,printlog,recover,stat,upgrade}$EXE} \
-+
{$dir/db_{archive,verify,hotbackup,log_verify}$EXE}]
-+ foreach fn $l {
-+ set fbasename [file tail $fn]
-+ eval file link {$destdir/$fbasename} $fn
-+ }
-+ }
-+ # we will be modifying this file, so we must copy, not link
- catch {eval file copy \
-- [eval glob {$dir/{.libs,include.tcl}}] $destdir}
-+ [eval glob {$dir/include.tcl}] $destdir}
- # catch {eval file copy $dir/$queuedir $destdir}
-- catch {eval file copy \
-- [eval glob {$dir/db_{checkpoint,deadlock}$EXE} \
-- {$dir/db_{dump,load,printlog,recover}$EXE} \
-- {$dir/db_{stat,upgrade,archive,verify}$EXE} \
-- {$dir/db_{hotbackup,log_verify,tuner}$EXE}] \
-- $destdir}
-- catch {eval file copy \
-- [eval glob -nocomplain
{$dir/db_{reptest,repsite,replicate}$EXE}] $destdir}
-+ catch {
-+ set l [eval glob -nocomplain
{$dir/db_{reptest,repsite,replicate}$EXE}]
-+ foreach fn $l {
-+ set fbasename [file tail $fn]
-+ eval file link {$destdir/$fbasename} $fn
-+ }
-+ }
-
- # Create modified copies of include.tcl in parallel
- # directories so paths still work.
diff --git a/sys-libs/db/files/db-18.1.40-fix-docs.patch
b/sys-libs/db/files/db-18.1.40-fix-docs.patch
deleted file mode 100644
index 7bed9f1cbca0..
--- a/sys-libs/db/files/db-18.1.40-fix-docs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fixes
-
- cp: cannot stat 'bdb-sql': No such file or directory
- cp: cannot stat 'gsg_db_server': No such file or directory
-
a/dist/Makefile.in
-+++ b/dist/Makefile.in
-@@ -1299,8 +1299,8 @@ uninstall_utilities:
-
- # We install csharp docs even on UNIX so we don't have a
- # broken link on the landing page.
--DOCLIST=api_reference articles bdb-sql collections csharp gsg \
-- gsg_db_rep gsg_db_server gsg_txn index.html installation \
-+DOCLIST=api_reference articles collections csharp gsg \
-+ gsg_db_rep
[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/files/, sys-libs/db/
commit: 9abad1e43a4afa095d8f97a40b4cafbf35dde087
Author: Sam James gentoo org>
AuthorDate: Sun Mar 20 20:19:51 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 20 21:04:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9abad1e4
sys-libs/db: fix bashism in 6.2.38 configure
Signed-off-by: Sam James gentoo.org>
sys-libs/db/db-6.2.38-r1.ebuild | 2 ++
sys-libs/db/files/db-6.2.38-bashism-configure.patch | 11 +++
2 files changed, 13 insertions(+)
diff --git a/sys-libs/db/db-6.2.38-r1.ebuild b/sys-libs/db/db-6.2.38-r1.ebuild
index 69957a34e851..d83e4107efcc 100644
--- a/sys-libs/db/db-6.2.38-r1.ebuild
+++ b/sys-libs/db/db-6.2.38-r1.ebuild
@@ -54,6 +54,8 @@ PATCHES=(
# The upstream testsuite copies .lib and the binaries for each parallel
test
# core, ~300MB each. This patch uses links instead, saves a lot of
space.
"${FILESDIR}"/${PN}-6.0.20-test-link.patch
+
+ "${FILESDIR}"/${PN}-6.2.38-bashism-configure.patch
)
src_prepare() {
diff --git a/sys-libs/db/files/db-6.2.38-bashism-configure.patch
b/sys-libs/db/files/db-6.2.38-bashism-configure.patch
new file mode 100644
index ..bea1f3d3bde0
--- /dev/null
+++ b/sys-libs/db/files/db-6.2.38-bashism-configure.patch
@@ -0,0 +1,11 @@
+--- a/dist/aclocal/types.m4
b/dist/aclocal/types.m4
+@@ -188,7 +188,7 @@ AC_SUBST(db_off_t_decl)
+ AC_CHECK_TYPE(db_off_t,,
+ [AM_SEARCH_SSIZES(db_off_t_decl, db_off_t, $ac_cv_sizeof_off_t)])
+ AC_SUBST(db_off_t_max_decl)
+-if test "$ac_cv_sizeof_off_t" == "4"; then
++if test "$ac_cv_sizeof_off_t" = "4"; then
+ db_off_t_max_decl="#define DB_OFF_T_MAX INT32_MAX"
+ else
+ db_off_t_max_decl="#define DB_OFF_T_MAX INT64_MAX"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/files/, sys-libs/db/
commit: 7649b930ec479a2001992e905a5a87b2fe7981a3
Author: Sam James gentoo org>
AuthorDate: Sun Mar 20 20:48:23 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 20 21:04:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7649b930
sys-libs/db: cleanup patches
Signed-off-by: Sam James gentoo.org>
sys-libs/db/db-18.1.40-r1.ebuild | 2 +-
sys-libs/db/db-4.8.30-r6.ebuild | 2 +-
sys-libs/db/db-5.3.28-r8.ebuild | 2 +-
sys-libs/db/db-6.0.35-r4.ebuild | 2 +-
sys-libs/db/db-6.1.38-r1.ebuild | 2 +-
sys-libs/db/db-6.2.38-r1.ebuild | 2 +-
sys-libs/db/files/db-18.1.25-test-link.patch | 4 ++--
sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch | 2 --
sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch | 2 --
sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch | 5 ++---
sys-libs/db/files/db-6.0.20-test-link.patch | 5 ++---
sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch | 4 ++--
sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch | 4 ++--
13 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/sys-libs/db/db-18.1.40-r1.ebuild b/sys-libs/db/db-18.1.40-r1.ebuild
index ce83bceb3309..7809ee145998 100644
--- a/sys-libs/db/db-18.1.40-r1.ebuild
+++ b/sys-libs/db/db-18.1.40-r1.ebuild
@@ -81,7 +81,7 @@ src_prepare() {
-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
aclocal/programs.m4 || die
AT_M4DIR="aclocal" eautoreconf
- # Upstream sucks - they do autoconf and THEN replace the version
variables.
+ # They do autoconf and THEN replace the version variables :(
. ./RELEASE
for v in \
DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
diff --git a/sys-libs/db/db-4.8.30-r6.ebuild b/sys-libs/db/db-4.8.30-r6.ebuild
index 57cf68428074..ca3d63339448 100644
--- a/sys-libs/db/db-4.8.30-r6.ebuild
+++ b/sys-libs/db/db-4.8.30-r6.ebuild
@@ -67,7 +67,7 @@ src_prepare() {
AT_M4DIR="aclocal" eautoreconf
- # Upstream sucks - they do autoconf and THEN replace the version
variables.
+ # They do autoconf and THEN replace the version variables :(
. ./RELEASE
sed \
-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
diff --git a/sys-libs/db/db-5.3.28-r8.ebuild b/sys-libs/db/db-5.3.28-r8.ebuild
index 44cdf166b590..c7f5d0f6d288 100644
--- a/sys-libs/db/db-5.3.28-r8.ebuild
+++ b/sys-libs/db/db-5.3.28-r8.ebuild
@@ -85,7 +85,7 @@ src_prepare() {
AT_M4DIR="aclocal" eautoreconf
- # Upstream sucks - they do autoconf and THEN replace the version
variables.
+ # They do autoconf and THEN replace the version variables :(
. ./RELEASE
local v ev
for v in \
diff --git a/sys-libs/db/db-6.0.35-r4.ebuild b/sys-libs/db/db-6.0.35-r4.ebuild
index 046278265fb0..cf95493690ea 100644
--- a/sys-libs/db/db-6.0.35-r4.ebuild
+++ b/sys-libs/db/db-6.0.35-r4.ebuild
@@ -83,7 +83,7 @@ src_prepare() {
AT_M4DIR="aclocal" eautoreconf
- # Upstream sucks - they do autoconf and THEN replace the version
variables.
+ # They do autoconf and THEN replace the version variables :(
. ./RELEASE
local v ev
for v in \
diff --git a/sys-libs/db/db-6.1.38-r1.ebuild b/sys-libs/db/db-6.1.38-r1.ebuild
index 861f881a6b02..278f210fd913 100644
--- a/sys-libs/db/db-6.1.38-r1.ebuild
+++ b/sys-libs/db/db-6.1.38-r1.ebuild
@@ -82,7 +82,7 @@ src_prepare() {
-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
aclocal/programs.m4 || die
AT_M4DIR="aclocal" eautoreconf
- # Upstream sucks - they do autoconf and THEN replace the version
variables.
+ # They do autoconf and THEN replace the version variables :(
. ./RELEASE
for v in \
DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
diff --git a/sys-libs/db/db-6.2.38-r1.ebuild b/sys-libs/db/db-6.2.38-r1.ebuild
index d83e4107efcc..de6a736bdf14 100644
--- a/sys-libs/db/db-6.2.38-r1.ebuild
+++ b/sys-libs/db/db-6.2.38-r1.ebuild
@@ -85,7 +85,7 @@ src_prepare() {
-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
aclocal/programs.m4 || die
AT_M4DIR="aclocal" eautoreconf
- # Upstream sucks - they do autoconf and THEN replace the version
variables.
+ # They do autoconf and THEN replace the version variables :(
. ./RELEASE
for v in \
DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
diff --git a/sys-libs/db/files/db-18.1.25-test-link.patch
b/sys-libs/db/files/db-18.1.25-test-link.patch
index dc3d8ae93c5a..5fb6d5fae7e9 100644
--- a/sys-libs/db/files/db-18.1.25-test-link.patch
+++
[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/files/
commit: a4d649f7f7c12797f2f063752b0c4ae4d3892de1 Author: Sam James gentoo org> AuthorDate: Sun Mar 20 21:00:24 2022 + Commit: Sam James gentoo org> CommitDate: Sun Mar 20 21:04:35 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d649f7 sys-libs/db: restore SQLite patch for 18.1.32 ... and tidied up. Signed-off-by: Sam James gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/24687 Signed-off-by: Sam James gentoo.org> sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch | 11 +++ 1 file changed, 11 insertions(+) diff --git a/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch b/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch new file mode 100644 index ..83fe2d66765e --- /dev/null +++ b/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch @@ -0,0 +1,11 @@ +--- a/dist/aclocal/sql.m4 b/dist/aclocal/sql.m4 +@@ -99,7 +99,7 @@ + if test "$db_cv_debug" = "yes"; then + CPPFLAGS="$CPPFLAGS -g" + fi +-(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline --enable-editline=$with_editline" && cat build_config.h >> config.h) || exit 1 ++(cd sql && eval "\$SHELL $sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline --enable-editline=$with_editline" && cat build_config.h >> config.h) || exit 1 + + # Configure JDBC if --enable-jdbc + if test "$db_cv_jdbc" != "no"; then
[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/files/, sys-libs/db/, profiles/
commit: 4f708b041d7d041a2d009f3ef83937c5c884e8b0 Author: David Seifert gentoo org> AuthorDate: Fri Oct 1 20:23:33 2021 + Commit: David Seifert gentoo org> CommitDate: Fri Oct 1 20:23:33 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f708b04 sys-libs/db: drop dead versions * db-1.85-r5 * db-3.2.9_p2-r2 * db-4.2.52_p5-r4 * db-4.3.29_p1-r4 * db-4.4.20_p4-r4 * db-4.5.20_p2-r6 * db-4.6.21_p4-r5 * db-4.7.25_p4-r5 * db-5.1.29-r3 Closes: https://github.com/gentoo/gentoo/pull/20982 Closes: https://bugs.gentoo.org/79 Signed-off-by: David Seifert gentoo.org> profiles/package.mask | 14 -- sys-libs/db/Manifest | 33 --- sys-libs/db/db-1.85-r5.ebuild | 56 -- sys-libs/db/db-3.2.9_p2-r2.ebuild | 196 -- sys-libs/db/db-4.2.52_p5-r4.ebuild | 185 - sys-libs/db/db-4.3.29_p1-r4.ebuild | 183 - sys-libs/db/db-4.4.20_p4-r4.ebuild | 177 sys-libs/db/db-4.5.20_p2-r6.ebuild | 193 -- sys-libs/db/db-4.6.21_p4-r5.ebuild | 182 - sys-libs/db/db-4.7.25_p4-r5.ebuild | 189 - sys-libs/db/db-5.1.29-r3.ebuild| 224 - sys-libs/db/files/db-1.85-gentoo-paths.patch | 29 --- .../files/db-18.1.25-sqlite-configure-path.patch | 11 - sys-libs/db/files/db-3.2.9-fix-dep-link.patch | 26 --- sys-libs/db/files/db-3.2.9-gcc43.patch | 16 -- sys-libs/db/files/db-4.0.14-fix-dep-link.patch | 38 .../db/files/db-4.2-jni-check-prefix-first.patch | 30 --- sys-libs/db/files/db-4.2-libtool.patch | 20 -- sys-libs/db/files/db-4.2.52_p2-TXN.patch | 68 --- sys-libs/db/files/db-4.3-libtool.patch | 47 - sys-libs/db/files/db-4.3.27-fix-dep-link.patch | 38 sys-libs/db/files/db-4.4-libtool.patch | 47 - 22 files changed, 2002 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 4b1aea196f7..53b3a4ec68d 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -364,20 +364,6 @@ dev-qt/qtwebkit:5 # is resolved. Bug #791259. >=media-libs/libopenaptx-0.2.1 -# David Seifert (2021-07-01) -# Berkeley DB slots that are long past EOL by Oracle, -# maintenance burden, and no real path forward by Oracle. -# Bug #79, removal in 90 days. -sys-libs/db:1 -sys-libs/db:3 -sys-libs/db:4.2 -sys-libs/db:4.3 -sys-libs/db:4.4 -sys-libs/db:4.5 -sys-libs/db:4.6 -sys-libs/db:4.7 -sys-libs/db:5.1 - # Conrad Kostecki (2021-06-20) # New Minecraft server release needs at least Java 16, # which is currently not available in Gentoo. diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest index 317ca5d8dac..8cfa23e4f61 100644 --- a/sys-libs/db/Manifest +++ b/sys-libs/db/Manifest @@ -1,40 +1,7 @@ -DIST db-1.85-r3.1.patch.bz2 14641 BLAKE2B 5ca59487a433a5e5b5fed7a8737c20df041be56733fe9209047f9e53845fa034576c29ad74407509ab96473e4eef0138a3a47de6c348d27209f0e39df85b9f5f SHA512 32b1810515476758ece7415f241378460a4051bf5ee23fb464748f84a90a56ff2c5119ed93028114d64f1b1691b1c694c2301ff825edd89cdee90a870a68b6f4 DIST db-18.1.32.tar.gz 44244747 BLAKE2B b539d8966a269f6a9440ef442248849f12c6b1eda79b9a41074e1eb0eb4930fd4674dd0e20a114e4020fe2ce19832572c4c86d458835da39a99f639dc3c4e23e SHA512 890b3047c28114ac30794c0234126b0b2a3e699f3ed259831091f02d51885e3583dd10c0ef0cecc215b9b8d80b48a2d3a82a5793cd3816afb45f6cc19ae23f25 DIST db-18.1.40.tar.gz 30763705 BLAKE2B c7235cbdf82d8e38450c98baa1ff67132f6132d59a43dd2d6ed8bc2672b7924b4cbd93320278a0a3a78e454caff622b4480abe8dcc20c94ae56a78b3569a76fd SHA512 53787164fb8a198a0178c7f58d891c2b0943d1c52b11fe9de525938469327e85664f0bc63e33d740c171bc370954710a6b3e8b9be2a08237fb9757a795c5b19e -DIST db-3.2.9.tar.gz 2085238 BLAKE2B 10cb1c102bf5db52ec16181ccbb02a8c4560f42afd2382689ee4903fcd63bf3ab4802482a065a85b1d34c8fb9f620fceb985155b1390de7ca404c121b6b4b6bc SHA512 5f07b27ae0cbd2832e5db9473cd4f2d4aebeee25ed8245ebd2c297a576571635ca5cf75e63e0967b1e90978128a5b6f5d8112559c56927d5bc5eb0d9fd3a2e95 -DIST db-4.2.52.tar.gz 4073147 BLAKE2B 0bb9649a08df9b425f28471eb65c0efac0b7833b4c5c841b9ef53a142669b549e1f1b78cf42eeceea05ebb271aacd513d115070ea028f77fb1830bb9fcc7c8a9 SHA512 47a4e1353fe4f5c2160952a8f7a09b73fdf2dfcd222a8214e12630cec3139a624907bba83a06f10f8492b4dce328a979e9155ee049b9a88798edaca62cfe60d1 -DIST db-4.3.29.tar.gz 6103264 BLAKE2B eda13cd5c8b9421044f6c8b6b41ec318ff33e19da15f8d5e3075612186e60cfce30069078f712841058224ed58caf69d43960156ac645651670665390eae28e1 SHA512 93d36c040b25739b92c52504e117a9c7f4b671463d61d00029e70d0bc8171311f5d04211f7d966b8a9ef8c2a85a5ebe8cc55e4469c3c7c0e468caa4221f691fc -DIST db-4.4.20-20060110-rpc_server-java.tar.gz 158976 BLAKE2B
[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/files/, sys-libs/db/
commit: c0bd697c0d3d78662d1fe84c685521140b7c5631
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Jan 24 17:47:29 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Jan 24 17:51:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0bd697c
sys-libs/db: remove old
Signed-off-by: Mike Gilbert gentoo.org>
sys-libs/db/Manifest | 1 -
sys-libs/db/db-18.1.32.ebuild | 247 -
.../files/db-18.1.25-sqlite-configure-path.patch | 11 -
3 files changed, 259 deletions(-)
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 317ca5d8dac..5e107989be8 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,5 +1,4 @@
DIST db-1.85-r3.1.patch.bz2 14641 BLAKE2B
5ca59487a433a5e5b5fed7a8737c20df041be56733fe9209047f9e53845fa034576c29ad74407509ab96473e4eef0138a3a47de6c348d27209f0e39df85b9f5f
SHA512
32b1810515476758ece7415f241378460a4051bf5ee23fb464748f84a90a56ff2c5119ed93028114d64f1b1691b1c694c2301ff825edd89cdee90a870a68b6f4
-DIST db-18.1.32.tar.gz 44244747 BLAKE2B
b539d8966a269f6a9440ef442248849f12c6b1eda79b9a41074e1eb0eb4930fd4674dd0e20a114e4020fe2ce19832572c4c86d458835da39a99f639dc3c4e23e
SHA512
890b3047c28114ac30794c0234126b0b2a3e699f3ed259831091f02d51885e3583dd10c0ef0cecc215b9b8d80b48a2d3a82a5793cd3816afb45f6cc19ae23f25
DIST db-18.1.40.tar.gz 30763705 BLAKE2B
c7235cbdf82d8e38450c98baa1ff67132f6132d59a43dd2d6ed8bc2672b7924b4cbd93320278a0a3a78e454caff622b4480abe8dcc20c94ae56a78b3569a76fd
SHA512
53787164fb8a198a0178c7f58d891c2b0943d1c52b11fe9de525938469327e85664f0bc63e33d740c171bc370954710a6b3e8b9be2a08237fb9757a795c5b19e
DIST db-3.2.9.tar.gz 2085238 BLAKE2B
10cb1c102bf5db52ec16181ccbb02a8c4560f42afd2382689ee4903fcd63bf3ab4802482a065a85b1d34c8fb9f620fceb985155b1390de7ca404c121b6b4b6bc
SHA512
5f07b27ae0cbd2832e5db9473cd4f2d4aebeee25ed8245ebd2c297a576571635ca5cf75e63e0967b1e90978128a5b6f5d8112559c56927d5bc5eb0d9fd3a2e95
DIST db-4.2.52.tar.gz 4073147 BLAKE2B
0bb9649a08df9b425f28471eb65c0efac0b7833b4c5c841b9ef53a142669b549e1f1b78cf42eeceea05ebb271aacd513d115070ea028f77fb1830bb9fcc7c8a9
SHA512
47a4e1353fe4f5c2160952a8f7a09b73fdf2dfcd222a8214e12630cec3139a624907bba83a06f10f8492b4dce328a979e9155ee049b9a88798edaca62cfe60d1
diff --git a/sys-libs/db/db-18.1.32.ebuild b/sys-libs/db/db-18.1.32.ebuild
deleted file mode 100644
index bc3dafe46b9..000
--- a/sys-libs/db/db-18.1.32.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal
eapi7-ver toolchain-funcs
-
-#Number of official patches
-#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
-PATCHNO=${PV/*.*.*_p}
-if [[ ${PATCHNO} == "${PV}" ]] ; then
- MY_PV=${PV}
- MY_P=${P}
- PATCHNO=0
-else
- MY_PV=${PV/_p${PATCHNO}}
- MY_P=${PN}-${MY_PV}
-fi
-
-RESTRICT="!test? ( test )"
-
-S_BASE="${WORKDIR}/${MY_P}"
-S="${S_BASE}/dist"
-DESCRIPTION="Oracle Berkeley DB"
-HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html;
-SRC_URI="https://download.oracle.com/otn/berkeley-db/${MY_P}.tar.gz
- mirror://gentoo/${MY_P}.tar.gz"
-for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
- SRC_URI+="
http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i};
-done
-
-LICENSE="AGPL-3"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc
~x86"
-IUSE="doc java cxx tcl test"
-
-REQUIRED_USE="test? ( tcl )"
-
-# the entire testsuite needs the TCL functionality
-DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
- test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
- java? ( >=virtual/jdk-1.5 )
- >=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
- java? ( >=virtual/jre-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/db$(ver_cut 1-2)/db.h
-)
-
-PATCHES=(
- # bug #510506
- "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
- # use the includes from the prefix
- "${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch
- "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
-
- # sqlite configure call has an extra leading ..
- # upstreamed:5.2.36, missing in 5.3.x/6.x
- # still needs to be patched in 6.0.20
- "${FILESDIR}"/${PN}-18.1.25-sqlite-configure-path.patch
-
- # The upstream testsuite copies .lib and the binaries for each parallel
test
- # core, ~300MB each. This patch uses links instead, saves a lot of
space.
- "${FILESDIR}"/${PN}-18.1.25-test-link.patch
-)
-
-src_prepare() {
- cd "${WORKDIR}"/"${MY_P}"
- for (( i=1 ; i<=${PATCHNO} ; i++ ))
- do
- eapply
[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/files/, sys-libs/db/
commit: a429a28dc3f9d208e5dd1c2b4f0f4473645453c9
Author: Lars Wendler gentoo org>
AuthorDate: Tue Nov 12 09:16:53 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Nov 12 09:16:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a429a28d
sys-libs/db: Fixed "DuplicateFiles" QA message...
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Lars Wendler gentoo.org>
sys-libs/db/db-4.3.29_p1-r2.ebuild | 4 +-
sys-libs/db/db-4.5.20_p2-r2.ebuild | 2 +-
sys-libs/db/db-4.6.21_p4-r1.ebuild | 2 +-
.../db/files/db-4.3-jni-check-prefix-first.patch | 30 --
.../db/files/db-4.3-listen-to-java-options.patch | 10 -
sys-libs/db/files/db-4.5-libtool.patch | 47 --
sys-libs/db/files/db-4.6-libtool.patch | 47 --
7 files changed, 4 insertions(+), 138 deletions(-)
diff --git a/sys-libs/db/db-4.3.29_p1-r2.ebuild
b/sys-libs/db/db-4.3.29_p1-r2.ebuild
index 3796eece528..6bdae1db061 100644
--- a/sys-libs/db/db-4.3.29_p1-r2.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r2.ebuild
@@ -41,8 +41,8 @@ PATCHES=(
"${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
# use the includes from the prefix
- "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
- "${FILESDIR}"/"${PN}"-"${SLOT}"-listen-to-java-options.patch
+ "${FILESDIR}"/"${PN}"-4.2-jni-check-prefix-first.patch
+ "${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch
"${FILESDIR}"/"${PN}"-4.3.27-fix-dep-link.patch
)
diff --git a/sys-libs/db/db-4.5.20_p2-r2.ebuild
b/sys-libs/db/db-4.5.20_p2-r2.ebuild
index 9db6c7cb2c8..8f2961315d9 100644
--- a/sys-libs/db/db-4.5.20_p2-r2.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r2.ebuild
@@ -38,7 +38,7 @@ RDEPEND="tcl? ( dev-lang/tcl )
java? ( >=virtual/jre-1.4 )"
PATCHES=(
- "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
+ "${FILESDIR}"/"${PN}"-4.4-libtool.patch
# use the includes from the prefix
"${FILESDIR}"/"${PN}"-4.3-jni-check-prefix-first.patch
diff --git a/sys-libs/db/db-4.6.21_p4-r1.ebuild
b/sys-libs/db/db-4.6.21_p4-r1.ebuild
index 8ee37a5e20d..2d57363d795 100644
--- a/sys-libs/db/db-4.6.21_p4-r1.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r1.ebuild
@@ -38,7 +38,7 @@ RDEPEND="tcl? ( dev-lang/tcl )
java? ( >=virtual/jre-1.4 )"
PATCHES=(
- "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
+ "${FILESDIR}"/"${PN}"-4.4-libtool.patch
# use the includes from the prefix
"${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
diff --git a/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch
b/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch
deleted file mode 100644
index 0777c706d0b..000
--- a/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch
+++ /dev/null
@@ -1,30 +0,0 @@
a/dist/aclocal_java/ac_jni_include_dirs.ac
-+++ b/dist/aclocal_java/ac_jni_include_dirs.ac
-@@ -43,14 +43,19 @@
- *)AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);;
- esac
-
--_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
--_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
--case "$host_os" in
-- darwin*)_JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
-- _JINC="$_JTOPDIR/Headers";;
-- *) _JINC="$_JTOPDIR/include";;
--esac
--
-+# If JAVAPREFIX is defined, look there first
-+if test -r "$JAVAPREFIX/include/jni.h"; then
-+ _JTOPDIR="$JAVAPREFIX"
-+ _JINC="$JAVAPREFIX/include"
-+else
-+ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
-+ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e
's:/[[^/]]*$::'`
-+ case "$host_os" in
-+ darwin*)_JTOPDIR=`echo "$_JTOPDIR" | sed -e
's:/[[^/]]*$::'`
-+ _JINC="$_JTOPDIR/Headers";;
-+ *) _JINC="$_JTOPDIR/include";;
-+ esac
-+fi
- # If we find jni.h in /usr/include, then it's not a java-only tree, so
- # don't add /usr/include or subdirectories to the list of includes.
- # An extra -I/usr/include can foul things up with newer gcc's.
diff --git a/sys-libs/db/files/db-4.3-listen-to-java-options.patch
b/sys-libs/db/files/db-4.3-listen-to-java-options.patch
deleted file mode 100644
index f1f701de126..000
--- a/sys-libs/db/files/db-4.3-listen-to-java-options.patch
+++ /dev/null
@@ -1,10 +0,0 @@
a/dist/configure.ac
-+++ b/dist/configure.ac
-@@ -385,6 +385,7 @@
- # A classpath that includes . is needed to check for Java
- CLASSPATH=".:$CLASSPATH"
- export CLASSPATH
-+ AC_JAVA_OPTIONS
- AC_PROG_JAVAC
- AC_PROG_JAR
- AC_PROG_JAVA
diff --git a/sys-libs/db/files/db-4.5-libtool.patch
b/sys-libs/db/files/db-4.5-libtool.patch
deleted file mode 100644
index b4d2fc8d73c..000
--- a/sys-libs/db/files/db-4.5-libtool.patch
+++ /dev/null
@@ -1,47 +0,0 @@
[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/files/, sys-libs/db/
commit: a159ca3e2c2f6466507807024a3035fe2cd62e24
Author: Lars Wendler gentoo org>
AuthorDate: Thu Nov 7 22:17:39 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Nov 7 22:19:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a159ca3e
sys-libs/db: Next batch of EAPI-7 revbumps
Fixed some minor issues from previous EAPI-7 revbump.
Closes: https://bugs.gentoo.org/697542
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler gentoo.org>
sys-libs/db/db-3.2.9_p2-r1.ebuild | 6 +-
sys-libs/db/db-4.2.52_p5-r2.ebuild | 11 +-
sys-libs/db/db-4.3.29_p1-r2.ebuild | 11 +-
sys-libs/db/db-4.4.20_p4-r2.ebuild | 13 +-
sys-libs/db/db-4.5.20_p2-r1.ebuild | 177 -
...{db-4.6.21_p4.ebuild => db-4.5.20_p2-r2.ebuild} | 155 ++
...-4.3.29_p1-r2.ebuild => db-4.6.21_p4-r1.ebuild} | 50 +++---
...{db-4.7.25_p4.ebuild => db-4.7.25_p4-r1.ebuild} | 135 +---
sys-libs/db/files/db-4.5-libtool.patch | 4 +-
.../db/files/db-4.6-jni-check-prefix-first.patch | 4 +-
sys-libs/db/files/db-4.6-libtool.patch | 4 +-
11 files changed, 193 insertions(+), 377 deletions(-)
diff --git a/sys-libs/db/db-3.2.9_p2-r1.ebuild
b/sys-libs/db/db-3.2.9_p2-r1.ebuild
index 39694fde8a7..a575baafe1c 100644
--- a/sys-libs/db/db-3.2.9_p2-r1.ebuild
+++ b/sys-libs/db/db-3.2.9_p2-r1.ebuild
@@ -81,8 +81,6 @@ src_configure() {
--enable-cxx
--enable-compat185
--enable-dump185
- --libdir="${EPREFIX}"/usr/$(get_libdir)
- --prefix="${EPREFIX}"/usr
)
local conf_shared=(
@@ -113,7 +111,7 @@ src_configure() {
pushd build-static &>/dev/null || die
strip="${EPREFIX}"/bin/true \
ECONF_SOURCE="${S}"/dist \
- econf ${conf[@]} ${conf_static[@]}
+ econf "${conf[@]}" "${conf_static[@]}"
popd &>/dev/null || die
einfo "Configuring ${P} (shared)..."
@@ -121,7 +119,7 @@ src_configure() {
pushd build-shared &>/dev/null || die
strip="${EPREFIX}"/bin/true \
ECONF_SOURCE="${S}"/dist \
- econf ${conf[@]} ${conf_shared[@]}
+ econf "${conf[@]}" "${conf_shared[@]}"
popd &>/dev/null || die
}
diff --git a/sys-libs/db/db-4.2.52_p5-r2.ebuild
b/sys-libs/db/db-4.2.52_p5-r2.ebuild
index ee47ba9b383..2db608127cc 100644
--- a/sys-libs/db/db-4.2.52_p5-r2.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r2.ebuild
@@ -26,7 +26,7 @@ for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
done
LICENSE="Sleepycat"
-SLOT="4.2"
+SLOT="$(ver_cut 1-2)"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc
x86"
IUSE="tcl java doc cxx rpc"
@@ -107,13 +107,6 @@ src_prepare() {
src_configure() {
local myconf=(
- --prefix="${EPREFIX}"/usr
- --mandir="${EPREFIX}"/usr/share/man
- --infodir="${EPREFIX}"/usr/share/info
- --datadir="${EPREFIX}"/usr/share
- --sysconfdir="${EPREFIX}"/etc
- --localstatedir="${EPREFIX}"/var/lib
- --libdir="${EPREFIX}"/usr/"$(get_libdir)"
--enable-compat185
--with-uniquename
$(use_enable rpc)
@@ -133,8 +126,6 @@ src_configure() {
)
fi
- [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
# the entire testsuite needs the TCL functionality
if use tcl && use test; then
myconf+=( --enable-test )
diff --git a/sys-libs/db/db-4.3.29_p1-r2.ebuild
b/sys-libs/db/db-4.3.29_p1-r2.ebuild
index 1a90b1c6f2f..a152f3a66fa 100644
--- a/sys-libs/db/db-4.3.29_p1-r2.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r2.ebuild
@@ -26,7 +26,7 @@ for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
done
LICENSE="Sleepycat"
-SLOT="4.3"
+SLOT="$(ver_cut 1-2)"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
IUSE="tcl java doc cxx rpc"
@@ -108,13 +108,6 @@ src_prepare() {
src_configure() {
local myconf=(
- --prefix="${EPREFIX}"/usr
- --mandir="${EPREFIX}"/usr/share/man
- --infodir="${EPREFIX}"/usr/share/info
- --datadir="${EPREFIX}"/usr/share
- --sysconfdir="${EPREFIX}"/etc
- --localstatedir="${EPREFIX}"/var/lib
- --libdir="${EPREFIX}"/usr/"$(get_libdir)"
--enable-compat185
--enable-o_direct
--without-uniquename
@@ -135,8 +128,6 @@ src_configure() {
)
fi
- [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
# the entire testsuite needs the TCL functionality
if use tcl && use test ; then
myconf+=( --enable-test )
diff --git a/sys-libs/db/db-4.4.20_p4-r2.ebuild
b/sys-libs/db/db-4.4.20_p4-r2.ebuild
index
[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/files/, sys-libs/db/
commit: 028f9596c072d426a3306af1bd083eb12e629fda
Author: Lars Wendler gentoo org>
AuthorDate: Fri Jan 25 14:07:49 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Fri Jan 25 14:10:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=028f9596
sys-libs/db: Bump to version 6.1.36
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Lars Wendler gentoo.org>
sys-libs/db/Manifest | 1 +
sys-libs/db/db-6.1.36.ebuild | 242 +
.../db/files/db-4.3-listen-to-java-options.patch | 4 +-
3 files changed, 245 insertions(+), 2 deletions(-)
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index d8fd85ce4af..2c9de6d4f74 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -12,6 +12,7 @@ DIST db-5.1.29.tar.gz 32188074 BLAKE2B
6af9e6afc0ebd06a43c0e96fd0b2b3c8e17476507
DIST db-5.3.28.tar.gz 35090431 BLAKE2B
5b77a4ec0945fa96ce6c2b452fb4b029295e037fa64d5ff8dcb3b5e01ee3501fd75d9a73b8f5fa54d8907717d93546fbb5348ee70119e877fa2f17d301ecf50d
SHA512
e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090
DIST db-6.0.35.tar.gz 36532251 BLAKE2B
22fbe557ccc13e4b936db8ca7d6ba11ce42e477bbf39f7e472067e06fb5910b1147fa58a44ac944c24a51ea839f1c61edda6bd8f3c450acac0c13d7fdba11e89
SHA512
002db1553def44efa715095b04b2bac2de7450cdc7142586d1d8b5d8ce79ee5e98f824b3bd276cd586ca932dc51ed35a9ffbed95b2b9847264f262cfa092479d
DIST db-6.1.29.tar.gz 37521943 BLAKE2B
3f036647337a36cb5f8cf5cc8774bd49d4cdff2d57750f21488183de67e426ab0863ee97d972751adc10b294f6c23e1e5e3f2c7b3fc02616463f971b10f3b15e
SHA512
ced40e357acd1214f8b5800ddcf084c65c0ab77ca045a4504ac1a4c864035bd50aa8993cd1232174ff81071a36806314807330aa53dcb18de548c886c2a99e73
+DIST db-6.1.36.tar.gz 37526795 BLAKE2B
9334dc66501465acf99f2675dc838a979c03a29b526b1d22fc9f811c6e76c5ecab4fafad4aa7efbc658c0bc64218f22ac4189c34bce866b0a4ffa052525607a6
SHA512
5f63eaaf75cad12c2a9b9f960bf39cb4ba6f8636609472f5909e38dccb65322a20104f0a8641b968c195c1b9a3ac5456c8bdaf3253995c9a4ace222a2e0d6811
DIST db-6.2.23.tar.gz 44305964 BLAKE2B
8d5705e8e4c66f93e52d1bee86a322ef6d2077d1e5c005208bedcb25f6cfd10e0a6d9c9a72a1d2e3568d6fec14ee82e2446a0fa0a0d505cc17f0ef245de826a1
SHA512
0aac380673ff4f97a2a6230f135f8151b8d2896a12710f708cd983b5fb95075b55fc2c67af577365e8ec7a32e43357a4f3118e37713d00b227f05eb11b1d12f5
DIST db-6.2.32.tar.gz 45342417 BLAKE2B
d3254fba1300d6c7dda5d872c5fa349e8704d71be9c4d37ccf3357782adeb879ce30e066cf083bd97554405c2e94071a96cee16090ad9f797a4fa657ff7e8c46
SHA512
83bdbf18a7b9782409cf4563f8d5f11322d5e564a39946c890604a60440a6ea6361e0236bbc30bd4e8e1de1fa9196b8e815fd126baa035f55c5826c2c6aa3401
DIST db.1.85.tar.gz 270953 BLAKE2B
7862979b6fe21a67eac7eb5e0d05093f33fa71fa92f9717a65bd39b366727e6928109c821b86ede85d6d2a8013199f3927e760bed19001a5cfd2270819a3b904
SHA512
03bf3a2b0947efdca4e38719542e96378b5eeb57da64d5030dd23ab710773c1826f1c867032d0bea658b7fdd8272db253e97bbc490d198b9437025ffdf9e880e
diff --git a/sys-libs/db/db-6.1.36.ebuild b/sys-libs/db/db-6.1.36.ebuild
new file mode 100644
index 000..4f1b84ebf02
--- /dev/null
+++ b/sys-libs/db/db-6.1.36.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal
eapi7-ver toolchain-funcs
+
+#Number of official patches
+#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+PATCHNO=${PV/*.*.*_p}
+if [[ ${PATCHNO} == "${PV}" ]] ; then
+ MY_PV=${PV}
+ MY_P=${P}
+ PATCHNO=0
+else
+ MY_PV=${PV/_p${PATCHNO}}
+ MY_P=${PN}-${MY_PV}
+fi
+
+S_BASE="${WORKDIR}/${MY_P}"
+S="${S_BASE}/build_unix"
+DESCRIPTION="Oracle Berkeley DB"
+HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html;
+SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz;
+for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
+ export SRC_URI="${SRC_URI}
http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i};
+done
+
+LICENSE="AGPL-3"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~x86-fbsd"
+IUSE="doc java cxx tcl test"
+
+REQUIRED_USE="test? ( tcl )"
+
+# the entire testsuite needs the TCL functionality
+DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
+ test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
+ java? ( >=virtual/jdk-1.5 )
+ >=sys-devel/binutils-2.16.1"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
+ java? ( >=virtual/jre-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/db$(ver_cut 1-2)/db.h
+)
+
+PATCHES=(
+ # bug #510506
+ "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
+
+ # use the includes
[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/files/, sys-libs/db/
commit: 82096a101682ec04ab47539b0ae835233f847116
Author: Lars Wendler gentoo org>
AuthorDate: Tue Oct 25 13:44:32 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Oct 25 13:44:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82096a10
sys-libs/db: Removed old.
Package-Manager: portage-2.3.2
Signed-off-by: Lars Wendler gentoo.org>
sys-libs/db/Manifest | 1 -
sys-libs/db/db-4.8.30-r1.ebuild| 185 -
sys-libs/db/db-6.1.26.ebuild | 231 -
sys-libs/db/files/db-3.2.9-jarlocation.patch | 12 --
sys-libs/db/files/db-3.2.9-java15.patch| 15 --
sys-libs/db/files/db-4.0.14-jarlocation.patch | 14 --
sys-libs/db/files/db-4.2-jarlocation.patch | 16 --
sys-libs/db/files/db-4.3-jarlocation.patch | 16 --
sys-libs/db/files/db-4.4-jarlocation.patch | 16 --
sys-libs/db/files/db-4.5-jarlocation.patch | 16 --
sys-libs/db/files/db-4.6-jarlocation.patch | 16 --
.../db/files/db-5.0.21-enable-dbm-autoconf.patch | 49 -
.../db/files/db-6.0.19-sqlite-configure-path.patch | 11 -
13 files changed, 598 deletions(-)
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 151a2c5..6bf257a0 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -11,7 +11,6 @@ DIST db-4.8.30.tar.gz 22887305 SHA256
e0491a07cdb21fb9aa82773bbbedaeb7639cbd0e7f
DIST db-5.1.29.tar.gz 32188074 SHA256
a943cb4920e62df71de1069ddca486d408f6d7a09ddbbb5637afe7a229389182 SHA512
b3487161cc09dd0aee6117d685d0bc0a58854cf5e96f9e778969a51d3a61b66f8e007b76e584e4ef73f84e07d4418b89c2f6697e34c1ad4072609b11b7b4c5b0
WHIRLPOOL
c2c5e335a8ed85f9dd947eb8225148c9633d21f5e17d321a6938b50d4bf061e735563cdbefb8c8aa457923ef80e778f95ad80aba4a92a381432ecf52c2a25353
DIST db-5.3.28.tar.gz 35090431 SHA256
e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628 SHA512
e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090
WHIRLPOOL
ad9042c4509ece1cae42ade4734f69d59a9ec946a85bd486063a7e8f9fa1ae3f925b71f0475fef05a27d33f695ef82ffd06fbaadbd7dc5bfaa77a8caacf9d1dc
DIST db-6.0.35.tar.gz 36532251 SHA256
24421affa8ae436fe427ae4f5f2d1634da83d3d55a5ad6354a98eeedb825de55 SHA512
002db1553def44efa715095b04b2bac2de7450cdc7142586d1d8b5d8ce79ee5e98f824b3bd276cd586ca932dc51ed35a9ffbed95b2b9847264f262cfa092479d
WHIRLPOOL
ebbbe7dd0969a36d06c8cc5618a0f61334396b38671b9b1c2523e3d1d3ba687903242acd23999be3efec45e1ea6b9c7f0f9f5acbb54d8d1dc48bba51d196c487
-DIST db-6.1.26.tar.gz 37495772 SHA256
dd1417af5443f326ee3998e40986c3c60e2a7cfb5bfa25177ef7cadb2afb13a6 SHA512
2590ee3d9e30e6eaeb350edbc2fa7400582c0b520177fe0a3a57a966573268e18ad10b1dc6dee3fb1be9c93ac6f96f848c120793eaf873562464edd125cff4d4
WHIRLPOOL
9aad6c2ec058d332185c630904dca766ca9f9c017c8f6216a4363f007fced3b7cf1b91d76134fa676780f6f8e37966bdea75845deb5cb2dff8f4b432e8068f5f
DIST db-6.1.29.tar.gz 37521943 SHA256
b3c18180e4160d97dd197ba1d37c19f6ea2ec91d31bbfaf8972d99ba097af17d SHA512
ced40e357acd1214f8b5800ddcf084c65c0ab77ca045a4504ac1a4c864035bd50aa8993cd1232174ff81071a36806314807330aa53dcb18de548c886c2a99e73
WHIRLPOOL
cf18bd00ff203c5b2ccb39fe87ad307fc9e1cdf45a1db96753c50eaf555b571b3ab77dc52b32c09122956505f366dbdbdcdff094486d7ded21512a3cb873aa42
DIST db-6.2.23.tar.gz 44305964 SHA256
47612c8991aa9ac2f6be721267c8d3cdccf5ac83105df8e50809daea24e95dc7 SHA512
0aac380673ff4f97a2a6230f135f8151b8d2896a12710f708cd983b5fb95075b55fc2c67af577365e8ec7a32e43357a4f3118e37713d00b227f05eb11b1d12f5
WHIRLPOOL
8a0537da75a5d0d4e0f335a9b27c3767ccab75d0a0f8b2b8b6ccb7483c2f6da02c55b1c14fcda9bdc5bc57fedad6a3c2b81e5d04775cba6d3b42ddcf8266a86e
DIST db.1.85.tar.gz 270953 SHA256
4220d4ddeb77fb57ba2f37c1aa105d561d3ef85a6fb89c79c3edd735d0e193c6 SHA512
03bf3a2b0947efdca4e38719542e96378b5eeb57da64d5030dd23ab710773c1826f1c867032d0bea658b7fdd8272db253e97bbc490d198b9437025ffdf9e880e
WHIRLPOOL
802346b9fc133f6c9316e987352e8bd8e12792b30b0eae9b4e2b3629c9bc8385ab12244dead428bb824945aab383cd4801de3fc705667797bdf6159066ed1352
diff --git a/sys-libs/db/db-4.8.30-r1.ebuild b/sys-libs/db/db-4.8.30-r1.ebuild
deleted file mode 100644
index a4cbcf5..
--- a/sys-libs/db/db-4.8.30-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
multilib-minimal
-
-#Number of official patches
-#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
-PATCHNO=${PV/*.*.*_p}
-if [[ ${PATCHNO} == "${PV}" ]] ; then
- MY_PV=${PV}
- MY_P=${P}
- PATCHNO=0
-else
- MY_PV=${PV/_p${PATCHNO}}
- MY_P=${PN}-${MY_PV}
-fi
-
-S="${WORKDIR}/${MY_P}/build_unix"
-DESCRIPTION="Oracle Berkeley DB"
