gentoo resync : 27.03.2018

17 files changed, 41 insertions, 39 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 0475c36a6255..3755136ba4b8 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index e474b713d42e..7e894b8c2acd 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -20,6 +20,6 @@ EBUILD avahi-0.6.31-r11.ebuild 6261 BLAKE2B a11de83cced8adec29e5a3df8ad09fc2dd16
 EBUILD avahi-0.6.32-r1.ebuild 5732 BLAKE2B 6b17c7e9d223e288e309ef3f51326bff5d3e895e12a1db585f0fe3a086ba0a80bfaccb0d9ef79b769200fe985be92826efb64eb071ca93c79d82a4addde91b98 SHA512 d26256a031d5d7ce6cf58ff4c98d5a88ed93498d0383e1a425e88bc9f1de4ee18c0b2ab6e987163b5a27acc807199c8f91276e449dc6d951607c1dfddfaa74c4
 EBUILD avahi-0.6.32-r2.ebuild 5971 BLAKE2B 97aa22378ee9791dddb866a097b4c1fe69152e90939d67b1a95c890488b297dcf80e2df1f4435af0d69f798c9fc7d6365329ff481b6f24af50dbe37dcf2fe1d5 SHA512 e25666354328ba52955b938d4cfd1d0ff661cd6c536fddfc8cfc84afdaaebdafc8091bd99d17d737e79242c45b858df23a3cfbed8cf0c5491bb70ff7ed192b93
 EBUILD avahi-0.6.32.ebuild 5584 BLAKE2B 48672b141bd86b76838acae05f4d6e3f4fffeb686e42e058b8b8c3c771568df7ca12bee6a215079729d585d6415c30146787e73aeb1b84abafbff5da00ec9b48 SHA512 031b6ea7962717de7f984c78a2814312610b86ce391a2474117b34b2e8c542a6de49b75998c99639f866f415b878ed58f807a12ea713d3b1d15ef0657013e4a0
-EBUILD avahi-0.7-r1.ebuild 5135 BLAKE2B 51a7ed6f56c87f6b0d7bde0b70cbdd6ba172e8efe8e76b4f9574fa2ea651a000ef8b688e5f48f0bd1abb5e3a68146474dc1667d68b719a80ff83453afc25542b SHA512 d292f443fdd644f39e72482e6bc91b0ecd15aebe08b7b7b49b3f253894bec9717fede275cacc4c1b65b097ac1391fe657b47d60efefdc18f675065c9bf6cffb8
+EBUILD avahi-0.7-r1.ebuild 5133 BLAKE2B 267c2c4036a7f1c8d2e3beb0dd9956bb5b1b45903b9f7fef11d5333924bc632e5bc2967f38468fdbf0bf2d0eb85daa1d0563db429cd905513a0df6ec02470d05 SHA512 844d4e20131523a9f8ff2b181856f4fac350f6fecb04ce466dd83ddbfb20af432968536d97fef4ad2f771a1028735689b0901ddb6b388b41eaf69c0f7576015a
 EBUILD avahi-0.7.ebuild 5189 BLAKE2B 2ded9ac255310a284f2b1a91a770a9ede5da20b5f351cfeca0908e7b67ec643770e6f6390490524cdb76637bad65abb7e2d0d223c5faeb531b9d48386e34c458 SHA512 60501ee89aedb2733643183793f144c0d6a3409c630fe829180ce6c600847184f5e61dcc049e2e412fad3bb9b2237d8772c506624fabe760ca49245a4cb5fa2c
 MISC metadata.xml 970 BLAKE2B 26904ceb3a89833caa77e2315d99be8ef729277a021faa3800a1cd0abe94c516d53176e65668d00687a6bb6ee807a2011106268f14a4d5012c27132e4fca4f3c SHA512 b9498d4757b6bd793846e4cbdd5c37da601a8e1430cafd1a6039ff54f8ff10576684c58801ebc679061f975cefa5909c94c30976e84354a5fcc7d2a586f7fa8e
