gentoo resync : 28.04.2019

8 files changed, 3 insertions, 265 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 0faa10f1ce88..a91599d93e49 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/luvit/Manifest b/dev-lua/luvit/Manifest
deleted file mode 100644
index 9e66df1f35b0..000000000000
--- a/dev-lua/luvit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX luvit-0.7.0-unbundle-http-parser.patch 1383 BLAKE2B 7b28d44ff91b9f599db4fc224dd471573e40c98caaa2404675d02cfc4de581457393952e4c793dd8ae55aedf133cd22e52ef6114670ae4d03ac0439dc6bab5f4 SHA512 0aefa90e3e10e557e59523f2d052aad8eb4f235471b34cf650a380f27faf97fa83cff6d1ae3c3f1e7642db839db8f0660c2ff2aa8e950041b3e1b3452d04619f
-DIST luvit-0.8.2.tar.gz 7126452 BLAKE2B fc08b9964883ad0708cfeec0740171936daa8e58b43ff587eecbe3986f86e46d850a67b47e7a14880c67b9abe650b5cac3bcffab1c6fb2a42f965f38663aa292 SHA512 46ce9e99d1a002697bb777000d97849135805c3b36344880c1d5cb48c648c7252ec440af35a78eb595d7706d11dc85f76e72c72569e2b3d26e2747b870f98c2b
-EBUILD luvit-0.8.2.ebuild 2229 BLAKE2B 2ef80c49f96b5b1a731a60ba2e1a5d5b82ba68317d3ebf73b0b1b6ea44c275391179b6e96037dfd1257d129409ceff33f9faa19be59122ccc5e971b3c6e96906 SHA512 59a9683f83e0c8233b9f28738de279e082ebafbff00ee3c15308ba0e99fc5a132a0f88292a621b6c60476c7736ead7c410c396fc62c40ac09e04329448806c6d
-EBUILD luvit-9999.ebuild 2425 BLAKE2B b625935d72facd0934674d6b6b93c8588ede4ad0baa87288fddd8b73acea37add5ca008c9993995bb96c0d9a3dcb1cd5f3523b56c620b71a7c830404abbf9d5c SHA512 082c7144b04be678eecbb1424a97b182d51730c5cf293c89c36d3cc1f36a8c0558be43c19c72ad6b6090194cb393836761f6a3926003366c704b4df647835ec2
-MISC metadata.xml 256 BLAKE2B 4770083294f5244f4cbac3512b31f2842b85efbe2d31a801f8937e0f0e616e8940c5f3c32836ab5404a29d4c07cb048a871360487d308eb68d01b7d97970ada6 SHA512 a8a13bfb63fbe12ba3f7753aff5fcd7711dcc1e5918d17fa67d0a9daaead72657f180538137148dfa70319ca0bb852c9c24416f9248564611caf75f68fa6f1eb
diff --git a/dev-lua/luvit/files/luvit-0.7.0-unbundle-http-parser.patch b/dev-lua/luvit/files/luvit-0.7.0-unbundle-http-parser.patch
deleted file mode 100644
index d9ae8568c140..000000000000
--- a/dev-lua/luvit/files/luvit-0.7.0-unbundle-http-parser.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-commit b34b7b0474878d1951637b762c68694c16c1c574
-Author: hasufell <hasufell@gentoo.org>
-Date:   Sun Jun 30 22:37:10 2013 +0200
-
-    unbundle http-parser
-
-diff --git a/Makefile b/Makefile
-index a0e9277..99535ca 100644
---- a/Makefile
-+++ b/Makefile
-@@ -40,6 +40,7 @@ USE_SYSTEM_SSL?=0
- USE_SYSTEM_LUAJIT?=0
- USE_SYSTEM_ZLIB?=0
- USE_SYSTEM_YAJL?=0
-+USE_SYSTEM_HTTPPARSER?=0
- 
- DEBUG ?= 1
- ifeq (${DEBUG},1)
-@@ -95,6 +96,10 @@ endif
- LIBS += ${UVDIR}/libuv.a
- LIBS += ${CARESDIR}/libcares.a
- 
-+ifeq (${USE_SYSTEM_HTTPPARSER},1)
-+LIBS += -lhttp_parser
-+endif
-+
- ifeq (${USE_SYSTEM_LUAJIT},1)
- CPPFLAGS+=$(shell pkg-config --cflags luajit)
- LIBS+=$(shell pkg-config --libs luajit)
-@@ -174,8 +179,11 @@ LUVLIBS=${BUILDDIR}/utils.o          \
-         ${BUILDDIR}/lhttp_parser.o
- 
- DEPS= ${UVDIR}/libuv.a             \
--		${CARESDIR}/libcares.a \
--		${HTTPDIR}/http_parser.o
-+		${CARESDIR}/libcares.a
-+
-+ifeq (${USE_SYSTEM_HTTPPARSER},0)
-+DEPS += ${HTTPDIR}/http_parser.o
-+endif
- 
- ifeq (${USE_SYSTEM_LUAJIT},0)
- DEPS+=${LUADIR}/src/libluajit.a
-@@ -290,8 +298,10 @@ install: all
- 	install ${BUILDDIR}/luvit ${BINDIR}/luvit
- 	mkdir -p ${LIBDIR}
- 	cp lib/luvit/*.lua ${LIBDIR}
-+ifeq (${USE_SYSTEM_HTTPPARSER},0)
- 	mkdir -p ${INCDIR}/http_parser
- 	cp ${HTTPDIR}/http_parser.h ${INCDIR}/http_parser/
-+endif
- 	mkdir -p ${INCDIR}/uv
- 	cp -r ${UVDIR}/include/* ${INCDIR}/uv/
- 	cp src/*.h ${INCDIR}/
diff --git a/dev-lua/luvit/luvit-0.8.2.ebuild b/dev-lua/luvit/luvit-0.8.2.ebuild
deleted file mode 100644
index f7f82f51341d..000000000000
--- a/dev-lua/luvit/luvit-0.8.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib
-
-# TODO: FHS https://github.com/luvit/luvit/issues/379
-
-DESCRIPTION="Takes node.js' architecture and dependencies and fits it in the Lua language"
-HOMEPAGE="https://luvit.io/"
-SRC_URI="https://luvit.io/dist/latest/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="bundled-libs examples libressl"
-# luvit Apache-2.0
-# luajit MIT
-# yajl BSD
-LICENSE="Apache-2.0 bundled-libs? ( BSD MIT )"
-
-# fails in portage environment
-# succeeds if run manually
-RESTRICT="test"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib
-	!bundled-libs? (
-		dev-lang/luajit:2[lua52compat]
-		>=dev-libs/yajl-2.0.2
-		net-libs/http-parser:=
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	rm -r deps/{openssl,zlib} || die
-	epatch "${FILESDIR}"/${PN}-0.7.0-unbundle-http-parser.patch
-	if use bundled-libs ; then
-		sed -i \
-			-e "s/-Werror//" \
-			-e "s/-O3//" \
-			deps/http-parser/Makefile || die "fixing flags failed!"
-	else
-		rm -r deps/{luajit,yajl,http-parser} || die
-		# TODO: no version detection for http-parser yet
-		MY_YAJL_VERSION=$($(tc-getPKG_CONFIG) --modversion yajl)
-		MY_LUAJIT_VERSION=$($(tc-getPKG_CONFIG) --modversion luajit)
-		sed -i \
-			-e "s:^YAJL_VERSION=.*:YAJL_VERSION=${MY_YAJL_VERSION}:" \
-			-e "s:^LUAJIT_VERSION=.*:LUAJIT_VERSION=${MY_LUAJIT_VERSION}:" \
-			Makefile || die "setting yajl version failed"
-	fi
-
-}
-
-src_configure() {
-	# skip retarded gyp build system
-	:
-}
-
-src_compile() {
-	tc-export CC AR
-
-	emake -C deps/cares
-
-	myemakeargs=(
-		DEBUG=0
-		WERROR=0
-		USE_SYSTEM_SSL=1
-		# bundled luajit is compiled with special flags
-		USE_SYSTEM_LUAJIT=$(usex bundled-libs "0" "1")
-		USE_SYSTEM_YAJL=$(usex bundled-libs "0" "1")
-		USE_SYSTEM_HTTPPARSER=$(usex bundled-libs "0" "1")
-		USE_SYSTEM_ZLIB=1
-		PREFIX=/usr
-		LIBDIR="${D%/}"/usr/$(get_libdir)/${PN}
-		DESTDIR="${D}"
-	)
-
-	emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-	emake "${myemakeargs[@]}" install
-	dodoc TODO ChangeLog README.markdown errors.markdown
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-lua/luvit/luvit-9999.ebuild b/dev-lua/luvit/luvit-9999.ebuild
deleted file mode 100644
index 5718d425719e..000000000000
--- a/dev-lua/luvit/luvit-9999.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib git-2
-
-# TODO: FHS https://github.com/luvit/luvit/issues/379
-
-DESCRIPTION="Takes node.js' architecture and dependencies and fits it in the Lua language"
-HOMEPAGE="https://luvit.io/"
-EGIT_REPO_URI="https://github.com/luvit/luvit.git"
-
-KEYWORDS=""
-SLOT="0"
-IUSE="bundled-libs examples libressl"
-# luvit Apache-2.0
-# luajit MIT
-# yajl BSD
-LICENSE="Apache-2.0 bundled-libs? ( BSD MIT )"
-
-# fails in portage environment
-# succeeds if run manually
-RESTRICT="test"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib
-	!bundled-libs? (
-		dev-lang/luajit:2[lua52compat]
-		>=dev-libs/yajl-2.0.4
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-EGIT_HAS_SUBMODULES=1
-
-src_prepare() {
-	rm -r deps/{openssl,zlib} || die
-
-	if use bundled-libs ; then
-		MY_YAJL_VERSION=$(git --git-dir deps/yajl/.git describe --tags)
-		MY_LUAJIT_VERSION=$(git --git-dir deps/luajit/.git describe --tags)
-	else
-		rm -r deps/{luajit,yajl} || die
-		MY_YAJL_VERSION=$($(tc-getPKG_CONFIG) --modversion yajl)
-		MY_LUAJIT_VERSION=$($(tc-getPKG_CONFIG) --modversion luajit)
-	fi
-
-	MY_HTTP_VERSION=$(git --git-dir deps/http-parser/.git describe --tags)
-	MY_UV_VERSION=$(git --git-dir deps/uv/.git describe --all --long | cut -f 3 -d -)
-
-	sed \
-		-e "s:^YAJL_VERSION=.*:YAJL_VERSION=${MY_YAJL_VERSION}:" \
-		-e "s:^LUAJIT_VERSION=.*:LUAJIT_VERSION=${MY_LUAJIT_VERSION}:" \
-		-e "s:^HTTP_VERSION=.*:HTTP_VERSION=${MY_HTTP_VERSION}:" \
-		-e "s:^UV_VERSION.*:UV_VERSION=${MY_UV_VERSION}:" \
-		-i Makefile || die "sed failed"
-
-	sed -i \
-		-e "s/-Werror//" \
-		-e "s/-O3//" \
-		deps/http-parser/Makefile || die "fixing flags failed!"
-}
-
-src_configure() {
-	# skip retarded gyp build system
-	:
-}
-
-src_compile() {
-	tc-export CC AR
-
-	emake -C deps/cares
-
-	myemakeargs=(
-		DEBUG=0
-		WERROR=0
-		USE_SYSTEM_SSL=1
-		USE_SYSTEM_ZLIB=1
-		# bundled luajit is compiled with special flags
-		USE_SYSTEM_LUAJIT=$(usex bundled-libs "0" "1")
-		USE_SYSTEM_YAJL=$(usex bundled-libs "0" "1")
-		PREFIX=/usr
-		LIBDIR="${D}"/usr/$(get_libdir)/${PN}
-		DESTDIR="${D}"
-	)
-
-	emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-	emake "${myemakeargs[@]}" install
-	dodoc TODO ChangeLog README.markdown errors.markdown
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-lua/luvit/metadata.xml b/dev-lua/luvit/metadata.xml
deleted file mode 100644
index dc16404b528a..000000000000
--- a/dev-lua/luvit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<use>
-		<flag name="bundled-libs">Use bundled versions of some libraries.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
index 317480502b1c..d5682aa89a86 100644
--- a/dev-lua/mpack/Manifest
+++ b/dev-lua/mpack/Manifest
@@ -1,3 +1,3 @@
 DIST mpack-1.0.4.tar.gz 46382 BLAKE2B 5092830e1a970ad96686ede4d96833a210543418cb23f218ba774bfd724267344f9e44e367490bb33dae8023e1145202ea6e457be7753a426eae990df906547d SHA512 8e40a562faf8b62137dec0733cbb9006fa7054e5a47bdd128fb4dfd676fac4e4385a23c3d908a4ce2edd65d673db25916695fa74bc08c5316b0c80e571a7442c
-EBUILD mpack-1.0.4.ebuild 1017 BLAKE2B 9ea57f9f1db116b99cdfb69fb42e9882f1aa23c2e2c750d29cd384a7942daf89fd7ceac7bfff49b48dc2ca72815c12b3df3a7c687043b778a3988b9906bba948 SHA512 0e8ff61f4b76779adb421d742c005d0b9a9ee8e723e9c94382696e0ad10c2f73f3140e4e8c38005b7ce516e3c7f1115080fdb834f5c8920a499554fac3132b03
+EBUILD mpack-1.0.4.ebuild 1019 BLAKE2B 03f3d2960b628c09b275851d4aa3c13caf673b4eedc32162141653a317954ca3300929ddd3b0d76cac6323088e8697703f8435db161bfb7b67954c5df7ac0ff0 SHA512 9966fe806de4ef3bfcb56bc3fce9abdf81b6282847bfdbf47de784be46c846a8ee550a87605585863ff793e096a45afcaade0fd7cc0b94508147d5f6f9f78222
 MISC metadata.xml 248 BLAKE2B 81385dcd4ba6430bbbdba154d5db77437f343697bf1c614bc817716830ed37e708630ca786a43618e2597fe1e5056c69b4960ad0f6264842919680d47205795f SHA512 1c1f01209afb5e2ba42c1d242940af7b846561018ad6abef9a0bc8abdab6d8ebff3e71be9e0fa783e0c7d8ae3597f56e695135f21ff631b1026bfe7d792764f8
diff --git a/dev-lua/mpack/mpack-1.0.4.ebuild b/dev-lua/mpack/mpack-1.0.4.ebuild
index 354d35b57794..2c65a7b361e6 100644
--- a/dev-lua/mpack/mpack-1.0.4.ebuild
+++ b/dev-lua/mpack/mpack-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ S="${WORKDIR}/libmpack-${PV}/binding/lua"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="luajit test"
 
 RDEPEND="