gentoo resync : 15.12.2019

4 files changed, 9 insertions, 147 deletions

diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 0be2d97e4248..927c6fc5b282 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,6 +1,5 @@
-AUX sparc-pause-instruction.patch 4109 BLAKE2B e0a705c5b29033f54ae5d707a0159d8814fb15be4fdc33f91834f2aa50c3c37ca2d653d17222f16bb4e45f8d2e6a983f15ef70ebcd07f579426d3d97b5d78ecf SHA512 590fa784999692700db796291236ce9436e775b16cb737f853d2b5e0b9433f2993682edad2e9f25be140d6fe00edc3768947670a404079b603f8e93651d6da84
-DIST bind-9.14.7.tar.gz 6320994 BLAKE2B 7f21f856c9cc8a85d7757dc58ca8063faeb5a227ea65502e0385f09874cabaecae6c6bb4e9c7ed1f72db9191688a940202448d2a9fd6b0ab7ef04acb9d362e39 SHA512 e1837ebfbbc60487f5f0e67fb9e935588fd6e5ffe55cdc9dc77e3ce63cd6fc4f076f4eb282cc4f51701ddda3e51e8f15255db5a3841f9fe92a4fb4207d806740
-DIST bind-9.15.5.tar.gz 6303092 BLAKE2B 82bc078a6540d8847ecf39c8b29a58175db2ed7017c8cfd9a40a88292ece0935d532ea02fea09143c48e2949c912eab90d41d199cf8acdb3d69b13bf6aa669c7 SHA512 7632402dfe30c83c732ea6a4079a36e8529e4dd0541d794167d43103e8cd5257709af74d5823c65f4fe4c8fe5ca80c514e66fafbb2302ccd94973b86c67a1978
-EBUILD bind-tools-9.14.7.ebuild 3152 BLAKE2B 045f55cdf9e9f1c3f7eba882a4d8a48c1e3ca1af2a3550bec9164367db7b914319cdc7264bedc785d902de9000fc20e065e3a6ab0ae2e052c4c7ac92398a4885 SHA512 b784a176bb9856a750783f19940a05a875ede771eadcd0490b80319d6b6a2cfeb50eb7e35adaf13a88e52a8c59f92db6c06ae39fe3be31c568123a4de3378e8b
-EBUILD bind-tools-9.15.5.ebuild 2964 BLAKE2B acd790353295ad0443255398cf2db941c09b2436b0cf0509ff5202ef402f58a0b1bb62ff153e1a5223bb72a27a07d20cc31d1ee70c258d7fe5081c8beace097b SHA512 b549bfaf7c0ba3a33d6a194cf318fddc169fe2a332d09d95eaa90d1d0d8f3f50365592f91202ae9e9472268a2a1fa41dc98949fa4a3fb07d4823b4738ec3b1d8
+DIST bind-9.14.8.tar.gz 6403140 BLAKE2B 45cb06ce8564880d501c63d25c7af8567184e4e4293e01886620cf655449c972ab55c77c7aded07838c61557bc56d9edac26097715c1121fcfb6b606d7a29365 SHA512 eb52760982ebd246e6e1945684771193fc7364324a6d6a95a0cae33afa0a4fa24ffe8313b5f9094420c7c2ec932b1b1a9fb19f6e673ff3c5583ab5e3ff04eb6a
+DIST bind-9.15.6.tar.gz 6432248 BLAKE2B c6dbaeeafdad3e2c7dd30ed1e5121c961829af8d82b9b93dd4eca34d96dfc2854e302068987dcd30ab88c768f6328c81bf81b348a698ceb11001d4d700ef374f SHA512 3bf7ebde706a6771606fda675c60daccbb22c2dc9551a8f361fe102b59e342ded99568b27bca7d7fa32d3f2be3811f38ec014f4ad0c281b590b7b69967395cb7
+EBUILD bind-tools-9.14.8.ebuild 3126 BLAKE2B b1a54f4734260a6a240a215db5b4e7f1a62cba59521217b2c838b9ff1993d70ce618ea86e2bcefc14753a37ec5d54bfa67ace44f217858aa87c661209b626657 SHA512 b97b5656cd216d83c19c938ab6c825081061785dc85798d40fa377ed1e04c72bf03b59e2ad54e77f9eb6fb28d43f3d5e6136f03b28a1197d3f470e8b75bacdde
+EBUILD bind-tools-9.15.6.ebuild 2941 BLAKE2B a3f2ab48291ada712c5c4ff7671ee92eb4cb621dc25e9683d088744e1b75f27d14f4922204005bb9725d5446c0b37a002cf9c3f15963ec0aa10b86694d15c9d9 SHA512 0d2cc97e139ec33a85fa7b34f390672240811fcc20e01b39f7dc3fe4020f2e07b97cc1308642420a29107af7bb7792f7c2f1410f17ec705609b441f030ae33d1
 MISC metadata.xml 488 BLAKE2B 44d0112102447f6d6f8c76aa5e3018de5fc4746240a1a7f187cb7bc493e9a442812c5b0f1c4a8a0a3410af12fbd2e390f6291c981440840b42348f403a278e2c SHA512 ac2a79f4622fd4aa957f9ad0618c631d4c68497443015bbd12c1670576d4515649f26c39c555046771b2aadd5f9b53fdc4c478ba7fb07e24f06b3a4f30f071e0