diff --git a/net-dns/avahi/avahi-0.7-r1.ebuild b/net-dns/avahi/avahi-0.7-r1.ebuild
index 73b37fa385ef..89ac33ceb743 100644
--- a/net-dns/avahi/avahi-0.7-r1.ebuild
+++ b/net-dns/avahi/avahi-0.7-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux test"
 
 REQUIRED_USE="
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 669ce5a02195..2aca2351e250 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -11,4 +11,4 @@ DIST dnscrypt-proxy-1.9.5.tar.bz2 1290573 BLAKE2B 8f16fdb58012e00a8b58d36364377c
 DIST dnscrypt-proxy-2.0.7.tar.gz 746018 BLAKE2B f6ede938d3a49a972510614f07831530aa2cdceccecaa9bc91e4c6c85bf809400ae7d451a538bc0ba63e9031091fae04cd83fd5d82bebccc33b482535eeeb76c SHA512 42d14e3aad5b38f6de8cafb0774c572807632f6464b0abf1ab7e33837d90e348e4ff8540ced02245531e1423fadfc5f7f6366ac15a56b10049ac46fb0fbc49ea
 EBUILD dnscrypt-proxy-1.9.5-r1.ebuild 1817 BLAKE2B bb0c48cadf271b942beeaee69c49dbb2582c41f86176b84c6e929ad5dd5b55deacfa03d15143b2180d05ab03913a93702315712afc73bbbea53b152e43ab30f8 SHA512 87a35841daf4da9b666bae888f9b73fa7205f9e7054afe5bdc47d1112525e2eb1237416fa7702c38bc63ce0878fc61d752f6851af1cc07a0f9b5a3591b8f0704
 EBUILD dnscrypt-proxy-2.0.7.ebuild 2448 BLAKE2B 93a03421e1a7784e719be54230187fbc674e685c700191d4bdf3a46975adc2dc1511ec42eb271f6cfd78255c5619a8edce9adba9e21da3967508c20e4b455cd3 SHA512 3aef6aff6d40f978f2a4798e26958cd371d033ccc54f6c2d2eafe786412a31f39b1500d79566eb3109896ff14cb2a0d626bc16b54d72036f1feff4ca8aeabeca
-MISC metadata.xml 967 BLAKE2B f423ce552f42f2f3cdcbe71a711104c34eb90b7cf75b6d60b324b1ce239cc34d13845971b9808b9ad19e3bd76c89d1bb3b2a5c3d53d33afafff7fa7009a01427 SHA512 7c2bab8a27a9bc8d8401867a2ec6e84928cf7520422604282e88db4dcba4003d675a457ce0225f67f7385baede7953b2d531b2ab68d7e6b016f1e7c5e0e5fdfd
+MISC metadata.xml 941 BLAKE2B 234421b342985e6980a870bc0f7e4dc96e2867d89aa589ac23723a7a7cc4767109de7f046c817c3a21ea1bab23d352210941dc092b002dd3a7374be6c459877c SHA512 6bad822978132f7467756a88695e9e87a3ec2c007af04b423496f7befc1fc4de781a78bac17167b6de6682688e3ef445e5dce7f6f3f3e9c25a632e6222268918
diff --git a/net-dns/dnscrypt-proxy/metadata.xml b/net-dns/dnscrypt-proxy/metadata.xml
index 547780397031..c1a85090aac5 100644
--- a/net-dns/dnscrypt-proxy/metadata.xml
+++ b/net-dns/dnscrypt-proxy/metadata.xml
@@ -5,10 +5,6 @@
 		<email>ya@sysdump.net</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
@@ -16,8 +12,8 @@
 	<longdescription lang="en">
 		dnscrypt-proxy provides local service which can be used directly as your
 		local resolver or as a DNS forwarder, encrypting and authenticating
-		requests using the DNSCrypt protocol and passing them to an upstream
-		server.
+		requests using the DNSCrypt protocol and passing them to upstream
+		servers.
 	</longdescription>
 	<use>
 		<flag name="plugins">Enable plugin support to inspect and modify
