[gentoo-dev] [PATCH 1/5] use.desc: Introduce 'luajit' as a global flag

public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-dev] [PATCH 1/5] use.desc: Introduce 'luajit' as a global flag
@ 2018-02-26 22:24 Michał Górny
  2018-02-26 22:24 ` [gentoo-dev] [PATCH 2/5] */*: Remove redundant local descriptions for USE=luajit Michał Górny
                   ` (4 more replies)
  0 siblings, 5 replies; 8+ messages in thread
From: Michał Górny @ 2018-02-26 22:24 UTC (permalink / raw
  To: gentoo-dev; +Cc: Michał Górny

'luajit' is used consistently in 25+ packages. Make it a global flag.
---
 profiles/use.desc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/use.desc b/profiles/use.desc
index 5cdf9808d2b6..5bf9a1d7f693 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -186,6 +186,7 @@ lirc - Add support for lirc (Linux's Infra-Red Remote Control)
 livecd - !!internal use only!! DO NOT SET THIS FLAG YOURSELF!, used during livecd building
 lm_sensors - Add linux lm_sensors (hardware sensors) support
 lua - Enable Lua scripting support
+luajit - Use dev-lang/luajit instead of dev-lang/lua (ineffective with USE=-lua)
 lzma - Support for LZMA (de)compression algorithm
 lzo - Enable support for lzo compression
 m17n-lib - Enable m17n-lib support
-- 
2.16.2



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-dev] [PATCH 2/5] */*: Remove redundant local descriptions for USE=luajit
  2018-02-26 22:24 [gentoo-dev] [PATCH 1/5] use.desc: Introduce 'luajit' as a global flag Michał Górny
@ 2018-02-26 22:24 ` Michał Górny
  2018-02-26 22:24 ` [gentoo-dev] [PATCH 3/5] net-analyzer/suricata: [QA] Use standard meaning of USE=luajit Michał Górny
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2018-02-26 22:24 UTC (permalink / raw
  To: gentoo-dev; +Cc: Michał Górny

---
 app-editors/gvim/metadata.xml               | 1 -
 app-editors/neovim/metadata.xml             | 2 --
 app-editors/vim/metadata.xml                | 1 -
 app-shells/mpv-bash-completion/metadata.xml | 3 ---
 dev-db/redis/metadata.xml                   | 1 -
 dev-lua/lpeg/metadata.xml                   | 4 ----
 dev-lua/lua-openssl/metadata.xml            | 4 ----
 dev-lua/luacheck/metadata.xml               | 4 ----
 dev-lua/luafilesystem/metadata.xml          | 3 ---
 dev-lua/luaossl/metadata.xml                | 4 ----
 dev-lua/luassert/metadata.xml               | 4 ----
 dev-lua/messagepack/metadata.xml            | 7 +------
 dev-lua/mpack/metadata.xml                  | 4 ----
 dev-lua/say/metadata.xml                    | 4 ----
 games-action/minetest/metadata.xml          | 4 ----
 games-engines/solarus/metadata.xml          | 1 -
 games-roguelike/stone-soup/metadata.xml     | 2 --
 mail-filter/opensmtpd-extras/metadata.xml   | 1 -
 media-sound/csound/metadata.xml             | 1 -
 media-video/mpv/metadata.xml                | 1 -
 net-dns/dnsdist/metadata.xml                | 1 -
 net-dns/pdns-recursor/metadata.xml          | 1 -
 www-client/luakit/metadata.xml              | 4 ----
 x11-wm/awesome/metadata.xml                 | 3 ---
 24 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml
index bd2205f57da1..aa4ea747bcc9 100644
--- a/app-editors/gvim/metadata.xml
+++ b/app-editors/gvim/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <use>
     <flag name="gtk3">Enable GTK+3 interface</flag>
-    <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
     <flag name="netbeans">Include netbeans external editor integration support</flag>
     <flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag>
   </use>
diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml
index 158212f33e00..57f11481bec1 100644
--- a/app-editors/neovim/metadata.xml
+++ b/app-editors/neovim/metadata.xml
@@ -11,8 +11,6 @@
     <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
     <flag name="remote">Enable support for remote options using nvr</flag>
     <flag name="tui">Build the neovim unix tui</flag>
-    <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of
-      <pkg>dev-lang/lua</pkg></flag>
   </use>
   <upstream>
     <remote-id type="github">neovim/neovim</remote-id>
diff --git a/app-editors/vim/metadata.xml b/app-editors/vim/metadata.xml
index fb8e0f11fb37..f65afcd7454c 100644
--- a/app-editors/vim/metadata.xml
+++ b/app-editors/vim/metadata.xml
@@ -6,7 +6,6 @@
     <name>Gentoo Vim Project</name>
   </maintainer>
   <use>
-    <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
     <flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag>
     <flag name="terminal">Enable terminal emulation support</flag>
     <flag name="vim-pager">Install vimpager and vimmanpager links</flag>
diff --git a/app-shells/mpv-bash-completion/metadata.xml b/app-shells/mpv-bash-completion/metadata.xml
index 9c81b8770e4c..1d75e0fd49a8 100644
--- a/app-shells/mpv-bash-completion/metadata.xml
+++ b/app-shells/mpv-bash-completion/metadata.xml
@@ -9,9 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
-	</use>
 	<upstream>
 		<changelog>https://github.com/2ion/mpv-bash-completion/releases</changelog>
 		<remote-id type="github">2ion/mpv-bash-completion</remote-id>
diff --git a/dev-db/redis/metadata.xml b/dev-db/redis/metadata.xml
index 872bd8ba741e..19c095efc2a0 100644
--- a/dev-db/redis/metadata.xml
+++ b/dev-db/redis/metadata.xml
@@ -14,6 +14,5 @@
     <flag name="tcmalloc">
       Use tcmalloc from <pkg>dev-util/google-perftools</pkg> for allocations.
     </flag>
-    <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/dev-lua/lpeg/metadata.xml b/dev-lua/lpeg/metadata.xml
index 8bc501c65d7d..fb7b91969e10 100644
--- a/dev-lua/lpeg/metadata.xml
+++ b/dev-lua/lpeg/metadata.xml
@@ -13,8 +13,4 @@
     <email>lluixhi@gmail.com</email>
     <name>Aric Belsito</name>
   </maintainer>
-  <use>
-    <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of
-      <pkg>dev-lang/lua</pkg></flag>
-  </use>
 </pkgmetadata>
diff --git a/dev-lua/lua-openssl/metadata.xml b/dev-lua/lua-openssl/metadata.xml
index 8d55d018568a..f4da03ad0c56 100644
--- a/dev-lua/lua-openssl/metadata.xml
+++ b/dev-lua/lua-openssl/metadata.xml
@@ -9,10 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of
-			<pkg>dev-lang/lua</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">zhaozg/lua-openssl</remote-id>
 	</upstream>
diff --git a/dev-lua/luacheck/metadata.xml b/dev-lua/luacheck/metadata.xml
index b79aded448ba..76ed9960fb57 100644
--- a/dev-lua/luacheck/metadata.xml
+++ b/dev-lua/luacheck/metadata.xml
@@ -9,8 +9,4 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of
-			<pkg>dev-lang/lua</pkg></flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-lua/luafilesystem/metadata.xml b/dev-lua/luafilesystem/metadata.xml
index fb533186d653..59f1123dc93b 100644
--- a/dev-lua/luafilesystem/metadata.xml
+++ b/dev-lua/luafilesystem/metadata.xml
@@ -11,7 +11,4 @@
 		LuaFileSystem offers a portable way to access the underlying directory
 		structure and file attributes.
 	</longdescription>
-	<use>
-		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-lua/luaossl/metadata.xml b/dev-lua/luaossl/metadata.xml
index fbef89369fe2..9988694cece1 100644
--- a/dev-lua/luaossl/metadata.xml
+++ b/dev-lua/luaossl/metadata.xml
@@ -9,10 +9,6 @@
 		<email>jakub@jirutka.cz</email>
 		<name>Jakub Jirutka</name>
 	</maintainer>
-	<use>
-		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of
-			<pkg>dev-lang/lua</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">wahern/luaossl</remote-id>
 	</upstream>
diff --git a/dev-lua/luassert/metadata.xml b/dev-lua/luassert/metadata.xml
index 8f62d93090bd..0c230917f9a9 100644
--- a/dev-lua/luassert/metadata.xml
+++ b/dev-lua/luassert/metadata.xml
@@ -9,10 +9,6 @@
 		Adds a framework that allows registering new assertions
 		without compromising builtin assertion functionality.
 	</longdescription>
-	<use>
-		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of
-		<pkg>dev-lang/lua</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">Olivine-Labs/luassert</remote-id>
 	</upstream>
diff --git a/dev-lua/messagepack/metadata.xml b/dev-lua/messagepack/metadata.xml
index 5291ff50f05e..c1744fe7fc5b 100644
--- a/dev-lua/messagepack/metadata.xml
+++ b/dev-lua/messagepack/metadata.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <use>
-    <flag name="luajit">
-      Use the lua just-in-time compiler <pkg>dev-lang/luajit</pkg> instead of
-      <pkg>dev-lang/lua</pkg>
-    </flag>
-  </use>
+  <!--maintainer-needed-->
 </pkgmetadata>
diff --git a/dev-lua/mpack/metadata.xml b/dev-lua/mpack/metadata.xml
index 3fbadc712f7a..9afcf4848c6b 100644
--- a/dev-lua/mpack/metadata.xml
+++ b/dev-lua/mpack/metadata.xml
@@ -9,10 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of
-			<pkg>dev-lang/lua</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">tarruda/libmpack</remote-id>
 	</upstream>
diff --git a/dev-lua/say/metadata.xml b/dev-lua/say/metadata.xml
index 382dfdc0f2bd..3f45427ec3a2 100644
--- a/dev-lua/say/metadata.xml
+++ b/dev-lua/say/metadata.xml
@@ -8,10 +8,6 @@
 	<longdescription lang="en">
 		Useful for internationalization.
 	</longdescription>
-	<use>
-		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of
-		<pkg>dev-lang/lua</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">Olivine-Labs/say</remote-id>
 	</upstream>
diff --git a/games-action/minetest/metadata.xml b/games-action/minetest/metadata.xml
index 8f6cd18b4453..a392aaeb34c5 100644
--- a/games-action/minetest/metadata.xml
+++ b/games-action/minetest/metadata.xml
@@ -32,10 +32,6 @@
 	</longdescription>
 	<use>
 		<flag name="leveldb">Enable LevelDB backend</flag>
-		<flag name="luajit">
-			Use <pkg>dev-lang/luajit</pkg>
-			instead of <pkg>dev-lang/lua</pkg>
-		</flag>
 		<flag name="postgres">Optionally use PostgreSQL as map backend</flag>
 		<flag name="redis">Enable redis backend via
 			<pkg>dev-libs/hiredis</pkg>
diff --git a/games-engines/solarus/metadata.xml b/games-engines/solarus/metadata.xml
index e8c3d77749ef..e9b337da9ffb 100644
--- a/games-engines/solarus/metadata.xml
+++ b/games-engines/solarus/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="doc">Install doxygen developer documentation.</flag>
-		<flag name="luajit">Use LuaJIT instead of default Lua.</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">christopho/solarus</remote-id>
diff --git a/games-roguelike/stone-soup/metadata.xml b/games-roguelike/stone-soup/metadata.xml
index 307007f5fa97..68e84b34cc48 100644
--- a/games-roguelike/stone-soup/metadata.xml
+++ b/games-roguelike/stone-soup/metadata.xml
@@ -11,8 +11,6 @@
 		<remote-id type="sourceforge">crawl-ref</remote-id>
 	</upstream>
 	<use>
-		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> as
-			scripting backend instead of <pkg>dev-lang/lua</pkg>.</flag>
 		<flag name="tiles">Enable for graphical (tiled) build.
 			(can be enabled on top of ncurses)
 		</flag>
diff --git a/mail-filter/opensmtpd-extras/metadata.xml b/mail-filter/opensmtpd-extras/metadata.xml
index 8a6e2719ffe1..7794758e2a4a 100644
--- a/mail-filter/opensmtpd-extras/metadata.xml
+++ b/mail-filter/opensmtpd-extras/metadata.xml
@@ -35,7 +35,6 @@
 		<flag name="scheduler-ram">ram scheduler</flag>
 		<flag name="scheduler-stub">stub scheduler</flag>
 		<flag name="scheduler-python">schedulre for interfacing with python</flag>
-		<flag name="luajit">Use JIT for Lua via dev-lang/luajit instead of dev-lang/lua</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">OpenSMTPD/OpenSMTPD-extras</remote-id>
diff --git a/media-sound/csound/metadata.xml b/media-sound/csound/metadata.xml
index 7bee7a51e80e..9cea2aaf92d9 100644
--- a/media-sound/csound/metadata.xml
+++ b/media-sound/csound/metadata.xml
@@ -15,7 +15,6 @@
 		<flag name="image">Build the image opcodes</flag>
 		<flag name="keyboard">Build Virtual MIDI keyboard</flag>
 		<flag name="linear">Build the linear algebra Opcodes</flag>
-		<flag name="luajit">Use the lua just-in-time compiler <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
 		<flag name="portmidi">Build the PortMIDI I/O module</flag>
 		<flag name="samples">Install the HRTF datafiles for use with hrtfmove, hrtfmove2, hrtfstat, hrtfearly, and hrtfreverb</flag>
 		<flag name="score">Build the alternative score parser</flag>
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index b69462424a7e..597c2ce92a71 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -26,7 +26,6 @@
 		<flag name="libass">Enable OSD (On Screen Display) and subtitles support via <pkg>media-libs/libass</pkg></flag>
 		<flag name="libmpv">Build mpv shared library</flag>
 		<flag name="lua">Enable Lua scripting, OSC (On Screen Controller) GUI and <pkg>net-misc/youtube-dl</pkg> hook-script</flag>
-		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
 		<flag name="opengl">Enable the recommended 'opengl' video output</flag>
 		<flag name="raspberry-pi">Enable support for the Raspberry Pi</flag>
 		<flag name="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</pkg></flag>
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/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/www-client/luakit/metadata.xml b/www-client/luakit/metadata.xml
index 0d7490811c7c..6db627700829 100644
--- a/www-client/luakit/metadata.xml
+++ b/www-client/luakit/metadata.xml
@@ -9,8 +9,4 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
-  <use>
-    <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of
-      <pkg>dev-lang/lua</pkg></flag>
-  </use>
 </pkgmetadata>
diff --git a/x11-wm/awesome/metadata.xml b/x11-wm/awesome/metadata.xml
index c00247f3126c..6798285a96fc 100644
--- a/x11-wm/awesome/metadata.xml
+++ b/x11-wm/awesome/metadata.xml
@@ -13,9 +13,6 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
-	<use>
-		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">awesomeWM/awesome</remote-id>
 	</upstream>
-- 
2.16.2



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-dev] [PATCH 3/5] net-analyzer/suricata: [QA] Use standard meaning of USE=luajit
  2018-02-26 22:24 [gentoo-dev] [PATCH 1/5] use.desc: Introduce 'luajit' as a global flag Michał Górny
  2018-02-26 22:24 ` [gentoo-dev] [PATCH 2/5] */*: Remove redundant local descriptions for USE=luajit Michał Górny
@ 2018-02-26 22:24 ` Michał Górny
  2018-02-26 22:24 ` [gentoo-dev] [PATCH 4/5] net-dns/pdns: " Michał Górny
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2018-02-26 22:24 UTC (permalink / raw
  To: gentoo-dev; +Cc: Michał Górny

Fix the package to use standard meaning for USE=luajit instead of making
it exclusive with USE=lua.
---
 net-analyzer/suricata/metadata.xml          |  1 -
 net-analyzer/suricata/suricata-4.0.3.ebuild | 21 +++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/net-analyzer/suricata/metadata.xml b/net-analyzer/suricata/metadata.xml
index 58878c64f05c..0afee5625d1a 100644
--- a/net-analyzer/suricata/metadata.xml
+++ b/net-analyzer/suricata/metadata.xml
@@ -9,7 +9,6 @@
     <flag name="control-socket">Enable unix socket</flag>
     <flag name="cuda">Enable NVIDIA Cuda computations support</flag>
     <flag name="detection">Enable detection modules</flag>
-    <flag name="luajit">Enable Luajit support</flag>
     <flag name="nflog">Enable libnetfilter_log support</flag>
     <flag name="nfqueue">Enable NFQUEUE support for inline IDP</flag>
     <flag name="redis">Enable Redis support</flag>
diff --git a/net-analyzer/suricata/suricata-4.0.3.ebuild b/net-analyzer/suricata/suricata-4.0.3.ebuild
index 604eae665be7..e501c9c775b2 100644
--- a/net-analyzer/suricata/suricata-4.0.3.ebuild
+++ b/net-analyzer/suricata/suricata-4.0.3.ebuild
@@ -14,8 +14,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+af-packet control-socket cuda debug +detection geoip hardened logrotate lua luajit nflog +nfqueue redis +rules test"
 
-REQUIRED_USE="lua? ( !luajit )"
-
 DEPEND="
 	>=dev-libs/jansson-2.2
 	dev-libs/libpcre
@@ -29,8 +27,10 @@ DEPEND="
 	sys-apps/file
 	cuda?       ( dev-util/nvidia-cuda-toolkit )
 	geoip?      ( dev-libs/geoip )
-	lua?        ( dev-lang/lua:* )
-	luajit?     ( dev-lang/luajit:* )
+	lua? (
+		!luajit? ( dev-lang/lua:* )
+		luajit? ( dev-lang/luajit:* )
+	)
 	nflog?      ( net-libs/libnetfilter_log )
 	nfqueue?    ( net-libs/libnetfilter_queue )
 	redis?      ( dev-libs/hiredis )
@@ -87,10 +87,15 @@ src_configure() {
 # 		myeconfargs+=( $(use_enable prelude) )
 # 	fi
 	if use lua ; then
-		myeconfargs+=( $(use_enable lua) )
-	fi
-	if use luajit ; then
-		myeconfargs+=( $(use_enable luajit) )
+		myeconfargs+=(
+			$(use_enable !luajit lua)
+			$(use_enable luajit)
+		)
+	else
+		myeconfargs+=(
+			--disable-lua
+			--disable-luajit
+		)
 	fi
 
 # this should be used when pf_ring use flag support will be added
-- 
2.16.2



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-dev] [PATCH 4/5] net-dns/pdns: [QA] Use standard meaning of USE=luajit
  2018-02-26 22:24 [gentoo-dev] [PATCH 1/5] use.desc: Introduce 'luajit' as a global flag Michał Górny
  2018-02-26 22:24 ` [gentoo-dev] [PATCH 2/5] */*: Remove redundant local descriptions for USE=luajit Michał Górny
  2018-02-26 22:24 ` [gentoo-dev] [PATCH 3/5] net-analyzer/suricata: [QA] Use standard meaning of USE=luajit Michał Górny
@ 2018-02-26 22:24 ` Michał Górny
  2018-02-26 22:24 ` [gentoo-dev] [PATCH 5/5] dev-libs/libpeas: USE=jit -> USE=luajit Michał Górny
  2018-03-26  8:47 ` [gentoo-dev] [PATCH 1/5] use.desc: Introduce 'luajit' as a global flag Gilles Dartiguelongue
  4 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2018-02-26 22:24 UTC (permalink / raw
  To: gentoo-dev; +Cc: Michał Górny

Fix the package to use standard meaning for USE=luajit instead of making
it exclusive with USE=lua.
---
 net-dns/pdns/metadata.xml      |  1 -
 net-dns/pdns/pdns-4.0.5.ebuild | 12 +++++++-----
 net-dns/pdns/pdns-4.1.0.ebuild | 12 +++++++-----
 net-dns/pdns/pdns-4.1.1.ebuild | 12 +++++++-----
 4 files changed, 21 insertions(+), 16 deletions(-)

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



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-dev] [PATCH 5/5] dev-libs/libpeas: USE=jit -> USE=luajit
  2018-02-26 22:24 [gentoo-dev] [PATCH 1/5] use.desc: Introduce 'luajit' as a global flag Michał Górny
                   ` (2 preceding siblings ...)
  2018-02-26 22:24 ` [gentoo-dev] [PATCH 4/5] net-dns/pdns: " Michał Górny
@ 2018-02-26 22:24 ` Michał Górny
  2018-03-26  8:47 ` [gentoo-dev] [PATCH 1/5] use.desc: Introduce 'luajit' as a global flag Gilles Dartiguelongue
  4 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2018-02-26 22:24 UTC (permalink / raw
  To: gentoo-dev; +Cc: Michał Górny

Closes: https://bugs.gentoo.org/648188
---
 dev-libs/libpeas/libpeas-1.20.0-r1.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild b/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
index 71803c6cb7fe..ead15aa6969b 100644
--- a/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
-IUSE="+gtk glade jit lua +python"
+IUSE="+gtk glade lua luajit +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
@@ -24,8 +24,8 @@ RDEPEND="
 	gtk? ( >=x11-libs/gtk+-3:3[introspection] )
 	lua? (
 		>=dev-lua/lgi-0.9.0
-		jit? ( >=dev-lang/luajit-2:2 )
-		!jit? ( =dev-lang/lua-5.1*:0 ) )
+		luajit? ( >=dev-lang/luajit-2:2 )
+		!luajit? ( =dev-lang/lua-5.1*:0 ) )
 	python? (
 		${PYTHON_DEPS}
 		>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
@@ -65,7 +65,7 @@ src_configure() {
 
 		# lua
 		$(use_enable lua lua5.1)
-		$(use_enable $(usex jit lua jit) luajit)
+		$(use_enable $(usex luajit lua luajit) luajit)
 	)
 
 	gnome2_src_configure "${myconf[@]}"
-- 
2.16.2



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [gentoo-dev] [PATCH 1/5] use.desc: Introduce 'luajit' as a global flag
  2018-02-26 22:24 [gentoo-dev] [PATCH 1/5] use.desc: Introduce 'luajit' as a global flag Michał Górny
                   ` (3 preceding siblings ...)
  2018-02-26 22:24 ` [gentoo-dev] [PATCH 5/5] dev-libs/libpeas: USE=jit -> USE=luajit Michał Górny
@ 2018-03-26  8:47 ` Gilles Dartiguelongue
  2018-03-26 11:55   ` Michał Górny
  4 siblings, 1 reply; 8+ messages in thread
From: Gilles Dartiguelongue @ 2018-03-26  8:47 UTC (permalink / raw
  To: gentoo-dev

Le lundi 26 février 2018 à 23:24 +0100, Michał Górny a écrit :
> 'luajit' is used consistently in 25+ packages. Make it a global flag.

Not that I have a strong opinion about it, but wouldn't it be better to
have USE="lua jit" like libpeas does ? Use flags aren't supposed to
match library names but features so this would seem more correct.

-- 
Gilles Dartiguelongue <eva@gentoo.org>


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [gentoo-dev] [PATCH 1/5] use.desc: Introduce 'luajit' as a global flag
  2018-03-26  8:47 ` [gentoo-dev] [PATCH 1/5] use.desc: Introduce 'luajit' as a global flag Gilles Dartiguelongue
@ 2018-03-26 11:55   ` Michał Górny
  2018-03-26 12:34     ` Gilles Dartiguelongue
  0 siblings, 1 reply; 8+ messages in thread
From: Michał Górny @ 2018-03-26 11:55 UTC (permalink / raw
  To: gentoo-dev, Gilles Dartiguelongue

Dnia 26 marca 2018 10:47:04 CEST, Gilles Dartiguelongue <eva@gentoo.org> napisał(a):
>Le lundi 26 février 2018 à 23:24 +0100, Michał Górny a écrit :
>> 'luajit' is used consistently in 25+ packages. Make it a global flag.
>
>Not that I have a strong opinion about it, but wouldn't it be better to
>have USE="lua jit" like libpeas does ? Use flags aren't supposed to
>match library names but features so this would seem more correct.

LuaJIT is a completely separate implementation of Lua, not a feature. And it's certainly not a feature of libpeas.


-- 
Best regards,
Michał Górny (by phone)


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [gentoo-dev] [PATCH 1/5] use.desc: Introduce 'luajit' as a global flag
  2018-03-26 11:55   ` Michał Górny
@ 2018-03-26 12:34     ` Gilles Dartiguelongue
  0 siblings, 0 replies; 8+ messages in thread
From: Gilles Dartiguelongue @ 2018-03-26 12:34 UTC (permalink / raw
  To: gentoo-dev

[-- Attachment #1: Type: text/plain, Size: 851 bytes --]

Le lundi 26 mars 2018 à 13:55 +0200, Michał Górny a écrit :
> Dnia 26 marca 2018 10:47:04 CEST, Gilles Dartiguelongue <eva@gentoo.o
> rg> napisał(a):
> > Le lundi 26 février 2018 à 23:24 +0100, Michał Górny a écrit :
> > > 'luajit' is used consistently in 25+ packages. Make it a global
> > > flag.
> > 
> > Not that I have a strong opinion about it, but wouldn't it be
> > better to
> > have USE="lua jit" like libpeas does ? Use flags aren't supposed to
> > match library names but features so this would seem more correct.
> 
> LuaJIT is a completely separate implementation of Lua, not a feature.
> And it's certainly not a feature of libpeas.

My bad, I had memories that recent (masked) lua had jit USE flag but it
seems I'm mistaken. Feel free to push these changes then.

-- 
Gilles Dartiguelongue <eva@gentoo.org>

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 981 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2018-03-26 12:34 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-26 22:24 [gentoo-dev] [PATCH 1/5] use.desc: Introduce 'luajit' as a global flag Michał Górny
2018-02-26 22:24 ` [gentoo-dev] [PATCH 2/5] */*: Remove redundant local descriptions for USE=luajit Michał Górny
2018-02-26 22:24 ` [gentoo-dev] [PATCH 3/5] net-analyzer/suricata: [QA] Use standard meaning of USE=luajit Michał Górny
2018-02-26 22:24 ` [gentoo-dev] [PATCH 4/5] net-dns/pdns: " Michał Górny
2018-02-26 22:24 ` [gentoo-dev] [PATCH 5/5] dev-libs/libpeas: USE=jit -> USE=luajit Michał Górny
2018-03-26  8:47 ` [gentoo-dev] [PATCH 1/5] use.desc: Introduce 'luajit' as a global flag Gilles Dartiguelongue
2018-03-26 11:55   ` Michał Górny
2018-03-26 12:34     ` Gilles Dartiguelongue

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox