gentoo resync : 14.12.2020

4 files changed, 84 insertions, 4 deletions

diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
index dc05310b1519..2115846ab578 100644
--- a/dev-lua/lpeg/Manifest
+++ b/dev-lua/lpeg/Manifest
@@ -2,6 +2,7 @@ AUX lpeg-0.12.1-makefile.patch 820 BLAKE2B 8706c3ee0588efc0c3d072d713cf1a8b0ca76
 AUX lpeg-1.0.2-makefile.patch 671 BLAKE2B 4ed03dc08e737fe6cc45f4fe9c53657a71341cac69a3ec6fa52d124dbf5c3b58bcf1077d255598f98952eb2329905a25b45e4c031ab9fb82700d919d7f264452 SHA512 0d17351cda382ddb5574f7d14bc6479439cc703ac0c360b2b0f043288427beda9aea1f229fd2e0ea8b604bd935bce2fc959a2410804bfd82bb2c2e128ab501ac
 DIST lpeg-1.0.1.tar.gz 71527 BLAKE2B 5f19d308572f2d7a5ff11d7aa33f437ec682994d0a396a322764cf12a4cb659c66ce6ffaf0c76f6a250a7d767b6545478dd3bb760150b9f88be41fac9dafde0d SHA512 7b43fbee7eff443000986684bc56bba6d2796a31cf860740746c70e155bdea1b62a46b93f97e2747e3ef0f63e965148778ac2985d0f2d83e1e37ec4ebbabf4aa
 DIST lpeg-1.0.2.tar.gz 71840 BLAKE2B e0d8fb4e9d17c9018f0b206cd3f7c9c0e21398c119600b5b0705c8df19e0956347bea795c7c3ded8e62e0c09802dd8eab931a5e3769fcacf44c35aa2b17fa8d6 SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814
-EBUILD lpeg-1.0.1.ebuild 1249 BLAKE2B 1759f35c89ed3331c8051f5de6b9085c94c3ecc97ce53f0186f6dea4dd371de8234ffcd014ec014aefffe4e3f438fc4828e8c9302653db5c99e702d3ca66a6cf SHA512 24acb31792144e36961425fd0da8512f30bfe11a39e7601feae18468d49aa1da5b6ca7774c37c9673595589f7c3afc3eb910422c2fa3564f73543c3c521e881c
-EBUILD lpeg-1.0.2.ebuild 1248 BLAKE2B b3339c1bf3510be64ea7062d84293a75ca7f9fcdf3fe360ea0de1176ade94001acc171189f3c8a23f3be35e40245df799cccf355cf07461664d98977f98eef7b SHA512 067e95f7df82997c7fa4ba0c69648ce51b28d4aa590cb8017c2888576762e018e8b1527fc03d01b842dd8c60d0062cbbf986d14ae8050781fecddf003cb19fdf
+EBUILD lpeg-1.0.1.ebuild 1250 BLAKE2B 8347a85fad87c1a3b97b296c28096993a6d1bba661baf24166540dd878c60d51e768dd5e359de69372f50930dd362058f4965456c4b0ce398b704fe6ab4781ea SHA512 9132dc63bc9786e444e30196241d2e6ec4a9d91b89b20b3e81b73513d16571118be701e0de44b9109c191620fbeb1ac91e293ab0dab8f943b0f81a63edbed15a
+EBUILD lpeg-1.0.2-r101.ebuild 1537 BLAKE2B b75e317be864dccaa694d84d141b8239012786a141269daf2d780f511a00c3c2ddedd1fa5d4417c63aec5f87156a3ec537e1579a68a2e35171cfa73cf7603080 SHA512 c2a13abc6c681af638cb783c2395544629ff7c28cc1cb1d9ceb20d6bbd22f3d556b15eec28e2fb2f073aafd4a8c0cc7227ee3c3e9888eeaffc529445e98c713d
+EBUILD lpeg-1.0.2.ebuild 1249 BLAKE2B eaad9865b67b3dca0b873cbb489ef0dde90b858c4bd715db88a0fdd3dec3f20aa7a08c520e88dde44a17c7a0689160e8cafa265f3c2d8649cac0b204dbe2b159 SHA512 0c8fb8c38a73ae74159962d08a4586377b5746545f49cbc065086a823775fd3c07feedc17341580d3bc05a354f65e19312aa65fb453fbd522f4903d0180ca279
 MISC metadata.xml 257 BLAKE2B fd30d59ebbc18529dbfe65cbec91247e5ad57a53f834d3abc85cbc18af964033e42dda00052b47281a9a85964b190a83c2c8a6eb30f4a9d38894de51d41d9de8 SHA512 06c87d68775d3b524abb426701b16341156bd54f2553b7a0f14a62ca5492c20bf9ff1719084e225ae5fc44c5b518a71258e1138e19551bfcfe828a11dffb12c4
diff --git a/dev-lua/lpeg/lpeg-1.0.1.ebuild b/dev-lua/lpeg/lpeg-1.0.1.ebuild
index 8b2a23d8b937..87761dcecf3e 100644
--- a/dev-lua/lpeg/lpeg-1.0.1.ebuild
+++ b/dev-lua/lpeg/lpeg-1.0.1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86"
 IUSE="debug doc luajit"
 
 RDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1:= )
+	!luajit? ( >=dev-lang/lua-5.1:0= )
 	luajit? ( dev-lang/luajit:2= )"
 
 DEPEND="
diff --git a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
new file mode 100644
index 000000000000..10a6b94a1b47
--- /dev/null
+++ b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
@@ -0,0 +1,79 @@
+# 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 flag-o-matic toolchain-funcs
+
+DESCRIPTION="Parsing Expression Grammars for Lua"
+HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/"
+SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test debug doc"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+DOCS=( HISTORY )
+HTML_DOCS=( lpeg.html re.html )
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2-makefile.patch )
+
+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
+	lua_foreach_impl lua_src_prepare
+}
+
+lua_src_compile() {
+	cd "${S}.${ELUA}/" || die
+	emake CC="$(tc-getCC)" \
+		LUADIR="$(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
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+	cd "${S}" || die
+	use doc && einstalldocs
+}
diff --git a/dev-lua/lpeg/lpeg-1.0.2.ebuild b/dev-lua/lpeg/lpeg-1.0.2.ebuild
index 1bd23c851d9d..3297c2ab4fa5 100644
--- a/dev-lua/lpeg/lpeg-1.0.2.ebuild
+++ b/dev-lua/lpeg/lpeg-1.0.2.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug doc luajit"
 
 RDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1:= )
+	!luajit? ( >=dev-lang/lua-5.1:0= )
 	luajit? ( dev-lang/luajit:2= )"
 
 DEPEND="