@@ -25,4 +21,7 @@
 		<flag name="systemd">Use systemd's socket activation instead of
 			creating the sockets itself</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">jedisct1/dnscrypt-proxy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 28f6ce758f91..99e3d0ee80e1 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -4,4 +4,4 @@ AUX dnsdist.initd 1340 BLAKE2B 390aa44bdfdaee12a92297a8a6b7d90503446a91eafb631b5
 DIST dnsdist-1.2.0.tar.bz2 876104 BLAKE2B 6e9d0f871c63a0aae539ae074648edcd6b9d626434c343b28c45cf16ffb6b088300d5327e04c45dbb1c9a0b9ad6077d539dc36ae0424d1ec0a240932e8b34223 SHA512 93f8c5f18462d3291c973a690f6ac2b3c5791d9947bee83d9250b503b7526de365bdcb530f3b082e51ae168a9129e77d5558af7cc3b9d2e98a585af53783c237
 EBUILD dnsdist-1.2.0.ebuild 1963 BLAKE2B b376eb233b35346cc8c82f887d0393fe9bf162304158a1f0bfec5a886af1a29d36d121378495726595b16de3be120d8ad4f53b4280c57ea5929d59c6ed87db97 SHA512 578263147111bb441842fe31fcd58b1cc92af228e8c86040bc28390a862dd3f083f4781dbcf8117b141f146ed36c0bc5f0bbf884270fc5116c436310c68cf006
 EBUILD dnsdist-9999.ebuild 1963 BLAKE2B b376eb233b35346cc8c82f887d0393fe9bf162304158a1f0bfec5a886af1a29d36d121378495726595b16de3be120d8ad4f53b4280c57ea5929d59c6ed87db97 SHA512 578263147111bb441842fe31fcd58b1cc92af228e8c86040bc28390a862dd3f083f4781dbcf8117b141f146ed36c0bc5f0bbf884270fc5116c436310c68cf006
-MISC metadata.xml 1138 BLAKE2B cb3d6b712b873e46ad2a2e6320715438d4c929c800bdceb47b65b6e2f7edc3b377ded28cf09078e7701cb23bca235bd9303f394b963f7f1187db5a0692d7d74a SHA512 28e685c390be1061fe1202174abc467223b7f0589648fcdbe3d6cbb93ead037501b33b4244687e66d431fc1d642d45e61be348ffed3086afd497516dd02d0e79
+MISC metadata.xml 1043 BLAKE2B 0db07c220caf8ed8523414bfd354f0551cbab7004924239809dca1bfe20dfdeb199cccb5e11531c684ae0bd6ee6940b75f83c3b95693485fa44c59c2a61f542a SHA512 7055c0c05bb6b179bd0095b9c6c9d9392bfda343aa2a380db680e134b60ef074680c1aadcae7d4a3cae95ca21566c9c2f60482e0ca41425c372a575c2f7d3a9d
diff --git a/net-dns/dnsdist/metadata.xml b/net-dns/dnsdist/metadata.xml
index a9231ab03330..3f6dc8527a32 100644
--- a/net-dns/dnsdist/metadata.xml
+++ b/net-dns/dnsdist/metadata.xml
@@ -14,7 +14,6 @@
 	</longdescription>
 	<use>
 		<flag name="dnscrypt">Enable the ability to act as a DNSCrypt server</flag>
