gentoo resync : 10.11.2017

4 files changed, 4 insertions, 122 deletions

diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index d107202d8811..2f62764e9b71 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,13 +1,12 @@
-AUX 2.5.3-link-with-libatomic.patch 3837 SHA256 a615313865f527af1ef3e1fe8aaf272b77d80b3c33a2500edf7330cffd28f422 SHA512 8e3eac0cce77971a5c2357cc9fc8729f072363fcd160f5dec8ceb1b4b5ed938826bcfbabc7b78f81f21ff4b95aa38dcfc887470242589dd7684e79820a83a01a WHIRLPOOL 82216a015131ee04f21581b5e86afff1b40d44f4fac1f4898d2e0503f39cf81fd88c2a2e34a2da8b2ff98df48f5c717ee32ebcec2b932141d9120a1a90432284
 AUX knot-1.service 337 SHA256 5140fd96b54c3ecf79e9f386ce27159fa5c9d85c60fea11eb3d46a1b98e17b1d SHA512 58c4186e57ebd00b86dae34d5d208ed8801c0376da40cccb23b3d4542a7ee04a1003a12a4b89347b76a384b50eae4a61f96164bf22ec987ce05b1c65691659e7 WHIRLPOOL 03d9fd28f19d7c4a5a17fce6944560e01a4f95dc67a6a6385900f407c638b13c6f2908c619e652a7cfa08cea823bccc39de7cd939c152811a05240b14751192c
 AUX knot.init 861 SHA256 ec5c5aef42aaf7b0e47be6ea7dd94abdb38605f6e64b251184e381e2d490daf3 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9 WHIRLPOOL 5c102cf9ca93757a98be1e41f04027b6072b27e3e5e55d24c26040c94bcf6ac96cf5684ba639d3c65f9f46745a50981ac28a40bd50d432f04f83c5f84217ab60
 AUX knot.service 275 SHA256 3b091f61652f7d91189659e1d297e5ead76c79f4b0515c9eb4c7f054894e6810 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86 WHIRLPOOL 39623f669bf141e785b630cd5caa71f47e67d6aa923cbfda074a4644faf83f05214484d133618a2c3731342f5bb44ef942d7559f36e7e2cade3c2318e8461dcb
 DIST knot-2.4.5.tar.xz 1111536 SHA256 87ce8ccc83511c5a1f4eadd3f0122f2f5ae86fb68e9b72f0700c6f5340ba95cb SHA512 db4919dbe2dc688f401e6611d784d47e1d40a0f8ec8c8cd6240d89ab9dd2ce7dd1976ac7cb24c712ed8aa074e0026ff0a10e9d6d5e685929d271ae554d9a1cff WHIRLPOOL cdfdf0bc2591df8436f8ab0959581129cb1a4d86138f6bb75b507d83280c7d567eb794e3b76b8374d4087721de53e4afd7566411b8e51fa2655e9e5462357ef4
