From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Dec 2020 13:26:14 +0000 Subject: gentoo resync : 14.12.2020 --- dev-lua/lua-utf8/Manifest | 8 +-- dev-lua/lua-utf8/files/lua-utf8.Makefile | 42 --------------- dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild | 44 ---------------- dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild | 82 +++++++++++++++++++++++++++++ dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild | 70 ++++++++++++++++++++++++ dev-lua/lua-utf8/metadata.xml | 4 ++ 6 files changed, 160 insertions(+), 90 deletions(-) delete mode 100644 dev-lua/lua-utf8/files/lua-utf8.Makefile delete mode 100644 dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild create mode 100644 dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild create mode 100644 dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild (limited to 'dev-lua/lua-utf8') diff --git a/dev-lua/lua-utf8/Manifest b/dev-lua/lua-utf8/Manifest index 174b2134c38e..be47345b4118 100644 --- a/dev-lua/lua-utf8/Manifest +++ b/dev-lua/lua-utf8/Manifest @@ -1,4 +1,4 @@ -AUX lua-utf8.Makefile 1099 BLAKE2B 5a704cb815f41cee6a5d681ec80f9c3ceab97c6711fddcd91581aaa39d033a418bccc0c59e1c41c1d7f5ada1b85615566d3443f2dcf02e57c8dec88c5480fe41 SHA512 f7a2b59c22cd92b7560a24ac469ffdd24641ab9907c26a8c22d944e75f26b3fe2d80298d70138fd6bdfc5da7a87b1a52cb7243106b47f6daebb237a17fdb06f4 -DIST lua-utf8-0.1.1.tar.gz 35475 BLAKE2B 99ffece901878fc966e0314886ca20255834c76b9266b1806acda7afb84d6a358c556b9a88c10497d2874d7902fac5905907ab25fefb4ba38544d46e3bae1471 SHA512 e0a8632b9391c7e7b35e371f4e95899ec58adb4988f1fe5a7101310f7c774c3a3e88073f156cf7799c57f69c0fc53aff4486beb1e7006bfaa96d86e248e38897 -EBUILD lua-utf8-0.1.1.ebuild 1034 BLAKE2B f10339a910b503ba834c10f751b9f41d9a5b3f6ff0dc51eaeffd475bab04bbed9a0e3f1076580a640b257e359ce3cafec91e1b896b44ada7c2fc6655b55ca4af SHA512 067eb57332bed9152f09e1776dfb6e4b4727f2a8b14ad38ea91708a176ccaf84f3fd2d3ecd3a3bd67be27ea90a4eeaf78e46d67e6b108124afce767b59c48212 -MISC metadata.xml 639 BLAKE2B eaf42f0f69767063b2e0c4745bd49529dbe1c8edd62dc22422a1af9363321f610625ad138f6a7a6828ebdfef0ade15577ed062f4de2817d99dfc2864c305ae09 SHA512 785c2139f6715e4b177d1d97f7ec13988f59af95461af9400e6085388cac83fcb99e3eb65cbf47449be9ff60ee4d0662316ea82b5fb761a22b3d8207b27b465f +DIST lua-utf8-0.1.3.tar.gz 41830 BLAKE2B 72982c7ec8d8837e391fa6bfb689c1e9f4a7746d0cbc058556f06027b4af00c936036f87baf58f45e1169fd3ea7e6d8174629d5a7279205622cf0710971ca29c SHA512 d0abe73fecbfeba36083c135d77962d953ad9e431721a2557669c912a2703e31c46f84f2ee9ee4ac966a5bcc88d4daef930f8d2d8e72106fa61010509c183e29 +EBUILD lua-utf8-0.1.3-r100.ebuild 1483 BLAKE2B b6a26a8189ccd3827be307d6be311fad82860c47c168cf382174933ed479071f359b046080fe4870076d87b7aeab3ab14c908749cc608d0dd17dc721065df19a SHA512 3c5666cc402e5f6fe71de35209d0ada6bb81ae1bd23d1c1bb753cfb76728c64c00fb4b755faed5c26fd52dd67348f3bd0a715f46db8d41a37862229865648e4e +EBUILD lua-utf8-0.1.3.ebuild 1349 BLAKE2B 7a294e8656fec4bb7c97f54d097927c64d4696cb57d720de37ca191c9200baf13dc4cc938ca65ba1cc09bfc875bc6c13c522552c11be4aac41d7c5afe7b296d8 SHA512 32afd12f4c12dea25be60c0006058e78f9097598530eca2f01abc0a062e021fc1651c5a897336e287003b3e1d1db0898a3219e557a3061966679752d66c19d2d +MISC metadata.xml 750 BLAKE2B 95215f3aed5389197a071e67411702a07102387343c568c02b48ada5b2f3c0f01b99bb895bd4f11e2c558fc7d352da1afece2b46ea6d63edbfa322ccc7c651cd SHA512 cf8fd4d207d9827fb1a7349f89fa0faf0d1ad38989ebc29dabde5dcee73e718183655a1b8c9f0074f16ea7878bd1d4dbf7e53f65f5003946fddf901c9568d4cd diff --git a/dev-lua/lua-utf8/files/lua-utf8.Makefile b/dev-lua/lua-utf8/files/lua-utf8.Makefile deleted file mode 100644 index 456c52f4aaa0..000000000000 --- a/dev-lua/lua-utf8/files/lua-utf8.Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# this file builds lua-utf8 - -MY_USE_LUA?=luajit -PKG_CONFIG?=pkg-config -PREFIX?=/usr/local -DESTDIR?=/ - -LUA_LIBDIR := $(shell $(PKG_CONFIG) --variable INSTALL_CMOD $(MY_USE_LUA)) -LUA_INC := $(shell $(PKG_CONFIG) --variable INSTALL_INC $(MY_USE_LUA)) -LUA_SHARE := $(shell $(PKG_CONFIG) --variable INSTALL_LMOD $(MY_USE_LUA)) -CWARNS := -Wall -pedantic -CFLAGS += -I$(LUA_INC) -fPIC $(CWARNS) -LIB_OPTION := -shared -LDFLAGS += $(LIB_OPTION) - -SONAME := lua-utf8.so -SONAMEV := $(SONAME).0 -LIBRARY := $(SONAMEV).1.1 -SRC := lutf8lib.c -OBJ := $(patsubst %.c, %.o, $(SRC)) - -FILES := parseucd.lua - -all: $(LIBRARY) $(SONAMEV) $(SONAME) - -$(SONAMEV): - ln -s $(LIBRARY) $@ - -$(SONAME): - ln -s $(SONAMEV) $@ - -$(LIBRARY): $(OBJ) - $(CC) $(CFLAGS) $(LDFLAGS) -o $(LIBRARY) $(OBJ) -lc - -install: - install -d $(DESTDIR)$(LUA_LIBDIR) - install $(SONAME) $(DESTDIR)$(LUA_LIBDIR) - install -d $(DESTDIR)$(LUA_SHARE) - install --mode=0444 $(FILES) $(DESTDIR)$(LUA_SHARE) - -clean: - rm -rf $(LIBRARY) $(SONAMEV) $(SONAME) *.o diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild deleted file mode 100644 index d3dffeb9e9fa..000000000000 --- a/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="UTF-8 support for Lua" -HOMEPAGE="https://github.com/starwing/luautf8" -SRC_URI="https://github.com/starwing/luautf8/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc64" -IUSE="luajit test" - -RESTRICT="!test? ( test )" - -BDEPEND="virtual/pkgconfig" -RDEPEND=" - !luajit? ( >=dev-lang/lua-5.1:= ) - luajit? ( dev-lang/luajit:2 )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${PN//-/}-${PV}" - -src_prepare() { - default - - cp -v "${FILESDIR}/${PN}".Makefile "${S}"/Makefile || die -} - -src_compile() { - tc-export CC - emake DESTDIR="${D}" PREFIX="${EPREFIX}" MY_USE_LUA="$(usex luajit 'luajit' 'lua')" PKG_CONFIG="$(tc-getPKG_CONFIG)" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}" MY_USE_LUA="$(usex luajit 'luajit' 'lua')" PKG_CONFIG="$(tc-getPKG_CONFIG)" install - einstalldocs -} - -src_test() { - LUA_CPATH=./?.so $(usex luajit 'luajit' 'lua') test.lua || die -} diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild new file mode 100644 index 000000000000..48e0614d06d8 --- /dev/null +++ b/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild @@ -0,0 +1,82 @@ +# Copyright 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="A UTF-8 support module for Lua and LuaJIT" +HOMEPAGE="https://github.com/starwing/luautf8" +SRC_URI="https://github.com/starwing/luautf8/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN//-/}-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +lua_src_compile() { + local compiler=( + "$(tc-getCC)" + "${CFLAGS}" + "-fPIC" + "${LDFLAGS}" + "$(lua_get_CFLAGS)" + "-c lutf8lib.c" + "-o lutf8lib-${ELUA}.o" + ) + einfo "${compiler[@]}" + ${compiler[@]} || die + + local linker=( + "$(tc-getCC)" + "-shared" + "${LDFLAGS}" + "-o lutf8lib-${ELUA}.so" + "lutf8lib-${ELUA}.o" + ) + einfo "${linker[@]}" + ${linker[@]} || die +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + local mytests=( + "test.lua" + "test_compat.lua" + "test_pm.lua" + ) + + for mytest in ${mytests[@]}; do + LUA_CPATH="${S}/lutf8lib-${ELUA}.so" ${ELUA} ${mytest} || die + done +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + exeinto "$(lua_get_cmod_dir)" + newexe "lutf8lib-${ELUA}.so" "lua-utf8.so" + + insinto "$(lua_get_lmod_dir)" + doins parseucd.lua +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild new file mode 100644 index 000000000000..f41c166ac3aa --- /dev/null +++ b/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="A UTF-8 support module for Lua and LuaJIT" +HOMEPAGE="https://github.com/starwing/luautf8" +SRC_URI="https://github.com/starwing/luautf8/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN//-/}-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 arm arm64 ppc ppc64 x86" +IUSE="luajit test" +RESTRICT="!test? ( test )" + +RDEPEND=" + luajit? ( dev-lang/luajit:2 ) + !luajit? ( >=dev-lang/lua-5.1:0= ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_compile() { + local compiler=( + "$(tc-getCC)" + "${CFLAGS}" + "-fPIC" + "${LDFLAGS}" + "-I/usr/include" + "-c lutf8lib.c" + "-o lutf8lib.o" + ) + einfo "${compiler[@]}" + ${compiler[@]} || die + + local linker=( + "$(tc-getCC)" + "-shared" + "${LDFLAGS}" + "-o lutf8lib.so" + "lutf8lib.o" + ) + einfo "${linker[@]}" + ${linker[@]} || die +} + +src_test() { + local mytests=( + "test.lua" + "test_compat.lua" + "test_pm.lua" + ) + + for mytest in ${mytests[@]}; do + LUA_CPATH="${S}/lutf8lib.so" $(usex luajit 'luajit' 'lua') ${mytest} || die + done +} + +src_install() { + exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" + newexe "lutf8lib.so" "lua-utf8.so" + + insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" + doins parseucd.lua + + einstalldocs +} diff --git a/dev-lua/lua-utf8/metadata.xml b/dev-lua/lua-utf8/metadata.xml index efc3ff445600..e9b8d834be80 100644 --- a/dev-lua/lua-utf8/metadata.xml +++ b/dev-lua/lua-utf8/metadata.xml @@ -1,6 +1,10 @@ + + conikost@gentoo.org + Conrad Kostecki + vpayno+gentoo@gmail.com Victor Payno -- cgit v1.2.3