-		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
 		<flag name="regex">Enable support for regular expression matching via <pkg>dev-libs/re2</pkg></flag>
 		<flag name="remote-logging">Enable support for remote logging via <pkg>dev-libs/protobuf</pkg></flag>
 		<flag name="ssl">Enable support for and encrypted client-server communication via <pkg>dev-libs/libsodium</pkg></flag>
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index 3539d428374f..9fee9f875057 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,6 +1,6 @@
 AUX 3.8.1-restore-newline.patch 508 BLAKE2B 932f891ed7372ba56058a364d0e8bab41972c82b43f7b4bcc61c68f5204f8121bc79e8641325cd6ffa9407b473d36097eefa81afaeaaa3c415feea17053cbb47 SHA512 ca2c79192f808e16d0aa876fbb35eb28330a86cc4f2bd7ef618bef16f623c127327b1ce16369aadfb73413b103aa5790d7b9e7f44a9c0b26131b17cab22c0552
 DIST openresolv-3.8.1.tar.xz 18396 BLAKE2B bddfb919728cb49baba6df6226abe2f893d36770643e735b41717dfd98edf17255d8b293f01b335d6ae31c7075884ea65aa150ebac9d34f252be724aa0a695ec SHA512 390bf30bb85b071839104e5c7e276b402f6f485edc038e38da389730d82e614bb11b0dde44a55aa2ca5e790b374671a9c89cc07b053633401a608150eebbf2c8
 DIST openresolv-3.9.0.tar.xz 18844 BLAKE2B 0aa2125d79305aab04a8d052d56328493d51aa6ff5b44fdfe08e96ccc78ae1d84f2115e5d59940e7e1cedf7e4fe7dc36a461839bcef8fc2c5b2e21242e441f36 SHA512 4498db60f0b5a762194dd3651b94cc8b01a349a8cfb891e10d040cd6b8e22fa0e9897909517831591787ad22ffad97c78d3281e32296aa1ee67de5dff9bf765e
-EBUILD openresolv-3.8.1.ebuild 1126 BLAKE2B cd61e274bc7cc1075699e41c12513779d10a835d744efa9a22a511abd2da7258d9546945c0f9f6789f9a510ad72fa277813b7783b4b054755b0550055f2cda34 SHA512 8f59bf9989aa71b959f61cf2491d8623bd641f9da1189e031b5b07e4c892bd3d7c5dbee8c165b2bfd01815ee987c7e03d9e6443a1510af80afe5601ed9760e2e
-EBUILD openresolv-3.9.0.ebuild 1079 BLAKE2B 759d5131a801c406e79c30273afeb8d3373e1ca15c4f9e49fa169115d31fc6a71061a2fd106adbcafc4557565db736285f6c715fcf8ad258e8d4dc3a1fe017f3 SHA512 bed3c2a8ed2440b6666a960457d16e2e575d42c8e22c89c751914f257e76f0802867aea4362b9b874f771a2561559df540f11939a7e9abb7768c93355500775a
+EBUILD openresolv-3.8.1.ebuild 1128 BLAKE2B 2805f40cacd880191c17650cc0e9a86352d12d29033459ba6dd429c7a83ad84a307683704ef61f52d0feffb136ef24da5795d6f15c418f9fcfeb811dafcfaf81 SHA512 1ed0222eb9131de79f17ff43ea9840ab6c2ecc055005be60dd129430b722e247bf28d25b0ff8aef2f73a37a9b7855f8c8c21840e68f30289c5ea6c543725f60c
+EBUILD openresolv-3.9.0.ebuild 1081 BLAKE2B 9362f10aa957318b03f281ff7e1a4e8529c9215a77db2a5d1052da7972a6c91bd8cf7085c38f0a2ca09a380eb648b7e402ff9adfcd60b74dae51a9a0f5d116d0 SHA512 d60f675b9f02239f2699dbb7d6b91946048aabf1dba3bdd7c3caf4b2f3299d4d6e89f36d517d5fce2d3f0c5550387f98da4cbabc0a7bdc3b25ef0d2d8229bcb2
 MISC metadata.xml 309 BLAKE2B 8abae227455bf1e75801e0dcf3b4165beedefc1499e12049e9eb6652302925a11b2b50ea09d417ed523e00103c5f2d7c619669d40bf3c98a7393b939bbb8a05c SHA512 311a9444ac8811bf1ea1a8bb06370b81360c6642921b2932095bd191d8784509bfe46189de8f073a34a831eaf1c8114c3b5bfcf67d0fe042ea2ecd8c1fc7cc0a