-DIST knot-2.5.5.tar.xz 1080072 SHA256 ee204dab4dfe571ac3cc8eb7843d562fa7a129543aa9d4cb92d3469084129baf SHA512 7f2f6e66e795e4771ac40ade8004e359a10d1bb82d851fd0e862e59a184ba9d4f028aa656064db58bfe63a3b4971c3705a83f1f1e6ada3991575a525410f0715 WHIRLPOOL 75284b554362b9682250103bc4c7661c1f8a939f945462e0c014cee4e8677b612fd11375fcb9bc3d9a858b52f0c8301a7c6de72f0d3af14be485f9adb1f0d512
-DIST knot-2.6.0.tar.xz 1103928 SHA256 68e04961d0bf6ba193cb7ec658b295c4ff6e60b3754d64bcd77ebdcee0f283fd SHA512 695d8f9c99a6bc49f504806054e2f5a0ef6d2ec43921384b3e55b0c250d2dfb5499c06534184db72c88d877ebb8815f3caa7ae1f6e1c7e59ccaa8bd9f3674c10 WHIRLPOOL 49027214f0aadd6070fef8efb467b68a83e8967ed3a990b138bd4e75dab68def0ca57aafc7fbd2e1819eec7a408f1af0c6dff378d3b0500368c357ce8594d403
+DIST knot-2.5.6.tar.xz 1081756 SHA256 37d1625c2aaefe2394c85f6742a6ae9421e8348318c13119a6c451796c387cfc SHA512 dcc58791469c8e4724a47b47105bf0c047bcf62611d6803a07a856bb281d72a397b186210087ff8f145232315bbd9baa194a7cdef10d1ebb36ca3b8c0a0c7379 WHIRLPOOL 199470662eb55971f5581a97d396342664789eb5803ae570598b4254bc14ad8f8fb9ca21198a42a26506fb7d29ed9417c42730651bd9ec38c48c50dbedf4726a
+DIST knot-2.6.1.tar.xz 1112956 SHA256 3013d45b4c7484268f3cad078f66f730a5bc9606e6b1061488dd821c1dce41e3 SHA512 f4eaf311adcdfd13628c7174333bcc766b300be573f7df32eaaf162c5857e0ba35ce5a5e022f799c95618203abbe8db93e2364f172a87c4dd4eaf90b30ef8428 WHIRLPOOL f69c58c9211b18e512e851044ba830c4011618175f6b78a37702e1afe9ed70ab244b1077a2d6ece745d064d2ad0131f61405c5fe811b108e85d86cd428fa4d7b
 EBUILD knot-2.4.5.ebuild 1531 SHA256 d84eb720f2939a2b18a11d68b53203814407859dfa258e8ac6e5f9188db3a943 SHA512 908ebfce7b6ecd87171efe02b39ac43b8fd91aabf17da072fddd270b8bb10063e161dad188036dcf68d21046b56c8611fc9f443ebea39949747e1d4403a94405 WHIRLPOOL 9fe1f25b139fb3286eca4e9e03dfb6bf321249c2140b088d3abc451baa5a329678a171a534fa3d233a2114411d5d1afd77bfba109d7e1039d0c5a64fcd1b9b68
