gentoo resync : 29.01.2021

4 files changed, 3 insertions, 73 deletions

diff --git a/dev-lua/luajson/Manifest b/dev-lua/luajson/Manifest
index 64377feac181..79680a243c18 100644
--- a/dev-lua/luajson/Manifest
+++ b/dev-lua/luajson/Manifest
@@ -1,6 +1,3 @@
-DIST luajson-1.3.3.tar.gz 42653 BLAKE2B 2bc7310317a1279906681c2de284dc7b9d50766c0c21c606da746d0e709168e5364c3a821798f3ce423dfdd246162212525c1fee7c13cb5f0999db56d1e5e3c3 SHA512 9b507148afaf59871f97e7cf78ad35dc01497d553699d1d1a928543fad6a375aebc3852da86d51d744f10ab2ec24c7b1d7c380852da8134ae05f2f22f6f200c2
 DIST luajson-1.3.4.tar.gz 46941 BLAKE2B 50c8c20c487f92fd19b3e080a87eec58c2cb30d83dfc6acd7aca3f155a04f85a194c069f735a2881e14b0eb3fd3b16e4a75ea625ac81c65b9e25cb1c3601673c SHA512 d24dc8399337b96cde3254a83e5cc1fa995b76f0e1fae54ad91a490f0a6f4c5d0927919320f99d7bc4238ac5529d0ea57435c6be2519fb52e2a83f5005fbc4f7
-EBUILD luajson-1.3.3-r1.ebuild 717 BLAKE2B 2979a988cec939d66bda0326af0f50c0cae2e70b546289a014966025deb3ad7e896a347ac18d518e2d6554a0e480ff2be0eef0fc516e72af2a1be3600394f649 SHA512 e932872553f077207e134bbd6c9e524984b7b80c38780ff0b61d1957e8820ddb4a97a849d614845d20c53ee58f5e0c8ab3f9f1db899728834bc349c89edc925b
-EBUILD luajson-1.3.4-r100.ebuild 829 BLAKE2B 9ea935a008b6c54953e9c7588de28b93f1fb2f2bdccc36cb5ed005b34ebb58caa6271d722f566ed69e41c104eb1218e893559d13d45b2351e5373391cab8ccb4 SHA512 d5aa6b0af940b30ca1439537f886ee4597e42e12c110cbcc947edc1e78ca41dd3b86039667db1c45b85f4ef99c0609e22e1184b87ef9394600f0e19aa9f52bfe
-EBUILD luajson-1.3.4.ebuild 883 BLAKE2B f979c521af83e134b7773dfab4b90f3738e72fe9d5b402db2a4c6124109c0db98003b13d80916519b2616c7f2825c4bc123f642c11c19aab9d263d96d3ecfd43 SHA512 f6c7695856cf28abf436e2177f58b1d084d08a8d94144594bb50ed1b5ca210e9af0783a4f4a9123e8ce3838f373ab2a417998e4e2b210a3c05df40528ce8d86a
+EBUILD luajson-1.3.4-r100.ebuild 824 BLAKE2B 0bfe6927b00504384070d8c0a71df0b6c929078354dfc807fc421622bcce8667db235395ddc6b31a17e6a1e645062ae5baf82dbb0aa03ee4bdebd1ccb4bd61be SHA512 822c2f3c8bb6710a429b0342502a45f102466400ce2b5b5e4cb81adf6a9de0bb38ba03590a1e2cfdcd1ace11b53ceb74dcace5043c99336cde73dcdc2ec9f36a
 MISC metadata.xml 253 BLAKE2B 9a21f2ec285f683bc6766396dc836716c6cb52b0b6829a18144d50010d199b93bd0e47216e958f08e23e7c047b11446f4aa127a8b8ca425ce61b247b0593b6d9 SHA512 0ffb4892273cb493c3afaa3adebb9757669fce7e4135ebbefe066511f4319f1e1b60f306e9a9a2a7ea64bcab53515cd342f8e677c232c1966e02c04599bfb75c
diff --git a/dev-lua/luajson/luajson-1.3.3-r1.ebuild b/dev-lua/luajson/luajson-1.3.3-r1.ebuild
deleted file mode 100644
index 48f67efbcaae..000000000000
--- a/dev-lua/luajson/luajson-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="JSON Parser/Constructor for Lua"
-HOMEPAGE="https://www.eharning.us/wiki/luajson/"
-SRC_URI="https://github.com/harningt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
-IUSE="test"
-
-RDEPEND="|| ( >=dev-lang/lua-5.1:0 dev-lang/luajit:2 )
-	dev-lua/lpeg"
-DEPEND="test? ( dev-lua/luafilesystem )"
-
-# lunit not in the tree yet
-RESTRICT="test"
-
-# nothing to compile
-src_compile() { :; }
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-	dodoc README docs/ReleaseNotes-${PV}.txt docs/LuaJSON.txt
-}
diff --git a/dev-lua/luajson/luajson-1.3.4-r100.ebuild b/dev-lua/luajson/luajson-1.3.4-r100.ebuild
index f06cd069d628..2fe781e7093e 100644
--- a/dev-lua/luajson/luajson-1.3.4-r100.ebuild
+++ b/dev-lua/luajson/luajson-1.3.4-r100.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="https://github.com/harningt/${PN}/archive/${PV}.tar.gz -> ${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"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/dev-lua/luajson/luajson-1.3.4.ebuild b/dev-lua/luajson/luajson-1.3.4.ebuild
deleted file mode 100644
index 23394e143028..000000000000
--- a/dev-lua/luajson/luajson-1.3.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="JSON Parser/Constructor for Lua"
-HOMEPAGE="https://www.eharning.us/wiki/luajson/"
-SRC_URI="https://github.com/harningt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="luajit test"
-
-# lunit not in the tree yet
-RESTRICT="test"
-
-RDEPEND="
-	dev-lua/lpeg
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0 )
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( dev-lua/luafilesystem )
-"
-
-DOCS=( README.md docs/ReleaseNotes-${PV}.txt docs/LuaJSON.txt )
-
-# nothing to compile
-src_compile() { :; }
-
-src_install() {
-	emake DESTDIR="${ED}" INSTALL_LMOD="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))" install
-
-	einstalldocs
-}