diff --git a/net-dns/bind-tools/bind-tools-9.14.7.ebuild b/net-dns/bind-tools/bind-tools-9.14.8.ebuild
index 089de718b324..4d1467150701 100644
--- a/net-dns/bind-tools/bind-tools-9.14.7.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.8.ebuild
@@ -22,19 +22,18 @@ IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
 
 COMMON_DEPEND="
 	caps? ( sys-libs/libcap )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
 	xml? ( dev-libs/libxml2 )
 	idn? ( net-dns/libidn2:= )
 	gssapi? ( virtual/krb5 )
 	libedit? ( dev-libs/libedit )
 	!libedit? (
-		readline? ( sys-libs/readline:0= )
+		readline? ( sys-libs/readline:= )
 	)"
 DEPEND="${COMMON_DEPEND}"
 
-RDEPEND="${COMMON_DEPEND}
-	!<net-dns/bind-9.10.2"
+RDEPEND="${COMMON_DEPEND}"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/net-dns/bind-tools/bind-tools-9.15.5.ebuild b/net-dns/bind-tools/bind-tools-9.15.6.ebuild
index 5a710f6efc50..8e1614afbea2 100644
--- a/net-dns/bind-tools/bind-tools-9.15.5.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.15.6.ebuild
@@ -34,8 +34,7 @@ COMMON_DEPEND="
 
 DEPEND="${COMMON_DEPEND}"
 
