subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sys\-libs\/db\/"

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

2023-12-01 Thread Sam James

commit: 1ae36006c79ef705252f5f7009e79f6add7dc353
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec  2 03:51:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec  2 04:01:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ae36006

sys-libs/db: fix another configure check for modern c

Closes: https://bugs.gentoo.org/898074
Closes: https://bugs.gentoo.org/918936
Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-4.8.30-r9.ebuild | 171 +
 sys-libs/db/db-5.3.28-r10.ebuild| 240 
 sys-libs/db/db-6.0.35-r5.ebuild | 234 +++
 sys-libs/db/files/db-4.8.30-tls-configure.patch |  31 +++
 4 files changed, 676 insertions(+)

diff --git a/sys-libs/db/db-4.8.30-r9.ebuild b/sys-libs/db/db-4.8.30-r9.ebuild
new file mode 100644
index ..ac50491119bd
--- /dev/null
+++ b/sys-libs/db/db-4.8.30-r9.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools db flag-o-matic multilib-minimal 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="${WORKDIR}/${MY_P}/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
+   SRC_URI+=" 
http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i};
+done
+
+LICENSE="Sleepycat"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~s390 ~sparc ~x86"
+IUSE="doc cxx tcl test"
+RESTRICT="!test? ( 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}] )"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
+# Need binutils for tc-ld-force-bfd
+BDEPEND="sys-devel/binutils:*"
+
+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
+   "${FILESDIR}"/${PN}-4.8.30-tls-configure.patch
+)
+
+src_prepare() {
+   cd "${WORKDIR}"/"${MY_P}" || die
+   for (( i=1 ; i<=${PATCHNO} ; i++ )); do
+   eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}"
+   done
+
+   default
+
+   sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE \
+   || die
+
+   cd dist || die
+   rm aclocal/libtool.m4 || die
+   sed \
+   -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+   -i configure.ac || die
+   sed \
+   -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
+   -i aclocal/programs.m4 || die
+
+   AT_M4DIR="aclocal" eautoreconf
+
+   # They do autoconf and THEN replace the version variables :(
+   . ./RELEASE
+   sed \
+   -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
+   -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
+   -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
+   -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
+   -e 
"s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
+   -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \
+   -i configure || die
+}
+
+src_configure() {
+   # Force bfd before calling multilib_toolchain_setup
+   tc-ld-force-bfd #470634 #729510
+   multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+   local myconf=(
+   --enable-compat185
+   --enable-o_direct
+   --without-uniquename
+   --disable-static
+   --disable-java
+   $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
+   $(use_enable cxx)
+   $(use_enable cxx stl)
+   $(use_enable test)
+   )
+
+   # compilation with -O0 fails on amd64, see bug #171231
+   if [[ ${ABI} == amd64 ]]; then
+   local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+   replace-flags -O0 -O2
+   is-flagq -O[s123] || append-flags -O2
+   fi
+
+   # Add linker versions to the symbols. Easier to do, and safer than 
header file
+   # mumbo jumbo.
+   append-ldflags -Wl,--default-symver
+
+   # Bug #270851: test needs TCL support
+   if use tcl ||

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2023-11-04 Thread Mike Gilbert

commit: 7ac86392444d950797d8cc035792370202614a7f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Nov  4 17:50:59 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Nov  4 17:50:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ac86392

sys-libs/db: fix pkgcheck warnings

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-libs/db/db-5.3.28-r9.ebuild | 4 ++--
 sys-libs/db/db-6.0.35-r4.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-libs/db/db-5.3.28-r9.ebuild b/sys-libs/db/db-5.3.28-r9.ebuild
index 13da32d2e3bb..a86fe5ad0d1f 100644
--- a/sys-libs/db/db-5.3.28-r9.ebuild
+++ b/sys-libs/db/db-5.3.28-r9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools db flag-o-matic multilib multilib-minimal toolchain-funcs
+inherit autotools db flag-o-matic multilib-minimal toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -24,7 +24,7 @@ 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};
+   SRC_URI+=" 
http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i};
 done
 
 LICENSE="Sleepycat"

diff --git a/sys-libs/db/db-6.0.35-r4.ebuild b/sys-libs/db/db-6.0.35-r4.ebuild
index 0ee187c58cea..422b7e8188a8 100644
--- a/sys-libs/db/db-6.0.35-r4.ebuild
+++ b/sys-libs/db/db-6.0.35-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools db flag-o-matic multilib multilib-minimal toolchain-funcs
+inherit autotools db flag-o-matic multilib-minimal toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -24,7 +24,7 @@ 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};
+   SRC_URI+=" 
http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i};
 done
 
 LICENSE="AGPL-3"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2023-11-04 Thread Mike Gilbert

commit: bd7fe586d642e047d14c193950f883e0b7b17a6a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Nov  4 17:41:59 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Nov  4 17:41:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd7fe586

sys-libs/db: call tc-ld-force-bfd before multilib code

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-libs/db/db-4.8.30-r8.ebuild | 9 ++---
 sys-libs/db/db-5.3.28-r9.ebuild | 8 ++--
 sys-libs/db/db-6.0.35-r4.ebuild | 8 ++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/sys-libs/db/db-4.8.30-r8.ebuild b/sys-libs/db/db-4.8.30-r8.ebuild
index f5906a0c970e..7d3883eeb360 100644
--- a/sys-libs/db/db-4.8.30-r8.ebuild
+++ b/sys-libs/db/db-4.8.30-r8.ebuild
@@ -80,6 +80,12 @@ src_prepare() {
-i configure || die
 }
 