-EBUILD knot-2.5.5.ebuild 1913 SHA256 cb6657792f474b7aa6a060cc783c13205c73f1ec20e28862c69bbd8189f99f5f SHA512 d2c4e59cb2ba96561f23b8b22be8c494689549d569d2fe785793723ed7035bf778db5494ad2c5ce0e90e72b41bf3080ef7cd3791d4b943cede97a9428bc7aee6 WHIRLPOOL 1e1012bdfcc037575d91c922e8d7f29c699cbf93eb311712fce545723232bcb44fd0b14d3d7f92966b25bbde1ba9e0acac0bc7f1b68ddec9edb3008937e900a0
-EBUILD knot-2.6.0.ebuild 1913 SHA256 cb6657792f474b7aa6a060cc783c13205c73f1ec20e28862c69bbd8189f99f5f SHA512 d2c4e59cb2ba96561f23b8b22be8c494689549d569d2fe785793723ed7035bf778db5494ad2c5ce0e90e72b41bf3080ef7cd3791d4b943cede97a9428bc7aee6 WHIRLPOOL 1e1012bdfcc037575d91c922e8d7f29c699cbf93eb311712fce545723232bcb44fd0b14d3d7f92966b25bbde1ba9e0acac0bc7f1b68ddec9edb3008937e900a0
+EBUILD knot-2.5.6.ebuild 1913 SHA256 cb6657792f474b7aa6a060cc783c13205c73f1ec20e28862c69bbd8189f99f5f SHA512 d2c4e59cb2ba96561f23b8b22be8c494689549d569d2fe785793723ed7035bf778db5494ad2c5ce0e90e72b41bf3080ef7cd3791d4b943cede97a9428bc7aee6 WHIRLPOOL 1e1012bdfcc037575d91c922e8d7f29c699cbf93eb311712fce545723232bcb44fd0b14d3d7f92966b25bbde1ba9e0acac0bc7f1b68ddec9edb3008937e900a0
+EBUILD knot-2.6.1.ebuild 1913 SHA256 cb6657792f474b7aa6a060cc783c13205c73f1ec20e28862c69bbd8189f99f5f SHA512 d2c4e59cb2ba96561f23b8b22be8c494689549d569d2fe785793723ed7035bf778db5494ad2c5ce0e90e72b41bf3080ef7cd3791d4b943cede97a9428bc7aee6 WHIRLPOOL 1e1012bdfcc037575d91c922e8d7f29c699cbf93eb311712fce545723232bcb44fd0b14d3d7f92966b25bbde1ba9e0acac0bc7f1b68ddec9edb3008937e900a0
 MISC ChangeLog 5135 SHA256 9150cf67baa485c42361fd8ca7cecc178aaf19f69c5f5b0633c2fce1f9346631 SHA512 f97db80651483493f902dfd37880e783d9c1a16ce0610a3134c99db2ea257f2453ada405a07359a0c89e17eaed16cdb41b84e7caf61c633febbdd56f4bbdd937 WHIRLPOOL c30e56530e61b1fc1a24c0be9a5f6ade64dee3c6d2b3e25fbaff2cc4f2bacefcd3e099a767ac7231db1dc1ce518a224855e4229adf00da0a11bf75d535564a26
 MISC ChangeLog-2015 6004 SHA256 78cf50c9a8661021396add7cef8436d81ffd773c52a492b2f50c045a07aae84e SHA512 2d591dea2c45fdbb789f325369b2f01ad8c54ff375676342aade271808902c56c7d16409e35e64a754101c305bc400c9a7bc289e49fa4b079dbb1adb98f76a54 WHIRLPOOL 43b175454e358b7a96f56882451f1c5c897e0ac06b59e4562244f6690cfa037cddb28922d84823052f67e90069b459e9a8ecd435ff06aa2ffd03ef52c660e53f
 MISC metadata.xml 1539 SHA256 c17766d9e8d1b7121ba58acf02ade924eb3f14d4aef61b530b6b337ce12a6f30 SHA512 8b39c687fb8b9fb4bf25e0baa8c851ffb4980c0028bf0f64a3c642146139429e292c6ca3fbd01b7bb311ecbbe7bf1df128885b53971b836f541fe97bedf6f056 WHIRLPOOL 54cf2ffe6c96b25698448ea6dfc6a44efcb1e6bfe5f712ad9e43d9847e670c7711c7b4273e649d8284ebcc6a8b9401eb735380f0d13b38f2475372884371a68d