-RDEPEND="${COMMON_DEPEND}
-	!<net-dns/bind-9.10.2"
+RDEPEND="${COMMON_DEPEND}"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/net-dns/bind-tools/files/sparc-pause-instruction.patch b/net-dns/bind-tools/files/sparc-pause-instruction.patch
deleted file mode 100644
index 35ddb24da0b0..000000000000
--- a/net-dns/bind-tools/files/sparc-pause-instruction.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From a5ad6b16c5c0bfd333758d707a6397be79a92914 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 8 Aug 2019 08:33:10 +0100
-Subject: [PATCH] configure.ac: autodetect 'pause' instruction presence on
- sparc
-
-The change fixes the following build failure on sparc T3 and older CPUs:
-
-```
-sparc-unknown-linux-gnu-gcc ... -O2 -mcpu=niagara2 ... -c rwlock.c
-{standard input}: Assembler messages:
-{standard input}:398: Error: Architecture mismatch on "pause ".
-{standard input}:398: (Requires v9e|v9v|v9m|m8; requested architecture is v9b.)
-make[1]: *** [Makefile:280: rwlock.o] Error 1
-```
-
-`pause` insutruction exists only on `-mcpu=niagara4` (`T4`) and upper.
-
-The change adds `pause` configure-time autodetection and uses it if available.
-config.h.in got new `HAVE_SPARC_PAUSE` knob. Fallback is a fall-through no-op.
-
-Build-tested on:
-
-- sparc-unknown-linux-gnu-gcc (no `pause`, build succeeds)
-- sparc-unknown-linux-gnu-gcc -mcpu=niagara4 (`pause`, build succeeds)
-
-Reported-by: Rolf Eike Beer
-Bug: https://bugs.gentoo.org/691708
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- config.h.in      |  3 +++
- configure        | 33 +++++++++++++++++++++++++++++++++
- configure.ac     | 14 ++++++++++++++
- lib/isc/rwlock.c |  2 +-
- 4 files changed, 51 insertions(+), 1 deletion(-)
-
-diff --git a/config.h.in b/config.h.in
-index 91508e5d91..eeba105ec6 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -357,6 +357,9 @@
- /* Define to 1 if you have the `setresuid' function. */
- #undef HAVE_SETRESUID
- 
-+/* define if the SPARC pause instruction is available */
-+#undef HAVE_SPARC_PAUSE
-+
- /* define if struct stat has st_mtim.tv_nsec field */
- #undef HAVE_STAT_NSEC
- 
-diff --git a/configure b/configure
-index d336f6aa24..757dacb06e 100755
---- a/configure
-+++ b/configure
-@@ -13872,6 +13872,39 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; #(
-      ;;
- esac
- 
-+#
-+# Check for pause support on SPARC processors
-+#
-+case $host in #(
-+  sparc*) :
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pause instruction support" >&5
-+$as_echo_n "checking for pause instruction support... " >&6; }
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+__asm__ __volatile__ ("pause")
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+$as_echo "#define HAVE_SPARC_PAUSE 1" >>confdefs.h
-+
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; #(
-+  *) :
-+     ;;
-+esac
-+
- for ac_func in sysctlbyname
- do :
-   ac_fn_c_check_func "$LINENO" "sysctlbyname" "ac_cv_func_sysctlbyname"
-diff --git a/configure.ac b/configure.ac
-index 90aafae8d0..b04c651966 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -415,6 +415,20 @@ AS_CASE([$host],
- 			[define if the ARM yield instruction is available])],
- 	     [AC_MSG_RESULT([no])])])
- 
-+#
-+# Check for pause support on SPARC processors
-+#
-+AS_CASE([$host],
-+	[sparc*],
-+	[AC_MSG_CHECKING([for pause instruction support])
-+	 AC_COMPILE_IFELSE(
-+	     [AC_LANG_PROGRAM([[]],
-+			     [[__asm__ __volatile__ ("pause")]])],
-+	     [AC_MSG_RESULT([yes])
-+	      AC_DEFINE([HAVE_SPARC_PAUSE], [1],
-+			[define if the SPARC pause instruction is available])],
-+	     [AC_MSG_RESULT([no])])])
-+
- AC_CHECK_FUNCS([sysctlbyname])
- 
- #
-diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c
-index a6ea35feed..e313a912e0 100644
---- a/lib/isc/rwlock.c
-+++ b/lib/isc/rwlock.c
-@@ -152,7 +152,7 @@ isc_rwlock_destroy(isc_rwlock_t *rwl) {
- # define isc_rwlock_pause() __asm__ __volatile__ ("yield")
- #elif defined(sun) && (defined(__sparc) || defined(__sparc__))
- # define isc_rwlock_pause() smt_pause()
--#elif defined(__sparc) || defined(__sparc__)
-+#elif (defined(__sparc) || defined(__sparc__)) && HAVE_SPARC_PAUSE
- # define isc_rwlock_pause() __asm__ __volatile__ ("pause")
- #elif defined(__ppc__) || defined(_ARCH_PPC)  ||			\
- 	defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER)
--- 
-2.21.0
-