public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-lua/luaexpat/
@ 2020-11-23 19:53 Conrad Kostecki
  0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2020-11-23 19:53 UTC (permalink / raw
  To: gentoo-commits

commit:     6cbbbd10a9a5a5ed5b8f801b04d3bfd08a59407d
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 19:44:39 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 19:53:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cbbbd10

dev-lua/luaexpat: migrate to lua eclass

Closes: https://bugs.gentoo.org/752642
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-r100.ebuild | 78 +++++++++++++++++++++++++++
 dev-lua/luaexpat/luaexpat-1.3.3-r100.ebuild | 82 +++++++++++++++++++++++++++++
 profiles/package.mask                       |  2 +
 3 files changed, 162 insertions(+)

diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r100.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r100.ebuild
new file mode 100644
index 00000000000..28ce6e13709
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r100.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
+
+	multilib_copy_sources
+}
+
+lua_multilib_src_compile() {
+	# Clean project, to compile it for every lua slot
+	emake clean
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LUA_INC=$(lua_get_CFLAGS)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	# Copy module to match the choosen LUA implementation
+	cp "src/lxp.so" "src/lxp-${ELUA}.so" || die
+}
+
+multilib_src_compile() {
+	lua_foreach_impl lua_multilib_src_compile
+}
+
+lua_multilib_src_install() {
+	# Use correct module for the choosen LUA implementation
+	cp "src/lxp-${ELUA}.so" "src/lxp.so" || 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
+}
+
+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-r100.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3-r100.ebuild
new file mode 100644
index 00000000000..7674c7cd76a
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.3.3-r100.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
+
+	multilib_copy_sources
+}
+
+lua_multilib_src_compile() {
+	# Clean project, to compile it for every lua slot
+	emake clean
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LUA_INC=$(lua_get_include_dir)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	# Copy module to match the choosen LUA implementation
+	cp "src/lxp.so.${PV}" "src/lxp-${ELUA}.so.${PV}" || die
+}
+
+multilib_src_compile() {
+	lua_foreach_impl lua_multilib_src_compile
+}
+
+lua_multilib_src_install() {
+	# Use correct module for the choosen LUA implementation
+	cp "src/lxp-${ELUA}.so.${PV}" "src/lxp.so.${PV}" || 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
+}
+
+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 d769320c1cf..acfa5d92581 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -469,6 +469,8 @@ dev-lua/luacrypto
 >=dev-lua/lua-bit32-5.3.5-r100
 >=dev-lua/lua-zlib-1.2-r100
 >=dev-lua/luaevent-0.4.6-r100
+=dev-lua/luaexpat-1.3.0-r100
+=dev-lua/luaexpat-1.3.3-r100
 >=dev-lua/luasec-0.9-r100
 >=dev-lua/luasocket-3.0_rc1_p20200328-r100
 >=dev-lua/luv-1.32.0.0-r100


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-lua/luaexpat/
@ 2020-12-14 17:59 Conrad Kostecki
  0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2020-12-14 17:59 UTC (permalink / raw
  To: gentoo-commits

commit:     a2e41cee60798ee3caae486612d5da83e563eada
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 14 17:29:27 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Dec 14 17:57:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e41cee

dev-lua/luaexpat: add luajit (slotted)

Dropping also multilib, as no package, which depends on this package,
needs multilib.

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-r102.ebuild | 74 +++++++++++++++++++++++++++
 dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild | 78 +++++++++++++++++++++++++++++
 profiles/package.mask                       |  2 +
 3 files changed, 154 insertions(+)

diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild
new file mode 100644
index 00000000000..ce6096ca0c4
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua 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
+	${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_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LUA_INC=$(lua_get_CFLAGS)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || 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
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}

diff --git a/dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild
new file mode 100644
index 00000000000..e1907b637e4
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.3.3-r102.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} luajit )
+
+inherit lua 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
+	${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_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC) ${CFLAGS}"
+		"LUA_INC=$(lua_get_include_dir)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || 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
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}

diff --git a/profiles/package.mask b/profiles/package.mask
index 8bfea7d4600..e1eae295d77 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -542,7 +542,9 @@ kde-apps/kdebase-meta:5
 >=dev-lua/luadbi-0.7.2-r100
 >=dev-lua/luaevent-0.4.6-r100
 =dev-lua/luaexpat-1.3.0-r101
+=dev-lua/luaexpat-1.3.0-r102
 =dev-lua/luaexpat-1.3.3-r101
+=dev-lua/luaexpat-1.3.3-r102
 >=dev-lua/luafilesystem-1.8.0-r100
 >=dev-lua/lualdap-1.2.5-r100
 >=dev-lua/luajson-1.3.4-r100


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-lua/luaexpat/
@ 2020-12-14 17:59 Conrad Kostecki
  0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2020-12-14 17:59 UTC (permalink / raw
  To: gentoo-commits

commit:     4bb1939953608ba048cbf7ed9896a7da10591311
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 14 17:30:53 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Dec 14 17:57:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bb19399

dev-lua/luaexpat: drop old version

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 deletions(-)

diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r101.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r101.ebuild
deleted file mode 100644
index b062c42090b..00000000000
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r101.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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
deleted file mode 100644
index 490ff8633d5..00000000000
--- a/dev-lua/luaexpat/luaexpat-1.3.3-r101.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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 e1eae295d77..99f2521a5e9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -541,9 +541,7 @@ kde-apps/kdebase-meta:5
 >=dev-lua/luacov-0.14.0-r100
 >=dev-lua/luadbi-0.7.2-r100
 >=dev-lua/luaevent-0.4.6-r100
-=dev-lua/luaexpat-1.3.0-r101
 =dev-lua/luaexpat-1.3.0-r102
-=dev-lua/luaexpat-1.3.3-r101
 =dev-lua/luaexpat-1.3.3-r102
 >=dev-lua/luafilesystem-1.8.0-r100
 >=dev-lua/lualdap-1.2.5-r100


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-12-14 17:59 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-14 17:59 [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-lua/luaexpat/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2020-12-14 17:59 Conrad Kostecki
2020-11-23 19:53 Conrad Kostecki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox