* [PR PATCH] lua{,51,52}: move -devel alternatives to dedicated group
@ 2020-05-14 15:25 ahesford
2020-05-14 15:32 ` [PR PATCH] [Updated] " ahesford
` (12 more replies)
0 siblings, 13 replies; 14+ messages in thread
From: ahesford @ 2020-05-14 15:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 799 bytes --]
There is a new pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages lua
https://github.com/void-linux/void-packages/pull/21964
lua{,51,52}: move -devel alternatives to dedicated group
The three lua packages all define alternatives that include headers and pkgconfig files; this results in broken links in `/usr` unless the `-devel` package for the selected lua alternative is also installed. I've moved the alternatives related to `-devel` subpackages into their own `lua-devel` alternatives group to avoid these broken symlinks, and to allow selection of a lua development environment that differs from the preferred lua execution environment.
A patch file from https://github.com/void-linux/void-packages/pull/21964.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lua-21964.patch --]
[-- Type: text/x-diff, Size: 6534 bytes --]
From ea1938cc5926391b5fcf4462c29dfd7d31449c04 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:16:48 -0400
Subject: [PATCH 1/3] lua: move -devel alternatives to dedicated group
---
srcpkgs/lua/template | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/lua/template b/srcpkgs/lua/template
index 82335783040..bd3d1c4135e 100644
--- a/srcpkgs/lua/template
+++ b/srcpkgs/lua/template
@@ -1,7 +1,7 @@
# Template file for 'lua'
pkgname=lua
version=5.3.5
-revision=2
+revision=3
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,15 +15,6 @@ alternatives="
lua:luac:/usr/bin/luac5.3
lua:lua.1:/usr/share/man/man1/lua5.3.1
lua:luac.1:/usr/share/man/man1/luac5.3.1
- lua:lua:/usr/include/lua5.3
- lua:/usr/include/lua.h:/usr/include/lua5.3/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.3/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.3/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.3/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.3/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.3.pc
- lua:liblua.a:/usr/lib/liblua5.3.a
- lua:liblua.so:/usr/lib/liblua5.3.so
lua:lua:/usr/share/doc/lua5.3
"
@@ -71,6 +62,17 @@ do_install() {
lua-devel_package() {
depends="${makedepends} lua>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.3
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.3/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.3/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.3/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.3/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.3/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.3.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.3.a
+ lua-devel:liblua.so:/usr/lib/liblua5.3.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
From ace1638677b6c181e0e2a1f653dd9afb9dd4e9c9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:17:02 -0400
Subject: [PATCH 2/3] lua51: move -devel alternatives to dedicated group
---
srcpkgs/lua51/template | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/lua51/template b/srcpkgs/lua51/template
index c257b209ada..e0b794c7f15 100644
--- a/srcpkgs/lua51/template
+++ b/srcpkgs/lua51/template
@@ -1,7 +1,7 @@
# Template file for 'lua51'
pkgname=lua51
version=5.1.5
-revision=8
+revision=9
wrksrc="lua-${version}"
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language (5.1.x)"
@@ -16,15 +16,6 @@ alternatives="
lua:luac:/usr/bin/luac5.1
lua:lua.1:/usr/share/man/man1/lua5.1.1
lua:luac.1:/usr/share/man/man1/luac5.1.1
- lua:lua:/usr/include/lua5.1
- lua:/usr/include/lua.h:/usr/include/lua5.1/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.1/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.1/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.1/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.1/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.1.pc
- lua:liblua.a:/usr/lib/liblua5.1.a
- lua:liblua.so:/usr/lib/liblua5.1.so
lua:lua:/usr/share/doc/lua5.1
"
@@ -61,6 +52,17 @@ do_install() {
lua51-devel_package() {
depends="ncurses-devel readline-devel>=6.3 lua51>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.1
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.1/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.1/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.1/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.1/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.1/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.1.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.1.a
+ lua-devel:liblua.so:/usr/lib/liblua5.1.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
From 884e16cb3c893a5a3445783dde43e013d2a231a9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:19:27 -0400
Subject: [PATCH 3/3] lua52: move -devel alternatives to dedicated group, add
update file
---
srcpkgs/lua52/template | 22 ++++++++++++----------
srcpkgs/lua52/update | 1 +
2 files changed, 13 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/lua52/update
diff --git a/srcpkgs/lua52/template b/srcpkgs/lua52/template
index f2111d2f770..b30ee08fdb8 100644
--- a/srcpkgs/lua52/template
+++ b/srcpkgs/lua52/template
@@ -1,7 +1,7 @@
# Template file for 'lua52'
pkgname=lua52
version=5.2.4
-revision=7
+revision=8
wrksrc=lua-${version}
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language (5.2.x)"
@@ -16,15 +16,6 @@ alternatives="
lua:luac:/usr/bin/luac5.2
lua:lua.1:/usr/share/man/man1/lua5.2.1
lua:luac.1:/usr/share/man/man1/luac5.2.1
- lua:lua:/usr/include/lua5.2
- lua:/usr/include/lua.h:/usr/include/lua5.2/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.2/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.2/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.2/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.2/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.2.pc
- lua:liblua.a:/usr/lib/liblua5.2.a
- lua:liblua.so:/usr/lib/liblua5.2.so
lua:lua:/usr/share/doc/lua5.2
"
@@ -66,6 +57,17 @@ do_install() {
lua52-devel_package() {
depends="${makedepends} lua52>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.2
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.2/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.2/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.2/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.2/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.2/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.2.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.2.a
+ lua-devel:liblua.so:/usr/lib/liblua5.2.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
diff --git a/srcpkgs/lua52/update b/srcpkgs/lua52/update
new file mode 100644
index 00000000000..ec75cb54d7d
--- /dev/null
+++ b/srcpkgs/lua52/update
@@ -0,0 +1 @@
+pattern="lua-\K5.2[\d.]+(?=\.tar)"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] lua{,51,52}: move -devel alternatives to dedicated group
2020-05-14 15:25 [PR PATCH] lua{,51,52}: move -devel alternatives to dedicated group ahesford
@ 2020-05-14 15:32 ` ahesford
2020-05-14 17:58 ` Duncaen
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-05-14 15:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages lua
https://github.com/void-linux/void-packages/pull/21964
lua{,51,52}: move -devel alternatives to dedicated group
The three lua packages all define alternatives that include headers and pkgconfig files; this results in broken links in `/usr` unless the `-devel` package for the selected lua alternative is also installed. I've moved the alternatives related to `-devel` subpackages into their own `lua-devel` alternatives group to avoid these broken symlinks, and to allow selection of a lua development environment that differs from the preferred lua execution environment.
A patch file from https://github.com/void-linux/void-packages/pull/21964.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lua-21964.patch --]
[-- Type: text/x-diff, Size: 7054 bytes --]
From ec94d4f95dc01c001f5469a52a23e62ddc9f091f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:16:48 -0400
Subject: [PATCH 1/3] lua: move -devel alternatives to dedicated group
---
srcpkgs/lua/template | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/lua/template b/srcpkgs/lua/template
index 82335783040..bd3d1c4135e 100644
--- a/srcpkgs/lua/template
+++ b/srcpkgs/lua/template
@@ -1,7 +1,7 @@
# Template file for 'lua'
pkgname=lua
version=5.3.5
-revision=2
+revision=3
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,15 +15,6 @@ alternatives="
lua:luac:/usr/bin/luac5.3
lua:lua.1:/usr/share/man/man1/lua5.3.1
lua:luac.1:/usr/share/man/man1/luac5.3.1
- lua:lua:/usr/include/lua5.3
- lua:/usr/include/lua.h:/usr/include/lua5.3/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.3/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.3/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.3/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.3/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.3.pc
- lua:liblua.a:/usr/lib/liblua5.3.a
- lua:liblua.so:/usr/lib/liblua5.3.so
lua:lua:/usr/share/doc/lua5.3
"
@@ -71,6 +62,17 @@ do_install() {
lua-devel_package() {
depends="${makedepends} lua>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.3
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.3/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.3/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.3/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.3/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.3/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.3.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.3.a
+ lua-devel:liblua.so:/usr/lib/liblua5.3.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
From bbfec6089c95074ccd920a88b36715737069e763 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:17:02 -0400
Subject: [PATCH 2/3] lua51: move -devel alternatives to dedicated group
---
srcpkgs/lua51/template | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/lua51/template b/srcpkgs/lua51/template
index c257b209ada..a471837407f 100644
--- a/srcpkgs/lua51/template
+++ b/srcpkgs/lua51/template
@@ -1,13 +1,13 @@
# Template file for 'lua51'
pkgname=lua51
version=5.1.5
-revision=8
+revision=9
wrksrc="lua-${version}"
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language (5.1.x)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.lua.org"
license="MIT"
+homepage="http://www.lua.org"
distfiles="http://www.lua.org/ftp/lua-$version.tar.gz"
checksum=2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333
@@ -16,15 +16,6 @@ alternatives="
lua:luac:/usr/bin/luac5.1
lua:lua.1:/usr/share/man/man1/lua5.1.1
lua:luac.1:/usr/share/man/man1/luac5.1.1
- lua:lua:/usr/include/lua5.1
- lua:/usr/include/lua.h:/usr/include/lua5.1/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.1/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.1/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.1/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.1/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.1.pc
- lua:liblua.a:/usr/lib/liblua5.1.a
- lua:liblua.so:/usr/lib/liblua5.1.so
lua:lua:/usr/share/doc/lua5.1
"
@@ -61,6 +52,17 @@ do_install() {
lua51-devel_package() {
depends="ncurses-devel readline-devel>=6.3 lua51>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.1
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.1/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.1/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.1/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.1/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.1/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.1.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.1.a
+ lua-devel:liblua.so:/usr/lib/liblua5.1.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
From 12de58486f6ddd87cfc8c010e94998373abc4311 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:19:27 -0400
Subject: [PATCH 3/3] lua52: move -devel alternatives to dedicated group, add
update file
---
srcpkgs/lua52/template | 24 +++++++++++++-----------
srcpkgs/lua52/update | 1 +
2 files changed, 14 insertions(+), 11 deletions(-)
create mode 100644 srcpkgs/lua52/update
diff --git a/srcpkgs/lua52/template b/srcpkgs/lua52/template
index f2111d2f770..c6b4015f753 100644
--- a/srcpkgs/lua52/template
+++ b/srcpkgs/lua52/template
@@ -1,13 +1,13 @@
# Template file for 'lua52'
pkgname=lua52
version=5.2.4
-revision=7
+revision=8
wrksrc=lua-${version}
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language (5.2.x)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.lua.org"
license="MIT"
+homepage="http://www.lua.org"
distfiles="http://www.lua.org/ftp/lua-$version.tar.gz"
checksum=b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b
@@ -16,15 +16,6 @@ alternatives="
lua:luac:/usr/bin/luac5.2
lua:lua.1:/usr/share/man/man1/lua5.2.1
lua:luac.1:/usr/share/man/man1/luac5.2.1
- lua:lua:/usr/include/lua5.2
- lua:/usr/include/lua.h:/usr/include/lua5.2/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.2/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.2/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.2/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.2/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.2.pc
- lua:liblua.a:/usr/lib/liblua5.2.a
- lua:liblua.so:/usr/lib/liblua5.2.so
lua:lua:/usr/share/doc/lua5.2
"
@@ -66,6 +57,17 @@ do_install() {
lua52-devel_package() {
depends="${makedepends} lua52>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.2
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.2/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.2/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.2/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.2/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.2/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.2.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.2.a
+ lua-devel:liblua.so:/usr/lib/liblua5.2.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
diff --git a/srcpkgs/lua52/update b/srcpkgs/lua52/update
new file mode 100644
index 00000000000..ec75cb54d7d
--- /dev/null
+++ b/srcpkgs/lua52/update
@@ -0,0 +1 @@
+pattern="lua-\K5.2[\d.]+(?=\.tar)"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: lua{,51,52}: move -devel alternatives to dedicated group
2020-05-14 15:25 [PR PATCH] lua{,51,52}: move -devel alternatives to dedicated group ahesford
2020-05-14 15:32 ` [PR PATCH] [Updated] " ahesford
@ 2020-05-14 17:58 ` Duncaen
2020-05-14 18:03 ` [PR PATCH] [Updated] " ahesford
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Duncaen @ 2020-05-14 17:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/21964#issuecomment-628795592
Comment:
Indents inside variables are usually just once space.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] lua{,51,52}: move -devel alternatives to dedicated group
2020-05-14 15:25 [PR PATCH] lua{,51,52}: move -devel alternatives to dedicated group ahesford
2020-05-14 15:32 ` [PR PATCH] [Updated] " ahesford
2020-05-14 17:58 ` Duncaen
@ 2020-05-14 18:03 ` ahesford
2020-05-14 18:05 ` ahesford
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-05-14 18:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages lua
https://github.com/void-linux/void-packages/pull/21964
lua{,51,52}: move -devel alternatives to dedicated group
The three lua packages all define alternatives that include headers and pkgconfig files; this results in broken links in `/usr` unless the `-devel` package for the selected lua alternative is also installed. I've moved the alternatives related to `-devel` subpackages into their own `lua-devel` alternatives group to avoid these broken symlinks, and to allow selection of a lua development environment that differs from the preferred lua execution environment.
A patch file from https://github.com/void-linux/void-packages/pull/21964.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lua-21964.patch --]
[-- Type: text/x-diff, Size: 7054 bytes --]
From 4cf81ca1c3a157e1fa1de78d86668514b5610db3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:16:48 -0400
Subject: [PATCH 1/3] lua: move -devel alternatives to dedicated group
---
srcpkgs/lua/template | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/lua/template b/srcpkgs/lua/template
index 82335783040..6ec7a77df0f 100644
--- a/srcpkgs/lua/template
+++ b/srcpkgs/lua/template
@@ -1,7 +1,7 @@
# Template file for 'lua'
pkgname=lua
version=5.3.5
-revision=2
+revision=3
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,15 +15,6 @@ alternatives="
lua:luac:/usr/bin/luac5.3
lua:lua.1:/usr/share/man/man1/lua5.3.1
lua:luac.1:/usr/share/man/man1/luac5.3.1
- lua:lua:/usr/include/lua5.3
- lua:/usr/include/lua.h:/usr/include/lua5.3/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.3/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.3/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.3/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.3/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.3.pc
- lua:liblua.a:/usr/lib/liblua5.3.a
- lua:liblua.so:/usr/lib/liblua5.3.so
lua:lua:/usr/share/doc/lua5.3
"
@@ -71,6 +62,17 @@ do_install() {
lua-devel_package() {
depends="${makedepends} lua>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.3
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.3/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.3/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.3/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.3/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.3/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.3.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.3.a
+ lua-devel:liblua.so:/usr/lib/liblua5.3.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
From 6dbea103706806d75af647e1b79c7221c4043b78 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:17:02 -0400
Subject: [PATCH 2/3] lua51: move -devel alternatives to dedicated group
---
srcpkgs/lua51/template | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/lua51/template b/srcpkgs/lua51/template
index c257b209ada..b5179c258a1 100644
--- a/srcpkgs/lua51/template
+++ b/srcpkgs/lua51/template
@@ -1,13 +1,13 @@
# Template file for 'lua51'
pkgname=lua51
version=5.1.5
-revision=8
+revision=9
wrksrc="lua-${version}"
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language (5.1.x)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.lua.org"
license="MIT"
+homepage="http://www.lua.org"
distfiles="http://www.lua.org/ftp/lua-$version.tar.gz"
checksum=2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333
@@ -16,15 +16,6 @@ alternatives="
lua:luac:/usr/bin/luac5.1
lua:lua.1:/usr/share/man/man1/lua5.1.1
lua:luac.1:/usr/share/man/man1/luac5.1.1
- lua:lua:/usr/include/lua5.1
- lua:/usr/include/lua.h:/usr/include/lua5.1/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.1/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.1/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.1/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.1/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.1.pc
- lua:liblua.a:/usr/lib/liblua5.1.a
- lua:liblua.so:/usr/lib/liblua5.1.so
lua:lua:/usr/share/doc/lua5.1
"
@@ -61,6 +52,17 @@ do_install() {
lua51-devel_package() {
depends="ncurses-devel readline-devel>=6.3 lua51>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.1
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.1/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.1/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.1/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.1/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.1/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.1.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.1.a
+ lua-devel:liblua.so:/usr/lib/liblua5.1.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
From f5a73e7600a5ccbb222645939c71ddddc637590e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:19:27 -0400
Subject: [PATCH 3/3] lua52: move -devel alternatives to dedicated group, add
update file
---
srcpkgs/lua52/template | 24 +++++++++++++-----------
srcpkgs/lua52/update | 1 +
2 files changed, 14 insertions(+), 11 deletions(-)
create mode 100644 srcpkgs/lua52/update
diff --git a/srcpkgs/lua52/template b/srcpkgs/lua52/template
index f2111d2f770..132bdd98f70 100644
--- a/srcpkgs/lua52/template
+++ b/srcpkgs/lua52/template
@@ -1,13 +1,13 @@
# Template file for 'lua52'
pkgname=lua52
version=5.2.4
-revision=7
+revision=8
wrksrc=lua-${version}
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language (5.2.x)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.lua.org"
license="MIT"
+homepage="http://www.lua.org"
distfiles="http://www.lua.org/ftp/lua-$version.tar.gz"
checksum=b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b
@@ -16,15 +16,6 @@ alternatives="
lua:luac:/usr/bin/luac5.2
lua:lua.1:/usr/share/man/man1/lua5.2.1
lua:luac.1:/usr/share/man/man1/luac5.2.1
- lua:lua:/usr/include/lua5.2
- lua:/usr/include/lua.h:/usr/include/lua5.2/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.2/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.2/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.2/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.2/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.2.pc
- lua:liblua.a:/usr/lib/liblua5.2.a
- lua:liblua.so:/usr/lib/liblua5.2.so
lua:lua:/usr/share/doc/lua5.2
"
@@ -66,6 +57,17 @@ do_install() {
lua52-devel_package() {
depends="${makedepends} lua52>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.2
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.2/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.2/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.2/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.2/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.2/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.2.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.2.a
+ lua-devel:liblua.so:/usr/lib/liblua5.2.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
diff --git a/srcpkgs/lua52/update b/srcpkgs/lua52/update
new file mode 100644
index 00000000000..ec75cb54d7d
--- /dev/null
+++ b/srcpkgs/lua52/update
@@ -0,0 +1 @@
+pattern="lua-\K5.2[\d.]+(?=\.tar)"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: lua{,51,52}: move -devel alternatives to dedicated group
2020-05-14 15:25 [PR PATCH] lua{,51,52}: move -devel alternatives to dedicated group ahesford
` (2 preceding siblings ...)
2020-05-14 18:03 ` [PR PATCH] [Updated] " ahesford
@ 2020-05-14 18:05 ` ahesford
2020-05-14 18:17 ` Duncaen
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-05-14 18:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 249 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/21964#issuecomment-628799506
Comment:
The updated indentation is now one space more than the indent level of the variable. Is that what you mean?
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: lua{,51,52}: move -devel alternatives to dedicated group
2020-05-14 15:25 [PR PATCH] lua{,51,52}: move -devel alternatives to dedicated group ahesford
` (3 preceding siblings ...)
2020-05-14 18:05 ` ahesford
@ 2020-05-14 18:17 ` Duncaen
2020-05-16 4:14 ` pullmoll
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Duncaen @ 2020-05-14 18:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 269 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/21964#issuecomment-628805474
Comment:
Yes looks good, it seems to update/install fine. Waiting for some other input as this is the first? alternative group like this.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: lua{,51,52}: move -devel alternatives to dedicated group
2020-05-14 15:25 [PR PATCH] lua{,51,52}: move -devel alternatives to dedicated group ahesford
` (4 preceding siblings ...)
2020-05-14 18:17 ` Duncaen
@ 2020-05-16 4:14 ` pullmoll
2020-05-16 4:16 ` pullmoll
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: pullmoll @ 2020-05-16 4:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 297 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/21964#issuecomment-629585306
Comment:
I believe this could work and see no reason why it would not work.
Still perhaps some tests with packages depending on different lua versions are advised.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: lua{,51,52}: move -devel alternatives to dedicated group
2020-05-14 15:25 [PR PATCH] lua{,51,52}: move -devel alternatives to dedicated group ahesford
` (5 preceding siblings ...)
2020-05-16 4:14 ` pullmoll
@ 2020-05-16 4:16 ` pullmoll
2020-05-16 5:55 ` pullmoll
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: pullmoll @ 2020-05-16 4:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/21964#issuecomment-629585306
Comment:
I believe this could work and see no reason why it would not work.
Still perhaps some tests with packages depending on different lua versions are advised. Doing that now.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: lua{,51,52}: move -devel alternatives to dedicated group
2020-05-14 15:25 [PR PATCH] lua{,51,52}: move -devel alternatives to dedicated group ahesford
` (6 preceding siblings ...)
2020-05-16 4:16 ` pullmoll
@ 2020-05-16 5:55 ` pullmoll
2020-05-16 5:55 ` pullmoll
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: pullmoll @ 2020-05-16 5:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/21964#issuecomment-629593631
Comment:
I tried various packages, even some which build for all versions of lua, and so no problems. IMO the PR is good to merge.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: lua{,51,52}: move -devel alternatives to dedicated group
2020-05-14 15:25 [PR PATCH] lua{,51,52}: move -devel alternatives to dedicated group ahesford
` (7 preceding siblings ...)
2020-05-16 5:55 ` pullmoll
@ 2020-05-16 5:55 ` pullmoll
2020-05-16 11:02 ` ahesford
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: pullmoll @ 2020-05-16 5:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 264 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/21964#issuecomment-629593631
Comment:
I tried various packages, even some which build for all versions of lua, and saw no problems. IMO the PR is good to merge.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: lua{,51,52}: move -devel alternatives to dedicated group
2020-05-14 15:25 [PR PATCH] lua{,51,52}: move -devel alternatives to dedicated group ahesford
` (8 preceding siblings ...)
2020-05-16 5:55 ` pullmoll
@ 2020-05-16 11:02 ` ahesford
2020-05-16 11:29 ` [PR PATCH] [Updated] " ahesford
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-05-16 11:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/21964#issuecomment-629628354
Comment:
Thanks for testing!
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] lua{,51,52}: move -devel alternatives to dedicated group
2020-05-14 15:25 [PR PATCH] lua{,51,52}: move -devel alternatives to dedicated group ahesford
` (9 preceding siblings ...)
2020-05-16 11:02 ` ahesford
@ 2020-05-16 11:29 ` ahesford
2020-05-24 9:35 ` ahesford
2020-05-29 2:58 ` ahesford
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-05-16 11:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages lua
https://github.com/void-linux/void-packages/pull/21964
lua{,51,52}: move -devel alternatives to dedicated group
The three lua packages all define alternatives that include headers and pkgconfig files; this results in broken links in `/usr` unless the `-devel` package for the selected lua alternative is also installed. I've moved the alternatives related to `-devel` subpackages into their own `lua-devel` alternatives group to avoid these broken symlinks, and to allow selection of a lua development environment that differs from the preferred lua execution environment.
A patch file from https://github.com/void-linux/void-packages/pull/21964.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lua-21964.patch --]
[-- Type: text/x-diff, Size: 7500 bytes --]
From 833f3dc3fc960c6a4fa820133e175c54a5a3ea71 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:16:48 -0400
Subject: [PATCH 1/3] lua: move -devel alternatives to dedicated group
---
srcpkgs/lua/template | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/lua/template b/srcpkgs/lua/template
index 82335783040..9172334c4e1 100644
--- a/srcpkgs/lua/template
+++ b/srcpkgs/lua/template
@@ -1,13 +1,13 @@
# Template file for 'lua'
pkgname=lua
version=5.3.5
-revision=2
+revision=3
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.lua.org"
-distfiles="http://www.lua.org/ftp/lua-${version}.tar.gz"
+homepage="https://www.lua.org"
+distfiles="https://www.lua.org/ftp/lua-${version}.tar.gz"
checksum=0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac
alternatives="
@@ -15,15 +15,6 @@ alternatives="
lua:luac:/usr/bin/luac5.3
lua:lua.1:/usr/share/man/man1/lua5.3.1
lua:luac.1:/usr/share/man/man1/luac5.3.1
- lua:lua:/usr/include/lua5.3
- lua:/usr/include/lua.h:/usr/include/lua5.3/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.3/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.3/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.3/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.3/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.3.pc
- lua:liblua.a:/usr/lib/liblua5.3.a
- lua:liblua.so:/usr/lib/liblua5.3.so
lua:lua:/usr/share/doc/lua5.3
"
@@ -71,6 +62,17 @@ do_install() {
lua-devel_package() {
depends="${makedepends} lua>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.3
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.3/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.3/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.3/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.3/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.3/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.3.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.3.a
+ lua-devel:liblua.so:/usr/lib/liblua5.3.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
From 49a3537ae1410be5ab764f45ffc1c8d505985b86 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:17:02 -0400
Subject: [PATCH 2/3] lua51: move -devel alternatives to dedicated group
---
srcpkgs/lua51/template | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/lua51/template b/srcpkgs/lua51/template
index c257b209ada..515fbd0f5d4 100644
--- a/srcpkgs/lua51/template
+++ b/srcpkgs/lua51/template
@@ -1,14 +1,14 @@
# Template file for 'lua51'
pkgname=lua51
version=5.1.5
-revision=8
+revision=9
wrksrc="lua-${version}"
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language (5.1.x)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.lua.org"
license="MIT"
-distfiles="http://www.lua.org/ftp/lua-$version.tar.gz"
+homepage="https://www.lua.org"
+distfiles="https://www.lua.org/ftp/lua-$version.tar.gz"
checksum=2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333
alternatives="
@@ -16,15 +16,6 @@ alternatives="
lua:luac:/usr/bin/luac5.1
lua:lua.1:/usr/share/man/man1/lua5.1.1
lua:luac.1:/usr/share/man/man1/luac5.1.1
- lua:lua:/usr/include/lua5.1
- lua:/usr/include/lua.h:/usr/include/lua5.1/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.1/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.1/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.1/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.1/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.1.pc
- lua:liblua.a:/usr/lib/liblua5.1.a
- lua:liblua.so:/usr/lib/liblua5.1.so
lua:lua:/usr/share/doc/lua5.1
"
@@ -61,6 +52,17 @@ do_install() {
lua51-devel_package() {
depends="ncurses-devel readline-devel>=6.3 lua51>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.1
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.1/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.1/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.1/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.1/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.1/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.1.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.1.a
+ lua-devel:liblua.so:/usr/lib/liblua5.1.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
From 914e7702107580c9507e2540045ee11861f0eb76 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:19:27 -0400
Subject: [PATCH 3/3] lua52: move -devel alternatives to dedicated group, add
update file
---
srcpkgs/lua52/template | 26 ++++++++++++++------------
srcpkgs/lua52/update | 1 +
2 files changed, 15 insertions(+), 12 deletions(-)
create mode 100644 srcpkgs/lua52/update
diff --git a/srcpkgs/lua52/template b/srcpkgs/lua52/template
index f2111d2f770..3cd12dbc63d 100644
--- a/srcpkgs/lua52/template
+++ b/srcpkgs/lua52/template
@@ -1,14 +1,14 @@
# Template file for 'lua52'
pkgname=lua52
version=5.2.4
-revision=7
+revision=8
wrksrc=lua-${version}
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language (5.2.x)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.lua.org"
license="MIT"
-distfiles="http://www.lua.org/ftp/lua-$version.tar.gz"
+homepage="https://www.lua.org"
+distfiles="https://www.lua.org/ftp/lua-$version.tar.gz"
checksum=b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b
alternatives="
@@ -16,15 +16,6 @@ alternatives="
lua:luac:/usr/bin/luac5.2
lua:lua.1:/usr/share/man/man1/lua5.2.1
lua:luac.1:/usr/share/man/man1/luac5.2.1
- lua:lua:/usr/include/lua5.2
- lua:/usr/include/lua.h:/usr/include/lua5.2/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.2/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.2/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.2/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.2/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.2.pc
- lua:liblua.a:/usr/lib/liblua5.2.a
- lua:liblua.so:/usr/lib/liblua5.2.so
lua:lua:/usr/share/doc/lua5.2
"
@@ -66,6 +57,17 @@ do_install() {
lua52-devel_package() {
depends="${makedepends} lua52>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.2
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.2/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.2/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.2/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.2/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.2/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.2.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.2.a
+ lua-devel:liblua.so:/usr/lib/liblua5.2.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
diff --git a/srcpkgs/lua52/update b/srcpkgs/lua52/update
new file mode 100644
index 00000000000..ec75cb54d7d
--- /dev/null
+++ b/srcpkgs/lua52/update
@@ -0,0 +1 @@
+pattern="lua-\K5.2[\d.]+(?=\.tar)"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] lua{,51,52}: move -devel alternatives to dedicated group
2020-05-14 15:25 [PR PATCH] lua{,51,52}: move -devel alternatives to dedicated group ahesford
` (10 preceding siblings ...)
2020-05-16 11:29 ` [PR PATCH] [Updated] " ahesford
@ 2020-05-24 9:35 ` ahesford
2020-05-29 2:58 ` ahesford
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-05-24 9:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages lua
https://github.com/void-linux/void-packages/pull/21964
lua{,51,52}: move -devel alternatives to dedicated group
The three lua packages all define alternatives that include headers and pkgconfig files; this results in broken links in `/usr` unless the `-devel` package for the selected lua alternative is also installed. I've moved the alternatives related to `-devel` subpackages into their own `lua-devel` alternatives group to avoid these broken symlinks, and to allow selection of a lua development environment that differs from the preferred lua execution environment.
A patch file from https://github.com/void-linux/void-packages/pull/21964.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lua-21964.patch --]
[-- Type: text/x-diff, Size: 7500 bytes --]
From 9eb9128bbf1081481d7436099be59432b2f42675 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:16:48 -0400
Subject: [PATCH 1/3] lua: move -devel alternatives to dedicated group
---
srcpkgs/lua/template | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/lua/template b/srcpkgs/lua/template
index 82335783040..9172334c4e1 100644
--- a/srcpkgs/lua/template
+++ b/srcpkgs/lua/template
@@ -1,13 +1,13 @@
# Template file for 'lua'
pkgname=lua
version=5.3.5
-revision=2
+revision=3
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.lua.org"
-distfiles="http://www.lua.org/ftp/lua-${version}.tar.gz"
+homepage="https://www.lua.org"
+distfiles="https://www.lua.org/ftp/lua-${version}.tar.gz"
checksum=0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac
alternatives="
@@ -15,15 +15,6 @@ alternatives="
lua:luac:/usr/bin/luac5.3
lua:lua.1:/usr/share/man/man1/lua5.3.1
lua:luac.1:/usr/share/man/man1/luac5.3.1
- lua:lua:/usr/include/lua5.3
- lua:/usr/include/lua.h:/usr/include/lua5.3/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.3/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.3/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.3/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.3/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.3.pc
- lua:liblua.a:/usr/lib/liblua5.3.a
- lua:liblua.so:/usr/lib/liblua5.3.so
lua:lua:/usr/share/doc/lua5.3
"
@@ -71,6 +62,17 @@ do_install() {
lua-devel_package() {
depends="${makedepends} lua>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.3
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.3/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.3/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.3/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.3/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.3/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.3.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.3.a
+ lua-devel:liblua.so:/usr/lib/liblua5.3.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
From 8eccaf3f51d20ab5bd4a373db8337552e75ca48b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:17:02 -0400
Subject: [PATCH 2/3] lua51: move -devel alternatives to dedicated group
---
srcpkgs/lua51/template | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/lua51/template b/srcpkgs/lua51/template
index c257b209ada..515fbd0f5d4 100644
--- a/srcpkgs/lua51/template
+++ b/srcpkgs/lua51/template
@@ -1,14 +1,14 @@
# Template file for 'lua51'
pkgname=lua51
version=5.1.5
-revision=8
+revision=9
wrksrc="lua-${version}"
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language (5.1.x)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.lua.org"
license="MIT"
-distfiles="http://www.lua.org/ftp/lua-$version.tar.gz"
+homepage="https://www.lua.org"
+distfiles="https://www.lua.org/ftp/lua-$version.tar.gz"
checksum=2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333
alternatives="
@@ -16,15 +16,6 @@ alternatives="
lua:luac:/usr/bin/luac5.1
lua:lua.1:/usr/share/man/man1/lua5.1.1
lua:luac.1:/usr/share/man/man1/luac5.1.1
- lua:lua:/usr/include/lua5.1
- lua:/usr/include/lua.h:/usr/include/lua5.1/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.1/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.1/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.1/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.1/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.1.pc
- lua:liblua.a:/usr/lib/liblua5.1.a
- lua:liblua.so:/usr/lib/liblua5.1.so
lua:lua:/usr/share/doc/lua5.1
"
@@ -61,6 +52,17 @@ do_install() {
lua51-devel_package() {
depends="ncurses-devel readline-devel>=6.3 lua51>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.1
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.1/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.1/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.1/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.1/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.1/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.1.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.1.a
+ lua-devel:liblua.so:/usr/lib/liblua5.1.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
From ca030c1d74b93847d58564516a302e830d973f98 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:19:27 -0400
Subject: [PATCH 3/3] lua52: move -devel alternatives to dedicated group, add
update file
---
srcpkgs/lua52/template | 26 ++++++++++++++------------
srcpkgs/lua52/update | 1 +
2 files changed, 15 insertions(+), 12 deletions(-)
create mode 100644 srcpkgs/lua52/update
diff --git a/srcpkgs/lua52/template b/srcpkgs/lua52/template
index f2111d2f770..3cd12dbc63d 100644
--- a/srcpkgs/lua52/template
+++ b/srcpkgs/lua52/template
@@ -1,14 +1,14 @@
# Template file for 'lua52'
pkgname=lua52
version=5.2.4
-revision=7
+revision=8
wrksrc=lua-${version}
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language (5.2.x)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.lua.org"
license="MIT"
-distfiles="http://www.lua.org/ftp/lua-$version.tar.gz"
+homepage="https://www.lua.org"
+distfiles="https://www.lua.org/ftp/lua-$version.tar.gz"
checksum=b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b
alternatives="
@@ -16,15 +16,6 @@ alternatives="
lua:luac:/usr/bin/luac5.2
lua:lua.1:/usr/share/man/man1/lua5.2.1
lua:luac.1:/usr/share/man/man1/luac5.2.1
- lua:lua:/usr/include/lua5.2
- lua:/usr/include/lua.h:/usr/include/lua5.2/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.2/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.2/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.2/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.2/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.2.pc
- lua:liblua.a:/usr/lib/liblua5.2.a
- lua:liblua.so:/usr/lib/liblua5.2.so
lua:lua:/usr/share/doc/lua5.2
"
@@ -66,6 +57,17 @@ do_install() {
lua52-devel_package() {
depends="${makedepends} lua52>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.2
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.2/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.2/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.2/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.2/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.2/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.2.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.2.a
+ lua-devel:liblua.so:/usr/lib/liblua5.2.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
diff --git a/srcpkgs/lua52/update b/srcpkgs/lua52/update
new file mode 100644
index 00000000000..ec75cb54d7d
--- /dev/null
+++ b/srcpkgs/lua52/update
@@ -0,0 +1 @@
+pattern="lua-\K5.2[\d.]+(?=\.tar)"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: lua{,51,52}: move -devel alternatives to dedicated group
2020-05-14 15:25 [PR PATCH] lua{,51,52}: move -devel alternatives to dedicated group ahesford
` (11 preceding siblings ...)
2020-05-24 9:35 ` ahesford
@ 2020-05-29 2:58 ` ahesford
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-05-29 2:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/21964#issuecomment-635728376
Comment:
Pinging here in case this fell through the cracks...
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2020-05-29 2:58 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-14 15:25 [PR PATCH] lua{,51,52}: move -devel alternatives to dedicated group ahesford
2020-05-14 15:32 ` [PR PATCH] [Updated] " ahesford
2020-05-14 17:58 ` Duncaen
2020-05-14 18:03 ` [PR PATCH] [Updated] " ahesford
2020-05-14 18:05 ` ahesford
2020-05-14 18:17 ` Duncaen
2020-05-16 4:14 ` pullmoll
2020-05-16 4:16 ` pullmoll
2020-05-16 5:55 ` pullmoll
2020-05-16 5:55 ` pullmoll
2020-05-16 11:02 ` ahesford
2020-05-16 11:29 ` [PR PATCH] [Updated] " ahesford
2020-05-24 9:35 ` ahesford
2020-05-29 2:58 ` ahesford
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).