| 1 |
Fix the package to use standard meaning for USE=luajit instead of making |
| 2 |
it exclusive with USE=lua. |
| 3 |
--- |
| 4 |
net-dns/pdns/metadata.xml | 1 - |
| 5 |
net-dns/pdns/pdns-4.0.5.ebuild | 12 +++++++----- |
| 6 |
net-dns/pdns/pdns-4.1.0.ebuild | 12 +++++++----- |
| 7 |
net-dns/pdns/pdns-4.1.1.ebuild | 12 +++++++----- |
| 8 |
4 files changed, 21 insertions(+), 16 deletions(-) |
| 9 |
|
| 10 |
diff --git a/net-dns/pdns/metadata.xml b/net-dns/pdns/metadata.xml |
| 11 |
index 36c754fdabc7..57e0d147b337 100644 |
| 12 |
--- a/net-dns/pdns/metadata.xml |
| 13 |
+++ b/net-dns/pdns/metadata.xml |
| 14 |
@@ -12,7 +12,6 @@ standards documents. Furthermore, PowerDNS interfaces with almost any database. |
| 15 |
</longdescription> |
| 16 |
<use> |
| 17 |
<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> |
| 18 |
- <flag name="luajit">Enable support for <pkg>dev-lang/luajit</pkg></flag> |
| 19 |
<flag name="mydns">Making it possible to use a MyDNS MySQL database with PowerDNS (not recommended for new deployments).</flag> |
| 20 |
<flag name="opendbx">Use a database supported by <pkg>dev-db/opendbx</pkg> as backend.</flag> |
| 21 |
<flag name="protobuf">Enable support for <pkg>dev-libs/protobuf</pkg>.</flag> |
| 22 |
diff --git a/net-dns/pdns/pdns-4.0.5.ebuild b/net-dns/pdns/pdns-4.0.5.ebuild |
| 23 |
index 90ac1b5b3306..bd6f0e93330f 100644 |
| 24 |
--- a/net-dns/pdns/pdns-4.0.5.ebuild |
| 25 |
+++ b/net-dns/pdns/pdns-4.0.5.ebuild |
| 26 |
@@ -20,15 +20,17 @@ KEYWORDS="amd64 x86" |
| 27 |
|
| 28 |
IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sqlite systemd tools tinydns test" |
| 29 |
|
| 30 |
-REQUIRED_USE="mydns? ( mysql ) ?? ( lua luajit )" |
| 31 |
+REQUIRED_USE="mydns? ( mysql )" |
| 32 |
|
| 33 |
RDEPEND=" |
| 34 |
libressl? ( dev-libs/libressl:= ) |
| 35 |
!libressl? ( dev-libs/openssl:= ) |
| 36 |
>=dev-libs/boost-1.35:= |
| 37 |
botan? ( dev-libs/botan:2= ) |
| 38 |
- lua? ( dev-lang/lua:= ) |
| 39 |
- luajit? ( dev-lang/luajit:= ) |
| 40 |
+ lua? ( |
| 41 |
+ !luajit? ( dev-lang/lua:= ) |
| 42 |
+ luajit? ( dev-lang/luajit:= ) |
| 43 |
+ ) |
| 44 |
mysql? ( virtual/mysql ) |
| 45 |
postgres? ( dev-db/postgresql:= ) |
| 46 |
ldap? ( >=net-nds/openldap-2.0.27-r4 ) |
| 47 |
@@ -74,8 +76,8 @@ src_configure() { |
| 48 |
$(use_enable test unit-tests) \ |
| 49 |
$(use_enable tools) \ |
| 50 |
$(use_enable systemd) \ |
| 51 |
- $(use_with lua) \ |
| 52 |
- $(use_with luajit) \ |
| 53 |
+ $(usex lua "$(use_with !luajit lua) $(use_with luajit)" \ |
| 54 |
+ '--without-lua --without-luajit') \ |
| 55 |
$(use_with protobuf) \ |
| 56 |
${myconf} |
| 57 |
} |
| 58 |
diff --git a/net-dns/pdns/pdns-4.1.0.ebuild b/net-dns/pdns/pdns-4.1.0.ebuild |
| 59 |
index 476a969f8a9a..60d5320f505e 100644 |
| 60 |
--- a/net-dns/pdns/pdns-4.1.0.ebuild |
| 61 |
+++ b/net-dns/pdns/pdns-4.1.0.ebuild |
| 62 |
@@ -20,15 +20,17 @@ KEYWORDS="~amd64 ~x86" |
| 63 |
|
| 64 |
IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test" |
| 65 |
|
| 66 |
-REQUIRED_USE="mydns? ( mysql ) ?? ( lua luajit )" |
| 67 |
+REQUIRED_USE="mydns? ( mysql )" |
| 68 |
|
| 69 |
RDEPEND=" |
| 70 |
libressl? ( dev-libs/libressl:= ) |
| 71 |
!libressl? ( dev-libs/openssl:= ) |
| 72 |
>=dev-libs/boost-1.35:= |
| 73 |
botan? ( dev-libs/botan:2= ) |
| 74 |
- lua? ( dev-lang/lua:= ) |
| 75 |
- luajit? ( dev-lang/luajit:= ) |
| 76 |
+ lua? ( |
| 77 |
+ !luajit? ( dev-lang/lua:= ) |
| 78 |
+ luajit? ( dev-lang/luajit:= ) |
| 79 |
+ ) |
| 80 |
mysql? ( virtual/mysql ) |
| 81 |
postgres? ( dev-db/postgresql:= ) |
| 82 |
ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) |
| 83 |
@@ -74,8 +76,8 @@ src_configure() { |
| 84 |
$(use_enable tools) \ |
| 85 |
$(use_enable systemd) \ |
| 86 |
$(use_enable sodium libsodium) \ |
| 87 |
- $(use_with lua) \ |
| 88 |
- $(use_with luajit) \ |
| 89 |
+ $(usex lua "$(use_with !luajit lua) $(use_with luajit)" \ |
| 90 |
+ '--without-lua --without-luajit') \ |
| 91 |
$(use_with protobuf) \ |
| 92 |
${myconf} |
| 93 |
} |
| 94 |
diff --git a/net-dns/pdns/pdns-4.1.1.ebuild b/net-dns/pdns/pdns-4.1.1.ebuild |
| 95 |
index 7ec5508cb26b..1dd30fc18958 100644 |
| 96 |
--- a/net-dns/pdns/pdns-4.1.1.ebuild |
| 97 |
+++ b/net-dns/pdns/pdns-4.1.1.ebuild |
| 98 |
@@ -20,15 +20,17 @@ KEYWORDS="~amd64 ~x86" |
| 99 |
|
| 100 |
IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test" |
| 101 |
|
| 102 |
-REQUIRED_USE="mydns? ( mysql ) ?? ( lua luajit )" |
| 103 |
+REQUIRED_USE="mydns? ( mysql )" |
| 104 |
|
| 105 |
RDEPEND=" |
| 106 |
libressl? ( dev-libs/libressl:= ) |
| 107 |
!libressl? ( dev-libs/openssl:= ) |
| 108 |
>=dev-libs/boost-1.35:= |
| 109 |
botan? ( dev-libs/botan:2= ) |
| 110 |
- lua? ( dev-lang/lua:= ) |
| 111 |
- luajit? ( dev-lang/luajit:= ) |
| 112 |
+ lua? ( |
| 113 |
+ !luajit? ( dev-lang/lua:= ) |
| 114 |
+ luajit? ( dev-lang/luajit:= ) |
| 115 |
+ ) |
| 116 |
mysql? ( virtual/mysql ) |
| 117 |
postgres? ( dev-db/postgresql:= ) |
| 118 |
ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) |
| 119 |
@@ -74,8 +76,8 @@ src_configure() { |
| 120 |
$(use_enable tools) \ |
| 121 |
$(use_enable systemd) \ |
| 122 |
$(use_enable sodium libsodium) \ |
| 123 |
- $(use_with lua) \ |
| 124 |
- $(use_with luajit) \ |
| 125 |
+ $(usex lua "$(use_with !luajit lua) $(use_with luajit)" \ |
| 126 |
+ '--without-lua --without-luajit') \ |
| 127 |
$(use_with protobuf) \ |
| 128 |
${myconf} |
| 129 |
} |
| 130 |
-- |
| 131 |
2.16.2 |
Archives