From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- dev-db/qdbm/Manifest | 4 +- dev-db/qdbm/files/qdbm-configure.patch | 139 +++++++++++++++++++++++++++++---- dev-db/qdbm/qdbm-1.8.78-r2.ebuild | 4 +- 3 files changed, 126 insertions(+), 21 deletions(-) (limited to 'dev-db/qdbm') diff --git a/dev-db/qdbm/Manifest b/dev-db/qdbm/Manifest index b5339325299a..039c6e522db7 100644 --- a/dev-db/qdbm/Manifest +++ b/dev-db/qdbm/Manifest @@ -1,7 +1,7 @@ -AUX qdbm-configure.patch 3385 BLAKE2B e2ed0d851476efdec349b2a2c18f260f4da205d3ec3e9c869056e4606855ed3814358821812c420e9d471ad4fe77b03e55fe0c5283850a39c313c6d9f916fbdc SHA512 a6eeed36b87bdaf9bbddbc7aa641cfca89e72e2e6c2acaec66b0444db9bd39f57afae0c8fb065293875c45dbb14ff6826a4c93061b7457c32b42943e8113d89a +AUX qdbm-configure.patch 5913 BLAKE2B a899d4d281eddbe974afd5969e4766d5f2eb55dfa545e6187003c4bb12f3224ead704cc1b14fd33841c8a9788832763d641ef04b5e49eee307aa71412d1301a4 SHA512 a15c513243f2b4976acf9a27f8572726bbaa7e55c7314228fa9fbc5899454c12d8c7efbf7ab24f1b3af427e64daded8ace1a5e4af4a227cae7fbb436e875461c AUX qdbm-perl.patch 1260 BLAKE2B e180ba6c2d57f6d813bbc6ae01ed787f6262a290eb59253b8950ec6f80ed29964e41cd3297b063db62e8c726a8e57399fe4ee52e67887bcaa74fad829b0b372f SHA512 a7356c2f5a4313e7da2524a6276bca5720459858d8619bfd8e6514cd9c1cd9aa1a2f7f0592e5ad1ee8b05e7e34452761e26be351f8e933e79a75cb4d19c862f3 AUX qdbm-ruby19.patch 10116 BLAKE2B 9a15c5d2e0cf8237edb78e68b2f9fde4868841bcca6abc08a33d110b9f25283e37fcb306c18bcca5495c7e5cedc778e3a2de2fe8414ce46c661a7c40d517cddc SHA512 f3e6c320a600ad3355fc74a333c28fc2dd904a2a52ca91a51f21b3dd14c7527bf312f5040dbc3e4f61d2dbcc0ade185e226333c79f9a04fc05437a156befc0e7 AUX qdbm-runpath.patch 1133 BLAKE2B 9b1c8c211d8e4075a77a34f3d79ca15cb3d833801777bdb328293047539bdd1a51c08031b3400c11d10732aa7864078ca8db02713a95cd90704e1a9e26f5bd10 SHA512 de8bde4a614617d742131e8025fd661019ec81b803817ef32ffca461b2c8b60c20756f6e6f84d6f23124eed3947ab3573b8c4a05b254f8b4d3e53f0cf7bc8452 DIST qdbm-1.8.78.tar.gz 1015429 BLAKE2B 1b985d856ff18ddfeb2d779694ba9a76006908b4b2a7509d4e3668aded80e08bbde28bcc24762ec27048cdc01dc84f9872dbfc221e8eea6f1c68f5e81cdc69d3 SHA512 480549c56071bf82edf714a611aef863599c858ed63702820ae0890fd2c0029d1a231ed94a8090c74420dd648bd3625d270a5c078b113cbb86a12ef509e19037 -EBUILD qdbm-1.8.78-r2.ebuild 3338 BLAKE2B 52c7b47ff2005a8676a00f2a7f50c6568981c9cda90f9dfa0cc848cd5a867251f058d4ecf593c1a0e7f67ea7296adad73682bcf59815c22e082d622506e64158 SHA512 392db2b680d34a6eff986e77d7144c51503aaec30f4219c691ff9d620dff271026c74d2b4542edacfb9b96201158a10d946940e33dbd2a8daa5ebd86e94d01b5 +EBUILD qdbm-1.8.78-r2.ebuild 3331 BLAKE2B 8e25cd8be385f4a87b7d06f4ec49171bc6ee1d10d04c0b09cff343f00de6eedc5be95b3bfe3db1c4a7e0895ccd49483b44d6df6633f2538bbba619f6b784a07d SHA512 9f1b389f512718a00a32f9ad7932d98aad94556d284811dad35d3eca0364769f412a1e9b3ba47429eb6430ceeb4a3933d75f0ced71d9a36fd61fa33af36f6cd3 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0 diff --git a/dev-db/qdbm/files/qdbm-configure.patch b/dev-db/qdbm/files/qdbm-configure.patch index 364c5c9f653e..4eb62949f32f 100644 --- a/dev-db/qdbm/files/qdbm-configure.patch +++ b/dev-db/qdbm/files/qdbm-configure.patch @@ -18,10 +18,13 @@ #================================================================ --- a/configure.in +++ b/configure.in -@@ -20,15 +20,6 @@ - LD="ld" - AR="ar" - +@@ -17,17 +17,6 @@ + MYDEFS="" + MYOPTS="" + MGWLIBS="" +-LD="ld" +-AR="ar" +- -# Building paths -pathtmp="$PATH" -PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" @@ -30,16 +33,56 @@ -LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" -CPATH="$HOME/include:/usr/local/include:$CPATH" -export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH -- - #================================================================ + +@@ -186,19 +175,15 @@ + then + MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr" + fi +-if gcc --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1 ++if $CC --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1 + then + MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr" + fi + + # Linker +-printf 'checking for ld... ' +-if which ld | grep '/ld$' > /dev/null 2>&1 ++AC_CHECK_TOOL(LD, ld, no) ++if test "$LD" = "no" + then +- LD=`which ld` +- printf '%s\n' "$LD" +-else +- printf 'no\n' + if test "$isnowarn" != "yes" + then + printf '#================================================================\n' 1>&2 +@@ -208,13 +193,9 @@ + fi + + # Archiver +-printf 'checking for ar... ' +-if which ar | grep '/ar$' > /dev/null 2>&1 ++AC_CHECK_TOOL(AR, ar, no) ++if test "$AR" = "no" + then +- AR=`which ar` +- printf '%s\n' "$AR" +-else +- printf 'no\n' + if test "$isnowarn" != "yes" + then + printf '#================================================================\n' 1>&2 --- a/java/configure.in +++ b/java/configure.in -@@ -25,15 +25,6 @@ +@@ -23,16 +23,6 @@ + JAVARUN="java" + MYDEFS="" MYOPTS="" - LD="ld" - +-LD="ld" +- -# Building paths -pathtmp="$PATH" -PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" @@ -48,10 +91,32 @@ -LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" -CPATH="$HOME/include:/usr/local/include:$CPATH" -export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH -- - #================================================================ + +@@ -162,19 +152,15 @@ + then + MYOPTS="-O1" + fi +-if gcc --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1 ++if $CC --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1 + then + MYOPTS="-O1" + fi + + # Linker +-printf 'checking for ld... ' +-if which ld | grep '/ld$' > /dev/null 2>&1 ++AC_CHECK_TOOL(LD, ld, no) ++if test "$LD" = "no" + then +- LD=`which ld` +- printf '%s\n' "$LD" +-else +- printf 'no\n' + printf '#================================================================\n' 1>&2 + printf '# WARNING: ld is not found in PATH.\n' 1>&2 + printf '#================================================================\n' 1>&2 --- a/perl/configure.in +++ b/perl/configure.in @@ -5,15 +5,6 @@ @@ -72,10 +137,13 @@ then --- a/plus/configure.in +++ b/plus/configure.in -@@ -19,15 +19,6 @@ - LD="ld" - AR="ar" - +@@ -16,17 +16,6 @@ + TARGETS="all" + MYDEFS="" + MYOPTS="" +-LD="ld" +-AR="ar" +- -# Building paths -pathtmp="$PATH" -PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" @@ -84,10 +152,47 @@ -LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" -CPATH="$HOME/include:/usr/local/include:$CPATH" -export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH -- - #================================================================ + +@@ -75,32 +64,24 @@ + then + MYOPTS="-O1" + fi +-if gcc --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1 ++if $CXX --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1 + then + MYOPTS="-O1" + fi + + # Linker +-printf 'checking for ld... ' +-if which ld | grep '/ld$' > /dev/null 2>&1 ++AC_CHECK_TOOL(LD, ld, no) ++if test "$LD" = "no" + then +- LD=`which ld` +- printf '%s\n' "$LD" +-else +- printf 'no\n' + printf '#================================================================\n' 1>&2 + printf '# WARNING: ld is not found in PATH.\n' 1>&2 + printf '#================================================================\n' 1>&2 + fi + + # Archiver +-printf 'checking for ar... ' +-if which ar | grep '/ar$' > /dev/null 2>&1 ++AC_CHECK_TOOL(AR, ar, no) ++if test "$AR" = "no" + then +- AR=`which ar` +- printf '%s\n' "$AR" +-else +- printf 'no\n' + printf '#================================================================\n' 1>&2 + printf '# WARNING: ar is not found in PATH.\n' 1>&2 + printf '#================================================================\n' 1>&2 --- a/ruby/configure.in +++ b/ruby/configure.in @@ -5,15 +5,6 @@ diff --git a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild index dc3d6dfc8c02..034733d2ae95 100644 --- a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild +++ b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -USE_RUBY="ruby21 ruby22 ruby23 ruby24" +EAPI="7" +USE_RUBY="ruby24 ruby25 ruby26" RUBY_OPTIONAL="yes" inherit autotools flag-o-matic java-pkg-opt-2 perl-functions ruby-ng -- cgit v1.2.3