summaryrefslogtreecommitdiff
path: root/dev-lua/luaexpat
diff options
context:
space:
mode:
authorLiguros - Gitlab CI/CD [master] <gitlab@liguros.net>2020-12-16 00:00:18 +0000
committerLiguros - Gitlab CI/CD [master] <gitlab@liguros.net>2020-12-16 00:00:18 +0000
commitc16790af2c9b4cbc38e565d4311252193ff85484 (patch)
tree4f43ee770507dee235d6b4f9433d9f807781fcc8 /dev-lua/luaexpat
parentfddf516add4924cfe9d698f116342e30b27d67b8 (diff)
downloadbaldeagleos-repo-21.1.1.tar.gz
baldeagleos-repo-21.1.1.tar.xz
baldeagleos-repo-21.1.1.zip
Updating liguros repo21.1.1
Diffstat (limited to 'dev-lua/luaexpat')
-rw-r--r--dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild (renamed from dev-lua/luaexpat/luaexpat-1.3.0-r101.ebuild)26
-rw-r--r--dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild (renamed from dev-lua/luaexpat/luaexpat-1.3.3-r101.ebuild)26
2 files changed, 22 insertions, 30 deletions
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r101.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild
index b062c42090b0..ce6096ca0c47 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r101.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild
@@ -3,10 +3,9 @@
EAPI=7
-LUA_COMPAT=( lua5-{1..3} )
-LUA_REQ_USE="${MULTILIB_USEDEP}"
+LUA_COMPAT=( lua5-{1..3} luajit )
-inherit lua multilib-minimal toolchain-funcs
+inherit lua toolchain-funcs
DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
HOMEPAGE="https://matthewwild.co.uk/projects/luaexpat/"
@@ -18,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
REQUIRED_USE="${LUA_REQUIRED_USE}"
RDEPEND="
- dev-libs/expat[${MULTILIB_USEDEP}]
+ dev-libs/expat
${LUA_DEPS}
"
DEPEND="${RDEPEND}"
@@ -34,11 +33,10 @@ src_prepare() {
sed -e 's/-O2/-DLUA_32BITS/g' -i Makefile || die
lua_copy_sources
- lua_foreach_impl multilib_copy_sources
}
-lua_multilib_src_compile() {
- pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_compile() {
+ pushd "${BUILD_DIR}" || die
local myemakeargs=(
"CC=$(tc-getCC)"
@@ -50,12 +48,12 @@ lua_multilib_src_compile() {
popd
}
-multilib_src_compile() {
- lua_foreach_impl lua_multilib_src_compile
+src_compile() {
+ lua_foreach_impl lua_src_compile
}
-lua_multilib_src_install() {
- pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_install() {
+ pushd "${BUILD_DIR}" || die
local myemakeargs=(
"DESTDIR=${ED}"
@@ -69,10 +67,8 @@ lua_multilib_src_install() {
popd
}
-multilib_src_install() {
- lua_foreach_impl lua_multilib_src_install
-}
+src_install() {
+ lua_foreach_impl lua_src_install
-multilib_src_install_all() {
einstalldocs
}
diff --git a/dev-lua/luaexpat/luaexpat-1.3.3-r101.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild
index 490ff8633d54..e1907b637e49 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.3-r101.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild
@@ -3,10 +3,9 @@
EAPI=7
-LUA_COMPAT=( lua5-{1..3} )
-LUA_REQ_USE="${MULTILIB_USEDEP}"
+LUA_COMPAT=( lua5-{1..3} luajit )
-inherit lua multilib-minimal toolchain-funcs
+inherit lua toolchain-funcs
DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
HOMEPAGE="https://github.com/tomasguisasola/luaexpat"
@@ -18,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
REQUIRED_USE="${LUA_REQUIRED_USE}"
RDEPEND="
- dev-libs/expat[${MULTILIB_USEDEP}]
+ dev-libs/expat
${LUA_DEPS}
"
DEPEND="${RDEPEND}"
@@ -39,11 +38,10 @@ src_prepare() {
sed -e 's/-O2//g' -i makefile || die
lua_copy_sources
- lua_foreach_impl multilib_copy_sources
}
-lua_multilib_src_compile() {
- pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_compile() {
+ pushd "${BUILD_DIR}" || die
local myemakeargs=(
"CC=$(tc-getCC) ${CFLAGS}"
@@ -55,12 +53,12 @@ lua_multilib_src_compile() {
popd
}
-multilib_src_compile() {
- lua_foreach_impl lua_multilib_src_compile
+src_compile() {
+ lua_foreach_impl lua_src_compile
}
-lua_multilib_src_install() {
- pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_install() {
+ pushd "${BUILD_DIR}" || die
local myemakeargs=(
"LUA_DIR=${ED}/$(lua_get_lmod_dir)"
@@ -73,10 +71,8 @@ lua_multilib_src_install() {
popd
}
-multilib_src_install() {
- lua_foreach_impl lua_multilib_src_install
-}
+src_install() {
+ lua_foreach_impl lua_src_install
-multilib_src_install_all() {
einstalldocs
}