diff --git a/net-dns/knot/files/2.5.3-link-with-libatomic.patch b/net-dns/knot/files/2.5.3-link-with-libatomic.patch
deleted file mode 100644
index 14e5366f7d94..000000000000
--- a/net-dns/knot/files/2.5.3-link-with-libatomic.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 5cf2d1acf87fa0ab18375534ca210f1cabf212b3 Mon Sep 17 00:00:00 2001
-From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
-Date: Wed, 2 Aug 2017 23:16:43 +0200
-Subject: [PATCH] Link with libatomic on architectures that requires it
-
----
- configure.ac    | 10 +++++++++-
- src/Makefile.am |  2 +-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2a28214..5bd1798 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -504,8 +504,16 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sched.h>]], [[cpuset_t* set = cpuset
- AC_COMPILE_IFELSE(
-   [AC_LANG_PROGRAM([[#include <stdint.h>]],
-                    [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])],
--  [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])]
-+  [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])
-+    AC_LINK_IFELSE(
-+     [AC_LANG_PROGRAM([[#include <stdint.h>]],
-+                      [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])],
-+     [atomic_LIBS=""],
-+     [atomic_LIBS="-latomic"]
-+  )],
-+  [atomic_LIBS=""]
- )
-+AC_SUBST([atomic_LIBS])
- 
- # Prepare CFLAG_VISIBILITY to be used where needed
- gl_VISIBILITY()
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 948912e..bf28013 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -399,7 +399,7 @@ libknotd_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(systemd_CFLAGS) \
-                        $(liburcu_CFLAGS) -DKNOTD_MOD_STATIC
- libknotd_la_LDFLAGS  = $(AM_LDFLAGS) -export-symbols-regex '^knotd_'
- libknotd_la_LIBADD   = libknot.la zscanner/libzscanner.la $(systemd_LIBS) \
--                       $(liburcu_LIBS)
-+                       $(liburcu_LIBS) $(atomic_LIBS)
- 
- ###################
- # Knot DNS Daemon #
---- a/src/Makefile.in	2017-08-05 18:09:14.029882010 +0200
-+++ b/src/Makefile.in	2017-08-05 18:12:43.541190937 +0200
-@@ -379,7 +379,7 @@
- @STATIC_MODULE_dnstap_TRUE@	contrib/dnstap/libdnstap.la
- libknotd_la_DEPENDENCIES = libknot.la zscanner/libzscanner.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_2)
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
- am__libknotd_la_SOURCES_DIST = knot/conf/base.c knot/conf/base.h \
- 	knot/conf/conf.c knot/conf/conf.h knot/conf/confdb.c \
- 	knot/conf/confdb.h knot/conf/confio.c knot/conf/confio.h \
-@@ -937,6 +937,7 @@
- am__quote = @am__quote@
- am__tar = @am__tar@
- am__untar = @am__untar@
-+atomic_LIBS = @atomic_LIBS@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -1275,7 +1276,8 @@
- 	$(am__append_11)
- libknotd_la_LDFLAGS = $(AM_LDFLAGS) -export-symbols-regex '^knotd_'
- libknotd_la_LIBADD = libknot.la zscanner/libzscanner.la \
--	$(systemd_LIBS) $(liburcu_LIBS) $(am__append_12)
-+	$(systemd_LIBS) $(liburcu_LIBS) $(atomic_LIBS) \
-+	$(am__append_12)
- @HAVE_DAEMON_TRUE@sbin_SCRIPTS = utils/pykeymgr/pykeymgr
- @HAVE_DAEMON_TRUE@CLEAN_FILES = $(sbin_SCRIPTS)
- @HAVE_DAEMON_TRUE@knotddir = $(includedir)/knot
---- a/configure	2017-08-05 18:09:14.039882551 +0200
-+++ b/configure	2017-08-05 18:12:18.779857706 +0200
-@@ -655,6 +655,7 @@
- CODE_COVERAGE_ENABLED_TRUE
- HAVE_VISIBILITY
- CFLAG_VISIBILITY
-+atomic_LIBS
- libidn_LIBS
- libidn_CFLAGS
- libidn2_LIBS
-@@ -16347,10 +16358,32 @@
- 
- $as_echo "#define HAVE_ATOMIC 1" >>confdefs.h
- 
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdint.h>
-+int
-+main ()
-+{
-+uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  atomic_LIBS=""
-+else
-+  atomic_LIBS="-latomic"
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+else
-+  atomic_LIBS=""
- 
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
-+
- # Prepare CFLAG_VISIBILITY to be used where needed
- 
- 
diff --git a/net-dns/knot/knot-2.5.5.ebuild b/net-dns/knot/knot-2.5.6.ebuild
index 0baf4877502e..0baf4877502e 100644
--- a/net-dns/knot/knot-2.5.5.ebuild
+++ b/net-dns/knot/knot-2.5.6.ebuild
diff --git a/net-dns/knot/knot-2.6.0.ebuild b/net-dns/knot/knot-2.6.1.ebuild
index 0baf4877502e..0baf4877502e 100644
--- a/net-dns/knot/knot-2.6.0.ebuild
+++ b/net-dns/knot/knot-2.6.1.ebuild