mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
sys-libs/db: Fixed "DuplicateFiles" QA message...
Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
This commit is contained in:
Lars Wendler
@@ -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
|
||||
)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
@@ -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
|
||||
@@ -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 ...
|
||||
@@ -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 ...
|
||||
Reference in New Issue
Block a user