Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lua/mpack/, profiles/
Date: Sun, 29 Nov 2020 18:49:39
Message-Id: 1606675705.6f4ae055dd54d9675b4f074919e3e97861c068f0.conikost@gentoo
1 commit: 6f4ae055dd54d9675b4f074919e3e97861c068f0
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 29 18:36:21 2020 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 29 18:48:25 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f4ae055
7
8 dev-lua/mpack: drop old version
9
10 Package-Manager: Portage-3.0.9, Repoman-3.0.2
11 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
12
13 dev-lua/mpack/mpack-1.0.4-r100.ebuild | 86 -----------------------------------
14 profiles/package.mask | 2 +-
15 2 files changed, 1 insertion(+), 87 deletions(-)
16
17 diff --git a/dev-lua/mpack/mpack-1.0.4-r100.ebuild b/dev-lua/mpack/mpack-1.0.4-r100.ebuild
18 deleted file mode 100644
19 index 7aca1045a87..00000000000
20 --- a/dev-lua/mpack/mpack-1.0.4-r100.ebuild
21 +++ /dev/null
22 @@ -1,86 +0,0 @@
23 -# Copyright 1999-2020 Gentoo Authors
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI=7
27 -
28 -LUA_COMPAT=( lua5-{1..3} luajit )
29 -
30 -inherit lua toolchain-funcs
31 -
32 -DESCRIPTION="Lua bindings for libmpack"
33 -HOMEPAGE="https://github.com/libmpack/libmpack/"
34 -SRC_URI="https://github.com/libmpack/libmpack/archive/${PV}.tar.gz -> ${P}.tar.gz"
35 -S="${WORKDIR}/libmpack-${PV}/binding/lua"
36 -
37 -LICENSE="MIT"
38 -SLOT="0"
39 -KEYWORDS="~amd64 ~arm ~arm64 ~x86"
40 -IUSE="test"
41 -RESTRICT="!test? ( test )"
42 -
43 -RDEPEND="${LUA_DEPS}"
44 -DEPEND="${RDEPEND}"
45 -BDEPEND="virtual/pkgconfig
46 - test? (
47 - ${RDEPEND}
48 - dev-lua/busted[${LUA_USEDEP}]
49 - )"
50 -
51 -lua_src_compile() {
52 - # Make sure we have got no leftovers from other implementations.
53 - # There is no 'clean' target in the makefile, though.
54 - rm -f ${PN}.so
55 -
56 - # We set LUA_LIB to an empty string while building version 1.0.4 because
57 - # compiled Lua modules must not link against liblua. This has already been
58 - # fixed upstream.
59 - emake \
60 - CC="$(tc-getCC)" \
61 - USE_SYSTEM_LUA=yes \
62 - LUA_INCLUDE="$(lua_get_CFLAGS)" \
63 - LUA_LIB=""
64 -
65 - # Tag the result with current implementation and move it out of the way.
66 - mv ${PN}.so ${PN}-${ELUA}.so || die
67 -}
68 -
69 -src_compile() {
70 - lua_foreach_impl lua_src_compile
71 -}
72 -
73 -lua_src_test() {
74 - # "[ FAILED ] test.lua @ 279: mpack should not leak memory"
75 - # It doesn't seem upstream actually support LuaJIT so were this up to me
76 - # I would drop it from LUA_COMPAT, unfortunately there are packages in the
77 - # tree which currently expect it to be supported.
78 - if [[ ${ELUA} == "luajit" ]]; then
79 - ewarn "Not running tests under ${ELUA} because they are known to fail"
80 - return
81 - fi
82 -
83 - # The test suite must be able to find the module under its original name.
84 - rm -f ${PN}.so
85 - ln -s ${PN}-${ELUA}.so ${PN}.so || die
86 - busted --lua="${ELUA}" -o gtest test.lua || die
87 -}
88 -
89 -src_test() {
90 - lua_foreach_impl lua_src_test
91 -}
92 -
93 -lua_src_install() {
94 - # This time we move the correct library file back in order not to risk
95 - # confusing make with symlinks.
96 - mv ${PN}-${ELUA}.so ${PN}.so || die
97 -
98 - emake \
99 - DESTDIR="${ED}" \
100 - USE_SYSTEM_LUA=yes \
101 - LUA_CMOD_INSTALLDIR="$(lua_get_cmod_dir)" \
102 - install
103 -}
104 -
105 -src_install() {
106 - lua_foreach_impl lua_src_install
107 - einstalldocs
108 -}
109
110 diff --git a/profiles/package.mask b/profiles/package.mask
111 index ef6ae87f557..e8ee1845c62 100644
112 --- a/profiles/package.mask
113 +++ b/profiles/package.mask
114 @@ -542,7 +542,7 @@ dev-lua/luacrypto
115 >=dev-lua/luv-1.32.0.0-r100
116 >=dev-lua/mediator_lua-1.1.2_p0-r100
117 >=dev-lua/messagepack-0.3.2-r100
118 ->=dev-lua/mpack-1.0.4-r100
119 +>=dev-lua/mpack-1.0.8-r100
120 >=dev-lua/penlight-1.9.2-r100
121 >=dev-lua/say-1.3_p1-r100
122 >=dev-lua/toluapp-1.0.93_p20190513-r100