diff --git a/net-dns/openresolv/openresolv-3.8.1.ebuild b/net-dns/openresolv/openresolv-3.8.1.ebuild
index d5f96351f52d..cc55e3160f11 100644
--- a/net-dns/openresolv/openresolv-3.8.1.ebuild
+++ b/net-dns/openresolv/openresolv-3.8.1.ebuild
@@ -4,8 +4,8 @@
 EAPI=6
 
 DESCRIPTION="A framework for managing DNS information"
-HOMEPAGE="http://roy.marples.name/projects/openresolv"
-SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.xz"
+HOMEPAGE="https://roy.marples.name/projects/openresolv"
+SRC_URI="https://roy.marples.name/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/net-dns/openresolv/openresolv-3.9.0.ebuild b/net-dns/openresolv/openresolv-3.9.0.ebuild
index 881fc5125a91..31dbc8e92a39 100644
--- a/net-dns/openresolv/openresolv-3.9.0.ebuild
+++ b/net-dns/openresolv/openresolv-3.9.0.ebuild
@@ -4,8 +4,8 @@
 EAPI=6
 
 DESCRIPTION="A framework for managing DNS information"
-HOMEPAGE="http://roy.marples.name/projects/openresolv"
-SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.xz"
+HOMEPAGE="https://roy.marples.name/projects/openresolv"
+SRC_URI="https://roy.marples.name/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 736e0b942b75..e6b65fd57be3 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -3,4 +3,4 @@ DIST pdns-recursor-4.0.8.tar.bz2 1071831 BLAKE2B d9ab0dada8efa4b05c136650b9a2eab
 DIST pdns-recursor-4.1.1.tar.bz2 1224544 BLAKE2B 886353fabed5795696e84c6f70872577ff3832e449c5b88c81fec007777eb39b764091b92c9c8b5dfc7aa0af2fdb305a3ec3578ccaff469e9c305903bcea8089 SHA512 a8561bf0688752f30c4c997930f13d55c506b2a2113d22b074443757a51cde9be182ef948e61eb8c4d639bbf8679d8a4139aafb6983f483b3a917e049fa64e45
 EBUILD pdns-recursor-4.0.8.ebuild 1698 BLAKE2B bf67849d5f47c1f0d148596aea3fbc4268ad6696761f76f7fdb3b3b574708b01a464f12ae2a6c1df8979d60ec0cb877542dbf927af91bb2709e4510ce675a691 SHA512 358312b26fad4c6f2c473b7756f9c6d71c77045d6c7d0e92a10555848bc1643d9fc59454f61f8286d0891d181a1f6b20eeae055598dc7b150ba06faa0af44650
 EBUILD pdns-recursor-4.1.1.ebuild 1826 BLAKE2B dc2c0474c4d91a7b50732a2f58833d5cb24762c1d27905506fb805f68de4378a9f6aca9dc35d9eb022dcd218f3c128b50bc022ba03606f136d6a4d528a1aa073 SHA512 b8f1f253ee793c7a5b97e4007ec513b798da985e945fccf931f366d8d42c8aac30462c40627974a128ffc3fb5beb2f779a2b98f27ce8bbbeb3351974b136e5b7
-MISC metadata.xml 1029 BLAKE2B 0c061cf1efda76160501345b26c7248385d2d813aba8bb9321009196005c51dc32422220ea8bbefe90a2a6bf9ed7ce79e97723a20e0487c7b1884aed7167381c SHA512 58604a97c2ed4dbd0c236011fa4a2bdf90464ee009aad10c1ca65102207484b57072d431e9ee3eead8500e231527d215efe02c61fc91d0f61f6495db6efca55d
+MISC metadata.xml 954 BLAKE2B 91824dd5b63f8533d2f0a9df87df133ba87f54d6ede9dfd1b1e920251081372fa659dbeb75e2252d91804a2fe269508693ef507c7e070a3cca5ba18711ea8d70 SHA512 1ade9c243b0bdaf70146c344bc318f8c042f846bd91c8e42706d803638c2132bc9ecc9f83db5b862e6e6aff65be9c7437250ac831264a640367d1308c8e3fcfe
diff --git a/net-dns/pdns-recursor/metadata.xml b/net-dns/pdns-recursor/metadata.xml
index c70638327ace..bee2820e1924 100644
--- a/net-dns/pdns-recursor/metadata.xml
+++ b/net-dns/pdns-recursor/metadata.xml
@@ -15,7 +15,6 @@ It also has built-in hooks for making graphs with rrdtool, providing insight int
 nameserver performance.
 </longdescription>
 <use>
