commit: 7649b930ec479a2001992e905a5a87b2fe7981a3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 20:48:23 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 21:04:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7649b930
sys-libs/db: cleanup patches
Signed-off-by: Sam James <sam <AT> 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
+++ b/sys-libs/db/files/db-18.1.25-test-link.patch
@@ -1,5 +1,5 @@
---- db-18.1.25/test/tcl/parallel.tcl
-+++ db-18.1.25/test/tcl/parallel.tcl
+--- 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}
diff --git a/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch
b/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch
index c53160a82970..99a26e15fbfb 100644
--- a/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch
+++ b/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch
@@ -1,5 +1,3 @@
-diff --git a/dbinc/atomic.h b/dbinc/atomic.h
-index 0034dcc..fa7ba93 100644
--- a/dbinc/atomic.h
+++ b/dbinc/atomic.h
@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
diff --git a/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch
b/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch
index ad3da2786c88..252a6213b30f 100644
--- a/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch
+++ b/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch
@@ -1,5 +1,3 @@
-diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h
-index 0034dcc..fa7ba93 100644
--- a/src/dbinc/atomic.h
+++ b/src/dbinc/atomic.h
@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
diff --git a/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch
b/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch
index ff7abbe1fd79..cfbe2a7ffd01 100644
--- a/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch
+++ b/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch
@@ -1,6 +1,5 @@
-diff -Nuar db-5.2.28.orig//dist/aclocal/sql.m4 db-5.2.28//dist/aclocal/sql.m4
---- db-5.2.28.orig//dist/aclocal/sql.m4 2011-06-10 09:50:45.000000000
-0700
-+++ db-5.2.28//dist/aclocal/sql.m4 2011-07-15 17:02:54.646521189 -0700
+--- a/dist/aclocal/sql.m4
++++ b/dist/aclocal/sql.m4
@@ -91,7 +91,7 @@
# !!! END COPIED from autoconf distribution
diff --git a/sys-libs/db/files/db-6.0.20-test-link.patch
b/sys-libs/db/files/db-6.0.20-test-link.patch
index 8aceaa4d6f8c..5fc6669465c6 100644
--- a/sys-libs/db/files/db-6.0.20-test-link.patch
+++ b/sys-libs/db/files/db-6.0.20-test-link.patch
@@ -1,6 +1,5 @@
-diff -Nuar db-6.0.20.orig/test/tcl/parallel.tcl db-6.0.20/test/tcl/parallel.tcl
---- db-6.0.20.orig/test/tcl/parallel.tcl 2013-07-04 15:49:43.408348040
+0000
-+++ db-6.0.20/test/tcl/parallel.tcl 2013-07-04 17:40:07.147943377 +0000
+--- a/test/tcl/parallel.tcl
++++ b/test/tcl/parallel.tcl
@@ -289,16 +289,26 @@
[eval glob -nocomplain
{$dir/$buildpath/db_{reptest,repsite,replicate}$EXE}] \
$destdir/$buildpath}
diff --git a/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch
b/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch
index c239bb118a82..66bdcf9fe130 100644
--- a/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch
+++ b/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch
@@ -1,5 +1,5 @@
---- db-6.0.35/dist/aclocal/sql.m4
-+++ db-6.0.35/dist/aclocal/sql.m4
+--- a/dist/aclocal/sql.m4
++++ b/dist/aclocal/sql.m4
@@ -96,7 +96,7 @@
if test "$db_cv_build_cryptography" = "yes"; then
CPPFLAGS="$CPPFLAGS -DSQLITE_HAS_CODEC=1"
diff --git a/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch
b/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch
index 25854c53e160..103e3302bdc9 100644
--- a/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch
+++ b/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch
@@ -1,5 +1,5 @@
---- db-6.1.19/dist/aclocal/sql.m4
-+++ db-6.1.19/dist/aclocal/sql.m4
+--- a/dist/aclocal/sql.m4
++++ b/dist/aclocal/sql.m4
@@ -96,6 +96,6 @@
if test "$db_cv_build_cryptography" = "yes"; then
CPPFLAGS="$CPPFLAGS -DSQLITE_HAS_CODEC=1"
