1 |
commit: 867f3b9b49b4651d0c4ca6f92f9f0cf2c7a48dc0 |
2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 29 15:21:41 2020 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 29 15:21:49 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=867f3b9b |
7 |
|
8 |
dev-lua/luaexpat: 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/luaexpat/luaexpat-1.3.0-r100.ebuild | 78 --------------------------- |
14 |
dev-lua/luaexpat/luaexpat-1.3.3-r100.ebuild | 82 ----------------------------- |
15 |
profiles/package.mask | 2 - |
16 |
3 files changed, 162 deletions(-) |
17 |
|
18 |
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r100.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r100.ebuild |
19 |
deleted file mode 100644 |
20 |
index 28ce6e13709..00000000000 |
21 |
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r100.ebuild |
22 |
+++ /dev/null |
23 |
@@ -1,78 +0,0 @@ |
24 |
-# Copyright 1999-2020 Gentoo Authors |
25 |
-# Distributed under the terms of the GNU General Public License v2 |
26 |
- |
27 |
-EAPI=7 |
28 |
- |
29 |
-LUA_COMPAT=( lua5-{1..3} ) |
30 |
-LUA_REQ_USE="${MULTILIB_USEDEP}" |
31 |
- |
32 |
-inherit lua multilib-minimal toolchain-funcs |
33 |
- |
34 |
-DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library" |
35 |
-HOMEPAGE="https://matthewwild.co.uk/projects/luaexpat/" |
36 |
-SRC_URI="https://matthewwild.co.uk/projects/${PN}/${P}.tar.gz" |
37 |
- |
38 |
-LICENSE="MIT" |
39 |
-SLOT="0" |
40 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" |
41 |
-REQUIRED_USE="${LUA_REQUIRED_USE}" |
42 |
- |
43 |
-RDEPEND=" |
44 |
- dev-libs/expat[${MULTILIB_USEDEP}] |
45 |
- ${LUA_DEPS} |
46 |
-" |
47 |
-DEPEND="${RDEPEND}" |
48 |
-BDEPEND="virtual/pkgconfig" |
49 |
- |
50 |
-HTML_DOCS=( "doc/us/." ) |
51 |
- |
52 |
-src_prepare() { |
53 |
- default |
54 |
- |
55 |
- # Respect users CFLAGS |
56 |
- # Add '-DLUA_32BITS' for fixing compilation with lua5.3 |
57 |
- sed -e 's/-O2/-DLUA_32BITS/g' -i Makefile || die |
58 |
- |
59 |
- multilib_copy_sources |
60 |
-} |
61 |
- |
62 |
-lua_multilib_src_compile() { |
63 |
- # Clean project, to compile it for every lua slot |
64 |
- emake clean |
65 |
- |
66 |
- local myemakeargs=( |
67 |
- "CC=$(tc-getCC)" |
68 |
- "LUA_INC=$(lua_get_CFLAGS)" |
69 |
- ) |
70 |
- |
71 |
- emake "${myemakeargs[@]}" |
72 |
- |
73 |
- # Copy module to match the choosen LUA implementation |
74 |
- cp "src/lxp.so" "src/lxp-${ELUA}.so" || die |
75 |
-} |
76 |
- |
77 |
-multilib_src_compile() { |
78 |
- lua_foreach_impl lua_multilib_src_compile |
79 |
-} |
80 |
- |
81 |
-lua_multilib_src_install() { |
82 |
- # Use correct module for the choosen LUA implementation |
83 |
- cp "src/lxp-${ELUA}.so" "src/lxp.so" || die |
84 |
- |
85 |
- local myemakeargs=( |
86 |
- "DESTDIR=${ED}" |
87 |
- "LUA_CDIR=$(lua_get_cmod_dir)" |
88 |
- "LUA_INC=$(lua_get_include_dir)" |
89 |
- "LUA_LDIR=$(lua_get_lmod_dir)" |
90 |
- ) |
91 |
- |
92 |
- emake "${myemakeargs[@]}" install |
93 |
-} |
94 |
- |
95 |
-multilib_src_install() { |
96 |
- lua_foreach_impl lua_multilib_src_install |
97 |
-} |
98 |
- |
99 |
-multilib_src_install_all() { |
100 |
- einstalldocs |
101 |
-} |
102 |
|
103 |
diff --git a/dev-lua/luaexpat/luaexpat-1.3.3-r100.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3-r100.ebuild |
104 |
deleted file mode 100644 |
105 |
index 7674c7cd76a..00000000000 |
106 |
--- a/dev-lua/luaexpat/luaexpat-1.3.3-r100.ebuild |
107 |
+++ /dev/null |
108 |
@@ -1,82 +0,0 @@ |
109 |
-# Copyright 1999-2020 Gentoo Authors |
110 |
-# Distributed under the terms of the GNU General Public License v2 |
111 |
- |
112 |
-EAPI=7 |
113 |
- |
114 |
-LUA_COMPAT=( lua5-{1..3} ) |
115 |
-LUA_REQ_USE="${MULTILIB_USEDEP}" |
116 |
- |
117 |
-inherit lua multilib-minimal toolchain-funcs |
118 |
- |
119 |
-DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library" |
120 |
-HOMEPAGE="https://github.com/tomasguisasola/luaexpat" |
121 |
-SRC_URI="https://github.com/tomasguisasola/luaexpat/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
122 |
- |
123 |
-LICENSE="MIT" |
124 |
-SLOT="0" |
125 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" |
126 |
-REQUIRED_USE="${LUA_REQUIRED_USE}" |
127 |
- |
128 |
-RDEPEND=" |
129 |
- dev-libs/expat[${MULTILIB_USEDEP}] |
130 |
- ${LUA_DEPS} |
131 |
-" |
132 |
-DEPEND="${RDEPEND}" |
133 |
-BDEPEND="virtual/pkgconfig" |
134 |
- |
135 |
-HTML_DOCS=( "doc/us/." ) |
136 |
- |
137 |
-PATCHES=( |
138 |
- "${FILESDIR}/${P}_makefile.patch" |
139 |
- "${FILESDIR}/${P}_getcurrentbytecount.patch" |
140 |
- "${FILESDIR}/${P}_restore_functionality.patch" |
141 |
-) |
142 |
- |
143 |
-src_prepare() { |
144 |
- default |
145 |
- |
146 |
- # Respect users CFLAGS |
147 |
- sed -e 's/-O2//g' -i makefile || die |
148 |
- |
149 |
- multilib_copy_sources |
150 |
-} |
151 |
- |
152 |
-lua_multilib_src_compile() { |
153 |
- # Clean project, to compile it for every lua slot |
154 |
- emake clean |
155 |
- |
156 |
- local myemakeargs=( |
157 |
- "CC=$(tc-getCC)" |
158 |
- "LUA_INC=$(lua_get_include_dir)" |
159 |
- ) |
160 |
- |
161 |
- emake "${myemakeargs[@]}" |
162 |
- |
163 |
- # Copy module to match the choosen LUA implementation |
164 |
- cp "src/lxp.so.${PV}" "src/lxp-${ELUA}.so.${PV}" || die |
165 |
-} |
166 |
- |
167 |
-multilib_src_compile() { |
168 |
- lua_foreach_impl lua_multilib_src_compile |
169 |
-} |
170 |
- |
171 |
-lua_multilib_src_install() { |
172 |
- # Use correct module for the choosen LUA implementation |
173 |
- cp "src/lxp-${ELUA}.so.${PV}" "src/lxp.so.${PV}" || die |
174 |
- |
175 |
- local myemakeargs=( |
176 |
- "LUA_DIR=${ED}/$(lua_get_lmod_dir)" |
177 |
- "LUA_INC=${ED}/$(lua_get_include_dir)" |
178 |
- "LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)" |
179 |
- ) |
180 |
- |
181 |
- emake "${myemakeargs[@]}" install |
182 |
-} |
183 |
- |
184 |
-multilib_src_install() { |
185 |
- lua_foreach_impl lua_multilib_src_install |
186 |
-} |
187 |
- |
188 |
-multilib_src_install_all() { |
189 |
- einstalldocs |
190 |
-} |
191 |
|
192 |
diff --git a/profiles/package.mask b/profiles/package.mask |
193 |
index 361f08c5e0a..4633518e7f1 100644 |
194 |
--- a/profiles/package.mask |
195 |
+++ b/profiles/package.mask |
196 |
@@ -528,9 +528,7 @@ dev-lua/luacrypto |
197 |
>=dev-lua/luacheck-0.23.0-r100 |
198 |
>=dev-lua/luadbi-0.7.2-r100 |
199 |
>=dev-lua/luaevent-0.4.6-r100 |
200 |
-=dev-lua/luaexpat-1.3.0-r100 |
201 |
=dev-lua/luaexpat-1.3.0-r101 |
202 |
-=dev-lua/luaexpat-1.3.3-r100 |
203 |
=dev-lua/luaexpat-1.3.3-r101 |
204 |
>=dev-lua/lua_cliargs-3.0_p2-r100 |
205 |
>=dev-lua/lua-term-0.7-r100 |