-	<flag name="luajit">Enable support for <pkg>dev-lang/luajit</pkg>.</flag>
 	<flag name="protobuf">Enable support for <pkg>dev-libs/protobuf</pkg>.</flag>
 	<flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for cryptography</flag>
 </use>
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 4cff17c8c606..cb9dc4eece20 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -3,7 +3,7 @@ AUX pdns-r1 2533 BLAKE2B 0d4af8f9cd4568cde40b44c72cb10a29662daa514df1a1d8174dd02
 DIST pdns-4.0.5.tar.bz2 1323468 BLAKE2B 7e10cc98177bfa4f81888e2598ab4f0ce83ee45e6349372c065940424a74015302da879536dea8346fe7b86f35c0524a5449489bdf71d1a091b7c6a82fac4b6f SHA512 4b0fa932c1d9caf35b988916447aa21c64ebe2a58bdd84417cf09321a21b264cf1057206dc6993a45a3b591eb1dfa49463710c06b6bdfaf6fb17ae6dec6086d9
 DIST pdns-4.1.0.tar.bz2 1116905 BLAKE2B 91ec0f0cfa70966ff71dfb6302ed01355120ca1429d3c610c4abfb1b964cff78a6332700991bc259387e9095be03d3850da41750e93bb3ffe3db0e23562d156c SHA512 4b2b42f4893f8aac3cf07a6c8a3c999cb728a5907a710f1a5c9c8d08377ecb63e202e5eececbefc069c8f1d97a29b2aa607da7cf2bcc6335a72222418e409e77
 DIST pdns-4.1.1.tar.bz2 1113659 BLAKE2B 916dd6ad815a867580d36668e70ec62991ccd45abafdcaa282a2d3edf7ea1b1ae4fc8add8f6b1ce5c8a8d76fc5bf6a6fa458202b7623842afabf7da593333585 SHA512 23e62ec39007e39a289945457e9b950cbeabf8581f477397341dfbd3592b7ccdede8f4c9ce653a47add07784d1a23116f9013c755eb11af1df383b49a8ca341d
