commit: 61cc07d408dafe031432ac4f5783edf8febd8e29 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue Nov 12 13:22:53 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue Nov 12 13:22:53 2019 +0000 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 <polynomial-c <AT> 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 + "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch # upstream autoconf fails to build DBM when it's supposed to # merged upstream in 5.0.26 diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild index ab3e1ac5105..65935b03170 100644 --- a/sys-libs/db/db-5.3.28-r2.ebuild +++ b/sys-libs/db/db-5.3.28-r2.ebuild @@ -58,7 +58,7 @@ src_prepare() { # 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 + epatch "${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 diff --git a/sys-libs/db/db-5.3.28-r4.ebuild b/sys-libs/db/db-5.3.28-r4.ebuild index feb6b08177b..d7e61dc35ab 100644 --- a/sys-libs/db/db-5.3.28-r4.ebuild +++ b/sys-libs/db/db-5.3.28-r4.ebuild @@ -52,7 +52,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 # sqlite configure call has an extra leading .. # upstreamed:5.2.36, missing in 5.3.x @@ -88,7 +88,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 cd dist || die rm aclocal/libtool.m4 || die diff --git a/sys-libs/db/db-6.0.35-r2.ebuild b/sys-libs/db/db-6.0.35-r2.ebuild index d64d2ecb9bf..b10a1424460 100644 --- a/sys-libs/db/db-6.0.35-r2.ebuild +++ b/sys-libs/db/db-6.0.35-r2.ebuild @@ -52,7 +52,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 # 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-6.1.38.ebuild b/sys-libs/db/db-6.1.38.ebuild index e1ebf51e41f..fa361fed901 100644 --- a/sys-libs/db/db-6.1.38.ebuild +++ b/sys-libs/db/db-6.1.38.ebuild @@ -52,7 +52,7 @@ PATCHES=( # use the includes from the prefix "${FILESDIR}"/${PN}-6.2-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-6.2.38.ebuild b/sys-libs/db/db-6.2.38.ebuild index 37e88ebf665..574e8c6fda3 100644 --- a/sys-libs/db/db-6.2.38.ebuild +++ b/sys-libs/db/db-6.2.38.ebuild @@ -52,7 +52,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
