gentoo resync : 27.03.2018

5 files changed, 25 insertions, 20 deletions

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}
 }