-EBUILD pdns-4.0.5.ebuild 4121 BLAKE2B e6614c7eea00e1e91826a20d25c4b440e4333a500fbd661f3b7c19f795e98b6e9b5d8f68222d2186cdd77edf387ae63b6b2861d3c7f6d55d982fe0f7f8c4c3fe SHA512 c6bc8aeec70b28faec1c7b0e77245e59a4a9903d621a2fc0ae149889e1661d3c210a2bd12286834a34efbd0343a929ebaed0931143630abb1a293ce7cd92df72
-EBUILD pdns-4.1.0.ebuild 4139 BLAKE2B 3b1c1baf7910e0b72d4c27ca34efb03e87d0983ac85a400adbe76d071edb5c274c68012365ac51b2af2a0c7442675e0a69a0e18e892b5115960093252076475b SHA512 befcd3c0e7e71a73e7c46e76592b71d843ec9b042029f60c952e6b4c9e1860d85cb910d29b40e7e5740c1e88f2314756fd251dec829c146120aaad9147c47853
-EBUILD pdns-4.1.1.ebuild 4139 BLAKE2B 7d81a34f1c69b7ddb67c3d6d15cc34b5ada70bd9c82c88846f3349a2a80ee0d31c897761b1173e55e4de3988ec82dff02fff51991e94e1ec0a54d55670ec8d0c SHA512 85790f988911ee7639f6229263709abfdcbc3bb26f3bd6aa268da41b1cfe22a857cf8279c6c2d8ea5edc0ed83247d52ef05b2b868b56be5685ee6feff1fdf68d
-MISC metadata.xml 1404 BLAKE2B 6bb5d9084ad4b3566b7f164513402ebecb4f60ff4c8d7c5eec9d870c4099e6b766debab20380a4458ec882bc3f8cffd330932b5ea57a086ed13b1c9df6d8d58a SHA512 8570957e3c85bf517a159811c62c5cf5b7e3347f8dcf0cdfc03ccc455598e9c4e6788610b67f5b36211386ba363423fed3fae0c6bc1ec6e63ddfb77adf509168
+EBUILD pdns-4.0.5.ebuild 4176 BLAKE2B db646faa496fafab122cf77cb4dd1a697387a571c6f391a5b5214f6fdef5573a736d95a657d408ccfc03cef8eebdc3512ca121e459445d3c210d2191b31077eb SHA512 4dfaba7ea90af3ddb448523a662423f8bf8d06d16c6f58433b2879848af6af214992b978ec821faec4bad5e93882743554ac18ce868d59e4f9cb92eb3f24223e
+EBUILD pdns-4.1.0.ebuild 4194 BLAKE2B d36e0ca27b16b0361b8d477b313031fd93627bcf9d5905e0d9bf798a26e5bb2529cc26bed22c09acf8e887e20da3ff4bae50beb45a36b40f9658babec78f27b8 SHA512 8e895af66faa50e850c5adc6fe297a869681b3e0fbdee1aedcb1b00ae50aa8de1058dfd1b4561b9d046aacf51d58080f5f055915d3f30114def4e89a27303556
+EBUILD pdns-4.1.1.ebuild 4194 BLAKE2B 9d29aa61473bb3de727fb1dff54d40a572ead8bc7f6f9dffda2d8404dedb3c2ff563321946235771cc58e2e9c1df09e6124917368441800b4f8b0f5af71e45f2 SHA512 14fd8ef1301faebf6af08c7c67bb6a28b019d5cd0bae7a614eb8d04f5841805713f14629d7a3ea48e4cd40736e35708f31addc803f1f3d6e26457ee6b09c5dc8
+MISC metadata.xml 1330 BLAKE2B 17be53a41fc13a3739905f8409b49996b1958cfd04baf1d2982c923ee7b39ef5b8be627017a6efb1261f158f45660337eb22157ceaadc7b07ed5b5b3da7c7cdf SHA512 fb13690059baceefc1366423c524427655d54313f5690e12709c9e1dd4b9567d111d7d748c530286dcd24dc78acfa38baac88a5cfc9a2b01996baae6b47f39dc
diff --git a/net-dns/pdns/metadata.xml b/net-dns/pdns/metadata.xml
index 36c754fdabc7..57e0d147b337 100644
--- a/net-dns/pdns/metadata.xml
+++ b/net-dns/pdns/metadata.xml
@@ -12,7 +12,6 @@ standards documents. Furthermore, PowerDNS interfaces with almost any database.
 </longdescription>
 <use>
 	<flag name="botan">Make it possible to use the <pkg>dev-libs/botan</pkg> library for crypto-related stuff (like DNSSec) which can be significantly faster than PolarSSL.</flag>
-	<flag name="luajit">Enable support for <pkg>dev-lang/luajit</pkg></flag>
 	<flag name="mydns">Making it possible to use a MyDNS MySQL database with PowerDNS (not recommended for new deployments).</flag>
 	<flag name="opendbx">Use a database supported by <pkg>dev-db/opendbx</pkg> as backend.</flag>
 	<flag name="protobuf">Enable support for <pkg>dev-libs/protobuf</pkg>.</flag>
diff --git a/net-dns/pdns/pdns-4.0.5.ebuild b/net-dns/pdns/pdns-4.0.5.ebuild
index 90ac1b5b3306..bd6f0e93330f 100644
--- a/net-dns/pdns/pdns-4.0.5.ebuild
+++ b/net-dns/pdns/pdns-4.0.5.ebuild
@@ -20,15 +20,17 @@ KEYWORDS="amd64 x86"
 
 IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sqlite systemd tools tinydns test"
 
