gentoo auto-resync : 31:08:2024 - 12:01:05

3 files changed, 134 insertions, 0 deletions

diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
index 584778670fc6..e3166c78a766 100644
--- a/dev-lua/lpeg/Manifest
+++ b/dev-lua/lpeg/Manifest
@@ -1,4 +1,7 @@
 AUX lpeg-1.0.2-makefile.patch 671 BLAKE2B 4ed03dc08e737fe6cc45f4fe9c53657a71341cac69a3ec6fa52d124dbf5c3b58bcf1077d255598f98952eb2329905a25b45e4c031ab9fb82700d919d7f264452 SHA512 0d17351cda382ddb5574f7d14bc6479439cc703ac0c360b2b0f043288427beda9aea1f229fd2e0ea8b604bd935bce2fc959a2410804bfd82bb2c2e128ab501ac
+AUX lpeg-1.1.0-makefile.patch 688 BLAKE2B 2b943fc146834f8be7791d8e3f24e8fc9b3fff121211c9a733beb25ffb1442db7187379cda0f01d9ffe1269d362064c44d14c81a431c51d64ecc646cc1e6b492 SHA512 eee0564a743957938a5d9faec71f00afed1faaa13704c421d60fa0bb34d1ea581df20390afe786641351687c917a5d867a933ba7ff3703ac328b45fb664f3433
 DIST lpeg-1.0.2.tar.gz 71840 BLAKE2B e0d8fb4e9d17c9018f0b206cd3f7c9c0e21398c119600b5b0705c8df19e0956347bea795c7c3ded8e62e0c09802dd8eab931a5e3769fcacf44c35aa2b17fa8d6 SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814
+DIST lpeg-1.1.0.zip 78933 BLAKE2B 90895d74088d59529229825dd0058f69d0cb035d0b5ef9be49d9643c02e7b37ffcf358daa6b7129ff8df2247946dd12627d2ed1be23f61c51112303b702842b1 SHA512 5be6d3d9608881d044185e4e9cb5a7577d94b82276f4273f5dda7e2da93e13b926eaced9fc577dd83a4af231224c85a0336ddb920d94fbb334f8f55f7f21f8b4
 EBUILD lpeg-1.0.2-r101.ebuild 1969 BLAKE2B 94ef434afb41a7f685e20fa54689a1ffe1878c4b3b560cd17ff03d2ab7ab7bf3d69ad997f83e2afcc5df48698895212dde0394688eed99098c3d93856c18ff23 SHA512 05a3f82f0362f51e1f19790f8d0793fe6ab53587d7386ba290fac58cb1e2a6c5cfeaabb461b3a4bcb49f64df7b9454ef988c295b8153a0080d96d70c336001c8
+EBUILD lpeg-1.1.0.ebuild 2091 BLAKE2B 84f25cc75ccaba7707ab209378ea31782dd6d3da03d9aeb3f8db3cdb17fba69a22a676ac0404f6fd19e1f3ad0bd92718e4a6fe13d1dbb4c1de79854768ad0bc3 SHA512 c011c64af2965ec03fda4b37ab7baf550660b96dedc71b3423ec08b08357e8b6f893f78ee41eedbe4a3ad0a1bac20ffe727003b5c52fc04dfadd7165fcd4aa3a
 MISC metadata.xml 258 BLAKE2B c0d0fed17412419de0d059e7ccb4289f3ffb2628a07c3d15329cba8ed726b2c52efde7ad15857b845ce71e7eeca903467f592e3e324d91147583f5178e5378fa SHA512 0dbe2c5806353798c494bddc4034ccd37181951a6f5085bbb25d15d36d4a800634db47d25d1834bc920000533e4f4db7a02840dd18bd460b35c1f77b743fa1d1
diff --git a/dev-lua/lpeg/files/lpeg-1.1.0-makefile.patch b/dev-lua/lpeg/files/lpeg-1.1.0-makefile.patch
new file mode 100644
index 000000000000..afef6f6c05b5
--- /dev/null
+++ b/dev-lua/lpeg/files/lpeg-1.1.0-makefile.patch
@@ -0,0 +1,31 @@
+Respect user CFLAGS and LDFLAGS.
+
+--- lpeg-1.1.0/makefile
++++ lpeg-1.1.0/makefile
+@@ -1,7 +1,7 @@
+ LIBNAME = lpeg
+ LUADIR = ../lua/
+ 
+-COPT = -O2 -DNDEBUG
++COPT = -DNDEBUG
+ # COPT = -O0 -DLPEG_DEBUG -g
+ 
+ CWARNS = -Wall -Wextra -pedantic \
+@@ -22,7 +22,7 @@
+ # -Wunreachable-code \
+ 
+ 
+-CFLAGS = $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
++CFLAGS += $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
+ CC = gcc
+ 
+ FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
+@@ -36,7 +36,7 @@
+ 	$(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
+ 
+ lpeg.so: $(FILES)
+-	env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
++	env $(CC) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so
+ 
+ $(FILES): makefile
+ 
diff --git a/dev-lua/lpeg/lpeg-1.1.0.ebuild b/dev-lua/lpeg/lpeg-1.1.0.ebuild
new file mode 100644
index 000000000000..2f1e3a74056c
--- /dev/null
+++ b/dev-lua/lpeg/lpeg-1.1.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua flag-o-matic toolchain-funcs
+
+DESCRIPTION="Parsing Expression Grammars for Lua"
+HOMEPAGE="https://www.inf.puc-rio.br/~roberto/lpeg/"
+SRC_URI="https://luarocks.org/manifests/gvvaughan/${P}-1.src.rock -> ${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+IUSE="test debug doc"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	app-arch/unzip
+	test? ( ${RDEPEND} )
+"
+
+DOCS=( HISTORY )
+HTML_DOCS=( lpeg.html re.html )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0-makefile.patch
+)
+
+src_unpack() {
+	unpack "${P}.zip" || die
+	unpack "${WORKDIR}/${P}.tar.gz" || die
+}
+
+lua_src_prepare() {
+	if ! test -d "${S}.${ELUA}/" ; then
+		cp -ral "${S}/" "${S}.${ELUA}/" || die
+	fi
+}
+
+src_prepare() {
+	default
+	use debug && append-cflags -DLPEG_DEBUG
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		append-ldflags "-undefined dynamic_lookup"
+	fi
+
+	lua_foreach_impl lua_src_prepare
+}
+
+lua_src_compile() {
+	cd "${S}.${ELUA}/" || die
+	emake CC="$(tc-getCC)" \
+		LUADIR="${EPREFIX}/$(lua_get_include_dir)"
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	cd "${S}.${ELUA}/" || die
+	${ELUA} test.lua || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	cd "${S}.${ELUA}/" || die
+	local instdir
+	instdir="$(lua_get_cmod_dir)"
+	exeinto "${instdir#${EPREFIX}}"
+	doexe lpeg.so
+	instdir="$(lua_get_lmod_dir)"
+	insinto "${instdir#${EPREFIX}}"
+	doins re.lua
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local luav=$(lua_get_version)
+		# we only want the major version (e.g. 5.1)
+		local luamv=${luav:0:3}
+		local file="lua/${luamv}/lpeg.so"
+		install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${file}" \
+			"${ED}/usr/$(get_libdir)/${file}" || die "Failed to adjust install_name"
+	fi
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+	cd "${S}" || die
+	use doc && einstalldocs
+}