gentoo resync : 29.01.2021

5 files changed, 3 insertions, 150 deletions

diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
index 340fb5552a5f..161055585cab 100644
--- a/dev-lua/lpeg/Manifest
+++ b/dev-lua/lpeg/Manifest
@@ -1,8 +1,4 @@
-AUX lpeg-0.12.1-makefile.patch 820 BLAKE2B 8706c3ee0588efc0c3d072d713cf1a8b0ca7653c6701eafe9ec9b3e5284a2ff8b7f989fb65425840da0513e719fe5fa820deb4814d3e838dd5b33651eb4e3c4e SHA512 8f49c6c3b1575cc77d0d9d6c8b75098889af1f8fda58fee1f58150669909e6c4ecbd953738e9c917adcbb1bddc16debe5564b70694d6983295439e06e26782d6
 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 1251 BLAKE2B a9953b0ab65db25c93ca81715be990d28d85fabd606805e851b5edc0657cb4e65c583bc0b2ff198a4e7cb34a36704e562f5b48ef6b3474fab38f30c0829833cf SHA512 cb09ec82058114e33601825d6d95e17ebc5b59e4ac586cfcaed5d0bb2994eb21e211c87a2dceeb5a9abec8fe99aa2962ef75b8a56525c2b2d112f93a2a41a0de
-EBUILD lpeg-1.0.2-r101.ebuild 1537 BLAKE2B b75e317be864dccaa694d84d141b8239012786a141269daf2d780f511a00c3c2ddedd1fa5d4417c63aec5f87156a3ec537e1579a68a2e35171cfa73cf7603080 SHA512 c2a13abc6c681af638cb783c2395544629ff7c28cc1cb1d9ceb20d6bbd22f3d556b15eec28e2fb2f073aafd4a8c0cc7227ee3c3e9888eeaffc529445e98c713d
-EBUILD lpeg-1.0.2.ebuild 1249 BLAKE2B eaad9865b67b3dca0b873cbb489ef0dde90b858c4bd715db88a0fdd3dec3f20aa7a08c520e88dde44a17c7a0689160e8cafa265f3c2d8649cac0b204dbe2b159 SHA512 0c8fb8c38a73ae74159962d08a4586377b5746545f49cbc065086a823775fd3c07feedc17341580d3bc05a354f65e19312aa65fb453fbd522f4903d0180ca279
+EBUILD lpeg-1.0.2-r101.ebuild 1530 BLAKE2B 0fe58fe3706822574f08a2bbc99020fc289c8ea1adfdf7c309d89f9c32148f27dbed129eeb26eb9926454a5e29187e0eb73b33d9d994563e96c346a40f682487 SHA512 2b5ebb56873364594d494ec70696c231a298ad291e9ca86d64e0933082fced7068ec96182bc21bf3ea15c133e00dde988279f2a1614a2d42368db3fbf96b2ad7
 MISC metadata.xml 257 BLAKE2B fd30d59ebbc18529dbfe65cbec91247e5ad57a53f834d3abc85cbc18af964033e42dda00052b47281a9a85964b190a83c2c8a6eb30f4a9d38894de51d41d9de8 SHA512 06c87d68775d3b524abb426701b16341156bd54f2553b7a0f14a62ca5492c20bf9ff1719084e225ae5fc44c5b518a71258e1138e19551bfcfe828a11dffb12c4
diff --git a/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch b/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch
deleted file mode 100644
index a0be0558aa97..000000000000
--- a/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- lpeg-0.12.1/makefile
-+++ lpeg-0.12.1/makefile
-@@ -1,7 +1,7 @@
- LIBNAME = lpeg
- LUADIR = ../lua/
- 
--COPT = -O2
-+#COPT = -O2
- # COPT = -DLPEG_DEBUG -g
- 
- CWARNS = -Wall -Wextra -pedantic \
-@@ -22,21 +22,21 @@
- # -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
- 
- # For Linux
- linux:
--	make lpeg.so "DLLFLAGS = -shared -fPIC"
-+	$(MAKE) lpeg.so "DLLFLAGS = -shared -fPIC"
- 
- # For Mac OS
- macosx:
--	make lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
-+	$(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.0.1.ebuild b/dev-lua/lpeg/lpeg-1.0.1.ebuild
deleted file mode 100644
index 063616f2b42a..000000000000
--- a/dev-lua/lpeg/lpeg-1.0.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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="debug doc luajit"
-
-RDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-	luajit? ( dev-lang/luajit:2= )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( "HISTORY" )
-HTML_DOCS=( "lpeg.html"  "re.html"  )
-PATCHES=( "${FILESDIR}"/${PN}-0.12.1-makefile.patch )
-
-src_prepare() {
-	default
-	use debug && append-cflags -DLPEG_DEBUG
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		LUADIR="$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
-}
-
-src_test() {
-	$(usex luajit 'luajit' 'lua') test.lua || die
-}
-
-src_install() {
-	local instdir
-	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
-	exeinto "${instdir#${EPREFIX}}"
-	doexe lpeg.so
-	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
-	insinto "${instdir#${EPREFIX}}"
-	doins re.lua
-
-	use doc && einstalldocs
-}
diff --git a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
index 10a6b94a1b47..769fbe86123a 100644
--- a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
+++ b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="test debug doc"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/dev-lua/lpeg/lpeg-1.0.2.ebuild b/dev-lua/lpeg/lpeg-1.0.2.ebuild
deleted file mode 100644
index 3297c2ab4fa5..000000000000
--- a/dev-lua/lpeg/lpeg-1.0.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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="debug doc luajit"
-
-RDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-	luajit? ( dev-lang/luajit:2= )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( HISTORY )
-HTML_DOCS=( lpeg.html re.html )
-PATCHES=( "${FILESDIR}"/${PN}-1.0.2-makefile.patch )
-
-src_prepare() {
-	default
-	use debug && append-cflags -DLPEG_DEBUG
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		LUADIR="$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
-}
-
-src_test() {
-	$(usex luajit 'luajit' 'lua') test.lua || die
-}
-
-src_install() {
-	local instdir
-	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
-	exeinto "${instdir#${EPREFIX}}"
-	doexe lpeg.so
-	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
-	insinto "${instdir#${EPREFIX}}"
-	doins re.lua
-
-	use doc && einstalldocs
-}