[gentoo-commits] repo/gentoo:master commit in: dev-lua/luaexpat/, profiles/

[Conrad Kostecki]

commit:     ef5d1b8365b0a2f76efe808e7f3decf7b8223ca8
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 29 15:20:06 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Nov 29 15:20:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef5d1b83

dev-lua/luaexpat: update ebuilds

Updated ebuilds not to use clean.

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-lua/luaexpat/luaexpat-1.3.0-r101.ebuild | 78 +++++++++++++++++++++++++++
 dev-lua/luaexpat/luaexpat-1.3.3-r101.ebuild | 82 +++++++++++++++++++++++++++++
 profiles/package.mask                       |  2 +
 3 files changed, 162 insertions(+)

diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r101.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r101.ebuild
new file mode 100644
index 00000000000..b062c42090b
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r101.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+LUA_REQ_USE="${MULTILIB_USEDEP}"
+
+inherit lua multilib-minimal toolchain-funcs
+
+DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
+HOMEPAGE="https://matthewwild.co.uk/projects/luaexpat/"
+SRC_URI="https://matthewwild.co.uk/projects/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS=( "doc/us/." )
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	# Add '-DLUA_32BITS' for fixing compilation with lua5.3
+	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
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LUA_INC=$(lua_get_CFLAGS)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	popd
+}
+
+multilib_src_compile() {
+	lua_foreach_impl lua_multilib_src_compile
+}
+
+lua_multilib_src_install() {
+	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+
+	local myemakeargs=(
+		"DESTDIR=${ED}"
+		"LUA_CDIR=$(lua_get_cmod_dir)"
+		"LUA_INC=$(lua_get_include_dir)"
+		"LUA_LDIR=$(lua_get_lmod_dir)"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	popd
+}
+
+multilib_src_install() {
+	lua_foreach_impl lua_multilib_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-r101.ebuild
new file mode 100644
index 00000000000..490ff8633d5
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.3.3-r101.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+LUA_REQ_USE="${MULTILIB_USEDEP}"
+
+inherit lua multilib-minimal toolchain-funcs
+
+DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
+HOMEPAGE="https://github.com/tomasguisasola/luaexpat"
+SRC_URI="https://github.com/tomasguisasola/luaexpat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS=( "doc/us/." )
+
+PATCHES=(
+	"${FILESDIR}/${P}_makefile.patch"
+	"${FILESDIR}/${P}_getcurrentbytecount.patch"
+	"${FILESDIR}/${P}_restore_functionality.patch"
+)
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	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
+
+	local myemakeargs=(
+		"CC=$(tc-getCC) ${CFLAGS}"
+		"LUA_INC=$(lua_get_include_dir)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	popd
+}
+
+multilib_src_compile() {
+	lua_foreach_impl lua_multilib_src_compile
+}
+
+lua_multilib_src_install() {
+	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+
+	local myemakeargs=(
+		"LUA_DIR=${ED}/$(lua_get_lmod_dir)"
+		"LUA_INC=${ED}/$(lua_get_include_dir)"
+		"LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	popd
+}
+
+multilib_src_install() {
+	lua_foreach_impl lua_multilib_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}

diff --git a/profiles/package.mask b/profiles/package.mask
index c5d108797df..361f08c5e0a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -529,7 +529,9 @@ dev-lua/luacrypto
 >=dev-lua/luadbi-0.7.2-r100
 >=dev-lua/luaevent-0.4.6-r100
 =dev-lua/luaexpat-1.3.0-r100
+=dev-lua/luaexpat-1.3.0-r101
 =dev-lua/luaexpat-1.3.3-r100
+=dev-lua/luaexpat-1.3.3-r101
 >=dev-lua/lua_cliargs-3.0_p2-r100
 >=dev-lua/lua-term-0.7-r100
 >=dev-lua/luafilesystem-1.8.0-r100