+src_configure() {
+   # Force bfd before calling multilib_toolchain_setup
+   tc-ld-force-bfd #470634 #729510
+   multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
local myconf=(
--enable-compat185
@@ -93,9 +99,6 @@ multilib_src_configure() {
$(use_enable test)
)
 
-   # bug #470634 and bug #729510
-   tc-ld-force-bfd
-
# compilation with -O0 fails on amd64, see bug #171231
if [[ ${ABI} == amd64 ]]; then
local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}

diff --git a/sys-libs/db/db-5.3.28-r9.ebuild b/sys-libs/db/db-5.3.28-r9.ebuild
index 1d029d38e96b..13da32d2e3bb 100644
--- a/sys-libs/db/db-5.3.28-r9.ebuild
+++ b/sys-libs/db/db-5.3.28-r9.ebuild
@@ -111,6 +111,12 @@ src_prepare() {
-i "${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
+src_configure() {
+   # Force bfd before calling multilib_toolchain_setup
+   tc-ld-force-bfd #470634 #729510
+   multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
local myconf=(
# sql_compat will cause a collision with sqlite3
@@ -132,8 +138,6 @@ multilib_src_configure() {
$(use_enable test)
)
 
-   tc-ld-force-bfd #470634 #729510
-
# compilation with -O0 fails on amd64, see bug #171231
if [[ ${ABI} == amd64 ]]; then
local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"

diff --git a/sys-libs/db/db-6.0.35-r4.ebuild b/sys-libs/db/db-6.0.35-r4.ebuild
index 20268a5c9996..0ee187c58cea 100644
--- a/sys-libs/db/db-6.0.35-r4.ebuild
+++ b/sys-libs/db/db-6.0.35-r4.ebuild
@@ -104,6 +104,12 @@ src_prepare() {
-i "${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
+src_configure() {
+   # Force bfd before calling multilib_toolchain_setup
+   tc-ld-force-bfd #470634 #729510
+   multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
local myconf=(
--enable-compat185
@@ -121,8 +127,6 @@ multilib_src_configure() {
$(use_enable test)
)
 
-   tc-ld-force-bfd #470634 #729510
-
# compilation with -O0 fails on amd64, see bug #171231
if [[ ${ABI} == amd64 ]]; then
local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2023-05-31 Thread Sam James

commit: ff24c8ad26e21dda8d2b0ac23fedc68b11e878a6
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 05:38:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 05:38:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff24c8ad

sys-libs/db: depend on binutils for tc-ld-force-bfd

Otherwise we may get errors like this on clang profiles (report from nvtrxs
in #gentoo-hardened):
```
clang-15: error: invalid linker name in argument '-fuse-ld=bfd'
```

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-4.8.30-r8.ebuild | 2 ++
 sys-libs/db/db-5.3.28-r9.ebuild | 6 +-
 sys-libs/db/db-6.0.35-r4.ebuild | 4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/sys-libs/db/db-4.8.30-r8.ebuild b/sys-libs/db/db-4.8.30-r8.ebuild
index e40d00b495fe..f5906a0c970e 100644
--- a/sys-libs/db/db-4.8.30-r8.ebuild
+++ b/sys-libs/db/db-4.8.30-r8.ebuild
@@ -36,6 +36,8 @@ REQUIRED_USE="test? ( tcl )"
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
+# Need binutils for tc-ld-force-bfd
+BDEPEND="sys-devel/binutils:*"
 
 PATCHES=(
"${FILESDIR}"/${PN}-4.8-libtool.patch

diff --git a/sys-libs/db/db-5.3.28-r9.ebuild b/sys-libs/db/db-5.3.28-r9.ebuild
index 4918af5d46fe..1d029d38e96b 100644
--- a/sys-libs/db/db-5.3.28-r9.ebuild
+++ b/sys-libs/db/db-5.3.28-r9.ebuild
@@ -39,7 +39,11 @@ DEPEND="tcl? ( 
>=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 # bug #841698
-BDEPEND="sys-devel/autoconf-archive"
+# Need binutils for tc-ld-force-bfd
+BDEPEND="
+   sys-devel/autoconf-archive
+   sys-devel/binutils:*
+"
 
 MULTILIB_WRAPPED_HEADERS=(
/usr/include/db${SLOT}/db.h

diff --git a/sys-libs/db/db-6.0.35-r4.ebuild b/sys-libs/db/db-6.0.35-r4.ebuild
index 93dc0fcf54a6..20268a5c9996 100644
--- a/sys-libs/db/db-6.0.35-r4.ebuild
+++ b/sys-libs/db/db-6.0.35-r4.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
@@ -38,6 +38,8 @@ REQUIRED_USE="test? ( tcl )"
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
+# Need binutils for tc-ld-force-bfd
+BDEPEND="sys-devel/binutils:*"
 
 MULTILIB_WRAPPED_HEADERS=(
/usr/include/db${SLOT}/db.h

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

2023-02-11 Thread Sam James

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/

2023-01-14 Thread Sam James

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/

2022-12-07 Thread Sam James

commit: 954cd5f6351b1701fe38f5fb6f89643cdddb0611
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  7 15:38:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  7 15:38:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=954cd5f6

sys-libs/db: drop 4.8.30-r6

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-4.8.30-r6.ebuild | 167 
 1 file changed, 167 deletions(-)

diff --git a/sys-libs/db/db-4.8.30-r6.ebuild b/sys-libs/db/db-4.8.30-r6.ebuild
deleted file mode 100644
index ca3d63339448..
--- a/sys-libs/db/db-4.8.30-r6.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools db flag-o-matic multilib multilib-minimal 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="${WORKDIR}/${MY_P}/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="Sleepycat"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86"
-IUSE="doc 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}] )"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.8-libtool.patch
-   "${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch
-)
-
-src_prepare() {
-   cd "${WORKDIR}"/"${MY_P}" || die
-   for (( i=1 ; i<=${PATCHNO} ; i++ ))
-   do
-   eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}"
-   done
-
-   default
-
-   sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE \
-   || die
-
-   cd dist || die
-   rm aclocal/libtool.m4 || die
-   sed \
-   -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-   -i configure.ac || die
-   sed \
-   -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-   -i aclocal/programs.m4 || die
-
-   AT_M4DIR="aclocal" eautoreconf
-
-   # They do autoconf and THEN replace the version variables :(
-   . ./RELEASE
-   sed \
-   -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
-   -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
-   -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
-   -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
-   -e 
"s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
-   -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \
-   -i configure || die
-}
-
-multilib_src_configure() {
-   local myconf=(
-   --enable-compat185
-   --enable-o_direct
-   --without-uniquename
-   --disable-static
-   --disable-java
-   $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
-   $(use_enable cxx)
-   $(use_enable cxx stl)
-   $(use_enable test)
-   )
-
-   tc-ld-force-bfd #470634 #729510
-
-   # compilation with -O0 fails on amd64, see bug #171231
-   if [[ ${ABI} == amd64 ]]; then
-   local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-   replace-flags -O0 -O2
-   is-flagq -O[s123] || append-flags -O2
-   fi
-
-   # Add linker versions to the symbols. Easier to do, and safer than 
header file
-   # mumbo jumbo.
-   append-ldflags -Wl,--default-symver
-
-   # Bug #270851: test needs TCL support
-   if use tcl || use test ; then
-   myconf+=(
-   --enable-tcl
-   --with-tcl="${EPREFIX}/usr/$(get_libdir)"
-   )
-   else
-   myconf+=(--disable-tcl )
-   fi
-
-   ECONF_SOURCE="${S}"/../dist \
-   STRIP="true" \
-   econf "${myconf[@]}"
-
-   # The embedded assembly on ARM does not work on newer hardware
-   # so you CANNOT use --with-mutex=ARM/gcc-assembly anymore.
-   # Specifically, it uses the SWPB op, which was deprecated:
-   # 
http://www.keil.com/support/man/docs/armasm/armasm_dom1361289909499.htm
-   # The op ALSO cannot be

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2022-12-05 Thread WANG Xuerui

commit: ee526972bf32cf189aa6fb63663ea50ccabd6a4d
Author: WANG Xuerui  gentoo  org>
AuthorDate: Mon Dec  5 06:07:33 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Mon Dec  5 09:29:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee526972

sys-libs/db: keyword 4.8.30-r7 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 sys-libs/db/db-4.8.30-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.8.30-r7.ebuild b/sys-libs/db/db-4.8.30-r7.ebuild
index 8e2c5b03582a..776ad34df993 100644
--- a/sys-libs/db/db-4.8.30-r7.ebuild
+++ b/sys-libs/db/db-4.8.30-r7.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~s390 
sparc x86"
 IUSE="doc cxx tcl test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2022-12-02 Thread Arthur Zamarin

commit: 79998f7f479ff5bde4cd924e6674f124fd706e7d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  2 13:21:12 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  2 13:21:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79998f7f

sys-libs/db: Stabilize 4.8.30-r7 x86, #882867

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/db/db-4.8.30-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.8.30-r7.ebuild b/sys-libs/db/db-4.8.30-r7.ebuild
index 13a1aac18559..8e2c5b03582a 100644
--- a/sys-libs/db/db-4.8.30-r7.ebuild
+++ b/sys-libs/db/db-4.8.30-r7.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86"
 IUSE="doc cxx tcl test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2022-12-01 Thread Arthur Zamarin

commit: 1f6ae28e3bd7377c552556b5f47f93635d8a39d8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Dec  1 18:58:52 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Dec  1 18:58:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f6ae28e

sys-libs/db: Stabilize 4.8.30-r7 amd64, #882867

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/db/db-4.8.30-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.8.30-r7.ebuild b/sys-libs/db/db-4.8.30-r7.ebuild
index 9f5fc2272724..13a1aac18559 100644
--- a/sys-libs/db/db-4.8.30-r7.ebuild
+++ b/sys-libs/db/db-4.8.30-r7.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
~x86"
 IUSE="doc cxx tcl test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2022-11-25 Thread Arthur Zamarin

commit: cc7fd2462fbdf4fe08a8ed79739ac0f67fbb5349
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 25 12:01:24 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 25 12:01:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc7fd246

sys-libs/db: Stabilize 4.8.30-r7 ppc64, #882867

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/db/db-4.8.30-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.8.30-r7.ebuild b/sys-libs/db/db-4.8.30-r7.ebuild
index 7d29343ff244..9f5fc2272724 100644
--- a/sys-libs/db/db-4.8.30-r7.ebuild
+++ b/sys-libs/db/db-4.8.30-r7.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 
sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
~x86"
 IUSE="doc cxx tcl test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2022-11-25 Thread Arthur Zamarin

commit: 46611c5fdacbfb7684f55397e82c7d560a3eaedd
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 25 12:01:18 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 25 12:01:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46611c5f

sys-libs/db: Stabilize 4.8.30-r7 ppc, #882867

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/db/db-4.8.30-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.8.30-r7.ebuild b/sys-libs/db/db-4.8.30-r7.ebuild
index ae628387346b..c9f54e90870c 100644
--- a/sys-libs/db/db-4.8.30-r7.ebuild
+++ b/sys-libs/db/db-4.8.30-r7.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 
sparc ~x86"
 IUSE="doc cxx tcl test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2022-11-25 Thread Arthur Zamarin

commit: b84aefafd09b5d3f981332c99505c42e97d7ae2a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 25 12:01:21 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 25 12:01:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b84aefaf

sys-libs/db: Stabilize 4.8.30-r7 hppa, #882867

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/db/db-4.8.30-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.8.30-r7.ebuild b/sys-libs/db/db-4.8.30-r7.ebuild
index c9f54e90870c..7d29343ff244 100644
--- a/sys-libs/db/db-4.8.30-r7.ebuild
+++ b/sys-libs/db/db-4.8.30-r7.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 
sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 
sparc ~x86"
 IUSE="doc cxx tcl test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2022-11-25 Thread Arthur Zamarin

commit: 07d54f48d2056801ea03eb9e68d9ec04afc1ecea
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 25 12:00:42 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 25 12:00:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d54f48

sys-libs/db: Stabilize 4.8.30-r7 arm, #882867

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/db/db-4.8.30-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.8.30-r7.ebuild b/sys-libs/db/db-4.8.30-r7.ebuild
index 190dd88f1da7..ae628387346b 100644
--- a/sys-libs/db/db-4.8.30-r7.ebuild
+++ b/sys-libs/db/db-4.8.30-r7.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc ~x86"
 IUSE="doc cxx tcl test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2022-11-25 Thread Arthur Zamarin

commit: d7fba059923c610403f0cfb7df0b6e3920ee878e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 25 12:00:25 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 25 12:00:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7fba059

sys-libs/db: Stabilize 4.8.30-r7 arm64, #882867

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/db/db-4.8.30-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.8.30-r7.ebuild b/sys-libs/db/db-4.8.30-r7.ebuild
index 4003edb50dff..190dd88f1da7 100644
--- a/sys-libs/db/db-4.8.30-r7.ebuild
+++ b/sys-libs/db/db-4.8.30-r7.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc ~x86"
 IUSE="doc cxx tcl test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2022-11-25 Thread Arthur Zamarin

commit: b94f3f660664006cd731b970ec9240d92dd18d29
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 25 09:54:42 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 25 09:54:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b94f3f66

sys-libs/db: Stabilize 4.8.30-r7 sparc, #882867

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/db/db-4.8.30-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.8.30-r7.ebuild b/sys-libs/db/db-4.8.30-r7.ebuild
index 6b8e376acdb7..4003edb50dff 100644
--- a/sys-libs/db/db-4.8.30-r7.ebuild
+++ b/sys-libs/db/db-4.8.30-r7.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc ~x86"
 IUSE="doc cxx tcl test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2022-10-19 Thread WANG Xuerui

commit: 0799c7eae6f6793483a9cee6df9ca4cfbe4749ca
Author: WANG Xuerui  gentoo  org>
AuthorDate: Fri Oct  7 09:09:12 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Wed Oct 19 10:06:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0799c7ea

sys-libs/db: keyword 5.3.28-r8 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 sys-libs/db/db-5.3.28-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-5.3.28-r8.ebuild b/sys-libs/db/db-5.3.28-r8.ebuild
index 133c241be4a6..6b76da14de94 100644
--- a/sys-libs/db/db-5.3.28-r8.ebuild
+++ b/sys-libs/db/db-5.3.28-r8.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc 
x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv 
~s390 sparc x86"
 IUSE="doc cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2022-10-08 Thread Sam James

commit: eabb6140723f0cc3e157a5e1d6f92b8076ceeb38
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  8 19:18:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 19:18:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eabb6140

sys-libs/db: fix DeprecatedEclass (versionator)

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-6.1.38-r1.ebuild | 4 ++--
 sys-libs/db/db-6.2.38-r1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-libs/db/db-6.1.38-r1.ebuild b/sys-libs/db/db-6.1.38-r1.ebuild
index 278f210fd913..9e4cdf7d678a 100644
--- a/sys-libs/db/db-6.1.38-r1.ebuild
+++ b/sys-libs/db/db-6.1.38-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit db flag-o-matic autotools multilib multilib-minimal eapi7-ver 
versionator toolchain-funcs
+inherit db flag-o-matic autotools multilib multilib-minimal eapi7-ver 
toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -28,7 +28,7 @@ for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
 done
 
 LICENSE="AGPL-3"
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
 IUSE="doc cxx tcl test"
 

diff --git a/sys-libs/db/db-6.2.38-r1.ebuild b/sys-libs/db/db-6.2.38-r1.ebuild
index de6a736bdf14..846d8741b73d 100644
--- a/sys-libs/db/db-6.2.38-r1.ebuild
+++ b/sys-libs/db/db-6.2.38-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit db flag-o-matic autotools multilib multilib-minimal versionator 
eapi7-ver toolchain-funcs
+inherit db flag-o-matic autotools multilib multilib-minimal eapi7-ver 
toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -28,7 +28,7 @@ for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
 done
 
 LICENSE="AGPL-3"
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 IUSE="doc cxx tcl test"

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

2022-06-19 Thread Sam James

commit: 503f602e1edc26f721b47c80981068f547b86b68
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 20 03:33:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 20 05:03:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=503f602e

sys-libs/db: fix -Wformat-security

Closes: https://bugs.gentoo.org/632628
Thanks-to: René Rhéaume  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-4.8.30-r7.ebuild | 164 
 sys-libs/db/files/db-4.8-wformat-security.patch |  43 +++
 2 files changed, 207 insertions(+)

diff --git a/sys-libs/db/db-4.8.30-r7.ebuild b/sys-libs/db/db-4.8.30-r7.ebuild
new file mode 100644
index ..6b8e376acdb7
--- /dev/null
+++ b/sys-libs/db/db-4.8.30-r7.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools db flag-o-matic multilib-minimal 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="${WORKDIR}/${MY_P}/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
+   SRC_URI+=" 
http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i};
+done
+
+LICENSE="Sleepycat"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+IUSE="doc cxx tcl test"
+RESTRICT="!test? ( 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}] )"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.8-libtool.patch
+   "${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch
+   "${FILESDIR}"/${PN}-4.8-wformat-security.patch
+)
+
+src_prepare() {
+   cd "${WORKDIR}"/"${MY_P}" || die
+   for (( i=1 ; i<=${PATCHNO} ; i++ )); do
+   eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}"
+   done
+
+   default
+
+   sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE \
+   || die
+
+   cd dist || die
+   rm aclocal/libtool.m4 || die
+   sed \
+   -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+   -i configure.ac || die
+   sed \
+   -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
+   -i aclocal/programs.m4 || die
+
+   AT_M4DIR="aclocal" eautoreconf
+
+   # They do autoconf and THEN replace the version variables :(
+   . ./RELEASE
+   sed \
+   -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
+   -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
+   -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
+   -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
+   -e 
"s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
+   -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \
+   -i configure || die
+}
+
+multilib_src_configure() {
+   local myconf=(
+   --enable-compat185
+   --enable-o_direct
+   --without-uniquename
+   --disable-static
+   --disable-java
+   $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
+   $(use_enable cxx)
+   $(use_enable cxx stl)
+   $(use_enable test)
+   )
+
+   # bug #470634 and bug #729510
+   tc-ld-force-bfd
+
+   # compilation with -O0 fails on amd64, see bug #171231
+   if [[ ${ABI} == amd64 ]]; then
+   local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+   replace-flags -O0 -O2
+   is-flagq -O[s123] || append-flags -O2
+   fi
+
+   # Add linker versions to the symbols. Easier to do, and safer than 
header file
+   # mumbo jumbo.
+   append-ldflags -Wl,--default-symver
+
+   # Bug #270851: test needs TCL support
+   if use tcl || use test ; then
+   myconf+=(
+   --enable-tcl
+   --with-tcl="${EPREFIX}/usr/$(get_libdir)"
+   )
+   else
+   myconf+=(--disable-tcl )
+   fi
+
+   ECONF_SOURCE="${S}"/../dist STRIP="true" econf "${myconf[@]}"
+
+   # The embedded assembly on ARM does not work on newer hardware
+   # so you CANNOT use --with-mutex=ARM/gcc-assembly anymore.
+

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2022-04-29 Thread Sam James

commit: bc50181c19d8f86a6fbba938f2715a977df2bb8a
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 30 00:25:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 30 00:25:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc50181c

sys-libs/db: add missing autoconf-archive BDEPEND to 5.3.28-r8

Closes: https://bugs.gentoo.org/841698
Thanks-to: Joonas Niilola  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-5.3.28-r8.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys-libs/db/db-5.3.28-r8.ebuild b/sys-libs/db/db-5.3.28-r8.ebuild
index c7f5d0f6d288..133c241be4a6 100644
--- a/sys-libs/db/db-5.3.28-r8.ebuild
+++ b/sys-libs/db/db-5.3.28-r8.ebuild
@@ -38,6 +38,8 @@ REQUIRED_USE="test? ( tcl )"
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
+# bug #841698
+BDEPEND="sys-devel/autoconf-archive"
 
 MULTILIB_WRAPPED_HEADERS=(
/usr/include/db${SLOT}/db.h

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

2022-03-20 Thread Sam James

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/

2022-03-20 Thread Sam James

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/

2022-03-20 Thread Sam James

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/

2022-01-06 Thread David Seifert

commit: 3c0836d17c7d89a5e4926f2d9588436d2f38735e
Author: David Seifert  gentoo  org>
AuthorDate: Thu Jan  6 09:07:15 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Jan  6 09:07:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c0836d1

sys-libs/db: remove userland_GNU

Signed-off-by: David Seifert  gentoo.org>

 sys-libs/db/db-18.1.32-r1.ebuild | 6 ++
 sys-libs/db/db-18.1.40-r1.ebuild | 6 ++
 sys-libs/db/db-4.8.30-r6.ebuild  | 6 ++
 sys-libs/db/db-5.3.28-r8.ebuild  | 6 ++
 sys-libs/db/db-6.0.35-r4.ebuild  | 6 ++
 sys-libs/db/db-6.1.38-r1.ebuild  | 6 ++
 6 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/sys-libs/db/db-18.1.32-r1.ebuild b/sys-libs/db/db-18.1.32-r1.ebuild
index ba0c4dac5df2..76b018c57445 100644
--- a/sys-libs/db/db-18.1.32-r1.ebuild
+++ b/sys-libs/db/db-18.1.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -150,9 +150,7 @@ multilib_src_configure() {
 
# Add linker versions to the symbols. Easier to do, and safer than 
header file
# mumbo jumbo.
-   if use userland_GNU ; then
-   append-ldflags -Wl,--default-symver
-   fi
+   append-ldflags -Wl,--default-symver
 
# use `set` here since the java opts will contain whitespace
if multilib_is_native_abi && use java ; then

diff --git a/sys-libs/db/db-18.1.40-r1.ebuild b/sys-libs/db/db-18.1.40-r1.ebuild
index 0ec531491511..407d361673f7 100644
--- a/sys-libs/db/db-18.1.40-r1.ebuild
+++ b/sys-libs/db/db-18.1.40-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -148,9 +148,7 @@ multilib_src_configure() {
 
# Add linker versions to the symbols. Easier to do, and safer than 
header file
# mumbo jumbo.
-   if use userland_GNU ; then
-   append-ldflags -Wl,--default-symver
-   fi
+   append-ldflags -Wl,--default-symver
 
# use `set` here since the java opts will contain whitespace
if multilib_is_native_abi && use java ; then

diff --git a/sys-libs/db/db-4.8.30-r6.ebuild b/sys-libs/db/db-4.8.30-r6.ebuild
index e26ebc8ebfa8..3bc178287279 100644
--- a/sys-libs/db/db-4.8.30-r6.ebuild
+++ b/sys-libs/db/db-4.8.30-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -116,9 +116,7 @@ multilib_src_configure() {
 
# Add linker versions to the symbols. Easier to do, and safer than 
header file
# mumbo jumbo.
-   if use userland_GNU ; then
-   append-ldflags -Wl,--default-symver
-   fi
+   append-ldflags -Wl,--default-symver
 
# use `set` here since the java opts will contain whitespace
if multilib_is_native_abi && use java ; then

diff --git a/sys-libs/db/db-5.3.28-r8.ebuild b/sys-libs/db/db-5.3.28-r8.ebuild
index 982f14a543a5..91d4a786cf4c 100644
--- a/sys-libs/db/db-5.3.28-r8.ebuild
+++ b/sys-libs/db/db-5.3.28-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -151,9 +151,7 @@ multilib_src_configure() {
 
# Add linker versions to the symbols. Easier to do, and safer than 
header file
# mumbo jumbo.
-   if use userland_GNU ; then
-   append-ldflags -Wl,--default-symver
-   fi
+   append-ldflags -Wl,--default-symver
 
if multilib_is_native_abi && use java ; then
myconf+=(

diff --git a/sys-libs/db/db-6.0.35-r4.ebuild b/sys-libs/db/db-6.0.35-r4.ebuild
index 282cf0680da4..261cbcd2b8c0 100644
--- a/sys-libs/db/db-6.0.35-r4.ebuild
+++ b/sys-libs/db/db-6.0.35-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -145,9 +145,7 @@ multilib_src_configure() {
 
# Add linker versions to the symbols. Easier to do, and safer than 
header file
# mumbo jumbo.
-   if use userland_GNU ; then
-   append-ldflags -Wl,--default-symver
-   fi
+   append-ldflags -Wl,--default-symver
 
# use `set` here since the java opts will contain whitespace
if multilib_is_native_abi && use java ; then

diff --git a/sys-libs/db/db-6.1.38-r1.ebuild b/sys-libs/db/db-6.1.38-r1.ebuild
index 9c01f35ac797..74fb45257401 100644
--- a/sys-libs/db/db-6.1.38-r1.ebuild
+++ b/sys-libs/db/db-6.1.38-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -148,9

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

2021-10-01 Thread David Seifert

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/

2021-05-26 Thread Lars Wendler

commit: 1aef598197cf2bcf68a9ba77eeaf1827eff6707b
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed May 26 09:32:51 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed May 26 09:33:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aef5981

Revert "sys-libs/db: drop 18.1.32-r1"

This reverts commit d0ba134ae40238c9b466890e48a5b9533235c40d.
Which is the last version where Oracle did not remove features.

Signed-off-by: Lars Wendler  gentoo.org>

 sys-libs/db/Manifest |   1 +
 sys-libs/db/db-18.1.32-r1.ebuild | 247 +++
 2 files changed, 248 insertions(+)

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 5e107989be8..317ca5d8dac 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,4 +1,5 @@
 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-r1.ebuild b/sys-libs/db/db-18.1.32-r1.ebuild
new file mode 100644
index 000..ba0c4dac5df
--- /dev/null
+++ b/sys-libs/db/db-18.1.32-r1.ebuild
@@ -0,0 +1,247 @@
+# 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.8 )
+   >=sys-devel/binutils-2.16.1"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
+   java? ( >=virtual/jre-1.8 )"
+
+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++

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-25 Thread David Seifert

commit: aa24d45004fa9ccc7ff2a0528fe41c695481e0aa
Author: David Seifert  gentoo  org>
AuthorDate: Tue May 25 10:36:38 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue May 25 10:36:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa24d450

sys-libs/db: drop versions

Closes: https://bugs.gentoo.org/790803
Signed-off-by: David Seifert  gentoo.org>

 sys-libs/db/db-4.5.20_p2-r5.ebuild | 189 ---
 sys-libs/db/db-4.6.21_p4-r4.ebuild | 178 --
 sys-libs/db/db-4.7.25_p4-r4.ebuild | 185 ---
 sys-libs/db/db-4.8.30-r5.ebuild| 192 
 sys-libs/db/db-5.3.28-r6.ebuild| 246 ---
 sys-libs/db/db-5.3.28-r7.ebuild| 254 -
 6 files changed, 1244 deletions(-)

diff --git a/sys-libs/db/db-4.5.20_p2-r5.ebuild 
b/sys-libs/db/db-4.5.20_p2-r5.ebuild
deleted file mode 100644
index c8677a2f0a4..000
--- a/sys-libs/db/db-4.5.20_p2-r5.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools db flag-o-matic java-pkg-opt-2 multilib
-
-#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"
-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="Sleepycat"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86"
-IUSE="tcl java doc cxx"
-RESTRICT="!test? ( test )"
-
-DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-   java? ( >=virtual/jdk-1.8 )"
-RDEPEND="tcl? ( dev-lang/tcl )
-   java? ( >=virtual/jre-1.8 )"
-
-PATCHES=(
-   "${FILESDIR}"/"${PN}"-4.4-libtool.patch
-
-   # use the includes from the prefix
-   "${FILESDIR}"/"${PN}"-4.2-jni-check-prefix-first.patch
-   "${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch
-)
-
-# Required to avoid unpack attempt of patches
-src_unpack() {
-   unpack "${MY_P}".tar.gz
-}
-
-src_prepare() {
-   pushd "${WORKDIR}"/"${MY_P}" &>/dev/null || die
-   for (( i=1 ; i<=${PATCHNO} ; i++ ))
-   do
-   eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}"
-   done
-
-   default
-
-   sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" \
-   -i dist/RELEASE || die
-
-   # Include the SLOT for Java JAR files
-   # This supersedes the unused jarlocation patches.
-   sed -r \
-   -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-   -i dist/Makefile.in || die
-
-   # START of 4.5+earlier specific
-   # Upstream sucks, they normally concat these
-   local i j
-   for j in dist/aclocal{,_java} ; do
-   pushd ${j} &>/dev/null || die
-   for i in * ; do
-   ln -s ${i} ${i%.ac}.m4 || die
-   done
-   popd &>/dev/null || die
-   done
-   # END of 4.5+earlier specific
-   pushd dist &>/dev/null || die
-   rm aclocal/libtool.{m4,ac} || die
-   sed \
-   -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-   -i configure.ac || die
-   sed \
-   -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-   -i aclocal/programs.m4 || die
-
-   AT_M4DIR="aclocal aclocal_java" eautoreconf
-
-   # Upstream sucks - they do autoconf and THEN replace the version 
variables.
-   . ./RELEASE
-   sed \
-   -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
-   -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
-   -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
-   -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
-   -e 
"s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
-   -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \
-   -i configure || die
-
-   popd &>/dev/null || die
-   popd &>/dev/null || die
-}
-
-src_configure() {
-   # compilation with -O0 fails on amd64, see bug #171231
-   if use amd64 ; then
-   replace-flags -O0 -O2
-   is-flagq -O[s123] || append-flags -O2
-   fi
-
-   local myconf=(
-   --enable-compat185
-   --enable-o_direct
-   --without-uniquename
-   --disable-rpc

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-25 Thread David Seifert

commit: 258cac0c4162713aa01cfcd5bebab14d0e85ca9f
Author: David Seifert  gentoo  org>
AuthorDate: Tue May 25 10:36:35 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue May 25 10:36:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=258cac0c

sys-libs/db: ALLARCHES remaining arches

* The only difference between the current stablization list
  and stable ebuilds is the removal of .a/.la files. The
  BDB test suite is excruciatingly slow and cumbersome to
  run, and wasting AT effort on this change is pointless.

Bug: https://bugs.gentoo.org/790803
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 sys-libs/db/db-4.5.20_p2-r6.ebuild | 2 +-
 sys-libs/db/db-4.6.21_p4-r5.ebuild | 2 +-
 sys-libs/db/db-4.7.25_p4-r5.ebuild | 2 +-
 sys-libs/db/db-4.8.30-r6.ebuild| 2 +-
 sys-libs/db/db-5.3.28-r8.ebuild| 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys-libs/db/db-4.5.20_p2-r6.ebuild 
b/sys-libs/db/db-4.5.20_p2-r6.ebuild
index 4122458de4d..72f1d68b26d 100644
--- a/sys-libs/db/db-4.5.20_p2-r6.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r6.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86"
 IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-libs/db/db-4.6.21_p4-r5.ebuild 
b/sys-libs/db/db-4.6.21_p4-r5.ebuild
index 9bd989b5db5..cf27b50dca2 100644
--- a/sys-libs/db/db-4.6.21_p4-r5.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r5.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86"
 IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-libs/db/db-4.7.25_p4-r5.ebuild 
b/sys-libs/db/db-4.7.25_p4-r5.ebuild
index 4d1b82086ba..81a4d83f617 100644
--- a/sys-libs/db/db-4.7.25_p4-r5.ebuild
+++ b/sys-libs/db/db-4.7.25_p4-r5.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 sparc 
~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86"
 IUSE="doc java cxx tcl test"
 
 # the entire testsuite needs the TCL functionality

diff --git a/sys-libs/db/db-4.8.30-r6.ebuild b/sys-libs/db/db-4.8.30-r6.ebuild
index 531b312d12b..e26ebc8ebfa 100644
--- a/sys-libs/db/db-4.8.30-r6.ebuild
+++ b/sys-libs/db/db-4.8.30-r6.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

diff --git a/sys-libs/db/db-5.3.28-r8.ebuild b/sys-libs/db/db-5.3.28-r8.ebuild
index 8f0224ccf14..982f14a543a 100644
--- a/sys-libs/db/db-5.3.28-r8.ebuild
+++ b/sys-libs/db/db-5.3.28-r8.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc 
x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-24 Thread Sam James

commit: 664144572ac65242aee59eaeea37688b9febcc90
Author: Sam James  gentoo  org>
AuthorDate: Mon May 24 22:37:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 24 22:38:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66414457

sys-libs/db: Stabilize 4.7.25_p4-r5 sparc, #790803

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-4.7.25_p4-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.7.25_p4-r5.ebuild 
b/sys-libs/db/db-4.7.25_p4-r5.ebuild
index 07af0ee6635..4d1b82086ba 100644
--- a/sys-libs/db/db-4.7.25_p4-r5.ebuild
+++ b/sys-libs/db/db-4.7.25_p4-r5.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 sparc 
~x86"
 IUSE="doc java cxx tcl test"
 
 # the entire testsuite needs the TCL functionality

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-24 Thread Sam James

commit: bd0323c761708cb6d68e698c191be2966ffb9d9c
Author: Sam James  gentoo  org>
AuthorDate: Mon May 24 22:37:54 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 24 22:38:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd0323c7

sys-libs/db: Stabilize 4.5.20_p2-r6 sparc, #790803

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-4.5.20_p2-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.5.20_p2-r6.ebuild 
b/sys-libs/db/db-4.5.20_p2-r6.ebuild
index 721dedfa6ce..4122458de4d 100644
--- a/sys-libs/db/db-4.5.20_p2-r6.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r6.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc ~x86"
 IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-24 Thread Sam James

commit: 44e5fcc8b01b739c35053bbadbf1812e5d1b61e1
Author: Sam James  gentoo  org>
AuthorDate: Mon May 24 22:37:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 24 22:38:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44e5fcc8

sys-libs/db: Stabilize 4.6.21_p4-r5 sparc, #790803

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-4.6.21_p4-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.6.21_p4-r5.ebuild 
b/sys-libs/db/db-4.6.21_p4-r5.ebuild
index ee387bdd3f1..9bd989b5db5 100644
--- a/sys-libs/db/db-4.6.21_p4-r5.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r5.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc ~x86"
 IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-24 Thread Sam James

commit: 18cd376c6a45949445b143e6bee808796aa97db6
Author: Sam James  gentoo  org>
AuthorDate: Mon May 24 22:38:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 24 22:38:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18cd376c

sys-libs/db: Stabilize 4.8.30-r6 sparc, #790803

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-4.8.30-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.8.30-r6.ebuild b/sys-libs/db/db-4.8.30-r6.ebuild
index 1ca0df6cf01..531b312d12b 100644
--- a/sys-libs/db/db-4.8.30-r6.ebuild
+++ b/sys-libs/db/db-4.8.30-r6.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-24 Thread Sam James

commit: 1629a08c396e36d1d77f54b9807d1ba0dd9162b7
Author: Sam James  gentoo  org>
AuthorDate: Mon May 24 22:38:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 24 22:38:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1629a08c

sys-libs/db: Stabilize 5.3.28-r8 sparc, #790803

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-5.3.28-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-5.3.28-r8.ebuild b/sys-libs/db/db-5.3.28-r8.ebuild
index a2b6ea3c489..8f0224ccf14 100644
--- a/sys-libs/db/db-5.3.28-r8.ebuild
+++ b/sys-libs/db/db-5.3.28-r8.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-23 Thread Sam James

commit: ea949fa72257cc3abe9a844bea60efaf13bc72b5
Author: Sam James  gentoo  org>
AuthorDate: Mon May 24 02:29:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 24 02:29:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea949fa7

sys-libs/db: Stabilize 5.3.28-r8 amd64, #790803

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-5.3.28-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-5.3.28-r8.ebuild b/sys-libs/db/db-5.3.28-r8.ebuild
index 7da5133f3c7..a2b6ea3c489 100644
--- a/sys-libs/db/db-5.3.28-r8.ebuild
+++ b/sys-libs/db/db-5.3.28-r8.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-23 Thread Sam James

commit: c19fbdfde1757b3bae4058258191b19cbcbd08eb
Author: Sam James  gentoo  org>
AuthorDate: Mon May 24 02:29:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 24 02:29:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c19fbdfd

sys-libs/db: Stabilize 4.6.21_p4-r5 amd64, #790803

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-4.6.21_p4-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.6.21_p4-r5.ebuild 
b/sys-libs/db/db-4.6.21_p4-r5.ebuild
index 6d51c0e1eb9..ee387bdd3f1 100644
--- a/sys-libs/db/db-4.6.21_p4-r5.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r5.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
 IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-23 Thread Sam James

commit: b01d84a0b701987dac1cd775324e1655fa90602b
Author: Sam James  gentoo  org>
AuthorDate: Mon May 24 02:29:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 24 02:29:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b01d84a0

sys-libs/db: Stabilize 4.8.30-r6 amd64, #790803

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-4.8.30-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.8.30-r6.ebuild b/sys-libs/db/db-4.8.30-r6.ebuild
index 0b56bb919ef..1ca0df6cf01 100644
--- a/sys-libs/db/db-4.8.30-r6.ebuild
+++ b/sys-libs/db/db-4.8.30-r6.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-23 Thread Sam James

commit: 14463b14f01534ccca1612b4e17ea4d5638e7263
Author: Sam James  gentoo  org>
AuthorDate: Mon May 24 02:29:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 24 02:29:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14463b14

sys-libs/db: Stabilize 4.5.20_p2-r6 amd64, #790803

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-4.5.20_p2-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.5.20_p2-r6.ebuild 
b/sys-libs/db/db-4.5.20_p2-r6.ebuild
index 04445720d1c..721dedfa6ce 100644
--- a/sys-libs/db/db-4.5.20_p2-r6.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r6.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
 IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-23 Thread Sam James

commit: 22e6f31bf5185b11ede2a97052e4fe334107a492
Author: Sam James  gentoo  org>
AuthorDate: Mon May 24 02:29:43 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 24 02:29:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e6f31b

sys-libs/db: Stabilize 4.7.25_p4-r5 amd64, #790803

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-4.7.25_p4-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.7.25_p4-r5.ebuild 
b/sys-libs/db/db-4.7.25_p4-r5.ebuild
index d7c527220db..07af0ee6635 100644
--- a/sys-libs/db/db-4.7.25_p4-r5.ebuild
+++ b/sys-libs/db/db-4.7.25_p4-r5.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc 
~x86"
 IUSE="doc java cxx tcl test"
 
 # the entire testsuite needs the TCL functionality

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-23 Thread David Seifert

commit: d0ba134ae40238c9b466890e48a5b9533235c40d
Author: David Seifert  gentoo  org>
AuthorDate: Sun May 23 11:47:50 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun May 23 11:47:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0ba134a

sys-libs/db: drop 18.1.32-r1

Signed-off-by: David Seifert  gentoo.org>

 sys-libs/db/Manifest |   1 -
 sys-libs/db/db-18.1.32-r1.ebuild | 247 ---
 2 files changed, 248 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-r1.ebuild b/sys-libs/db/db-18.1.32-r1.ebuild
deleted file mode 100644
index ba0c4dac5df..000
--- a/sys-libs/db/db-18.1.32-r1.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.8 )
-   >=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-   java? ( >=virtual/jre-1.8 )"
-
-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 "${DISTDIR}"/patch."${MY_PV}"."${i}"
-   done
-
-   default
-
-   # Upstream

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-19 Thread Sam James

commit: 1f438438175e4d2b4528e00ebfa723019d9f9a24
Author: Sam James  gentoo  org>
AuthorDate: Wed May 19 17:31:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 19 17:31:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f438438

sys-libs/db: Stabilize 4.6.21_p4-r5 arm, #790803

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-4.6.21_p4-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.6.21_p4-r5.ebuild 
b/sys-libs/db/db-4.6.21_p4-r5.ebuild
index d69c3c32c2a..6d51c0e1eb9 100644
--- a/sys-libs/db/db-4.6.21_p4-r5.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r5.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
 IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-19 Thread Sam James

commit: bdbfc8aee1443421da7447e235f92c4fd2d9b31a
Author: Sam James  gentoo  org>
AuthorDate: Wed May 19 17:31:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 19 17:31:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdbfc8ae

sys-libs/db: Stabilize 5.3.28-r8 arm, #790803

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-5.3.28-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-5.3.28-r8.ebuild b/sys-libs/db/db-5.3.28-r8.ebuild
index 6a25488eddc..7da5133f3c7 100644
--- a/sys-libs/db/db-5.3.28-r8.ebuild
+++ b/sys-libs/db/db-5.3.28-r8.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-19 Thread Sam James

commit: f8e18ecc78d1905132469717f226ff47da90079e
Author: Sam James  gentoo  org>
AuthorDate: Wed May 19 17:31:08 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 19 17:31:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8e18ecc

sys-libs/db: Stabilize 4.7.25_p4-r5 arm, #790803

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-4.7.25_p4-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.7.25_p4-r5.ebuild 
b/sys-libs/db/db-4.7.25_p4-r5.ebuild
index a4d8f87a8e4..d7c527220db 100644
--- a/sys-libs/db/db-4.7.25_p4-r5.ebuild
+++ b/sys-libs/db/db-4.7.25_p4-r5.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc 
~x86"
 IUSE="doc java cxx tcl test"
 
 # the entire testsuite needs the TCL functionality

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-19 Thread Sam James

commit: 909f07d0a6fdc8621d10098e506f94fbc7e264e1
Author: Sam James  gentoo  org>
AuthorDate: Wed May 19 17:31:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 19 17:31:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=909f07d0

sys-libs/db: Stabilize 4.5.20_p2-r6 arm, #790803

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-4.5.20_p2-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.5.20_p2-r6.ebuild 
b/sys-libs/db/db-4.5.20_p2-r6.ebuild
index 5d76d20b008..04445720d1c 100644
--- a/sys-libs/db/db-4.5.20_p2-r6.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r6.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
 IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-19 Thread Sam James

commit: ced64936ae984f50aab797cca7fbbff105a70f3d
Author: Sam James  gentoo  org>
AuthorDate: Wed May 19 17:31:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 19 17:31:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced64936

sys-libs/db: Stabilize 4.8.30-r6 arm, #790803

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-4.8.30-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-4.8.30-r6.ebuild b/sys-libs/db/db-4.8.30-r6.ebuild
index 80ec7706ca1..0b56bb919ef 100644
--- a/sys-libs/db/db-4.8.30-r6.ebuild
+++ b/sys-libs/db/db-4.8.30-r6.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-05-15 Thread Joshua Kinard

commit: ea7f9b143ea1b003ed79aff53e53f176ad6e9e66
Author: Joshua Kinard  gentoo  org>
AuthorDate: Sat May 15 20:07:12 2021 +
Commit: Joshua Kinard  gentoo  org>
CommitDate: Sat May 15 20:07:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea7f9b14

sys-libs/db: Added ~mips to KEYWORDS

Bug: https://bugs.gentoo.org/729932
Signed-off-by: Joshua Kinard  gentoo.org>
Package-Manager: Portage-3.0.18, Repoman-3.0.3

 sys-libs/db/db-6.0.35-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-6.0.35-r4.ebuild b/sys-libs/db/db-6.0.35-r4.ebuild
index 9e9b623e048..282cf0680da 100644
--- a/sys-libs/db/db-6.0.35-r4.ebuild
+++ b/sys-libs/db/db-6.0.35-r4.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-04-30 Thread Miroslav Šulc

commit: a8e03934426bd753b01fc53d0b726640d7400299
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Apr 30 10:50:52 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Apr 30 10:53:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8e03934

sys-libs/db: fixed min java in 6.0.35-r4

Bug: https://bugs.gentoo.org/786699
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 sys-libs/db/db-6.0.35-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-libs/db/db-6.0.35-r4.ebuild b/sys-libs/db/db-6.0.35-r4.ebuild
index 18c03138591..9e9b623e048 100644
--- a/sys-libs/db/db-6.0.35-r4.ebuild
+++ b/sys-libs/db/db-6.0.35-r4.ebuild
@@ -37,9 +37,9 @@ 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.8 )"
+   java? ( >=virtual/jdk-1.7:* )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-   java? ( >=virtual/jre-1.8 )"
+   java? ( >=virtual/jre-1.7:* )"
 
 MULTILIB_WRAPPED_HEADERS=(
/usr/include/db${SLOT}/db.h

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-04-29 Thread Sergei Trofimovich

commit: 5b72b0b20daef61cc0a4dd24f6f5b85bdd61b591
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Apr 29 18:18:10 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Apr 29 18:42:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b72b0b2

sys-libs/db: stable 5.3.28-r7 for hppa, bug #736870

Package-Manager: Portage-3.0.18, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-libs/db/db-5.3.28-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-5.3.28-r7.ebuild b/sys-libs/db/db-5.3.28-r7.ebuild
index a9fb98ad424..9e789e440c0 100644
--- a/sys-libs/db/db-5.3.28-r7.ebuild
+++ b/sys-libs/db/db-5.3.28-r7.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~s390 
sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~s390 
sparc x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-04-29 Thread Mike Gilbert

commit: bb973e046fd1d76d4b9918d6177d4b0a03f80d5c
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Apr 29 17:23:25 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Apr 29 17:26:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb973e04

sys-libs/db: downgrade 5.3 to java 1.7

Bug: https://bugs.gentoo.org/786699
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-libs/db/db-5.3.28-r6.ebuild | 4 ++--
 sys-libs/db/db-5.3.28-r7.ebuild | 4 ++--
 sys-libs/db/db-5.3.28-r8.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-libs/db/db-5.3.28-r6.ebuild b/sys-libs/db/db-5.3.28-r6.ebuild
index 715e6de997c..a89dd6db598 100644
--- a/sys-libs/db/db-5.3.28-r6.ebuild
+++ b/sys-libs/db/db-5.3.28-r6.ebuild
@@ -37,10 +37,10 @@ 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.8 )
+   java? ( >=virtual/jdk-1.7 )
>=sys-devel/binutils-2.16.1"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-   java? ( >=virtual/jre-1.8 )"
+   java? ( >=virtual/jre-1.7 )"
 
 MULTILIB_WRAPPED_HEADERS=(
/usr/include/db5.3/db.h

diff --git a/sys-libs/db/db-5.3.28-r7.ebuild b/sys-libs/db/db-5.3.28-r7.ebuild
index 9143d24498e..a9fb98ad424 100644
--- a/sys-libs/db/db-5.3.28-r7.ebuild
+++ b/sys-libs/db/db-5.3.28-r7.ebuild
@@ -37,9 +37,9 @@ 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.8 )"
+   java? ( >=virtual/jdk-1.7 )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-   java? ( >=virtual/jre-1.8 )"
+   java? ( >=virtual/jre-1.7 )"
 
 MULTILIB_WRAPPED_HEADERS=(
/usr/include/db${SLOT}/db.h

diff --git a/sys-libs/db/db-5.3.28-r8.ebuild b/sys-libs/db/db-5.3.28-r8.ebuild
index f89908a5c14..6a25488eddc 100644
--- a/sys-libs/db/db-5.3.28-r8.ebuild
+++ b/sys-libs/db/db-5.3.28-r8.ebuild
@@ -37,9 +37,9 @@ 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.8 )"
+   java? ( >=virtual/jdk-1.7 )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-   java? ( >=virtual/jre-1.8 )"
+   java? ( >=virtual/jre-1.7 )"
 
 MULTILIB_WRAPPED_HEADERS=(
/usr/include/db${SLOT}/db.h

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-04-29 Thread Lars Wendler

commit: 1dc58f45f305e1faf2c9bcc1ac5207f08fe98e67
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Apr 29 08:48:53 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Apr 29 08:49:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc58f45

sys-libs/db: Revbumps for adjusted java deps

Bug: https://bugs.gentoo.org/786699
Signed-off-by: Lars Wendler  gentoo.org>

 sys-libs/db/{db-1.85-r4.ebuild => db-1.85-r5.ebuild}   | 0
 sys-libs/db/{db-18.1.32.ebuild => db-18.1.32-r1.ebuild}| 0
 sys-libs/db/{db-18.1.40.ebuild => db-18.1.40-r1.ebuild}| 0
 sys-libs/db/{db-3.2.9_p2-r1.ebuild => db-3.2.9_p2-r2.ebuild}   | 0
 sys-libs/db/{db-4.2.52_p5-r3.ebuild => db-4.2.52_p5-r4.ebuild} | 0
 sys-libs/db/{db-4.3.29_p1-r3.ebuild => db-4.3.29_p1-r4.ebuild} | 0
 sys-libs/db/{db-4.4.20_p4-r3.ebuild => db-4.4.20_p4-r4.ebuild} | 0
 sys-libs/db/{db-4.5.20_p2-r3.ebuild => db-4.5.20_p2-r5.ebuild} | 0
 sys-libs/db/{db-4.5.20_p2-r4.ebuild => db-4.5.20_p2-r6.ebuild} | 0
 sys-libs/db/{db-4.6.21_p4-r2.ebuild => db-4.6.21_p4-r4.ebuild} | 0
 sys-libs/db/{db-4.6.21_p4-r3.ebuild => db-4.6.21_p4-r5.ebuild} | 0
 sys-libs/db/{db-4.7.25_p4-r2.ebuild => db-4.7.25_p4-r4.ebuild} | 0
 sys-libs/db/{db-4.7.25_p4-r3.ebuild => db-4.7.25_p4-r5.ebuild} | 0
 sys-libs/db/{db-4.8.30-r3.ebuild => db-4.8.30-r5.ebuild}   | 0
 sys-libs/db/{db-4.8.30-r4.ebuild => db-4.8.30-r6.ebuild}   | 0
 sys-libs/db/{db-5.1.29-r2.ebuild => db-5.1.29-r3.ebuild}   | 0
 sys-libs/db/{db-5.3.28-r2.ebuild => db-5.3.28-r6.ebuild}   | 0
 sys-libs/db/{db-5.3.28-r4.ebuild => db-5.3.28-r7.ebuild}   | 0
 sys-libs/db/{db-5.3.28-r5.ebuild => db-5.3.28-r8.ebuild}   | 0
 sys-libs/db/{db-6.0.35-r3.ebuild => db-6.0.35-r4.ebuild}   | 0
 sys-libs/db/{db-6.1.38.ebuild => db-6.1.38-r1.ebuild}  | 0
 sys-libs/db/{db-6.2.38.ebuild => db-6.2.38-r1.ebuild}  | 0
 22 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/sys-libs/db/db-1.85-r4.ebuild b/sys-libs/db/db-1.85-r5.ebuild
similarity index 100%
rename from sys-libs/db/db-1.85-r4.ebuild
rename to sys-libs/db/db-1.85-r5.ebuild

diff --git a/sys-libs/db/db-18.1.32.ebuild b/sys-libs/db/db-18.1.32-r1.ebuild
similarity index 100%
rename from sys-libs/db/db-18.1.32.ebuild
rename to sys-libs/db/db-18.1.32-r1.ebuild

diff --git a/sys-libs/db/db-18.1.40.ebuild b/sys-libs/db/db-18.1.40-r1.ebuild
similarity index 100%
rename from sys-libs/db/db-18.1.40.ebuild
rename to sys-libs/db/db-18.1.40-r1.ebuild

diff --git a/sys-libs/db/db-3.2.9_p2-r1.ebuild 
b/sys-libs/db/db-3.2.9_p2-r2.ebuild
similarity index 100%
rename from sys-libs/db/db-3.2.9_p2-r1.ebuild
rename to sys-libs/db/db-3.2.9_p2-r2.ebuild

diff --git a/sys-libs/db/db-4.2.52_p5-r3.ebuild 
b/sys-libs/db/db-4.2.52_p5-r4.ebuild
similarity index 100%
rename from sys-libs/db/db-4.2.52_p5-r3.ebuild
rename to sys-libs/db/db-4.2.52_p5-r4.ebuild

diff --git a/sys-libs/db/db-4.3.29_p1-r3.ebuild 
b/sys-libs/db/db-4.3.29_p1-r4.ebuild
similarity index 100%
rename from sys-libs/db/db-4.3.29_p1-r3.ebuild
rename to sys-libs/db/db-4.3.29_p1-r4.ebuild

diff --git a/sys-libs/db/db-4.4.20_p4-r3.ebuild 
b/sys-libs/db/db-4.4.20_p4-r4.ebuild
similarity index 100%
rename from sys-libs/db/db-4.4.20_p4-r3.ebuild
rename to sys-libs/db/db-4.4.20_p4-r4.ebuild

diff --git a/sys-libs/db/db-4.5.20_p2-r3.ebuild 
b/sys-libs/db/db-4.5.20_p2-r5.ebuild
similarity index 100%
rename from sys-libs/db/db-4.5.20_p2-r3.ebuild
rename to sys-libs/db/db-4.5.20_p2-r5.ebuild

diff --git a/sys-libs/db/db-4.5.20_p2-r4.ebuild 
b/sys-libs/db/db-4.5.20_p2-r6.ebuild
similarity index 100%
rename from sys-libs/db/db-4.5.20_p2-r4.ebuild
rename to sys-libs/db/db-4.5.20_p2-r6.ebuild

diff --git a/sys-libs/db/db-4.6.21_p4-r2.ebuild 
b/sys-libs/db/db-4.6.21_p4-r4.ebuild
similarity index 100%
rename from sys-libs/db/db-4.6.21_p4-r2.ebuild
rename to sys-libs/db/db-4.6.21_p4-r4.ebuild

diff --git a/sys-libs/db/db-4.6.21_p4-r3.ebuild 
b/sys-libs/db/db-4.6.21_p4-r5.ebuild
similarity index 100%
rename from sys-libs/db/db-4.6.21_p4-r3.ebuild
rename to sys-libs/db/db-4.6.21_p4-r5.ebuild

diff --git a/sys-libs/db/db-4.7.25_p4-r2.ebuild 
b/sys-libs/db/db-4.7.25_p4-r4.ebuild
similarity index 100%
rename from sys-libs/db/db-4.7.25_p4-r2.ebuild
rename to sys-libs/db/db-4.7.25_p4-r4.ebuild

diff --git a/sys-libs/db/db-4.7.25_p4-r3.ebuild 
b/sys-libs/db/db-4.7.25_p4-r5.ebuild
similarity index 100%
rename from sys-libs/db/db-4.7.25_p4-r3.ebuild
rename to sys-libs/db/db-4.7.25_p4-r5.ebuild

diff --git a/sys-libs/db/db-4.8.30-r3.ebuild b/sys-libs/db/db-4.8.30-r5.ebuild
similarity index 100%
rename from sys-libs/db/db-4.8.30-r3.ebuild
rename to sys-libs/db/db-4.8.30-r5.ebuild

diff --git a/sys-libs/db/db-4.8.30-r4.ebuild b/sys-libs/db/db-4.8.30-r6.ebuild
similarity index 100%
rename from sys-libs/db/db-4.8.30-r4.ebuild
rename to sys-libs/db/db-4.8.30-r6.ebuild

diff --git a/sys-libs/db/db-5.1.29-r2.ebuild b/sys-libs/db/db-5.1.29-r3.ebuild
similarity index 100%

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-04-29 Thread Lars Wendler

commit: 2d3c57a9af2ba276575e8ee315f5d213ae98e400
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Apr 29 08:11:15 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Apr 29 08:12:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d3c57a9

sys-libs/db: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 sys-libs/db/db-6.0.35-r2.ebuild | 253 
 1 file changed, 253 deletions(-)

diff --git a/sys-libs/db/db-6.0.35-r2.ebuild b/sys-libs/db/db-6.0.35-r2.ebuild
deleted file mode 100644
index 5d1ee090cf5..000
--- a/sys-libs/db/db-6.0.35-r2.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal 
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}/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="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~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 )"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-   java? ( >=virtual/jre-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-   /usr/include/db${SLOT}/db.h
-)
-
-PATCHES=(
-   # bug #510506
-   "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-   # use the includes from the prefix
-   "${FILESDIR}"/${PN}-4.6-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}-6.0.35-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}-6.0.20-test-link.patch
-)
-
-src_prepare() {
-   cd "${S_BASE}" || die
-   for (( i=1 ; i<=${PATCHNO} ; i++ ))
-   do
-   eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}"
-   done
-
-   default
-
-   # Upstream release script grabs the dates when the script was run, so 
lets
-   # end-run them to keep the date the same.
-   export REAL_DB_RELEASE_DATE="$(awk \
-   '/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' 
\
-   "${S_BASE}"/dist/configure)"
-   sed -r \
-   -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
-   -i dist/RELEASE || die
-
-   # Include the SLOT for Java JAR files
-   # This supersedes the unused jarlocation patches.
-   sed -r \
-   -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-   -i dist/Makefile.in || die
-
-   cd dist || die
-   rm aclocal/libtool.m4 || die
-   sed \
-   -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-   -i configure.ac || die
-   sed \
-   -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-   -i aclocal/programs.m4 || die
-
-   AT_M4DIR="aclocal aclocal_java" eautoreconf
-
-   # Upstream sucks - they do autoconf and THEN replace the version 
variables.
-   . ./RELEASE
-   local v ev
-   for v in \
-   DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
-   DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
-   DB_VERSION \
-   DB_RELEASE_DATE ; do
-   ev="__EDIT_${v}__"
-   sed -e "s/${ev}/${!v}/g" -i configure || die
-   done
-
-   # This is a false positive skip in the tests as the test-reviewer code
-   # looks for 'Skipping\s'
-   sed \
-   -e '/db_repsite/s,Skipping:,Skipping,g' \
-   -i "${S_BASE}"/test/tcl/reputils.tcl || die
-}
-
-multilib_src_configure() {
-   local myconf=(
-   --enable-compat185
-   --enable-dbm
-

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-04-29 Thread Lars Wendler

commit: c53fdc2cec122f33799fdc6f246800b9e9a0c09e
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Apr 29 08:11:35 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Apr 29 08:12:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c53fdc2c

sys-libs/db: Adjusted java deps

Closes: https://bugs.gentoo.org/786699
Signed-off-by: Lars Wendler  gentoo.org>

 sys-libs/db/db-18.1.32.ebuild  | 4 ++--
 sys-libs/db/db-18.1.40.ebuild  | 4 ++--
 sys-libs/db/db-4.2.52_p5-r3.ebuild | 4 ++--
 sys-libs/db/db-4.3.29_p1-r3.ebuild | 4 ++--
 sys-libs/db/db-4.4.20_p4-r3.ebuild | 4 ++--
 sys-libs/db/db-4.5.20_p2-r3.ebuild | 4 ++--
 sys-libs/db/db-4.5.20_p2-r4.ebuild | 4 ++--
 sys-libs/db/db-4.6.21_p4-r2.ebuild | 4 ++--
 sys-libs/db/db-4.6.21_p4-r3.ebuild | 4 ++--
 sys-libs/db/db-4.7.25_p4-r2.ebuild | 4 ++--
 sys-libs/db/db-4.7.25_p4-r3.ebuild | 4 ++--
 sys-libs/db/db-4.8.30-r3.ebuild| 4 ++--
 sys-libs/db/db-4.8.30-r4.ebuild| 4 ++--
 sys-libs/db/db-5.1.29-r2.ebuild| 4 ++--
 sys-libs/db/db-5.3.28-r2.ebuild| 4 ++--
 sys-libs/db/db-5.3.28-r4.ebuild| 4 ++--
 sys-libs/db/db-5.3.28-r5.ebuild| 4 ++--
 sys-libs/db/db-6.0.35-r3.ebuild| 4 ++--
 sys-libs/db/db-6.1.38.ebuild   | 4 ++--
 sys-libs/db/db-6.2.38.ebuild   | 4 ++--
 20 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/sys-libs/db/db-18.1.32.ebuild b/sys-libs/db/db-18.1.32.ebuild
index bc3dafe46b9..ba0c4dac5df 100644
--- a/sys-libs/db/db-18.1.32.ebuild
+++ b/sys-libs/db/db-18.1.32.ebuild
@@ -38,10 +38,10 @@ 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 )
+   java? ( >=virtual/jdk-1.8 )
>=sys-devel/binutils-2.16.1"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-   java? ( >=virtual/jre-1.5 )"
+   java? ( >=virtual/jre-1.8 )"
 
 MULTILIB_WRAPPED_HEADERS=(
/usr/include/db$(ver_cut 1-2)/db.h

diff --git a/sys-libs/db/db-18.1.40.ebuild b/sys-libs/db/db-18.1.40.ebuild
index 6b02ee829b5..0ec53149151 100644
--- a/sys-libs/db/db-18.1.40.ebuild
+++ b/sys-libs/db/db-18.1.40.ebuild
@@ -39,10 +39,10 @@ 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 )
+   java? ( >=virtual/jdk-1.8 )
>=sys-devel/binutils-2.16.1"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-   java? ( >=virtual/jre-1.5 )"
+   java? ( >=virtual/jre-1.8 )"
 
 MULTILIB_WRAPPED_HEADERS=(
/usr/include/db$(ver_cut 1-2)/db.h

diff --git a/sys-libs/db/db-4.2.52_p5-r3.ebuild 
b/sys-libs/db/db-4.2.52_p5-r3.ebuild
index e31ffdfadaa..47066904ed2 100644
--- a/sys-libs/db/db-4.2.52_p5-r3.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r3.ebuild
@@ -32,9 +32,9 @@ IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-   java? ( >=virtual/jdk-1.4 )"
+   java? ( >=virtual/jdk-1.8 )"
 RDEPEND="tcl? ( dev-lang/tcl )
-   java? ( >=virtual/jre-1.4 )"
+   java? ( >=virtual/jre-1.8 )"
 
 PATCHES=(
"${FILESDIR}"/"${PN}"-4.2.52_p2-TXN.patch

diff --git a/sys-libs/db/db-4.3.29_p1-r3.ebuild 
b/sys-libs/db/db-4.3.29_p1-r3.ebuild
index e4bdf106da5..c8c2b701e13 100644
--- a/sys-libs/db/db-4.3.29_p1-r3.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r3.ebuild
@@ -32,9 +32,9 @@ IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-   java? ( >=virtual/jdk-1.4 )"
+   java? ( >=virtual/jdk-1.8 )"
 RDEPEND="tcl? ( dev-lang/tcl )
-   java? ( >=virtual/jre-1.4 )"
+   java? ( >=virtual/jre-1.8 )"
 
 PATCHES=(
"${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch

diff --git a/sys-libs/db/db-4.4.20_p4-r3.ebuild 
b/sys-libs/db/db-4.4.20_p4-r3.ebuild
index 7c080be4429..f2d903b7354 100644
--- a/sys-libs/db/db-4.4.20_p4-r3.ebuild
+++ b/sys-libs/db/db-4.4.20_p4-r3.ebuild
@@ -33,9 +33,9 @@ IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-   java? ( >=virtual/jdk-1.4 )"
+   java? ( >=virtual/jdk-1.8 )"
 RDEPEND="tcl? ( dev-lang/tcl )
-   java? ( >=virtual/jre-1.4 )"
+   java? ( >=virtual/jre-1.8 )"
 
 PATCHES=(
"${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch

diff --git a/sys-libs/db/db-4.5.20_p2-r3.ebuild 
b/sys-libs/db/db-4.5.20_p2-r3.ebuild
index df21a49880a..c8677a2f0a4 100644
--- a/sys-libs/db/db-4.5.20_p2-r3.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r3.ebuild
@@ -32,9 +32,9 @@ IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-   java? ( >=virtual/jdk-1.4 )"
+   java? ( >=virtual/jdk-1.8 )"
 RDEPEND="tcl? ( dev-lang/tcl )
-   java? ( >=virtual/jre-1.4 )"
+

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-02-05 Thread Sam James

commit: 32c11b7c0fb895ce6ea1c52f9b5e580287414a21
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  5 21:36:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  5 21:36:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32c11b7c

sys-libs/db: Stabilize 5.3.28-r4 s390, #736870

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-5.3.28-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-5.3.28-r4.ebuild b/sys-libs/db/db-5.3.28-r4.ebuild
index 25079725abb..99876d1e9eb 100644
--- a/sys-libs/db/db-5.3.28-r4.ebuild
+++ b/sys-libs/db/db-5.3.28-r4.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~s390 
sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~riscv s390 
sparc x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-01-30 Thread Sam James

commit: eb0bffabdb40072bb657141569832c9715fe9353
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 16:14:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 16:14:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb0bffab

sys-libs/db: Stabilize 5.3.28-r4 sparc, #736870

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-5.3.28-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-5.3.28-r4.ebuild b/sys-libs/db/db-5.3.28-r4.ebuild
index f1fc34d4b54..25079725abb 100644
--- a/sys-libs/db/db-5.3.28-r4.ebuild
+++ b/sys-libs/db/db-5.3.28-r4.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~s390 
~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~s390 
sparc x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-01-25 Thread Lars Wendler

commit: 8ef7b59d9eaf924cd7b88d8fff0c02d7f1378f3c
Author: David Michael  gmail  com>
AuthorDate: Mon Jan 25 17:06:32 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jan 25 17:09:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef7b59d

sys-libs/db: drop unused binutils dependency

Closes: https://bugs.gentoo.org/767172
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: David Michael  gmail.com>
Signed-off-by: Lars Wendler  gentoo.org>

 sys-libs/db/db-4.3.29_p1-r3.ebuild | 5 ++---
 sys-libs/db/db-4.4.20_p4-r3.ebuild | 5 ++---
 sys-libs/db/db-4.5.20_p2-r3.ebuild | 5 ++---
 sys-libs/db/db-4.5.20_p2-r4.ebuild | 5 ++---
 sys-libs/db/db-4.6.21_p4-r2.ebuild | 5 ++---
 sys-libs/db/db-4.6.21_p4-r3.ebuild | 5 ++---
 sys-libs/db/db-4.7.25_p4-r2.ebuild | 5 ++---
 sys-libs/db/db-4.7.25_p4-r3.ebuild | 5 ++---
 sys-libs/db/db-4.8.30-r3.ebuild| 3 +--
 sys-libs/db/db-4.8.30-r4.ebuild| 3 +--
 sys-libs/db/db-5.1.29-r2.ebuild| 3 +--
 sys-libs/db/db-5.3.28-r4.ebuild| 3 +--
 sys-libs/db/db-5.3.28-r5.ebuild| 3 +--
 sys-libs/db/db-6.0.35-r2.ebuild| 3 +--
 sys-libs/db/db-6.0.35-r3.ebuild| 3 +--
 15 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/sys-libs/db/db-4.3.29_p1-r3.ebuild 
b/sys-libs/db/db-4.3.29_p1-r3.ebuild
index b2852ed59b7..6203db5bb19 100644
--- a/sys-libs/db/db-4.3.29_p1-r3.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,8 +32,7 @@ IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-   java? ( >=virtual/jdk-1.4 )
-   >=sys-devel/binutils-2.16.1"
+   java? ( >=virtual/jdk-1.4 )"
 RDEPEND="tcl? ( dev-lang/tcl )
java? ( >=virtual/jre-1.4 )"
 

diff --git a/sys-libs/db/db-4.4.20_p4-r3.ebuild 
b/sys-libs/db/db-4.4.20_p4-r3.ebuild
index dfdea3ae9c2..7c080be4429 100644
--- a/sys-libs/db/db-4.4.20_p4-r3.ebuild
+++ b/sys-libs/db/db-4.4.20_p4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,8 +33,7 @@ IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-   java? ( >=virtual/jdk-1.4 )
-   >=sys-devel/binutils-2.16.1"
+   java? ( >=virtual/jdk-1.4 )"
 RDEPEND="tcl? ( dev-lang/tcl )
java? ( >=virtual/jre-1.4 )"
 

diff --git a/sys-libs/db/db-4.5.20_p2-r3.ebuild 
b/sys-libs/db/db-4.5.20_p2-r3.ebuild
index 0167e85d91b..daddf6588b8 100644
--- a/sys-libs/db/db-4.5.20_p2-r3.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,8 +32,7 @@ IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-   java? ( >=virtual/jdk-1.4 )
-   >=sys-devel/binutils-2.16.1"
+   java? ( >=virtual/jdk-1.4 )"
 RDEPEND="tcl? ( dev-lang/tcl )
java? ( >=virtual/jre-1.4 )"
 

diff --git a/sys-libs/db/db-4.5.20_p2-r4.ebuild 
b/sys-libs/db/db-4.5.20_p2-r4.ebuild
index 12148350901..47bd0927727 100644
--- a/sys-libs/db/db-4.5.20_p2-r4.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,8 +32,7 @@ IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-   java? ( >=virtual/jdk-1.4 )
-   >=sys-devel/binutils-2.16.1"
+   java? ( >=virtual/jdk-1.4 )"
 RDEPEND="tcl? ( dev-lang/tcl )
java? ( >=virtual/jre-1.4 )"
 

diff --git a/sys-libs/db/db-4.6.21_p4-r2.ebuild 
b/sys-libs/db/db-4.6.21_p4-r2.ebuild
index e0038732223..4f065e64ff7 100644
--- a/sys-libs/db/db-4.6.21_p4-r2.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,8 +32,7 @@ IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-   java? ( >=virtual/jdk-1.4 )
-   >=sys-devel/binutils-2.16.1"
+   java? ( >=virtual/jdk-1.4 )"
 RDEPEND="tcl? ( dev-lang/tcl )
java? ( >=virtual/jre-1.4 )"
 

diff --git a/sys-libs/db/db-4.6.21_p4-r3.ebuild 
b/sys-libs/db/db-4.6.21_p4-r3.ebuild
index 7b9ae1bc492..e424bff8ea0 100644
--- a/sys-libs/db/db-4.6.21_p4-r3.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,8 +32,7 @@ IUSE="tcl java doc cxx"

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

2021-01-24 Thread Mike Gilbert

commit: d54fe5fc599733879a3f2cdc85cd088d4ab3febe
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Jan 24 18:26:49 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Jan 24 18:27:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d54fe5fc

Revert "sys-libs/db: remove old"

db-18.1.40 dropped features, so people may want to stick with 18.1.32.

Reverts: c0bd697c0d3d78662d1fe84c685521140b7c5631
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 insertions(+)

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 5e107989be8..317ca5d8dac 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,4 +1,5 @@
 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
new file mode 100644
index 000..bc3dafe46b9
--- /dev/null
+++ b/sys-libs/db/db-18.1.32.ebuild
@@ -0,0 +1,247 @@
+# 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

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-01-24 Thread Mike Gilbert

commit: 692c804867b6e3d7fd53638edbd16ac709e58d2f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Jan 24 17:45:24 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Jan 24 17:51:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=692c8048

sys-libs/db: sync KEYWORDS in 18.1.40

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-libs/db/db-18.1.40.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-libs/db/db-18.1.40.ebuild b/sys-libs/db/db-18.1.40.ebuild
index efa1c827a9e..6b02ee829b5 100644
--- a/sys-libs/db/db-18.1.40.ebuild
+++ b/sys-libs/db/db-18.1.40.ebuild
@@ -30,7 +30,8 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

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

2021-01-24 Thread Mike Gilbert

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/

2021-01-24 Thread Mike Gilbert

commit: 811c7e411281c4c911890175b7615cb1971851a7
Author: Theo Anderson  posteo  de>
AuthorDate: Sat Jan 23 10:24:20 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Jan 24 17:39:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811c7e41

sys-libs/db: use tc-ld-force-bfd instead of tc-ld-disable-gold

ld.bfd is forced due to sys-libs/db requiring
the --default-symver ldflag, which is not present in either
ld.gold or ld.lld

Closes: https://bugs.gentoo.org/595108
Closes: https://bugs.gentoo.org/729510
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Theo Anderson  posteo.de>
Signed-off-by: Mike Gilbert  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/19171

 sys-libs/db/db-18.1.32.ebuild   | 4 ++--
 sys-libs/db/db-18.1.40.ebuild   | 4 ++--
 sys-libs/db/db-4.8.30-r3.ebuild | 4 ++--
 sys-libs/db/db-4.8.30-r4.ebuild | 4 ++--
 sys-libs/db/db-5.1.29-r2.ebuild | 4 ++--
 sys-libs/db/db-5.3.28-r2.ebuild | 4 ++--
 sys-libs/db/db-5.3.28-r4.ebuild | 2 +-
 sys-libs/db/db-5.3.28-r5.ebuild | 4 ++--
 sys-libs/db/db-6.0.35-r2.ebuild | 4 ++--
 sys-libs/db/db-6.0.35-r3.ebuild | 4 ++--
 sys-libs/db/db-6.1.38.ebuild| 4 ++--
 sys-libs/db/db-6.2.38.ebuild| 2 +-
 12 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/sys-libs/db/db-18.1.32.ebuild b/sys-libs/db/db-18.1.32.ebuild
index c8d7486e83f..bc3dafe46b9 100644
--- a/sys-libs/db/db-18.1.32.ebuild
+++ b/sys-libs/db/db-18.1.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -139,7 +139,7 @@ multilib_src_configure() {
$(use_enable test)
)
 
-   tc-ld-disable-gold #470634
+   tc-ld-force-bfd #470634 #729510
 
# compilation with -O0 fails on amd64, see bug #171231
if [[ ${ABI} == amd64 ]]; then

diff --git a/sys-libs/db/db-18.1.40.ebuild b/sys-libs/db/db-18.1.40.ebuild
index c4022d840e7..efa1c827a9e 100644
--- a/sys-libs/db/db-18.1.40.ebuild
+++ b/sys-libs/db/db-18.1.40.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -136,7 +136,7 @@ multilib_src_configure() {
$(use_enable test)
)
 
-   tc-ld-disable-gold #470634
+   tc-ld-force-bfd #470634 #729510
 
# compilation with -O0 fails on amd64, see bug #171231
if [[ ${ABI} == amd64 ]]; then

diff --git a/sys-libs/db/db-4.8.30-r3.ebuild b/sys-libs/db/db-4.8.30-r3.ebuild
index 11a3e263968..8681fcf5b7f 100644
--- a/sys-libs/db/db-4.8.30-r3.ebuild
+++ b/sys-libs/db/db-4.8.30-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -105,7 +105,7 @@ multilib_src_configure() {
$(use_enable test)
)
 
-   tc-ld-disable-gold #470634
+   tc-ld-force-bfd #470634 #729510
 
# compilation with -O0 fails on amd64, see bug #171231
if [[ ${ABI} == amd64 ]]; then

diff --git a/sys-libs/db/db-4.8.30-r4.ebuild b/sys-libs/db/db-4.8.30-r4.ebuild
index 8aa5a58e63b..5eed810dfd1 100644
--- a/sys-libs/db/db-4.8.30-r4.ebuild
+++ b/sys-libs/db/db-4.8.30-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -106,7 +106,7 @@ multilib_src_configure() {
$(use_enable test)
)
 
-   tc-ld-disable-gold #470634
+   tc-ld-force-bfd #470634 #729510
 
# compilation with -O0 fails on amd64, see bug #171231
if [[ ${ABI} == amd64 ]]; then

diff --git a/sys-libs/db/db-5.1.29-r2.ebuild b/sys-libs/db/db-5.1.29-r2.ebuild
index 210615eeed8..56046db05ac 100644
--- a/sys-libs/db/db-5.1.29-r2.ebuild
+++ b/sys-libs/db/db-5.1.29-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -128,7 +128,7 @@ src_configure() {
$(use_enable test)
)
 
-   tc-ld-disable-gold #470634
+   tc-ld-force-bfd #470634 #729510
 
# compilation with -O0 fails on amd64, see bug #171231
if use amd64; then

diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index fed3b53efbf..69fbf19d0cf 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -116,7 +116,7 @@ src_prepare() {
 multilib_src_configure() {
local myconf=()
 
-   tc-ld-disable-gold #470634
+   tc-ld-force-bfd #470634 #729510
 
# compilation

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-01-07 Thread Sam James

commit: 7bc56d4bf88802a2971d975a1c39aca0292d1212
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  7 10:07:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  7 10:09:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bc56d4b

sys-libs/db: Stabilize 5.3.28-r4 ppc, #736870

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-5.3.28-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-libs/db/db-5.3.28-r4.ebuild b/sys-libs/db/db-5.3.28-r4.ebuild
index a8e4ad0ef20..907ac10a55f 100644
--- a/sys-libs/db/db-5.3.28-r4.ebuild
+++ b/sys-libs/db/db-5.3.28-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~s390 
~sparc x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2021-01-06 Thread Fabian Groffen

commit: 49072440cb02af1530a123e0deb5d4183af8b6c9
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 15:34:05 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 15:34:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49072440

sys-libs/db: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-libs/db/db-6.2.38.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-libs/db/db-6.2.38.ebuild b/sys-libs/db/db-6.2.38.ebuild
index 7f8d9f870ae..e37f108dd31 100644
--- a/sys-libs/db/db-6.2.38.ebuild
+++ b/sys-libs/db/db-6.2.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2020-12-14 Thread Fabian Groffen

commit: e400c607964c0e0925f077e6f18d8fbb061cdf33
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Dec 14 20:15:39 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Dec 14 20:15:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e400c607

sys-libs/db-6.2.38: add Prefix keywords

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-libs/db/db-4.2.52_p5-r3.ebuild | 2 +-
 sys-libs/db/db-6.2.38.ebuild   | 7 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sys-libs/db/db-4.2.52_p5-r3.ebuild 
b/sys-libs/db/db-4.2.52_p5-r3.ebuild
index dd191ead6b9..9280a2a20ae 100644
--- a/sys-libs/db/db-4.2.52_p5-r3.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r3.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc 
x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc 
x86 ~x64-macos"
 IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-libs/db/db-6.2.38.ebuild b/sys-libs/db/db-6.2.38.ebuild
index 091651e008b..7f8d9f870ae 100644
--- a/sys-libs/db/db-6.2.38.ebuild
+++ b/sys-libs/db/db-6.2.38.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
@@ -38,7 +38,8 @@ REQUIRED_USE="test? ( tcl )"
 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"
+   kernel_linux? ( >=sys-devel/binutils-2.16.1 )
+   kernel_SunOS? ( >=sys-devel/binutils-2.16.1 )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
java? ( >=virtual/jre-1.5 )"
 
@@ -148,7 +149,7 @@ multilib_src_configure() {
 
# Add linker versions to the symbols. Easier to do, and safer than 
header file
# mumbo jumbo.
-   if use userland_GNU ; then
+   if use kernel_linux || use kernel_SunOS; then
append-ldflags -Wl,--default-symver
fi

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2020-10-30 Thread David Seifert

commit: 8ba76d90f9cfddccfd6935dee71ef442395abd8d
Author: David Seifert  gentoo  org>
AuthorDate: Fri Oct 30 17:22:51 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Oct 30 17:22:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba76d90

sys-libs/db: Revbump for --disable-static

Bug: https://bugs.gentoo.org/378289
Closes: https://github.com/gentoo/gentoo/pull/18073
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 sys-libs/db/db-4.5.20_p2-r4.ebuild | 194 
 sys-libs/db/db-4.6.21_p4-r3.ebuild | 183 +++
 sys-libs/db/db-4.7.25_p4-r3.ebuild | 190 
 sys-libs/db/db-4.8.30-r4.ebuild| 197 +
 .../db/{db-6.1.38.ebuild => db-5.3.28-r5.ebuild}   | 123 +++--
 .../db/{db-6.1.38.ebuild => db-6.0.35-r3.ebuild}   | 116 ++--
 sys-libs/db/db-6.1.38.ebuild   |   4 +
 sys-libs/db/db-6.2.38.ebuild   |   4 +
 8 files changed, 906 insertions(+), 105 deletions(-)

diff --git a/sys-libs/db/db-4.5.20_p2-r4.ebuild 
b/sys-libs/db/db-4.5.20_p2-r4.ebuild
new file mode 100644
index 000..12148350901
--- /dev/null
+++ b/sys-libs/db/db-4.5.20_p2-r4.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools db flag-o-matic java-pkg-opt-2 multilib
+
+#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"
+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="Sleepycat"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+IUSE="tcl java doc cxx"
+RESTRICT="!test? ( test )"
+
+DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
+   java? ( >=virtual/jdk-1.4 )
+   >=sys-devel/binutils-2.16.1"
+RDEPEND="tcl? ( dev-lang/tcl )
+   java? ( >=virtual/jre-1.4 )"
+
+PATCHES=(
+   "${FILESDIR}"/"${PN}"-4.4-libtool.patch
+
+   # use the includes from the prefix
+   "${FILESDIR}"/"${PN}"-4.2-jni-check-prefix-first.patch
+   "${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch
+)
+
+# Required to avoid unpack attempt of patches
+src_unpack() {
+   unpack "${MY_P}".tar.gz
+}
+
+src_prepare() {
+   pushd "${WORKDIR}"/"${MY_P}" &>/dev/null || die
+   for (( i=1 ; i<=${PATCHNO} ; i++ ))
+   do
+   eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}"
+   done
+
+   default
+
+   sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" \
+   -i dist/RELEASE || die
+
+   # Include the SLOT for Java JAR files
+   # This supersedes the unused jarlocation patches.
+   sed -r \
+   -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
+   -i dist/Makefile.in || die
+
+   # START of 4.5+earlier specific
+   # Upstream sucks, they normally concat these
+   local i j
+   for j in dist/aclocal{,_java} ; do
+   pushd ${j} &>/dev/null || die
+   for i in * ; do
+   ln -s ${i} ${i%.ac}.m4 || die
+   done
+   popd &>/dev/null || die
+   done
+   # END of 4.5+earlier specific
+   pushd dist &>/dev/null || die
+   rm aclocal/libtool.{m4,ac} || die
+   sed \
+   -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+   -i configure.ac || die
+   sed \
+   -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
+   -i aclocal/programs.m4 || die
+
+   AT_M4DIR="aclocal aclocal_java" eautoreconf
+
+   # Upstream sucks - they do autoconf and THEN replace the version 
variables.
+   . ./RELEASE
+   sed \
+   -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
+   -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
+   -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
+   -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
+   -e 
"s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
+   -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \
+   -i configure || die
+
+   popd &>/dev/null || die
+   popd &>/dev/null || die
+}
+
+src_configure() {
+   # compilation with -O0 fails on

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2020-10-04 Thread Sam James

commit: 7ad7aa9d89745957744f86f98dac06ecacd0ecec
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct  4 16:52:36 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct  4 16:52:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad7aa9d

sys-libs/db: Stabilize 5.3.28-r4 amd64, #736870

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-5.3.28-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-5.3.28-r4.ebuild b/sys-libs/db/db-5.3.28-r4.ebuild
index e675393c8b4..a8e4ad0ef20 100644
--- a/sys-libs/db/db-5.3.28-r4.ebuild
+++ b/sys-libs/db/db-5.3.28-r4.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2020-09-12 Thread Sam James

commit: 2f0f2591e810e9100a67f0794ad72873c88ef35f
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 12 16:52:01 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 12 16:52:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f0f2591

sys-libs/db: Stabilize 5.3.28-r4 arm64, #736870

Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-5.3.28-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-5.3.28-r4.ebuild b/sys-libs/db/db-5.3.28-r4.ebuild
index 8d5fff7d1ce..f7e6241d511 100644
--- a/sys-libs/db/db-5.3.28-r4.ebuild
+++ b/sys-libs/db/db-5.3.28-r4.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2020-09-11 Thread Sam James

commit: 3d03688c56fe63ede00aa3783061dd97043d251c
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 11 20:47:13 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 11 20:47:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d03688c

sys-libs/db: arm stable (bug #736870)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 sys-libs/db/db-5.3.28-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-5.3.28-r4.ebuild b/sys-libs/db/db-5.3.28-r4.ebuild
index 01c3e5b1835..8d5fff7d1ce 100644
--- a/sys-libs/db/db-5.3.28-r4.ebuild
+++ b/sys-libs/db/db-5.3.28-r4.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

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

2020-08-26 Thread Thomas Deutschmann

commit: d42efea31004b7ea4ad298f5ac00fd34e98f901f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug 26 15:18:44 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug 26 15:21:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d42efea3

sys-libs/db: bump to v18.1.40

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-libs/db/Manifest|   1 +
 sys-libs/db/db-18.1.40.ebuild   | 244 
 sys-libs/db/files/db-18.1.40-fix-docs.patch |  19 +++
 3 files changed, 264 insertions(+)

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 93f9b50e235..317ca5d8dac 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,5 +1,6 @@
 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

diff --git a/sys-libs/db/db-18.1.40.ebuild b/sys-libs/db/db-18.1.40.ebuild
new file mode 100644
index 000..c4022d840e7
--- /dev/null
+++ b/sys-libs/db/db-18.1.40.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2020 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="fetch
+   !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;
+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
+
+   # 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
+
+

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2020-03-27 Thread Robin H. Johnson

commit: c4b03805ffa1b6b59109e356ea4e5752f3514da6
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Fri Mar 27 19:01:35 2020 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Fri Mar 27 19:06:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4b03805

sys-libs/db: remove USE=rpc support

Remove USE=rpc support for all 4.x releases. Upstream removed RPC
support in the 4.8 series, but it was still present in older releases.

The upstream RPC server component (berkeley_db_svc) is single-threaded,
has no security, and other limitations that make it not suited for many
uses.

It could be revived by porting to use libtirpc, see
net-analyzer/argus/files/argus-3.0.8.2-rpc.patch as an example of some
of the required changes.

Fixes: https://bugs.gentoo.org/699750
Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-libs/db/{db-4.2.52_p5-r2.ebuild => db-4.2.52_p5-r3.ebuild} | 4 ++--
 sys-libs/db/{db-4.3.29_p1-r2.ebuild => db-4.3.29_p1-r3.ebuild} | 4 ++--
 sys-libs/db/{db-4.4.20_p4-r2.ebuild => db-4.4.20_p4-r3.ebuild} | 4 ++--
 sys-libs/db/{db-4.5.20_p2-r2.ebuild => db-4.5.20_p2-r3.ebuild} | 4 ++--
 sys-libs/db/{db-4.6.21_p4-r1.ebuild => db-4.6.21_p4-r2.ebuild} | 4 ++--
 sys-libs/db/{db-4.7.25_p4-r1.ebuild => db-4.7.25_p4-r2.ebuild} | 4 ++--
 sys-libs/db/metadata.xml   | 3 ---
 7 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/sys-libs/db/db-4.2.52_p5-r2.ebuild 
b/sys-libs/db/db-4.2.52_p5-r3.ebuild
similarity index 98%
rename from sys-libs/db/db-4.2.52_p5-r2.ebuild
rename to sys-libs/db/db-4.2.52_p5-r3.ebuild
index f9454de5eef..a5f249c6a52 100644
--- a/sys-libs/db/db-4.2.52_p5-r2.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r3.ebuild
@@ -28,7 +28,7 @@ done
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="tcl java doc cxx rpc"
+IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
@@ -110,7 +110,7 @@ src_configure() {
local myconf=(
--enable-compat185
--with-uniquename
-   $(use_enable rpc)
+   --disable-rpc
--host="${CHOST}"
 
$(usex amd64 '--with-mutex=x86/gcc-assembly' '')

diff --git a/sys-libs/db/db-4.3.29_p1-r2.ebuild 
b/sys-libs/db/db-4.3.29_p1-r3.ebuild
similarity index 98%
rename from sys-libs/db/db-4.3.29_p1-r2.ebuild
rename to sys-libs/db/db-4.3.29_p1-r3.ebuild
index 81896b6e565..f208ffd19e6 100644
--- a/sys-libs/db/db-4.3.29_p1-r2.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r3.ebuild
@@ -28,7 +28,7 @@ done
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sparc x86"
-IUSE="tcl java doc cxx rpc"
+IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
@@ -112,7 +112,7 @@ src_configure() {
--enable-compat185
--enable-o_direct
--without-uniquename
-   $(use_enable rpc)
+   --disable-rpc
--host="${CHOST}"
 
$(usex amd64 '--with-mutex=x86/gcc-assembly' '')

diff --git a/sys-libs/db/db-4.4.20_p4-r2.ebuild 
b/sys-libs/db/db-4.4.20_p4-r3.ebuild
similarity index 98%
rename from sys-libs/db/db-4.4.20_p4-r2.ebuild
rename to sys-libs/db/db-4.4.20_p4-r3.ebuild
index 980ee7aa93e..dfdea3ae9c2 100644
--- a/sys-libs/db/db-4.4.20_p4-r2.ebuild
+++ b/sys-libs/db/db-4.4.20_p4-r3.ebuild
@@ -29,7 +29,7 @@ done
 LICENSE="Sleepycat BSD"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="tcl java doc cxx rpc"
+IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
@@ -106,7 +106,7 @@ src_configure() {
--enable-compat185
--enable-o_direct
--without-uniquename
-   $(use_enable rpc)
+   --disable-rpc
--host="${CHOST}"
 
$(usex amd64 '--with-mutex=x86/gcc-assembly' '')

diff --git a/sys-libs/db/db-4.5.20_p2-r2.ebuild 
b/sys-libs/db/db-4.5.20_p2-r3.ebuild
similarity index 98%
rename from sys-libs/db/db-4.5.20_p2-r2.ebuild
rename to sys-libs/db/db-4.5.20_p2-r3.ebuild
index 3b7360b9467..3a85922dd9f 100644
--- a/sys-libs/db/db-4.5.20_p2-r2.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r3.ebuild
@@ -28,7 +28,7 @@ done
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="tcl java doc cxx rpc"
+IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
@@ -116,7 +116,7 @@ src_configure() {
--enable-compat185
--enable-o_direct
--without-uniquename
-   $(use_enable rpc)
+   --disable-rpc
--host="${CHOST}"
 
$(usex amd64 '--with-mutex=x86/gcc-assembly' '')

diff

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2019-11-12 Thread Lars Wendler

commit: 61cc07d408dafe031432ac4f5783edf8febd8e29
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Nov 12 13:22:53 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Nov 12 13:22:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61cc07d4

sys-libs/db: Fixed regressions introduced by commit a429a28d

Closes: https://bugs.gentoo.org/699940
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Lars Wendler  gentoo.org>

 sys-libs/db/db-18.1.32.ebuild  | 2 +-
 sys-libs/db/db-4.4.20_p4-r2.ebuild | 4 ++--
 sys-libs/db/db-4.5.20_p2-r2.ebuild | 4 ++--
 sys-libs/db/db-4.6.21_p4-r1.ebuild | 2 +-
 sys-libs/db/db-4.7.25_p4-r1.ebuild | 4 ++--
 sys-libs/db/db-4.8.30-r3.ebuild| 2 +-
 sys-libs/db/db-5.1.29-r2.ebuild| 2 +-
 sys-libs/db/db-5.3.28-r2.ebuild| 2 +-
 sys-libs/db/db-5.3.28-r4.ebuild| 4 ++--
 sys-libs/db/db-6.0.35-r2.ebuild| 2 +-
 sys-libs/db/db-6.1.38.ebuild   | 2 +-
 sys-libs/db/db-6.2.38.ebuild   | 2 +-
 12 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/sys-libs/db/db-18.1.32.ebuild b/sys-libs/db/db-18.1.32.ebuild
index f1e091a2851..b44531fc25e 100644
--- a/sys-libs/db/db-18.1.32.ebuild
+++ b/sys-libs/db/db-18.1.32.ebuild
@@ -53,7 +53,7 @@ PATCHES=(
 
# use the includes from the prefix
"${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch
-   "${FILESDIR}"/${PN}-4.3-listen-to-java-options.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

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 f96efa921c5..ba34f3c14a1 100644
--- a/sys-libs/db/db-4.4.20_p4-r2.ebuild
+++ b/sys-libs/db/db-4.4.20_p4-r2.ebuild
@@ -42,8 +42,8 @@ PATCHES=(
"${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
 
# use the includes from the prefix
-   "${FILESDIR}"/"${PN}"-4.3-jni-check-prefix-first.patch
-   "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
+   "${FILESDIR}"/"${PN}"-4.2-jni-check-prefix-first.patch
+   "${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch
 )
 
 # Required to avoid unpack attempt of patches

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 8f2961315d9..b0224a1b6b3 100644
--- a/sys-libs/db/db-4.5.20_p2-r2.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r2.ebuild
@@ -41,8 +41,8 @@ PATCHES=(
"${FILESDIR}"/"${PN}"-4.4-libtool.patch
 
# use the includes from the prefix
-   "${FILESDIR}"/"${PN}"-4.3-jni-check-prefix-first.patch
-   "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
+   "${FILESDIR}"/"${PN}"-4.2-jni-check-prefix-first.patch
+   "${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch
 )
 
 # Required to avoid unpack attempt of patches

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 2d57363d795..ac6d71e9f2f 100644
--- a/sys-libs/db/db-4.6.21_p4-r1.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r1.ebuild
@@ -42,7 +42,7 @@ PATCHES=(
 
# use the includes from the prefix
"${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
-   "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
+   "${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch
 )
 
 # Required to avoid unpack attempt of patches

diff --git a/sys-libs/db/db-4.7.25_p4-r1.ebuild 
b/sys-libs/db/db-4.7.25_p4-r1.ebuild
index 7309f2c9201..58f152d09e4 100644
--- a/sys-libs/db/db-4.7.25_p4-r1.ebuild
+++ b/sys-libs/db/db-4.7.25_p4-r1.ebuild
@@ -41,11 +41,11 @@ RDEPEND="tcl? ( dev-lang/tcl )
java? ( >=virtual/jre-1.5 )"
 
 PATCHES=(
-   "${FILESDIR}"/"${PN}"-4.6-libtool.patch
+   "${FILESDIR}"/"${PN}"-4.4-libtool.patch
 
# use the includes from the prefix
"${FILESDIR}"/"${PN}"-4.6-jni-check-prefix-first.patch
-   "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
+   "${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch
 )
 
 # Required to avoid unpack attempt of patches

diff --git a/sys-libs/db/db-4.8.30-r3.ebuild b/sys-libs/db/db-4.8.30-r3.ebuild
index 72e1ebf21a9..2ab7720ed8e 100644
--- a/sys-libs/db/db-4.8.30-r3.ebuild
+++ b/sys-libs/db/db-4.8.30-r3.ebuild
@@ -49,7 +49,7 @@ PATCHES=(
 
# use the includes from the prefix
"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
-   "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
+   "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
 )
 
 src_prepare() {

diff --git a/sys-libs/db/db-5.1.29-r2.ebuild b/sys-libs/db/db-5.1.29-r2.ebuild
index e756c205a3c..fa1ad448f71 100644
--- a/sys-libs/db/db-5.1.29-r2.ebuild
+++ b/sys-libs/db/db-5.1.29-r2.ebuild
@@ -48,7 +48,7 @@ PATCHES=(
 
# use the includes from the prefix
"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
-   "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
+

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2019-11-12 Thread Lars Wendler

commit: f2dc49658e7cb3b2e718e8d4224616d790838598
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Nov 12 09:17:35 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Nov 12 09:17:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2dc4965

sys-libs/db: Fixed non-functional sed call

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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 6bdae1db061..0f5a92f4d33 100644
--- a/sys-libs/db/db-4.3.29_p1-r2.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r2.ebuild
@@ -68,7 +68,7 @@ src_prepare() {
# This supersedes the unused jarlocation patches.
sed -r \
-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-   dist/Makefile.in || die
+   -i dist/Makefile.in || die
 
# START of 4.5+earlier specific
# Upstream sucks, they normally concat these

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

2019-11-12 Thread Lars Wendler

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/

2019-11-12 Thread Lars Wendler

commit: 3e5147dc79d34861e449a6ebb39299aa1ec60f81
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Nov 12 09:09:41 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Nov 12 09:09:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e5147dc

sys-libs/db: Fixed trailing whitespace QA issue...

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Lars Wendler  gentoo.org>

 sys-libs/db/db-3.2.9_p2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 6d601f8e220..7a7212b3fb4 100644
--- a/sys-libs/db/db-3.2.9_p2-r1.ebuild
+++ b/sys-libs/db/db-3.2.9_p2-r1.ebuild
@@ -141,7 +141,7 @@ src_compile() {
 
 src_install() {
pushd build-shared &>/dev/null || die
-   # build system does not support DESTDIR 
+   # build system does not support DESTDIR
emake \
libdb=libdb-3.2.a \
libcxx=libcxx_3.2.a \

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2019-11-10 Thread Michał Górny

commit: 34fe05b1bfe7a7a6f60821bf88d209bb593711fc
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov 10 15:22:33 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov 10 15:27:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34fe05b1

sys-libs/db: [QA] Fix MissingTestRestrict

Signed-off-by: Michał Górny  gentoo.org>

 sys-libs/db/db-3.2.9_p2-r1.ebuild  | 1 +
 sys-libs/db/db-4.2.52_p5-r2.ebuild | 1 +
 sys-libs/db/db-4.3.29_p1-r2.ebuild | 1 +
 sys-libs/db/db-4.4.20_p4-r2.ebuild | 1 +
 sys-libs/db/db-4.5.20_p2-r2.ebuild | 1 +
 sys-libs/db/db-4.6.21_p4-r1.ebuild | 1 +
 6 files changed, 6 insertions(+)

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 5385f48b606..6d601f8e220 100644
--- a/sys-libs/db/db-3.2.9_p2-r1.ebuild
+++ b/sys-libs/db/db-3.2.9_p2-r1.ebuild
@@ -30,6 +30,7 @@ SLOT="3"
 # in the tree.
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"
 IUSE="doc"
+RESTRICT="!test? ( test )"
 
 DEPEND="${RDEPEND}
=sys-libs/db-1.85*"

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 2db608127cc..a612717f568 100644
--- a/sys-libs/db/db-4.2.52_p5-r2.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r2.ebuild
@@ -29,6 +29,7 @@ LICENSE="Sleepycat"
 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"
+RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
java? ( >=virtual/jdk-1.4 )"

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 a152f3a66fa..3796eece528 100644
--- a/sys-libs/db/db-4.3.29_p1-r2.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r2.ebuild
@@ -29,6 +29,7 @@ LICENSE="Sleepycat"
 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"
+RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
java? ( >=virtual/jdk-1.4 )

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 64d3c53846b..f96efa921c5 100644
--- a/sys-libs/db/db-4.4.20_p4-r2.ebuild
+++ b/sys-libs/db/db-4.4.20_p4-r2.ebuild
@@ -30,6 +30,7 @@ LICENSE="Sleepycat BSD"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="tcl java doc cxx rpc"
+RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
java? ( >=virtual/jdk-1.4 )

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 c44739cf0a9..9db6c7cb2c8 100644
--- a/sys-libs/db/db-4.5.20_p2-r2.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r2.ebuild
@@ -29,6 +29,7 @@ LICENSE="Sleepycat"
 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"
+RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
java? ( >=virtual/jdk-1.4 )

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 00ab2118d14..8ee37a5e20d 100644
--- a/sys-libs/db/db-4.6.21_p4-r1.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r1.ebuild
@@ -29,6 +29,7 @@ LICENSE="Sleepycat"
 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"
+RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
java? ( >=virtual/jdk-1.4 )

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2019-11-07 Thread Mikle Kolyada

commit: 442913ffdaa5a8cfdc82d9c06c1aa19acf35efe1
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Nov  8 07:43:10 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Nov  8 07:44:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=442913ff

sys-libs/db: force RESTRICT="!test? ( test )"

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada  gentoo.org>

 sys-libs/db/db-18.1.32.ebuild  | 2 ++
 sys-libs/db/db-4.7.25_p4-r1.ebuild | 2 ++
 sys-libs/db/db-4.8.30-r3.ebuild| 2 ++
 sys-libs/db/db-5.1.29-r2.ebuild| 2 ++
 sys-libs/db/db-5.3.28-r2.ebuild| 2 ++
 sys-libs/db/db-5.3.28-r4.ebuild| 2 ++
 sys-libs/db/db-6.0.35-r2.ebuild| 2 ++
 sys-libs/db/db-6.1.38.ebuild   | 2 ++
 sys-libs/db/db-6.2.38.ebuild   | 2 ++
 9 files changed, 18 insertions(+)

diff --git a/sys-libs/db/db-18.1.32.ebuild b/sys-libs/db/db-18.1.32.ebuild
index 0cfe2f615c1..f1e091a2851 100644
--- a/sys-libs/db/db-18.1.32.ebuild
+++ b/sys-libs/db/db-18.1.32.ebuild
@@ -16,6 +16,8 @@ else
MY_P=${PN}-${MY_PV}
 fi
 
+RESTRICT="!test? ( test )"
+
 S_BASE="${WORKDIR}/${MY_P}"
 S="${S_BASE}/dist"
 DESCRIPTION="Oracle Berkeley DB"

diff --git a/sys-libs/db/db-4.7.25_p4-r1.ebuild 
b/sys-libs/db/db-4.7.25_p4-r1.ebuild
index 69af40930ef..7309f2c9201 100644
--- a/sys-libs/db/db-4.7.25_p4-r1.ebuild
+++ b/sys-libs/db/db-4.7.25_p4-r1.ebuild
@@ -17,6 +17,8 @@ else
MY_P="${PN}-${MY_PV}"
 fi
 
+RESTRICT="!test? ( test )"
+
 S="${WORKDIR}/${MY_P}/build_unix"
 DESCRIPTION="Oracle Berkeley DB"
 
HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html;

diff --git a/sys-libs/db/db-4.8.30-r3.ebuild b/sys-libs/db/db-4.8.30-r3.ebuild
index 8479c2a10fb..72e1ebf21a9 100644
--- a/sys-libs/db/db-4.8.30-r3.ebuild
+++ b/sys-libs/db/db-4.8.30-r3.ebuild
@@ -17,6 +17,8 @@ else
MY_P="${PN}-${MY_PV}"
 fi
 
+RESTRICT="!test? ( test )"
+
 S="${WORKDIR}/${MY_P}/build_unix"
 DESCRIPTION="Oracle Berkeley DB"
 
HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html;

diff --git a/sys-libs/db/db-5.1.29-r2.ebuild b/sys-libs/db/db-5.1.29-r2.ebuild
index 54548984ba6..e756c205a3c 100644
--- a/sys-libs/db/db-5.1.29-r2.ebuild
+++ b/sys-libs/db/db-5.1.29-r2.ebuild
@@ -16,6 +16,8 @@ else
MY_P="${PN}-${MY_PV}"
 fi
 
+RESTRICT="!test? ( test )"
+
 S_BASE="${WORKDIR}/${MY_P}"
 S="${S_BASE}/build_unix"
 DESCRIPTION="Oracle Berkeley DB"

diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index c96a4413498..ab3e1ac5105 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -16,6 +16,8 @@ else
MY_P=${PN}-${MY_PV}
 fi
 
+RESTRICT="!test? ( test )"
+
 S_BASE="${WORKDIR}/${MY_P}"
 S="${S_BASE}/build_unix"
 DESCRIPTION="Oracle Berkeley DB"

diff --git a/sys-libs/db/db-5.3.28-r4.ebuild b/sys-libs/db/db-5.3.28-r4.ebuild
index db5f8b8a8c0..feb6b08177b 100644
--- a/sys-libs/db/db-5.3.28-r4.ebuild
+++ b/sys-libs/db/db-5.3.28-r4.ebuild
@@ -16,6 +16,8 @@ else
MY_P="${PN}-${MY_PV}"
 fi
 
+RESTRICT="!test? ( test )"
+
 S_BASE="${WORKDIR}/${MY_P}"
 S="${S_BASE}/build_unix"
 DESCRIPTION="Oracle Berkeley DB"

diff --git a/sys-libs/db/db-6.0.35-r2.ebuild b/sys-libs/db/db-6.0.35-r2.ebuild
index 3db37562bd9..d64d2ecb9bf 100644
--- a/sys-libs/db/db-6.0.35-r2.ebuild
+++ b/sys-libs/db/db-6.0.35-r2.ebuild
@@ -16,6 +16,8 @@ else
MY_P="${PN}-${MY_PV}"
 fi
 
+RESTRICT="!test? ( test )"
+
 S_BASE="${WORKDIR}/${MY_P}"
 S="${S_BASE}/build_unix"
 DESCRIPTION="Oracle Berkeley DB"

diff --git a/sys-libs/db/db-6.1.38.ebuild b/sys-libs/db/db-6.1.38.ebuild
index 7d292cd735b..e1ebf51e41f 100644
--- a/sys-libs/db/db-6.1.38.ebuild
+++ b/sys-libs/db/db-6.1.38.ebuild
@@ -16,6 +16,8 @@ else
MY_P=${PN}-${MY_PV}
 fi
 
+RESTRICT="!test? ( test )"
+
 S_BASE="${WORKDIR}/${MY_P}"
 S="${S_BASE}/build_unix"
 DESCRIPTION="Oracle Berkeley DB"

diff --git a/sys-libs/db/db-6.2.38.ebuild b/sys-libs/db/db-6.2.38.ebuild
index 635689ac65c..37e88ebf665 100644
--- a/sys-libs/db/db-6.2.38.ebuild
+++ b/sys-libs/db/db-6.2.38.ebuild
@@ -16,6 +16,8 @@ else
MY_P=${PN}-${MY_PV}
 fi
 
+RESTRICT="!test? ( test )"
+
 S_BASE="${WORKDIR}/${MY_P}"
 S="${S_BASE}/build_unix"
 DESCRIPTION="Oracle Berkeley DB"

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

2019-11-07 Thread Lars Wendler

commit: 3fda85d3fef1fad04e37c214446cc1b759659ee2
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Nov  7 23:21:09 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Nov  7 23:23:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fda85d3

sys-libs/db: Another batch of EAPI-7 revbumps

Fixed whitespace issue from previous EAPI-7 revbump

Closes: https://bugs.gentoo.org/655302
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  |   2 +-
 .../{db-4.8.30-r2.ebuild => db-4.8.30-r3.ebuild}   |  83 ++--
 .../{db-5.1.29-r1.ebuild => db-5.1.29-r2.ebuild}   | 142 +++--
 .../{db-5.3.28-r3.ebuild => db-5.3.28-r4.ebuild}   | 133 ++-
 .../{db-6.0.35-r1.ebuild => db-6.0.35-r2.ebuild}   | 124 +-
 sys-libs/db/files/db-4.8-libtool.patch |   4 +-
 6 files changed, 260 insertions(+), 228 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 a575baafe1c..5385f48b606 100644
--- a/sys-libs/db/db-3.2.9_p2-r1.ebuild
+++ b/sys-libs/db/db-3.2.9_p2-r1.ebuild
@@ -131,7 +131,7 @@ src_compile() {
pushd "${S}"/build-static &>/dev/null || die
emake strip="${EPREFIX}"/bin/true
popd &>/dev/null || die
-   
+
einfo "Building ${P} (shared)..."
pushd build-shared &>/dev/null || die
emake strip="${EPREFIX}"/bin/true

diff --git a/sys-libs/db/db-4.8.30-r2.ebuild b/sys-libs/db/db-4.8.30-r3.ebuild
similarity index 80%
rename from sys-libs/db/db-4.8.30-r2.ebuild
rename to sys-libs/db/db-4.8.30-r3.ebuild
index 23c18500065..8479c2a10fb 100644
--- a/sys-libs/db/db-4.8.30-r2.ebuild
+++ b/sys-libs/db/db-4.8.30-r3.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib 
multilib-minimal toolchain-funcs
+inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal 
toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
-PATCHNO=${PV/*.*.*_p}
+PATCHNO="${PV/*.*.*_p}"
 if [[ ${PATCHNO} == "${PV}" ]] ; then
-   MY_PV=${PV}
-   MY_P=${P}
+   MY_PV="${PV}"
+   MY_P="${P}"
PATCHNO=0
 else
-   MY_PV=${PV/_p${PATCHNO}}
-   MY_P=${PN}-${MY_PV}
+   MY_PV="${PV/_p${PATCHNO}}"
+   MY_P="${PN}-${MY_PV}"
 fi
 
 S="${WORKDIR}/${MY_P}/build_unix"
@@ -26,7 +26,7 @@ for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
 done
 
 LICENSE="Sleepycat"
-SLOT="4.8"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"
 IUSE="doc java cxx tcl test"
 
@@ -40,51 +40,68 @@ DEPEND="tcl? ( 
>=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
java? ( >=virtual/jre-1.5 )"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.8-libtool.patch
+   "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
+   "${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch
+
+   # use the includes from the prefix
+   "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
+   "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
+)
+
 src_prepare() {
cd "${WORKDIR}"/"${MY_P}" || die
for (( i=1 ; i<=${PATCHNO} ; i++ ))
do
-   epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
+   eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}"
done
-   epatch "${FILESDIR}"/${PN}-4.8-libtool.patch
-   epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-   epatch "${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch
 
-   # use the includes from the prefix
-   epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
-   epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
+   default
 
sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE \
|| die
 
# Include the SLOT for Java JAR files
# This supersedes the unused jarlocation patches.
-   sed -r -i \
+   sed -r \
-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-   "${S}"/../dist/Makefile.in || die
+   -i dist/Makefile.in || die
 
-   cd "${S}"/../dist || die
-   rm -f aclocal/libtool.m4
-   sed -i \
+   cd dist || die
+   rm aclocal/libtool.m4 || die
+   sed \
-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-   configure.ac || die
-   sed -i \
+   -i configure.ac || die
+   sed \
-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-   aclocal/programs.m4 || die
+   -i aclocal/programs.m4 || die
+
AT_M4DIR="aclocal aclocal_java" eautoreconf
+
# Upstream sucks -

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

2019-11-07 Thread Lars Wendler

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/, sys-libs/db/files/

2019-11-07 Thread Lars Wendler

commit: 35649ba689623e24501e7091b13eb8ba8d60fc84
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Nov  7 17:35:02 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Nov  7 17:35:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35649ba6

sys-libs/db: First batch of EAPI-7 revbumps

Bug: https://bugs.gentoo.org/697542
Closes: https://bugs.gentoo.org/612686
Closes: https://bugs.gentoo.org/639754
Closes: https://bugs.gentoo.org/603680
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 .../db/{db-1.85-r3.ebuild => db-1.85-r4.ebuild}|  30 ++--
 .../{db-3.2.9_p2.ebuild => db-3.2.9_p2-r1.ebuild}  | 177 +++--
 ...-4.2.52_p5-r1.ebuild => db-4.2.52_p5-r2.ebuild} | 164 +++
 ...-4.3.29_p1-r1.ebuild => db-4.3.29_p1-r2.ebuild} | 158 ++
 ...-4.4.20_p4-r1.ebuild => db-4.4.20_p4-r2.ebuild} | 146 +
 sys-libs/db/files/db-1.85-gentoo-paths.patch   |   4 +-
 sys-libs/db/files/db-3.2.9-gcc43.patch |   2 +-
 .../db/files/db-4.2-jni-check-prefix-first.patch   |   4 +-
 .../db/files/db-4.2-listen-to-java-options.patch   |   4 +-
 sys-libs/db/files/db-4.2.52_p2-TXN.patch   |   8 +-
 .../db/files/db-4.3-jni-check-prefix-first.patch   |   4 +-
 sys-libs/db/files/db-4.3-libtool.patch |   4 +-
 sys-libs/db/files/db-4.4-libtool.patch |   4 +-
 13 files changed, 398 insertions(+), 311 deletions(-)

diff --git a/sys-libs/db/db-1.85-r3.ebuild b/sys-libs/db/db-1.85-r4.ebuild
similarity index 67%
rename from sys-libs/db/db-1.85-r3.ebuild
rename to sys-libs/db/db-1.85-r4.ebuild
index 065baf18bbd..055296208c6 100644
--- a/sys-libs/db/db-1.85-r3.ebuild
+++ b/sys-libs/db/db-1.85-r4.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils toolchain-funcs multilib multilib
+inherit toolchain-funcs multilib
 
 DESCRIPTION="old berk db kept around for really old packages"
 
HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html;
 SRC_URI="http://download.oracle.com/berkeley-db/db.${PV}.tar.gz
-mirror://gentoo/${PF}.1.patch.bz2"
+mirror://gentoo/${P}-r3.1.patch.bz2"
 # The patch used by Gentoo is from Fedora, and includes all 5 patches found on
 # the Oracle page, plus others.
 
@@ -19,13 +19,16 @@ IUSE=""
 
 DEPEND=""
 
-S=${WORKDIR}/db.${PV}
+S="${WORKDIR}/db.${PV}"
+
+PATCHES=(
+   "${WORKDIR}"/${P}-r3.1.patch
+   "${FILESDIR}"/${P}-gentoo-paths.patch
+)
+
+src_prepare() {
+   default
 
-src_unpack() {
-   unpack ${A}
-   cd "${S}"
-   epatch "${WORKDIR}"/${PF}.1.patch
-   epatch "${FILESDIR}"/${P}-gentoo-paths.patch
sed -i \
-e "s:@GENTOO_LIBDIR@:$(get_libdir):" \
PORT/linux/Makefile || die
@@ -33,16 +36,17 @@ src_unpack() {
 
 src_compile() {
tc-export CC AR RANLIB
-   emake -C PORT/linux OORG="${CFLAGS}" || die
+   emake -C PORT/linux OORG="${CFLAGS}"
 }
 
 src_install() {
make -C PORT/linux install DESTDIR="${ED}" || die
 
# binary compat symlink
-   dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2 || die
+   dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2
 
-   dosed "s:::" /usr/include/db1/ndbm.h
+   sed -e "s:::" \
+   -i "${ED}"/usr/include/db1/ndbm.h || die
dosym db1/ndbm.h /usr/include/ndbm.h
 
dodoc changelog README

diff --git a/sys-libs/db/db-3.2.9_p2.ebuild b/sys-libs/db/db-3.2.9_p2-r1.ebuild
similarity index 56%
rename from sys-libs/db/db-3.2.9_p2.ebuild
rename to sys-libs/db/db-3.2.9_p2-r1.ebuild
index eac5cd83442..39694fde8a7 100644
--- a/sys-libs/db/db-3.2.9_p2.ebuild
+++ b/sys-libs/db/db-3.2.9_p2-r1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils db multilib
+inherit db flag-o-matic multilib
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
-PATCHNO=${PV/*.*.*_p}
+PATCHNO="${PV/*.*.*_p}"
 if [[ ${PATCHNO} == "${PV}" ]] ; then
-   MY_PV=${PV}
-   MY_P=${P}
+   MY_PV="${PV}"
+   MY_P="${P}"
PATCHNO=0
 else
-   MY_PV=${PV/_p${PATCHNO}}
-   MY_P=${PN}-${MY_PV}
+   MY_PV="${PV/_p${PATCHNO}}"
+   MY_P="${PN}-${MY_PV}"
 fi
 
 DESCRIPTION="Berkeley DB for transaction support in MySQL"
@@ -36,62 +36,68 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-   # This doesn't build without exceptions
-   export CXXFLAGS="${CXXFLAGS/-fno-exceptions/-fexceptions}"
+PATCHES=(
+   # Get db to link libdb* to correct dependencies ... for example if we 
use
+   # NPTL or NGPT, db detects usable mutexes, and

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2019-11-07 Thread Lars Wendler

commit: 2042cda3d31b9c74060b0c4c41ba668648c65b48
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Nov  7 15:21:14 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Nov  7 17:05:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2042cda3

sys-libs/db: Removed old

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 sys-libs/db/Manifest|   3 -
 sys-libs/db/db-18.1.25.ebuild   | 245 
 sys-libs/db/db-6.0.35.ebuild| 242 ---
 sys-libs/db/db-6.1.36.ebuild| 242 ---
 sys-libs/db/db-6.2.32-r1.ebuild | 243 ---
 5 files changed, 975 deletions(-)

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index cf552adc74f..93f9b50e235 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.25.tar.gz 43980391 BLAKE2B 
364f023809d9d68d58879dda80e5a6a1826db261ac371d63151278731a777c6ca629b051df3c1430f1c049fcc7e4ddfe041522e891290a43aba051b519b28523
 SHA512 
30a0508dc7eb92adb56bdc881cedf179e901f888c776bc515b342ae585168521fa9f3c763f438d0e8a008e7cc779b3f40a7385285d724f8494d25d3652e6f1c9
 DIST db-18.1.32.tar.gz 44244747 BLAKE2B 
b539d8966a269f6a9440ef442248849f12c6b1eda79b9a41074e1eb0eb4930fd4674dd0e20a114e4020fe2ce19832572c4c86d458835da39a99f639dc3c4e23e
 SHA512 
890b3047c28114ac30794c0234126b0b2a3e699f3ed259831091f02d51885e3583dd10c0ef0cecc215b9b8d80b48a2d3a82a5793cd3816afb45f6cc19ae23f25
 DIST db-3.2.9.tar.gz 2085238 BLAKE2B 
10cb1c102bf5db52ec16181ccbb02a8c4560f42afd2382689ee4903fcd63bf3ab4802482a065a85b1d34c8fb9f620fceb985155b1390de7ca404c121b6b4b6bc
 SHA512 
5f07b27ae0cbd2832e5db9473cd4f2d4aebeee25ed8245ebd2c297a576571635ca5cf75e63e0967b1e90978128a5b6f5d8112559c56927d5bc5eb0d9fd3a2e95
 DIST db-4.2.52.tar.gz 4073147 BLAKE2B 
0bb9649a08df9b425f28471eb65c0efac0b7833b4c5c841b9ef53a142669b549e1f1b78cf42eeceea05ebb271aacd513d115070ea028f77fb1830bb9fcc7c8a9
 SHA512 
47a4e1353fe4f5c2160952a8f7a09b73fdf2dfcd222a8214e12630cec3139a624907bba83a06f10f8492b4dce328a979e9155ee049b9a88798edaca62cfe60d1
@@ -13,9 +12,7 @@ DIST db-4.8.30.tar.gz 22887305 BLAKE2B 
10487580a371fa97ef5e468e1fcc4af68490934a8
 DIST db-5.1.29.tar.gz 32188074 BLAKE2B 
6af9e6afc0ebd06a43c0e96fd0b2b3c8e17476507996605aea0c1519b9120140ff410829118a59ea8eff1ab220762131cfab8cf574ffddfa6348128a57721b37
 SHA512 
b3487161cc09dd0aee6117d685d0bc0a58854cf5e96f9e778969a51d3a61b66f8e007b76e584e4ef73f84e07d4418b89c2f6697e34c1ad4072609b11b7b4c5b0
 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.36.tar.gz 37526795 BLAKE2B 
9334dc66501465acf99f2675dc838a979c03a29b526b1d22fc9f811c6e76c5ecab4fafad4aa7efbc658c0bc64218f22ac4189c34bce866b0a4ffa052525607a6
 SHA512 
5f63eaaf75cad12c2a9b9f960bf39cb4ba6f8636609472f5909e38dccb65322a20104f0a8641b968c195c1b9a3ac5456c8bdaf3253995c9a4ace222a2e0d6811
 DIST db-6.1.38.tar.gz 37644337 BLAKE2B 
32b3f65bef04bb18e45c3c0c9110d5d0bf58f4761bee5bf07949e192f4b9f5fa28117b1696c17863da0affe408bd6c8132c472c46d31c17693519959ff03
 SHA512 
5760d1e441bea11c371825ac47203b1eb9f188f9cb2ea0e3d547b3d3b15620d27cb0bd617eb7b89c53407fb7ed79cad27477d714b5b797869f8bf4b1808b
-DIST db-6.2.32.tar.gz 45342417 BLAKE2B 
d3254fba1300d6c7dda5d872c5fa349e8704d71be9c4d37ccf3357782adeb879ce30e066cf083bd97554405c2e94071a96cee16090ad9f797a4fa657ff7e8c46
 SHA512 
83bdbf18a7b9782409cf4563f8d5f11322d5e564a39946c890604a60440a6ea6361e0236bbc30bd4e8e1de1fa9196b8e815fd126baa035f55c5826c2c6aa3401
 DIST db-6.2.38.tar.gz 41298311 BLAKE2B 
a04a3344058b1d9982f39628c1114aded8f8c860753853c8b487e9ea14bd69a0391301620396d22204b3c8f25945c3f5485ea4792567e2d903a657541204d297
 SHA512 
b357932e4a5856b9cf8cf42050a307977eee8483d24a32ad938611545178fb1e6be597c1542a11466b1fb31ef4ef47b519deea1c5310a6460495281539083a19
 DIST db.1.85.tar.gz 270953 BLAKE2B 
7862979b6fe21a67eac7eb5e0d05093f33fa71fa92f9717a65bd39b366727e6928109c821b86ede85d6d2a8013199f3927e760bed19001a5cfd2270819a3b904
 SHA512

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2019-05-08 Thread Robin H. Johnson

commit: c8762844e2a26ab7ed62a161195106652675828b
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Wed May  8 21:19:50 2019 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Wed May  8 21:24:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8762844

sys-libs/db: compile-fix by dropping mutex=ARM/gcc-assembly

This is a compile-fix so that old versions build on newer ARM hardware.

The ARM assembly code does not work on newer hardware
so you CANNOT use --with-mutex=ARM/gcc-assembly anymore.

Specifically, it uses the SWPB op, which was deprecated [1]
The SWPB op ALSO cannot be used in ARM-Thumb mode.

>=sys-libs/db-6.1 uses LDREX instead, but that fix CANNOT be backported
due differing licenses in the new versions (the new version is AGPL).

Trust the compiler instead for older sys-libs/db versions, and just drop
--with-mutex=ARM/gcc-assembly from the configure.

[1] http://www.keil.com/support/man/docs/armasm/armasm_dom1361289909499.htm

Fixes: https://bugs.gentoo.org/555740
Reported-By: Christohper Harrington  gmail.com>
Reported-By: Luke-Jr  utopios.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-libs/db/db-4.7.25_p4.ebuild | 10 --
 sys-libs/db/db-4.8.30-r2.ebuild | 10 --
 sys-libs/db/db-5.1.29-r1.ebuild | 10 --
 sys-libs/db/db-5.3.28-r2.ebuild |  8 +++-
 sys-libs/db/db-5.3.28-r3.ebuild |  8 +++-
 sys-libs/db/db-6.0.35-r1.ebuild |  8 +++-
 sys-libs/db/db-6.0.35.ebuild|  8 +++-
 7 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/sys-libs/db/db-4.7.25_p4.ebuild b/sys-libs/db/db-4.7.25_p4.ebuild
index 2f341da53d5..807fc0adc02 100644
--- a/sys-libs/db/db-4.7.25_p4.ebuild
+++ b/sys-libs/db/db-4.7.25_p4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -118,13 +118,19 @@ src_compile() {
--enable-o_direct \
--without-uniquename \
$(use_enable rpc) \
-   $(use arm && echo --with-mutex=ARM/gcc-assembly) \
$(use amd64 && echo --with-mutex=x86/gcc-assembly) \
$(use_enable cxx) \
$(use_enable java) \
${myconf} \
$(use_enable test) \
"$@"
+   # The embedded assembly on ARM does not work on newer hardware
+   # so you CANNOT use --with-mutex=ARM/gcc-assembly anymore.
+   # Specifically, it uses the SWPB op, which was deprecated:
+   # 
http://www.keil.com/support/man/docs/armasm/armasm_dom1361289909499.htm
+   # The op ALSO cannot be used in ARM-Thumb mode.
+   # Trust the compiler instead.
+   # >=db-6.1 uses LDREX instead.
 
emake || die "make failed"
 }

diff --git a/sys-libs/db/db-4.8.30-r2.ebuild b/sys-libs/db/db-4.8.30-r2.ebuild
index b19ec4fc505..bdedb3547a7 100644
--- a/sys-libs/db/db-4.8.30-r2.ebuild
+++ b/sys-libs/db/db-4.8.30-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -125,13 +125,19 @@ multilib_src_configure() {
--enable-compat185 \
--enable-o_direct \
--without-uniquename \
-   $([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \
$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \
$(use_enable cxx) \
$(use_enable cxx stl) \
$(multilib_native_use_enable java) \
"${myconf[@]}" \
$(use_enable test)
+   # The embedded assembly on ARM does not work on newer hardware
+   # so you CANNOT use --with-mutex=ARM/gcc-assembly anymore.
+   # Specifically, it uses the SWPB op, which was deprecated:
+   # 
http://www.keil.com/support/man/docs/armasm/armasm_dom1361289909499.htm
+   # The op ALSO cannot be used in ARM-Thumb mode.
+   # Trust the compiler instead.
+   # >=db-6.1 uses LDREX instead.
 }
 
 multilib_src_test() {

diff --git a/sys-libs/db/db-5.1.29-r1.ebuild b/sys-libs/db/db-5.1.29-r1.ebuild
index a00e96a4a1b..5f28da0d367 100644
--- a/sys-libs/db/db-5.1.29-r1.ebuild
+++ b/sys-libs/db/db-5.1.29-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -148,7 +148,6 @@ src_configure() {
--enable-sql \
--enable-sql_codegen \
--disable-sql_compat \
-   $(use arm && echo --with-mutex=ARM/gcc-assembly) \
$(use amd64 && echo --with-mutex=x86/gcc-assembly) \
$(use_enable cxx) \
$(use_enable cxx stl) \
@@ -156,6 +155,13 @@ src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2019-05-04 Thread Mikle Kolyada

commit: 51684b860ab6d7d9e97ad0425d7d6eee06155d5d
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat May  4 13:21:12 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat May  4 13:21:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51684b86

sys-libs/db: Add ~riscv keyword

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 sys-libs/db/db-5.3.28-r2.ebuild | 4 ++--
 sys-libs/db/db-5.3.28-r3.ebuild | 4 ++--
 sys-libs/db/db-6.0.35-r1.ebuild | 4 ++--
 sys-libs/db/db-6.0.35.ebuild| 4 ++--
 sys-libs/db/db-6.1.36.ebuild| 2 +-
 sys-libs/db/db-6.1.38.ebuild| 2 +-
 sys-libs/db/db-6.2.32-r1.ebuild | 4 ++--
 sys-libs/db/db-6.2.38.ebuild| 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index 3ea41ecbe1a..8738e10e008 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="5.3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 
~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sh 
sparc x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

diff --git a/sys-libs/db/db-5.3.28-r3.ebuild b/sys-libs/db/db-5.3.28-r3.ebuild
index 757a78b281e..24f0d3c333b 100644
--- a/sys-libs/db/db-5.3.28-r3.ebuild
+++ b/sys-libs/db/db-5.3.28-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="5.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

diff --git a/sys-libs/db/db-6.0.35-r1.ebuild b/sys-libs/db/db-6.0.35-r1.ebuild
index 8a69554b06a..0cd34cc3b7a 100644
--- a/sys-libs/db/db-6.0.35-r1.ebuild
+++ b/sys-libs/db/db-6.0.35-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

diff --git a/sys-libs/db/db-6.0.35.ebuild b/sys-libs/db/db-6.0.35.ebuild
index 0797982c661..b03e9d66b02 100644
--- a/sys-libs/db/db-6.0.35.ebuild
+++ b/sys-libs/db/db-6.0.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

diff --git a/sys-libs/db/db-6.1.36.ebuild b/sys-libs/db/db-6.1.36.ebuild
index 4f1b84ebf02..5e8e5754553 100644
--- a/sys-libs/db/db-6.1.36.ebuild
+++ b/sys-libs/db/db-6.1.36.ebuild
@@ -27,7 +27,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

diff --git a/sys-libs/db/db-6.1.38.ebuild b/sys-libs/db/db-6.1.38.ebuild
index 4f1b84ebf02..5e8e5754553 100644
--- a/sys-libs/db/db-6.1.38.ebuild
+++ b/sys-libs/db/db-6.1.38.ebuild
@@ -27,7 +27,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

diff --git a/sys-libs/db/db-6.2.32-r1.ebuild b/sys-libs/db/db-6.2.32-r1.ebuild
index 59706d362b9..156fbed4dc8 100644
--- a/sys-libs/db/db-6.2.32-r1.ebuild
+++ b/sys-libs/db/db-6.2.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2019-04-15 Thread Lars Wendler

commit: cee731e54c218a01ec5976211e2d1eb8f3a6cd7c
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Apr 15 12:43:11 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Apr 15 12:43:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee731e5

sys-libs/db: Bump to version 6.1.38 and 6.2.38

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 sys-libs/db/Manifest |   2 +
 sys-libs/db/db-6.1.38.ebuild | 242 +++
 sys-libs/db/db-6.2.38.ebuild | 242 +++
 3 files changed, 486 insertions(+)

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 5a22e3cb56a..5ad9aa060e6 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -15,7 +15,9 @@ DIST db-5.3.28.tar.gz 35090431 BLAKE2B 
5b77a4ec0945fa96ce6c2b452fb4b029295e037fa
 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.1.38.tar.gz 37644337 BLAKE2B 
32b3f65bef04bb18e45c3c0c9110d5d0bf58f4761bee5bf07949e192f4b9f5fa28117b1696c17863da0affe408bd6c8132c472c46d31c17693519959ff03
 SHA512 
5760d1e441bea11c371825ac47203b1eb9f188f9cb2ea0e3d547b3d3b15620d27cb0bd617eb7b89c53407fb7ed79cad27477d714b5b797869f8bf4b1808b
 DIST db-6.2.32.tar.gz 45342417 BLAKE2B 
d3254fba1300d6c7dda5d872c5fa349e8704d71be9c4d37ccf3357782adeb879ce30e066cf083bd97554405c2e94071a96cee16090ad9f797a4fa657ff7e8c46
 SHA512 
83bdbf18a7b9782409cf4563f8d5f11322d5e564a39946c890604a60440a6ea6361e0236bbc30bd4e8e1de1fa9196b8e815fd126baa035f55c5826c2c6aa3401
+DIST db-6.2.38.tar.gz 41298311 BLAKE2B 
a04a3344058b1d9982f39628c1114aded8f8c860753853c8b487e9ea14bd69a0391301620396d22204b3c8f25945c3f5485ea4792567e2d903a657541204d297
 SHA512 
b357932e4a5856b9cf8cf42050a307977eee8483d24a32ad938611545178fb1e6be597c1542a11466b1fb31ef4ef47b519deea1c5310a6460495281539083a19
 DIST db.1.85.tar.gz 270953 BLAKE2B 
7862979b6fe21a67eac7eb5e0d05093f33fa71fa92f9717a65bd39b366727e6928109c821b86ede85d6d2a8013199f3927e760bed19001a5cfd2270819a3b904
 SHA512 
03bf3a2b0947efdca4e38719542e96378b5eeb57da64d5030dd23ab710773c1826f1c867032d0bea658b7fdd8272db253e97bbc490d198b9437025ffdf9e880e
 DIST patch.3.2.9.1 2139 BLAKE2B 
7c442311499244d3432a1648294f3b610da827f7d940777de01f98816d6dc8bc50b68cb45900bcc1acf1672207a86009dbc33b6226f8a4fcbefc1bee51961138
 SHA512 
f410c43ea4af28a39d8ea47f774d38b53bf1183a34abfcf1f27e253eb61b42f4b5e9f0a3a500e174eb796ea342e6dd50a8bb95ff3eb8ee188461489cc994b8f9
 DIST patch.3.2.9.2 495 BLAKE2B 
a29338b8fd1cdd75833fd4dabcca17106a75e4cc49e7f5198ac723422e0b0ed553969109293d5e83517f2e5bf6478ddcc7e0cdf371e721fb3784dc7d8165e4b6
 SHA512 
cc75fef11a641d480beaa2b62201177c72d10c4eb20376b5f15769db6e9e1a0da41c0365d79772af19b4cacdaa9f91dad049c735de9f95b98dcfc4f0b611b557

diff --git a/sys-libs/db/db-6.1.38.ebuild b/sys-libs/db/db-6.1.38.ebuild
new file mode 100644
index 000..4f1b84ebf02
--- /dev/null
+++ b/sys-libs/db/db-6.1.38.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"
+

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2019-04-15 Thread Lars Wendler

commit: 8337f9f8e97557e455fbccf34695efc2abc34472
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Apr 15 12:44:30 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Apr 15 12:44:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8337f9f8

sys-libs/db: Removed old.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 sys-libs/db/Manifest|   1 -
 sys-libs/db/db-6.1.29-r1.ebuild | 238 
 2 files changed, 239 deletions(-)

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 5ad9aa060e6..cf552adc74f 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -13,7 +13,6 @@ DIST db-4.8.30.tar.gz 22887305 BLAKE2B 
10487580a371fa97ef5e468e1fcc4af68490934a8
 DIST db-5.1.29.tar.gz 32188074 BLAKE2B 
6af9e6afc0ebd06a43c0e96fd0b2b3c8e17476507996605aea0c1519b9120140ff410829118a59ea8eff1ab220762131cfab8cf574ffddfa6348128a57721b37
 SHA512 
b3487161cc09dd0aee6117d685d0bc0a58854cf5e96f9e778969a51d3a61b66f8e007b76e584e4ef73f84e07d4418b89c2f6697e34c1ad4072609b11b7b4c5b0
 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.1.38.tar.gz 37644337 BLAKE2B 
32b3f65bef04bb18e45c3c0c9110d5d0bf58f4761bee5bf07949e192f4b9f5fa28117b1696c17863da0affe408bd6c8132c472c46d31c17693519959ff03
 SHA512 
5760d1e441bea11c371825ac47203b1eb9f188f9cb2ea0e3d547b3d3b15620d27cb0bd617eb7b89c53407fb7ed79cad27477d714b5b797869f8bf4b1808b
 DIST db-6.2.32.tar.gz 45342417 BLAKE2B 
d3254fba1300d6c7dda5d872c5fa349e8704d71be9c4d37ccf3357782adeb879ce30e066cf083bd97554405c2e94071a96cee16090ad9f797a4fa657ff7e8c46
 SHA512 
83bdbf18a7b9782409cf4563f8d5f11322d5e564a39946c890604a60440a6ea6361e0236bbc30bd4e8e1de1fa9196b8e815fd126baa035f55c5826c2c6aa3401

diff --git a/sys-libs/db/db-6.1.29-r1.ebuild b/sys-libs/db/db-6.1.29-r1.ebuild
deleted file mode 100644
index 4f3570a788d..000
--- a/sys-libs/db/db-6.1.29-r1.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib 
multilib-minimal versionator 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$(get_version_component_range 1-2)/db.h
-)
-
-src_prepare() {
-   cd "${WORKDIR}"/"${MY_P}"
-   for (( i=1 ; i<=${PATCHNO} ; i++ ))
-   do
-   epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
-   done
-
-

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2019-03-05 Thread Lars Wendler

commit: 47e3188592dcdfa333c8a8c4488db15482ed02e0
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Mar  5 09:24:41 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Mar  5 09:24:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47e31885

sys-libs/db: Bump to version 18.1.32

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 sys-libs/db/Manifest  |   1 +
 sys-libs/db/db-18.1.32.ebuild | 245 ++
 2 files changed, 246 insertions(+)

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index c06e3e1b641..5a22e3cb56a 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,5 +1,6 @@
 DIST db-1.85-r3.1.patch.bz2 14641 BLAKE2B 
5ca59487a433a5e5b5fed7a8737c20df041be56733fe9209047f9e53845fa034576c29ad74407509ab96473e4eef0138a3a47de6c348d27209f0e39df85b9f5f
 SHA512 
32b1810515476758ece7415f241378460a4051bf5ee23fb464748f84a90a56ff2c5119ed93028114d64f1b1691b1c694c2301ff825edd89cdee90a870a68b6f4
 DIST db-18.1.25.tar.gz 43980391 BLAKE2B 
364f023809d9d68d58879dda80e5a6a1826db261ac371d63151278731a777c6ca629b051df3c1430f1c049fcc7e4ddfe041522e891290a43aba051b519b28523
 SHA512 
30a0508dc7eb92adb56bdc881cedf179e901f888c776bc515b342ae585168521fa9f3c763f438d0e8a008e7cc779b3f40a7385285d724f8494d25d3652e6f1c9
+DIST db-18.1.32.tar.gz 44244747 BLAKE2B 
b539d8966a269f6a9440ef442248849f12c6b1eda79b9a41074e1eb0eb4930fd4674dd0e20a114e4020fe2ce19832572c4c86d458835da39a99f639dc3c4e23e
 SHA512 
890b3047c28114ac30794c0234126b0b2a3e699f3ed259831091f02d51885e3583dd10c0ef0cecc215b9b8d80b48a2d3a82a5793cd3816afb45f6cc19ae23f25
 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

diff --git a/sys-libs/db/db-18.1.32.ebuild b/sys-libs/db/db-18.1.32.ebuild
new file mode 100644
index 000..be515fd043e
--- /dev/null
+++ b/sys-libs/db/db-18.1.32.ebuild
@@ -0,0 +1,245 @@
+# 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}/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 ~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 from the prefix
+   "${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch
+   "${FILESDIR}"/${PN}-4.3-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.

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2019-01-27 Thread Mike Gilbert

commit: 15eeb7cef2e8f5e30451c43a7355a799ff68c6ae
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Jan 27 18:33:31 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Jan 27 18:33:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15eeb7ce

sys-libs/db: add mirror://gentoo to SRC_URI

Bug: https://bugs.gentoo.org/676374
Package-Manager: Portage-2.3.58, Repoman-2.3.12_p63
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-libs/db/db-18.1.25.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys-libs/db/db-18.1.25.ebuild b/sys-libs/db/db-18.1.25.ebuild
index ff6f5d1ca7d..be515fd043e 100644
--- a/sys-libs/db/db-18.1.25.ebuild
+++ b/sys-libs/db/db-18.1.25.ebuild
@@ -20,9 +20,10 @@ 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="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz;
+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
-   export SRC_URI="${SRC_URI} 
http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i};
+   SRC_URI+=" 
http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i};
 done
 
 LICENSE="AGPL-3"

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

2019-01-25 Thread Lars Wendler

commit: 79b63b3ecbf9298268529709d1129d11a230ebe8
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jan 25 14:34:17 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jan 25 14:47:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79b63b3e

sys-libs/db: Bump to version 18.1.25

Closes: https://bugs.gentoo.org/675202
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-18.1.25.ebuild  | 244 +
 .../files/db-18.1.25-sqlite-configure-path.patch   |  11 +
 sys-libs/db/files/db-18.1.25-test-link.patch   |  38 
 4 files changed, 294 insertions(+)

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 0fa279baf2d..c06e3e1b641 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,4 +1,5 @@
 DIST db-1.85-r3.1.patch.bz2 14641 BLAKE2B 
5ca59487a433a5e5b5fed7a8737c20df041be56733fe9209047f9e53845fa034576c29ad74407509ab96473e4eef0138a3a47de6c348d27209f0e39df85b9f5f
 SHA512 
32b1810515476758ece7415f241378460a4051bf5ee23fb464748f84a90a56ff2c5119ed93028114d64f1b1691b1c694c2301ff825edd89cdee90a870a68b6f4
+DIST db-18.1.25.tar.gz 43980391 BLAKE2B 
364f023809d9d68d58879dda80e5a6a1826db261ac371d63151278731a777c6ca629b051df3c1430f1c049fcc7e4ddfe041522e891290a43aba051b519b28523
 SHA512 
30a0508dc7eb92adb56bdc881cedf179e901f888c776bc515b342ae585168521fa9f3c763f438d0e8a008e7cc779b3f40a7385285d724f8494d25d3652e6f1c9
 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

diff --git a/sys-libs/db/db-18.1.25.ebuild b/sys-libs/db/db-18.1.25.ebuild
new file mode 100644
index 000..ff6f5d1ca7d
--- /dev/null
+++ b/sys-libs/db/db-18.1.25.ebuild
@@ -0,0 +1,244 @@
+# 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}/dist"
+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="$(ver_cut 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 from the prefix
+   "${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch
+   "${FILESDIR}"/${PN}-4.3-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

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2019-01-25 Thread Lars Wendler

commit: f00620102dc8c99b7760ae2b769fa2146452c9f7
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jan 25 14:09:44 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jan 25 14:10:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0062010

sys-libs/db: Removed old.

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.29.ebuild| 236 --
 sys-libs/db/db-6.2.23-r1.ebuild | 243 
 sys-libs/db/db-6.2.23.ebuild| 241 ---
 sys-libs/db/db-6.2.32.ebuild| 241 ---
 5 files changed, 962 deletions(-)

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 2c9de6d4f74..0fa279baf2d 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -13,7 +13,6 @@ DIST db-5.3.28.tar.gz 35090431 BLAKE2B 
5b77a4ec0945fa96ce6c2b452fb4b029295e037fa
 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
 DIST patch.3.2.9.1 2139 BLAKE2B 
7c442311499244d3432a1648294f3b610da827f7d940777de01f98816d6dc8bc50b68cb45900bcc1acf1672207a86009dbc33b6226f8a4fcbefc1bee51961138
 SHA512 
f410c43ea4af28a39d8ea47f774d38b53bf1183a34abfcf1f27e253eb61b42f4b5e9f0a3a500e174eb796ea342e6dd50a8bb95ff3eb8ee188461489cc994b8f9

diff --git a/sys-libs/db/db-6.1.29.ebuild b/sys-libs/db/db-6.1.29.ebuild
deleted file mode 100644
index 5a93fb270c1..000
--- a/sys-libs/db/db-6.1.29.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib 
multilib-minimal versionator 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=(
-

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

2019-01-25 Thread Lars Wendler

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/

2018-03-22 Thread Mart Raudsepp

commit: 01697b6bfae6b210fd8d4aa0188f18c367de9c2f
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Mar 22 15:05:13 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Mar 22 15:06:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01697b6b

sys-libs/db-5.3.28-r2: arm64 stable (bug #599134)

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="arm64"

 sys-libs/db/db-5.3.28-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index 90433d195b8..3ea41ecbe1a 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="5.3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 
~x86-fbsd"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2018-03-05 Thread Robin H. Johnson

commit: 017477bc43f80f99a38da5345ca8756e99be1343
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Mar  5 19:39:44 2018 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Mar  5 19:49:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=017477bc

sys-libs/db: tweak test output to reduce a false positive

Signed-off-by: Robin H. Johnson  gentoo.org>
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 sys-libs/db/db-5.1.29-r1.ebuild | 6 ++
 sys-libs/db/db-5.3.28-r2.ebuild | 6 ++
 sys-libs/db/db-5.3.28-r3.ebuild | 6 ++
 sys-libs/db/db-6.0.35-r1.ebuild | 6 ++
 sys-libs/db/db-6.0.35.ebuild| 6 ++
 sys-libs/db/db-6.1.29-r1.ebuild | 6 ++
 sys-libs/db/db-6.1.29.ebuild| 6 ++
 sys-libs/db/db-6.2.23-r1.ebuild | 6 ++
 sys-libs/db/db-6.2.23.ebuild| 6 ++
 sys-libs/db/db-6.2.32-r1.ebuild | 6 ++
 sys-libs/db/db-6.2.32.ebuild| 6 ++
 11 files changed, 66 insertions(+)

diff --git a/sys-libs/db/db-5.1.29-r1.ebuild b/sys-libs/db/db-5.1.29-r1.ebuild
index 815bcac9ef9..a00e96a4a1b 100644
--- a/sys-libs/db/db-5.1.29-r1.ebuild
+++ b/sys-libs/db/db-5.1.29-r1.ebuild
@@ -94,6 +94,12 @@ src_prepare() {
local ev="__EDIT_${v}__"
sed -i -e "s/${ev}/${!v}/g" configure
done
+
+   # This is a false positive skip in the tests as the test-reviewer code
+   # looks for 'Skipping\s'
+   sed -i \
+   -e '/db_repsite/s,Skipping:,Skipping,g' \
+   "${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
 src_configure() {

diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index a4ef2e665c3..90433d195b8 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -103,6 +103,12 @@ src_prepare() {
local ev="__EDIT_${v}__"
sed -i -e "s/${ev}/${!v}/g" configure || die
done
+
+   # This is a false positive skip in the tests as the test-reviewer code
+   # looks for 'Skipping\s'
+   sed -i \
+   -e '/db_repsite/s,Skipping:,Skipping,g' \
+   "${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
 multilib_src_configure() {

diff --git a/sys-libs/db/db-5.3.28-r3.ebuild b/sys-libs/db/db-5.3.28-r3.ebuild
index 6906ac2db5a..757a78b281e 100644
--- a/sys-libs/db/db-5.3.28-r3.ebuild
+++ b/sys-libs/db/db-5.3.28-r3.ebuild
@@ -103,6 +103,12 @@ src_prepare() {
local ev="__EDIT_${v}__"
sed -i -e "s/${ev}/${!v}/g" configure || die
done
+
+   # This is a false positive skip in the tests as the test-reviewer code
+   # looks for 'Skipping\s'
+   sed -i \
+   -e '/db_repsite/s,Skipping:,Skipping,g' \
+   "${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
 multilib_src_configure() {

diff --git a/sys-libs/db/db-6.0.35-r1.ebuild b/sys-libs/db/db-6.0.35-r1.ebuild
index d3d38fabd1a..8a69554b06a 100644
--- a/sys-libs/db/db-6.0.35-r1.ebuild
+++ b/sys-libs/db/db-6.0.35-r1.ebuild
@@ -101,6 +101,12 @@ src_prepare() {
local ev="__EDIT_${v}__"
sed -i -e "s/${ev}/${!v}/g" configure || die
done
+
+   # This is a false positive skip in the tests as the test-reviewer code
+   # looks for 'Skipping\s'
+   sed -i \
+   -e '/db_repsite/s,Skipping:,Skipping,g' \
+   "${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
 multilib_src_configure() {

diff --git a/sys-libs/db/db-6.0.35.ebuild b/sys-libs/db/db-6.0.35.ebuild
index 9b9497e4426..0797982c661 100644
--- a/sys-libs/db/db-6.0.35.ebuild
+++ b/sys-libs/db/db-6.0.35.ebuild
@@ -101,6 +101,12 @@ src_prepare() {
local ev="__EDIT_${v}__"
sed -i -e "s/${ev}/${!v}/g" configure || die
done
+
+   # This is a false positive skip in the tests as the test-reviewer code
+   # looks for 'Skipping\s'
+   sed -i \
+   -e '/db_repsite/s,Skipping:,Skipping,g' \
+   "${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
 multilib_src_configure() {

diff --git a/sys-libs/db/db-6.1.29-r1.ebuild b/sys-libs/db/db-6.1.29-r1.ebuild
index 97730d01551..4f3570a788d 100644
--- a/sys-libs/db/db-6.1.29-r1.ebuild
+++ b/sys-libs/db/db-6.1.29-r1.ebuild
@@ -101,6 +101,12 @@ src_prepare() {
local ev="__EDIT_${v}__"
sed -i -e "s/${ev}/${!v}/g" configure || die
done
+
+   # This is a false positive skip in the tests as the test-reviewer code
+   # looks for 'Skipping\s'
+   sed -i \
+   -e '/db_repsite/s,Skipping:,Skipping,g' \
+   "${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
 multilib_src_configure() {

diff --git a/sys-libs/db/db-6.1.29.ebuild b/sys-libs/db/db-6.1.29.ebuild
index c993478412f..5a93fb270c1 100644
--- a/sys-libs/db/db-6.1.29.ebuild
+++ b/sys-libs/db/db-6.1.29.ebuild
@@ -101,6 +101,12 @@ src_prepare() {
local ev="__EDIT_${v}__"
sed -i -e "s/${ev}/${!v}/g"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2017-10-06 Thread Sergei Trofimovich

commit: 6017b34ef6c722262c8c2d6ffd0839fa4530532f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Oct  6 21:29:05 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Oct  6 21:29:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6017b34e

sys-libs/db: stable 5.3.28-r2 for ppc/ppc64, bug #599134

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc ppc64"

 sys-libs/db/db-5.3.28-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index c9c47add336..5f80d60111f 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="5.3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 
~sparc-fbsd ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2017-07-11 Thread Lars Wendler

commit: 96da169000b276f2dd8a643d04d92766b9f8b7df
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jul 11 07:08:19 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jul 11 07:08:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96da1690

sys-libs/db: Disable sqlite in latest version as well.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-libs/db/db-6.2.32-r1.ebuild | 237 
 1 file changed, 237 insertions(+)

diff --git a/sys-libs/db/db-6.2.32-r1.ebuild b/sys-libs/db/db-6.2.32-r1.ebuild
new file mode 100644
index 000..2dbb2cc1a5d
--- /dev/null
+++ b/sys-libs/db/db-6.2.32-r1.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib 
multilib-minimal versionator 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 ~sparc-fbsd ~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$(get_version_component_range 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.3-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}-6.1.19-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}-6.0.20-test-link.patch
+)
+
+src_prepare() {
+   cd "${WORKDIR}"/"${MY_P}"
+   for (( i=1 ; i<=${PATCHNO} ; i++ ))
+   do
+   epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
+   done
+
+   epatch "${PATCHES[@]}"
+   epatch_user
+
+   # Upstream release script grabs the dates when the script was run, so 
lets
+   # end-run them to keep the date the same.
+   export REAL_DB_RELEASE_DATE="$(awk \
+   '/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' 
\
+   "${S_BASE}"/dist/configure)"
+   sed -r -i \
+   -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
+   "${S_BASE}"/dist/RELEASE || die
+
+   # Include the SLOT for Java JAR files
+   # This supersedes the unused jarlocation patches.
+   sed -r -i \
+   -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
+   "${S_BASE}"/dist/Makefile.in || die
+
+   cd "${S_BASE}"/dist || die
+   rm -f aclocal/libtool.m4
+   sed -i \
+   -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+   configure.ac || die
+   sed -i \
+   -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
+   aclocal/programs.m4 || die
+   AT_M4DIR="aclocal aclocal_java" eautoreconf
+   # Upstream sucks - they do autoconf and THEN replace the version 
variables.
+   . ./RELEASE
+   for v in \
+   DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
+   DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
+   DB_VERSION \
+   DB_RELEASE_DATE ; do
+   local ev="__EDIT_${v}__"
+   sed -i -e "s/${ev}/${!v}/g" configure || die
+   done
+}
+
+multilib_src_configure() {
+   local myconf=()
+
+   tc-ld-disable-gold #470634
+
+   # compilation with -O0 fails on amd64, see bug #171231
+   if [[ ${ABI} == amd64 ]]; then
+

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2017-07-10 Thread Robin H. Johnson

commit: a44b4b0f8f7b013cdf368ae53b5fad073aedc0f6
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jul 10 22:49:00 2017 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Jul 10 22:49:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a44b4b0f

sys-libs/db: re-add older ebuilds again, because 
78beda8bdbf94b62a586e38d6ac00e32180f3eb8 wrongly removed them.

Package-Manager: portage-2.3.6
Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-libs/db/db-5.3.28-r2.ebuild | 232 +++
 sys-libs/db/db-6.0.35.ebuild| 230 +++
 sys-libs/db/db-6.1.29.ebuild| 230 +++
 sys-libs/db/db-6.2.23.ebuild| 235 
 4 files changed, 927 insertions(+)

diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
new file mode 100644
index 000..c9c47add336
--- /dev/null
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib 
multilib-minimal 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="Sleepycat"
+SLOT="5.3"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~sparc-fbsd ~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/db5.3/db.h
+)
+
+src_prepare() {
+   cd "${WORKDIR}"/"${MY_P}"
+   for (( i=1 ; i<=${PATCHNO} ; i++ ))
+   do
+   epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
+   done
+
+   # bug #510506
+   epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
+
+   # use the includes from the prefix
+   epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
+   epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
+
+   # sqlite configure call has an extra leading ..
+   # upstreamed:5.2.36, missing in 5.3.x
+   epatch "${FILESDIR}"/${PN}-5.2.28-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.
+   epatch "${FILESDIR}"/${PN}-6.0.20-test-link.patch
+
+   # Needed when compiling with clang
+   epatch "${FILESDIR}"/${PN}-5.1.29-rename-atomic-compare-exchange.patch
+
+   # Upstream release script grabs the dates when the script was run, so 
lets
+   # end-run them to keep the date the same.
+   export REAL_DB_RELEASE_DATE="$(awk \
+   '/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' 
\
+   "${S_BASE}"/dist/configure)"
+   sed -r -i \
+   -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
+   "${S_BASE}"/dist/RELEASE || die
+
+   # Include the SLOT for Java JAR files
+   # This supersedes the unused jarlocation patches.
+   sed -r -i \
+   -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
+   "${S_BASE}"/dist/Makefile.in || die
+
+   cd "${S_BASE}"/dist || die
+   rm -f aclocal/libtool.m4
+   sed -i \
+   -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+   configure.ac || die
+   sed -i \
+   -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
+   aclocal/programs.m4 || die
+   AT_M4DIR="aclocal aclocal_java" eautoreconf
+   # Upstream sucks - they do autoconf and THEN replace the version 
variables.
+   . ./RELEASE
+   for v in \
+   DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
+   DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
+   DB_VERSION \
+   DB_RELEASE_DATE ; do
+

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2017-07-10 Thread Robin H. Johnson

commit: 27148cd4dced41ed0e83994b77389d72cd649626
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jul 10 22:24:14 2017 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Jul 10 22:24:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27148cd4

sys-libs/db: previous commit had extra stable keywords.

Package-Manager: portage-2.3.6

 sys-libs/db/db-5.3.28-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-5.3.28-r3.ebuild b/sys-libs/db/db-5.3.28-r3.ebuild
index e5330769b21..240a2b09a41 100644
--- a/sys-libs/db/db-5.3.28-r3.ebuild
+++ b/sys-libs/db/db-5.3.28-r3.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="5.3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2017-07-10 Thread Robin H. Johnson

commit: 78beda8bdbf94b62a586e38d6ac00e32180f3eb8
Author: Lars  gentoo  org>
AuthorDate: Sat Jan 14 18:17:36 2017 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Jul 10 22:22:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78beda8b

sys-libs/db: Security revbumps to disable usage of bundled sqlite.

This fixes Gentoo bug #605688

(cherry picked from commit 953247c8dda0eec48bf7f019583003077d008ba1)
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=605688
Fixes: https://github.com/gentoo/gentoo/pull/3480/
Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-libs/db/{db-5.3.28-r2.ebuild => db-5.3.28-r3.ebuild} | 6 --
 sys-libs/db/{db-6.0.35.ebuild => db-6.0.35-r1.ebuild}| 6 --
 sys-libs/db/{db-6.1.29.ebuild => db-6.1.29-r1.ebuild}| 6 --
 sys-libs/db/{db-6.2.23.ebuild => db-6.2.23-r1.ebuild}| 6 --
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r3.ebuild
similarity index 97%
rename from sys-libs/db/db-5.3.28-r2.ebuild
rename to sys-libs/db/db-5.3.28-r3.ebuild
index c9c47add336..e5330769b21 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r3.ebuild
@@ -143,6 +143,8 @@ multilib_src_configure() {
 
# sql_compat will cause a collision with sqlite3
# --enable-sql_compat
+   # Don't --enable-sql* because we don't want to use bundled sqlite.
+   # See Gentoo bug #605688
ECONF_SOURCE="${S_BASE}"/dist \
STRIP="true" \
econf \
@@ -150,8 +152,8 @@ multilib_src_configure() {
--enable-dbm \
--enable-o_direct \
--without-uniquename \
-   --enable-sql \
-   --enable-sql_codegen \
+   --disable-sql \
+   --disable-sql_codegen \
--disable-sql_compat \
$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \
$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \

diff --git a/sys-libs/db/db-6.0.35.ebuild b/sys-libs/db/db-6.0.35-r1.ebuild
similarity index 97%
rename from sys-libs/db/db-6.0.35.ebuild
rename to sys-libs/db/db-6.0.35-r1.ebuild
index feca1dcaa8b..0c5fe167e08 100644
--- a/sys-libs/db/db-6.0.35.ebuild
+++ b/sys-libs/db/db-6.0.35-r1.ebuild
@@ -141,6 +141,8 @@ multilib_src_configure() {
 
# sql_compat will cause a collision with sqlite3
# --enable-sql_compat
+   # Don't --enable-sql* because we don't want to use bundled sqlite.
+   # See Gentoo bug #605688
ECONF_SOURCE="${S_BASE}"/dist \
STRIP="true" \
econf \
@@ -148,8 +150,8 @@ multilib_src_configure() {
--enable-dbm \
--enable-o_direct \
--without-uniquename \
-   --enable-sql \
-   --enable-sql_codegen \
+   --disable-sql \
+   --disable-sql_codegen \
--disable-sql_compat \
$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \
$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \

diff --git a/sys-libs/db/db-6.1.29.ebuild b/sys-libs/db/db-6.1.29-r1.ebuild
similarity index 97%
rename from sys-libs/db/db-6.1.29.ebuild
rename to sys-libs/db/db-6.1.29-r1.ebuild
index 75d89109cd9..1055a51317b 100644
--- a/sys-libs/db/db-6.1.29.ebuild
+++ b/sys-libs/db/db-6.1.29-r1.ebuild
@@ -141,6 +141,8 @@ multilib_src_configure() {
 
# sql_compat will cause a collision with sqlite3
# --enable-sql_compat
+   # Don't --enable-sql* because we don't want to use bundled sqlite.
+   # See Gentoo bug #605688
ECONF_SOURCE="${S_BASE}"/dist \
STRIP="true" \
econf \
@@ -148,8 +150,8 @@ multilib_src_configure() {
--enable-dbm \
--enable-o_direct \
--without-uniquename \
-   --enable-sql \
-   --enable-sql_codegen \
+   --disable-sql \
+   --disable-sql_codegen \
--disable-sql_compat \
$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \
$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \

diff --git a/sys-libs/db/db-6.2.23.ebuild b/sys-libs/db/db-6.2.23-r1.ebuild
similarity index 97%
rename from sys-libs/db/db-6.2.23.ebuild
rename to sys-libs/db/db-6.2.23-r1.ebuild
index af25495f83e..2d4ba9b4437 100644
--- a/sys-libs/db/db-6.2.23.ebuild
+++ b/sys-libs/db/db-6.2.23-r1.ebuild
@@ -146,6 +146,8 @@ multilib_src_configure() {
 
# sql_compat will cause a collision with sqlite3
# --enable-sql_compat
+   # Don't --enable-sql* because we don't want to use bundled sqlite.
+   # See Gentoo bug #605688
ECONF_SOURCE="${S_BASE}"/dist \
STRIP="true" \
econf \
@@ -153,8 +155,8 @@ multilib_src_configure() {
--enable-dbm \
--enable-o_direct \

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2017-06-08 Thread Sergei Trofimovich

commit: 9cb8bb07c06cda49940a39d2f406d856cc1ece78
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Jun  7 19:10:23 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Jun  8 12:26:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb8bb07

sys-libs/db: ia64 stable, bug #599134

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-libs/db/db-5.3.28-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index 1834e0de75b..c9c47add336 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="5.3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

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

2017-04-19 Thread Lars Wendler

commit: bebf2f281885242eee9f31df5814d34d8b312dcf
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Apr 19 08:18:34 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Apr 19 08:18:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bebf2f28

sys-libs/db: Bump to version 6.2.32

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-libs/db/Manifest   |   1 +
 sys-libs/db/db-6.2.32.ebuild   | 235 +
 .../files/db-6.2.32-jni-check-prefix-first.patch   |  44 
 3 files changed, 280 insertions(+)

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 6bf257a06eb..ce675af7884 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -13,6 +13,7 @@ DIST db-5.3.28.tar.gz 35090431 SHA256 
e0a992d740709892e81f9d93f06daf305cf73fb81b
 DIST db-6.0.35.tar.gz 36532251 SHA256 
24421affa8ae436fe427ae4f5f2d1634da83d3d55a5ad6354a98eeedb825de55 SHA512 
002db1553def44efa715095b04b2bac2de7450cdc7142586d1d8b5d8ce79ee5e98f824b3bd276cd586ca932dc51ed35a9ffbed95b2b9847264f262cfa092479d
 WHIRLPOOL 
ebbbe7dd0969a36d06c8cc5618a0f61334396b38671b9b1c2523e3d1d3ba687903242acd23999be3efec45e1ea6b9c7f0f9f5acbb54d8d1dc48bba51d196c487
 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-6.2.32.tar.gz 45342417 SHA256 
a9c5e2b004a5777aa03510cfe5cd766a4a3b13406b02809c17c8e0e7a8fb SHA512 
83bdbf18a7b9782409cf4563f8d5f11322d5e564a39946c890604a60440a6ea6361e0236bbc30bd4e8e1de1fa9196b8e815fd126baa035f55c5826c2c6aa3401
 WHIRLPOOL 
66b2f2ba2e86800b837b9093f3ebf0caeec71ae29b3614aa6b0f908af933539cb6113980049f6c68f63dbfad808fdd530b4f2435bd8ca32611662e384b38885e
 DIST db.1.85.tar.gz 270953 SHA256 
4220d4ddeb77fb57ba2f37c1aa105d561d3ef85a6fb89c79c3edd735d0e193c6 SHA512 
03bf3a2b0947efdca4e38719542e96378b5eeb57da64d5030dd23ab710773c1826f1c867032d0bea658b7fdd8272db253e97bbc490d198b9437025ffdf9e880e
 WHIRLPOOL 
802346b9fc133f6c9316e987352e8bd8e12792b30b0eae9b4e2b3629c9bc8385ab12244dead428bb824945aab383cd4801de3fc705667797bdf6159066ed1352
 DIST patch.3.2.9.1 2139 SHA256 
6d89a42ee0be9e47b3e8a42981c65266a556de84bc6281edcf0f977f52547798 SHA512 
f410c43ea4af28a39d8ea47f774d38b53bf1183a34abfcf1f27e253eb61b42f4b5e9f0a3a500e174eb796ea342e6dd50a8bb95ff3eb8ee188461489cc994b8f9
 WHIRLPOOL 
3a879d5306403739465550ade1fbf53ac62b832fbdf507a204fef13949bc7be9c35ddd972834d3ca74bf17c421791011200556dffd95265eb64849f1d7b647ec
 DIST patch.3.2.9.2 495 SHA256 
61db874796fe8789b0045f456285b27c5b8b7b8902a5e342a115456015716d0e SHA512 
cc75fef11a641d480beaa2b62201177c72d10c4eb20376b5f15769db6e9e1a0da41c0365d79772af19b4cacdaa9f91dad049c735de9f95b98dcfc4f0b611b557
 WHIRLPOOL 
1362c32dc16875a97b451ff52415fe4b9e9d37b256a92c7e86c14a52431937352ae55ecee4361459e9036b9bea238c205a8f0d4406ac7e47387a8cda22906879

diff --git a/sys-libs/db/db-6.2.32.ebuild b/sys-libs/db/db-6.2.32.ebuild
new file mode 100644
index 000..61a18bfa944
--- /dev/null
+++ b/sys-libs/db/db-6.2.32.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib 
multilib-minimal versionator 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 ~sparc-fbsd ~x86-fbsd"
+IUSE="doc java cxx tcl test"
+
+REQUIRED_USE="test? ( tcl )"
+
+# the entire testsuite needs the TCL functionality
+DEPEND="tcl? (

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2017-01-27 Thread Robin H. Johnson

commit: b7bb930838f049041c51e3763bb4a9fc7f5be0be
Author: Martin Mokrejš  gmail  com>
AuthorDate: Fri Jan 27 10:33:30 2017 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan 27 22:11:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7bb9308

sys-libs/db: respect EPREFIX, fixes bug #587520

(cherry picked from commit 6eab44c650e8134e1b3025a197cb77057d2925d5)
Signed-off-by: Robin H. Johnson  gentoo.org>
Fixes: https://github.com/gentoo/gentoo/pull/3671

 sys-libs/db/db-1.85-r3.ebuild  |  2 +-
 sys-libs/db/db-3.2.9_p2.ebuild | 20 ++--
 sys-libs/db/db-4.2.52_p5-r1.ebuild | 26 +-
 sys-libs/db/db-4.3.29_p1-r1.ebuild | 26 +-
 sys-libs/db/db-4.4.20_p4-r1.ebuild | 26 +-
 sys-libs/db/db-4.5.20_p2-r1.ebuild | 26 +-
 sys-libs/db/db-4.6.21_p4.ebuild| 26 +-
 sys-libs/db/db-4.7.25_p4.ebuild| 10 +-
 sys-libs/db/db-4.8.30-r2.ebuild| 12 ++--
 sys-libs/db/db-5.1.29-r1.ebuild| 10 +-
 10 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/sys-libs/db/db-1.85-r3.ebuild b/sys-libs/db/db-1.85-r3.ebuild
index df57100..6630970 100644
--- a/sys-libs/db/db-1.85-r3.ebuild
+++ b/sys-libs/db/db-1.85-r3.ebuild
@@ -36,7 +36,7 @@ src_compile() {
 }
 
 src_install() {
-   make -C PORT/linux install DESTDIR="${D}" || die
+   make -C PORT/linux install DESTDIR="${ED}" || die
 
# binary compat symlink
dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2 || die

diff --git a/sys-libs/db/db-3.2.9_p2.ebuild b/sys-libs/db/db-3.2.9_p2.ebuild
index 454fecc..adf8063 100644
--- a/sys-libs/db/db-3.2.9_p2.ebuild
+++ b/sys-libs/db/db-3.2.9_p2.ebuild
@@ -84,7 +84,7 @@ src_compile() {
--enable-cxx \
--enable-compat185 \
--enable-dump185 \
-   --prefix=/usr"
+   --prefix=${EPREFIX}/usr"
 
# --enable-rpc DOES NOT BUILD
# Robin H. Johnson  (18 Oct 2003)
@@ -107,17 +107,17 @@ src_compile() {
strip=/bin/true \
ECONF_SOURCE="${S}"/dist econf \
${conf} ${conf_static} \
-   --libdir=/usr/$(get_libdir) \
+   --libdir="${EPREFIX}"/usr/$(get_libdir) \
--disable-shared \
--enable-static || die
 
einfo "Configuring ${P} (shared)..."
mkdir -p "${S}"/build-shared
cd "${S}"/build-shared
-   strip=/bin/true \
+   strip="${ED}"/bin/true \
ECONF_SOURCE="${S}"/dist econf \
${conf} ${conf_shared} \
-   --libdir=/usr/$(get_libdir) \
+   --libdir="${EPREFIX}"/usr/$(get_libdir) \
--disable-static \
--enable-shared || die
 
@@ -125,19 +125,19 @@ src_compile() {
MAKEOPTS="${MAKEOPTS} -j1"
einfo "Building ${P} (static)..."
cd "${S}"/build-static
-   emake strip=/bin/true || die "Static build failed"
+   emake strip="${EPREFIX}"/bin/true || die "Static build failed"
einfo "Building ${P} (shared)..."
cd "${S}"/build-shared
-   emake strip=/bin/true || die "Shared build failed"
+   emake strip="${EPREFIX}"/bin/true || die "Shared build failed"
 }
 
 src_install () {
cd "${S}"/build-shared
make libdb=libdb-3.2.a \
libcxx=libcxx_3.2.a \
-   prefix="${D}"/usr \
-   libdir="${D}"/usr/$(get_libdir) \
-   strip=/bin/true \
+   prefix="${EPREFIX}"/usr \
+   libdir="${EPREFIX}"/usr/$(get_libdir) \
+   strip="${EPREFIX}"/bin/true \
install || die
 
cd "${S}"/build-static
@@ -153,7 +153,7 @@ src_install () {
# For some reason, db.so's are *not* readable by group or others,
# resulting in no one but root being able to use them!!!
# This fixes it -- DR 15 Jun 2001
-   cd "${D}"/usr/$(get_libdir)
+   cd "${ED}"/usr/$(get_libdir)
chmod go+rx *.so
# The .la's aren't readable either
chmod go+r *.la

diff --git a/sys-libs/db/db-4.2.52_p5-r1.ebuild 
b/sys-libs/db/db-4.2.52_p5-r1.ebuild
index c0b98c7..3571d83 100644
--- a/sys-libs/db/db-4.2.52_p5-r1.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r1.ebuild
@@ -113,13 +113,13 @@ src_compile() {
fi
 
cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \
-   --prefix=/usr \
-   --mandir=/usr/share/man \
-   --infodir=/usr/share/info \
-   --datadir=/usr/share \
-   --sysconfdir=/etc \
-   --localstatedir=/var/lib \
-   --libdir=/usr/"$(get_libdir)" \
+   --prefix="${EPREFIX}"/usr \
+   --mandir="${EPREFIX}"/usr/share/man \
+   --infodir="${EPREFIX}"/usr/share/info \
+   --datadir="${EPREFIX}"/usr/share \
+

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2017-01-27 Thread Robin H. Johnson

commit: 341fc672209c42ba191d94431740c3c39ed4a730
Author: Martin Mokrejš  gmail  com>
AuthorDate: Thu Jan 26 20:51:13 2017 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan 27 22:11:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=341fc672

sys-libs/db: fix ebuilds for recent versions to respect EPREFIX

(cherry picked from commit fdf6c8b0ace87100319face30463d38fa4daf637)
Signed-off-by: Robin H. Johnson  gentoo.org>
Fixes: https://github.com/gentoo/gentoo/pull/3671

 sys-libs/db/db-5.3.28-r2.ebuild | 12 ++--
 sys-libs/db/db-6.0.35.ebuild| 12 ++--
 sys-libs/db/db-6.1.29.ebuild| 12 ++--
 sys-libs/db/db-6.2.23.ebuild| 12 ++--
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index df351cf..61774e7 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -171,9 +171,9 @@ multilib_src_install() {
db_src_install_usrlibcleanup
 
if multilib_is_native_abi && use java; then
-   java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
-   java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
-   rm -f "${D}"/usr/"$(get_libdir)"/*.jar
+   java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
+   java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
+   rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
fi
 }
 
@@ -184,9 +184,9 @@ multilib_src_install_all() {
 
dodir /usr/sbin
# This file is not always built, and no longer exists as of db-4.8
-   if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then
-   mv "${D}"/usr/bin/berkeley_db_svc \
-   "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
+   if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then
+   mv "${ED}"/usr/bin/berkeley_db_svc \
+   "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
fi
 }
 

diff --git a/sys-libs/db/db-6.0.35.ebuild b/sys-libs/db/db-6.0.35.ebuild
index 0ebd996..4ef04b9 100644
--- a/sys-libs/db/db-6.0.35.ebuild
+++ b/sys-libs/db/db-6.0.35.ebuild
@@ -169,9 +169,9 @@ multilib_src_install() {
db_src_install_usrlibcleanup
 
if multilib_is_native_abi && use java; then
-   java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
-   java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
-   rm -f "${D}"/usr/"$(get_libdir)"/*.jar
+   java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
+   java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
+   rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
fi
 }
 
@@ -182,9 +182,9 @@ multilib_src_install_all() {
 
dodir /usr/sbin
# This file is not always built, and no longer exists as of db-4.8
-   if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then
-   mv "${D}"/usr/bin/berkeley_db_svc \
-   "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
+   if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then
+   mv "${ED}"/usr/bin/berkeley_db_svc \
+   "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
fi
 }
 

diff --git a/sys-libs/db/db-6.1.29.ebuild b/sys-libs/db/db-6.1.29.ebuild
index 412ab73..54e28f1 100644
--- a/sys-libs/db/db-6.1.29.ebuild
+++ b/sys-libs/db/db-6.1.29.ebuild
@@ -169,9 +169,9 @@ multilib_src_install() {
db_src_install_usrlibcleanup
 
if multilib_is_native_abi && use java; then
-   java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
-   java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
-   rm -f "${D}"/usr/"$(get_libdir)"/*.jar
+   java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
+   java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
+   rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
fi
 }
 
@@ -182,9 +182,9 @@ multilib_src_install_all() {
 
dodir /usr/sbin
# This file is not always built, and no longer exists as of db-4.8
-   if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then
-   mv "${D}"/usr/bin/berkeley_db_svc \
-   "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
+   if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then
+   mv "${ED}"/usr/bin/berkeley_db_svc \
+   "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
fi
 }
 

diff --git a/sys-libs/db/db-6.2.23.ebuild b/sys-libs/db/db-6.2.23.ebuild
index b0dfbe9..786c35b 100644
--- a/sys-libs/db/db-6.2.23.ebuild
+++ b/sys-libs/db/db-6.2.23.ebuild
@@ -174,9 +174,9 @@ multilib_src_install() {
db_src_install_usrlibcleanup
 
if multilib_is_native_abi && use java; then
-   java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
-   java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2017-01-09 Thread Jeroen Roovers

commit: c12b244b33b498d7e1b75bb6d6725c4c9f985d22
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jan  9 13:59:36 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jan  9 13:59:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c12b244b

sys-libs/db: Stable for HPPA (bug #599134).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 sys-libs/db/db-5.3.28-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index cc1052b..1f4bb89 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -28,7 +28,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="5.3"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2017-01-05 Thread Aaron Bauman

commit: e1f528c7bd67817f5d4dd32589f2629e54b329f6
Author: Aaron Bauman  gentoo  org>
AuthorDate: Thu Jan  5 12:54:42 2017 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Jan  5 12:55:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1f528c7

sys-libs/db: amd64 stable wrt bug #599134

 sys-libs/db/db-5.3.28-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index 703084c..cc1052b 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -28,7 +28,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="5.3"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

2016-12-07 Thread Mike Frysinger

commit: 280d59cc34dc07bd5b88ebd8317e4e69baf8250f
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Dec  8 06:13:50 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Dec  8 06:14:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=280d59cc

sys-libs/db: pass EPREFIX to --with-tcl path to fix prefix builds #592672

 sys-libs/db/db-4.2.52_p5-r1.ebuild | 2 +-
 sys-libs/db/db-4.3.29_p1-r1.ebuild | 2 +-
 sys-libs/db/db-4.4.20_p4-r1.ebuild | 2 +-
 sys-libs/db/db-4.5.20_p2-r1.ebuild | 2 +-
 sys-libs/db/db-4.6.21_p4.ebuild| 2 +-
 sys-libs/db/db-4.7.25_p4.ebuild| 2 +-
 sys-libs/db/db-4.8.30-r2.ebuild| 2 +-
 sys-libs/db/db-5.1.29-r1.ebuild| 2 +-
 sys-libs/db/db-5.3.28-r2.ebuild| 2 +-
 sys-libs/db/db-6.0.35.ebuild   | 2 +-
 sys-libs/db/db-6.1.29.ebuild   | 2 +-
 sys-libs/db/db-6.2.23.ebuild   | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys-libs/db/db-4.2.52_p5-r1.ebuild 
b/sys-libs/db/db-4.2.52_p5-r1.ebuild
index 50c1c7c..c0b98c7 100644
--- a/sys-libs/db/db-4.2.52_p5-r1.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r1.ebuild
@@ -92,7 +92,7 @@ src_compile() {
myconf="${myconf} $(use_enable cxx)"
 
use tcl \
-   && myconf="${myconf} --enable-tcl 
--with-tcl=/usr/$(get_libdir)" \
+   && myconf="${myconf} --enable-tcl 
--with-tcl=${EPREFIX}/usr/$(get_libdir)" \
|| myconf="${myconf} --disable-tcl"
 
myconf="${myconf} $(use_enable java)"

diff --git a/sys-libs/db/db-4.3.29_p1-r1.ebuild 
b/sys-libs/db/db-4.3.29_p1-r1.ebuild
index 22691b4..5aa0eb8 100644
--- a/sys-libs/db/db-4.3.29_p1-r1.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r1.ebuild
@@ -93,7 +93,7 @@ src_compile() {
myconf="${myconf} $(use_enable cxx)"
 
use tcl \
-   && myconf="${myconf} --enable-tcl 
--with-tcl=/usr/$(get_libdir)" \
+   && myconf="${myconf} --enable-tcl 
--with-tcl=${EPREFIX}/usr/$(get_libdir)" \
|| myconf="${myconf} --disable-tcl"
 
myconf="${myconf} $(use_enable java)"

diff --git a/sys-libs/db/db-4.4.20_p4-r1.ebuild 
b/sys-libs/db/db-4.4.20_p4-r1.ebuild
index 4c30294..16d94fe 100644
--- a/sys-libs/db/db-4.4.20_p4-r1.ebuild
+++ b/sys-libs/db/db-4.4.20_p4-r1.ebuild
@@ -87,7 +87,7 @@ src_compile() {
myconf="${myconf} $(use_enable cxx)"
 
use tcl \
-   && myconf="${myconf} --enable-tcl 
--with-tcl=/usr/$(get_libdir)" \
+   && myconf="${myconf} --enable-tcl 
--with-tcl=${EPREFIX}/usr/$(get_libdir)" \
|| myconf="${myconf} --disable-tcl"
 
myconf="${myconf} $(use_enable java)"

diff --git a/sys-libs/db/db-4.5.20_p2-r1.ebuild 
b/sys-libs/db/db-4.5.20_p2-r1.ebuild
index f4e950a..2395c41 100644
--- a/sys-libs/db/db-4.5.20_p2-r1.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r1.ebuild
@@ -97,7 +97,7 @@ src_compile() {
myconf="${myconf} $(use_enable cxx)"
 
use tcl \
-   && myconf="${myconf} --enable-tcl 
--with-tcl=/usr/$(get_libdir)" \
+   && myconf="${myconf} --enable-tcl 
--with-tcl=${EPREFIX}/usr/$(get_libdir)" \
|| myconf="${myconf} --disable-tcl"
 
myconf="${myconf} $(use_enable java)"

diff --git a/sys-libs/db/db-4.6.21_p4.ebuild b/sys-libs/db/db-4.6.21_p4.ebuild
index 1ae9340..04423a1 100644
--- a/sys-libs/db/db-4.6.21_p4.ebuild
+++ b/sys-libs/db/db-4.6.21_p4.ebuild
@@ -90,7 +90,7 @@ src_compile() {
myconf="${myconf} $(use_enable cxx)"
 
use tcl \
-   && myconf="${myconf} --enable-tcl 
--with-tcl=/usr/$(get_libdir)" \
+   && myconf="${myconf} --enable-tcl 
--with-tcl=${EPREFIX}/usr/$(get_libdir)" \
|| myconf="${myconf} --disable-tcl"
 
myconf="${myconf} $(use_enable java)"

diff --git a/sys-libs/db/db-4.7.25_p4.ebuild b/sys-libs/db/db-4.7.25_p4.ebuild
index 263855b..153588f 100644
--- a/sys-libs/db/db-4.7.25_p4.ebuild
+++ b/sys-libs/db/db-4.7.25_p4.ebuild
@@ -104,7 +104,7 @@ src_compile() {
# Bug #270851: test needs TCL support
if use tcl || use test ; then
myconf="${myconf} --enable-tcl"
-   myconf="${myconf} --with-tcl=/usr/$(get_libdir)"
+   myconf="${myconf} --with-tcl=${EPREFIX}/usr/$(get_libdir)"
else
myconf="${myconf} --disable-tcl"
fi

diff --git a/sys-libs/db/db-4.8.30-r2.ebuild b/sys-libs/db/db-4.8.30-r2.ebuild
index 4c9fb9b..93cbd4b 100644
--- a/sys-libs/db/db-4.8.30-r2.ebuild
+++ b/sys-libs/db/db-4.8.30-r2.ebuild
@@ -118,7 +118,7 @@ multilib_src_configure() {
if use tcl || use test ; then
myconf+=(
--enable-tcl
-   --with-tcl=/usr/$(get_libdir)
+   --with-tcl="${EPREFIX}/usr/$(get_libdir)"
)
else
myconf+=(--disable-tcl )

diff --git a/sys-libs/db/db-5.1.29-r1.ebuild b/sys-libs/db/db-5.1.29-r1.ebuild
index

1 2 >

1 - 100 of 111 matches

Mail list logo