commit: a429a28dc3f9d208e5dd1c2b4f0f4473645453c9
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 09:16:53 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 09:16:53 2019 +0000
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 <polynomial-c <AT> 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..00000000000
--- 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..00000000000
--- 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..00000000000
--- a/sys-libs/db/files/db-4.5-libtool.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/dist/configure
-+++ b/dist/configure
-@@ -5765,7 +5765,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
- ;;
-@@ -8753,7 +8753,7 @@
- whole_archive_flag_spec=
- fi
- supports_anon_versioning=no
-- case `$LD -v 2>/dev/null` in
-+ case `"$LD" -v 2>/dev/null` in
- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -11855,7 +11855,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
- ;;
-@@ -15842,7 +15842,7 @@
- whole_archive_flag_spec_F77=
- fi
- supports_anon_versioning=no
-- case `$LD -v 2>/dev/null` in
-+ case `"$LD" -v 2>/dev/null` in
- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -18300,7 +18300,7 @@
- whole_archive_flag_spec_GCJ=
- fi
- supports_anon_versioning=no
-- case `$LD -v 2>/dev/null` in
-+ case `"$LD" -v 2>/dev/null` in
- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
diff --git a/sys-libs/db/files/db-4.6-libtool.patch
b/sys-libs/db/files/db-4.6-libtool.patch
deleted file mode 100644
index b4d2fc8d73c..00000000000
--- a/sys-libs/db/files/db-4.6-libtool.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/dist/configure
-+++ b/dist/configure
-@@ -5765,7 +5765,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
- ;;
-@@ -8753,7 +8753,7 @@
- whole_archive_flag_spec=
- fi
- supports_anon_versioning=no
-- case `$LD -v 2>/dev/null` in
-+ case `"$LD" -v 2>/dev/null` in
- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -11855,7 +11855,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
-+case `"$LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
- ;;
-@@ -15842,7 +15842,7 @@
- whole_archive_flag_spec_F77=
- fi
- supports_anon_versioning=no
-- case `$LD -v 2>/dev/null` in
-+ case `"$LD" -v 2>/dev/null` in
- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -18300,7 +18300,7 @@
- whole_archive_flag_spec_GCJ=
- fi
- supports_anon_versioning=no
-- case `$LD -v 2>/dev/null` in
-+ case `"$LD" -v 2>/dev/null` in
- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