-REQUIRED_USE="mydns? ( mysql ) ?? ( lua luajit )"
+REQUIRED_USE="mydns? ( mysql )"
 
 RDEPEND="
 	libressl? ( dev-libs/libressl:= )
 	!libressl? ( dev-libs/openssl:= )
 	>=dev-libs/boost-1.35:=
 	botan? ( dev-libs/botan:2= )
-	lua? ( dev-lang/lua:= )
-	luajit? ( dev-lang/luajit:= )
+	lua? (
+		!luajit? ( dev-lang/lua:= )
+		luajit? ( dev-lang/luajit:= )
+	)
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql:= )
 	ldap? ( >=net-nds/openldap-2.0.27-r4 )
@@ -74,8 +76,8 @@ src_configure() {
 		$(use_enable test unit-tests) \
 		$(use_enable tools) \
 		$(use_enable systemd) \
-		$(use_with lua) \
-		$(use_with luajit) \
+		$(usex lua "$(use_with !luajit lua) $(use_with luajit)" \
+			'--without-lua --without-luajit') \
 		$(use_with protobuf) \
 		${myconf}
 }
diff --git a/net-dns/pdns/pdns-4.1.0.ebuild b/net-dns/pdns/pdns-4.1.0.ebuild
index 476a969f8a9a..60d5320f505e 100644
--- a/net-dns/pdns/pdns-4.1.0.ebuild
+++ b/net-dns/pdns/pdns-4.1.0.ebuild
@@ -20,15 +20,17 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
 
-REQUIRED_USE="mydns? ( mysql ) ?? ( lua luajit )"
+REQUIRED_USE="mydns? ( mysql )"
 
 RDEPEND="
 	libressl? ( dev-libs/libressl:= )
 	!libressl? ( dev-libs/openssl:= )
 	>=dev-libs/boost-1.35:=
 	botan? ( dev-libs/botan:2= )
-	lua? ( dev-lang/lua:= )
-	luajit? ( dev-lang/luajit:= )
+	lua? (
+		!luajit? ( dev-lang/lua:= )
+		luajit? ( dev-lang/luajit:= )
+	)
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql:= )
 	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
@@ -74,8 +76,8 @@ src_configure() {
 		$(use_enable tools) \
 		$(use_enable systemd) \
 		$(use_enable sodium libsodium) \
-		$(use_with lua) \
-		$(use_with luajit) \
+		$(usex lua "$(use_with !luajit lua) $(use_with luajit)" \
+			'--without-lua --without-luajit') \
 		$(use_with protobuf) \
 		${myconf}
 }
diff --git a/net-dns/pdns/pdns-4.1.1.ebuild b/net-dns/pdns/pdns-4.1.1.ebuild
index 7ec5508cb26b..1dd30fc18958 100644
--- a/net-dns/pdns/pdns-4.1.1.ebuild
+++ b/net-dns/pdns/pdns-4.1.1.ebuild
@@ -20,15 +20,17 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
 
-REQUIRED_USE="mydns? ( mysql ) ?? ( lua luajit )"
+REQUIRED_USE="mydns? ( mysql )"
 
 RDEPEND="
 	libressl? ( dev-libs/libressl:= )
 	!libressl? ( dev-libs/openssl:= )
 	>=dev-libs/boost-1.35:=
 	botan? ( dev-libs/botan:2= )
-	lua? ( dev-lang/lua:= )
-	luajit? ( dev-lang/luajit:= )
+	lua? (
+		!luajit? ( dev-lang/lua:= )
+		luajit? ( dev-lang/luajit:= )
+	)
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql:= )
 	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
@@ -74,8 +76,8 @@ src_configure() {
 		$(use_enable tools) \
 		$(use_enable systemd) \
 		$(use_enable sodium libsodium) \
-		$(use_with lua) \
-		$(use_with luajit) \
+		$(usex lua "$(use_with !luajit lua) $(use_with luajit)" \
+			'--without-lua --without-luajit') \
 		$(use_with protobuf) \
 		${myconf}
 }