Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-lua/luarocks/
Date: Mon, 30 Nov 2020 00:16:28
Message-Id: 1606695360.0d903986eb9894fad0924b485402376cdbd7c4ca.conikost@gentoo
1 commit: 0d903986eb9894fad0924b485402376cdbd7c4ca
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 30 00:14:45 2020 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 30 00:16:00 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d903986
7
8 dev-lua/luarocks: bump to version 3.4.0, migrate to lua eclass
9
10 Closes: https://bugs.gentoo.org/590474
11 Closes: https://bugs.gentoo.org/752654
12 Package-Manager: Portage-3.0.9, Repoman-3.0.2
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 dev-lua/luarocks/Manifest | 1 +
16 dev-lua/luarocks/luarocks-3.4.0-r100.ebuild | 61 ++++++++++++++++++++++++++++
17 dev-lua/luarocks/luarocks-3.4.0.ebuild | 63 +++++++++++++++++++++++++++++
18 dev-lua/luarocks/metadata.xml | 4 ++
19 profiles/package.mask | 1 +
20 5 files changed, 130 insertions(+)
21
22 diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
23 index dd6984a1219..6bc9964136d 100644
24 --- a/dev-lua/luarocks/Manifest
25 +++ b/dev-lua/luarocks/Manifest
26 @@ -1 +1,2 @@
27 DIST luarocks-3.3.1.tar.gz 241636 BLAKE2B fd34d7a233bbf1c5f224bd04886a7f1382d63ffc014c8b78ae7924fb799d66a32e048298deed103686771263885c85c9173c013d1bbb3bad6a48e9fd99fdaac0 SHA512 0a695ceb30ae575cbca52abd2aad9675e33a234c53c5d1e125442d874c21e0e3cf6157431f07085e4311f81833680366adfe5c626a66cb5880380b48899a116a
28 +DIST luarocks-3.4.0.tar.gz 244013 BLAKE2B 873c315ca3616179d20d665ceb09b8549c6f007d721581751bb4bb27d147547a52f5be1458541f9c0f936fcc3659c1d8eb253431ee0cf12530f3bef09aa838a3 SHA512 111ef93cbc4c0d79fdb26d9696b76e6b9e7fb1e30029db43feae9622cc6dd89991f1a62f87af0ca11f4043cb0d445ec73c5edf53e1af5f0d9bc4f756d4c18151
29
30 diff --git a/dev-lua/luarocks/luarocks-3.4.0-r100.ebuild b/dev-lua/luarocks/luarocks-3.4.0-r100.ebuild
31 new file mode 100644
32 index 00000000000..e13283efaff
33 --- /dev/null
34 +++ b/dev-lua/luarocks/luarocks-3.4.0-r100.ebuild
35 @@ -0,0 +1,61 @@
36 +# Copyright 1999-2020 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=7
40 +
41 +LUA_COMPAT=( lua5-{1..3} luajit )
42 +
43 +inherit lua-single
44 +
45 +DESCRIPTION="A package manager for the Lua programming language"
46 +HOMEPAGE="http://www.luarocks.org"
47 +SRC_URI="http://luarocks.org/releases/${P}.tar.gz"
48 +
49 +LICENSE="MIT"
50 +SLOT="0"
51 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
52 +IUSE="libressl test"
53 +REQUIRED_USE="${LUA_REQUIRED_USE}"
54 +RESTRICT="test"
55 +
56 +RDEPEND="${LUA_DEPS}"
57 +
58 +DEPEND="
59 + net-misc/curl
60 + libressl? ( dev-libs/libressl:0 )
61 + !libressl? ( dev-libs/openssl:0 )
62 + ${RDEPEND}
63 +"
64 +
65 +BDEPEND="
66 + virtual/pkgconfig
67 + test? (
68 + $(lua_gen_cond_dep '>=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}]')
69 + $(lua_gen_cond_dep '>=dev-lua/busted-htest-1.0.0-r100[${LUA_USEDEP}]')
70 + ${RDEPEND}
71 + )
72 +"
73 +
74 +src_configure() {
75 + local myeconfargs=(
76 + "--prefix=${EPRIFIX}/usr"
77 + "--rocks-tree=$(lua_get_lmod_dir)"
78 + "--with-lua-include=$(lua_get_include_dir)"
79 + "--with-lua-interpreter=${ELUA}"
80 + "--with-lua-lib=$(lua_get_cmod_dir)"
81 + )
82 +
83 + # Since the configure script is handcrafted,
84 + # and yells at unknown options, do not use 'econf'.
85 + ./configure "${myeconfargs[@]}" || die
86 +}
87 +
88 +src_test() {
89 + busted --lua=${ELUA} || die
90 +}
91 +
92 +src_install() {
93 + default
94 +
95 + { find "${D}" -type f -exec sed -i -e "s:${D}::g" {} \;; } || die
96 +}
97
98 diff --git a/dev-lua/luarocks/luarocks-3.4.0.ebuild b/dev-lua/luarocks/luarocks-3.4.0.ebuild
99 new file mode 100644
100 index 00000000000..e1ebfcab444
101 --- /dev/null
102 +++ b/dev-lua/luarocks/luarocks-3.4.0.ebuild
103 @@ -0,0 +1,63 @@
104 +# Copyright 1999-2020 Gentoo Authors
105 +# Distributed under the terms of the GNU General Public License v2
106 +
107 +EAPI=7
108 +
109 +inherit toolchain-funcs
110 +
111 +DESCRIPTION="A package manager for the Lua programming language"
112 +HOMEPAGE="http://www.luarocks.org"
113 +SRC_URI="http://luarocks.org/releases/${P}.tar.gz"
114 +
115 +LICENSE="MIT"
116 +SLOT="0"
117 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
118 +IUSE="luajit libressl test"
119 +REQUIRED_USE="${LUA_REQUIRED_USE}"
120 +RESTRICT="test"
121 +
122 +RDEPEND="
123 + luajit? ( dev-lang/luajit:2 )
124 + !luajit? ( >=dev-lang/lua-5.1:0 )
125 +"
126 +
127 +DEPEND="
128 + net-misc/curl
129 + libressl? ( dev-libs/libressl:0 )
130 + !libressl? ( dev-libs/openssl:0 )
131 + ${RDEPEND}
132 +"
133 +
134 +BDEPEND="
135 + virtual/pkgconfig
136 + test? (
137 + dev-lua/busted
138 + dev-lua/busted-htest
139 + ${RDEPEND}
140 + )
141 +"
142 +
143 +src_configure() {
144 + "--with-lua-interpreter=${ELUA}"
145 + local myeconfargs=(
146 + "--prefix=${EPRIFIX}/usr"
147 + "--rocks-tree=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
148 + "--with-lua-include=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'includedir' 'INSTALL_INC') $(usex luajit 'luajit' 'lua'))"
149 + "--with-lua-interpreter=$(usex luajit 'luajit' 'lua')"
150 + "--with-lua-lib=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
151 + )
152 +
153 + # Since the configure script is handcrafted,
154 + # and yells at unknown options, do not use 'econf'.
155 + ./configure "${myeconfargs[@]}" || die
156 +}
157 +
158 +src_test() {
159 + busted --lua=${ELUA} || die
160 +}
161 +
162 +src_install() {
163 + default
164 +
165 + { find "${D}" -type f -exec sed -i -e "s:${D}::g" {} \;; } || die
166 +}
167
168 diff --git a/dev-lua/luarocks/metadata.xml b/dev-lua/luarocks/metadata.xml
169 index da7ced9078f..e3ced5af424 100644
170 --- a/dev-lua/luarocks/metadata.xml
171 +++ b/dev-lua/luarocks/metadata.xml
172 @@ -1,6 +1,10 @@
173 <?xml version="1.0" encoding="UTF-8"?>
174 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
175 <pkgmetadata>
176 + <maintainer type="person">
177 + <email>conikost@g.o</email>
178 + <name>Conrad Kostecki</name>
179 + </maintainer>
180 <maintainer type="person">
181 <email>vpayno+gentoo@×××××.com</email>
182 <name>Victor Payno</name>
183
184 diff --git a/profiles/package.mask b/profiles/package.mask
185 index 470f230edde..32a15d7bd0f 100644
186 --- a/profiles/package.mask
187 +++ b/profiles/package.mask
188 @@ -535,6 +535,7 @@ dev-lua/luacrypto
189 =dev-lua/luaexpat-1.3.3-r101
190 >=dev-lua/luafilesystem-1.8.0-r100
191 >=dev-lua/luajson-1.3.4
192 +>=dev-lua/luarocks-3.4.0-r100
193 >=dev-lua/luasec-0.9-r100
194 >=dev-lua/luasocket-3.0_rc1_p20200328-r100
195 >=dev-lua/luassert-1.8.0-r100