gentoo resync : 14.12.2020

6 files changed, 251 insertions, 4 deletions

diff --git a/dev-lua/lanes/Manifest b/dev-lua/lanes/Manifest
index dad72528e1f5..7851243e0e6d 100644
--- a/dev-lua/lanes/Manifest
+++ b/dev-lua/lanes/Manifest
@@ -1,4 +1,8 @@
 AUX lanes-3.10.0-fix-makefile.patch 855 BLAKE2B 4505cb94476ffcc1100917a660d5b8d9aa062c2a87fa463cc98bcf84190239ceb5ad53bb0c9db57b512db5590dc128f102c1af4b72c02442953220a1ed12e46e SHA512 877e3ad24d9192c2b87de7e684f77c7db725d929d1f2709b531929cf343e1da9b0396a79dd0763d2fa36a492d7920937553f533d9a75dfb353ec2ab4466c2e80
+AUX lanes-3.13.0-makefile.patch 2909 BLAKE2B e2325494fdf3f54923ed29cc66e80443a22be26cb7352b1fcbe46d0df7983bda958874e5a8a4156a65c9f2cc019fb7a6b6ed8da8652aa6d45af63f787ccf828e SHA512 ad3b7456a6c68043974ffcc1e1955b96364461b90b1edfa32f50ad48a3aeae9755ec8f756303f5e7c009f6c3e07f2d2c6bcfadc7e484d7a6e140b59e55b5d5a7
 DIST lanes-3.10.0.tar.gz 231359 BLAKE2B beb1972a9b37097947fc673a644330fe8b66c826bc09967526b96d8e28838939516ee3ad4640fb8e5dca7061227c2844d55270c48f26416c7a7bd3613a83e648 SHA512 4a49f560623e291a8344ffef69f4f26fd422d21d3926d73dfee9c9ae9ebd4973e5ae2d307dfd42c5a3bf101bfcc277df54f0a46d89390c83483208e36d4e5d9b
-EBUILD lanes-3.10.0.ebuild 755 BLAKE2B 9034cc6d8f6f0124e9e18d1ebad67d33a798b62dd286a2d7b16d2940c44c3c55827e8343da6a19fca663b73a1ebde60845170917f287cecb264fff353bd07938 SHA512 e3dd7ab1960a3fa2e9f90123b1f6d52ed90215c167b504c1d5986d0b2adcac3d279292c26628e8cc8d30d98c95d81acc7f9a0973333451c0173c785b08b0c679
-MISC metadata.xml 327 BLAKE2B 7b9f8e7dd81f276b8f95697a22412a955efc368172847c3fd2b74baa34cd0f65e3f0e1fe16a450bdbd811dafce036b374e8ba9956ad80f94e866e3a3a840651a SHA512 b7a1e293faa34fe5bb51e15dfb1537be01bafeeb1a48b36847e96e45ed8bf82364f9154332fc615c3b3dab8f93d1b2dbf9662ffbd8cb117ac22f481daed44a2d
+DIST lanes-3.13.0.tar.gz 247978 BLAKE2B e330f3648e865b8b7c1b77061b6a8210f46e1db650066736afe62040dbb20c7e31e0037b420fded8fb0931cc2ac59687e2039fb31f43c1bdf0cae8cd3c031307 SHA512 bb509181757fa2b4f07a55962015b35ca6bb867b18ec89dd655f333babe2e12f56479fa85bc98e0dacf5bec2a523265bbc3a978396dc332dc1fdda4df760b2e5
+EBUILD lanes-3.10.0.ebuild 755 BLAKE2B bf7d14cfce83787e7c3100fe4ca311bf3312a55c9cd82a0b30f7f95e39ae9ef20f6274cf5a6f396c46cd3ac4f926b039c462169e49fb93a2ca2bc4f1f0ec85d0 SHA512 614c5a5e21b33a25edf3e34e41e993705008918afda3f60d542f197f229068a3b15eccc17a2ea5ea731d93b71ca90ae864d11a73a5d24f9e738e8d4b2ba1bf0e
+EBUILD lanes-3.13.0-r100.ebuild 1404 BLAKE2B b96e9fa333fb440ac806e6213b210d77e74c7cfdc56d537f36f2f147ae5a8bef0ee74bedbfcb0b9f0a04e7895d4b14d38c44ed658818e022755f8f4a3fbb1379 SHA512 d1b9b4f665b87796b4b7219668955965587ea94c568c43e4ca8e15c87eee7abddca000b628cb735fbac6e200f8ac89d856f93746a8ec21afa3ea228aaf7f9172
+EBUILD lanes-3.13.0.ebuild 1312 BLAKE2B f130e3e5faaf31d3d0e639199f322e18bc8ff5802e83d1ca59b31b3b3199ddfcbfc6c8df497ef3964f805251abb6d58f0c0cdb6565ecad8da89518bccd165182 SHA512 510b94480af415b9046cba4da7740e9d8eb6514b6630bafe4131c0b84da911e654893bf45548f44c33105c072f1088f92ad7fc3496ba93b8023d2c0f0ea7747b
+MISC metadata.xml 438 BLAKE2B 7edf60b96d12fe2b577ca5665bbfe053830e53f4821f50b14467e025472db68cdb0d7c4874ff03c882d710d9180ac170beb9f5b07e1f021dc9c576645d2606a7 SHA512 d9258d0d00639649436ae8877e4856309332ad07cc765f228f17b1be79fd2c876fab0bd5a303e1a77f64b9951d5e109126dc6baa5cd92da197202895d9528138
diff --git a/dev-lua/lanes/files/lanes-3.13.0-makefile.patch b/dev-lua/lanes/files/lanes-3.13.0-makefile.patch
new file mode 100644
index 000000000000..257c9efca466
--- /dev/null
+++ b/dev-lua/lanes/files/lanes-3.13.0-makefile.patch
@@ -0,0 +1,93 @@
+--- lanes-3.13.0.old/Makefile	2018-11-30 13:28:50.000000000 +0100
++++ lanes-3.13.0/Makefile	2020-11-30 21:28:36.769384766 +0100
+@@ -33,7 +33,7 @@
+ 
+ # Autodetect LUA
+ #
+-LUA=$(word 1,$(shell which lua5.1$(_LUAEXT)) $(shell which lua51$(_LUAEXT)) lua$(_LUAEXT))
++LUA ?= $(word 1,$(shell which lua5.1$(_LUAEXT)) $(shell which lua51$(_LUAEXT)) lua$(_LUAEXT))
+ 
+ _TARGET_SO=$(_TARGET_DIR)/core.$(_SO)
+ 
+--- lanes-3.13.0.old/src/Makefile	2018-11-30 13:28:50.000000000 +0100
++++ lanes-3.13.0/src/Makefile	2020-11-30 21:40:06.399382894 +0100
+@@ -15,7 +15,7 @@
+ #
+ LIBFLAG=-shared
+ 
+-OPT_FLAGS=-O2
++OPT_FLAGS ?=
+     # -O0 -g
+ 
+ _SO=so
+@@ -38,50 +38,8 @@
+     LUA_LIBS:="$(LUA_DEV)/lua5.1.dll" -lgcc
+     LIBFLAG=-shared -Wl,-Map,lanes.map
+   else
+-    # Autodetect LUA_FLAGS and/or LUA_LIBS
+-    #
+-    ifneq "$(shell which pkg-config)" ""
+-      ifeq "$(shell pkg-config --exists luajit && echo 1)" "1"
+-        LUA_FLAGS:=$(shell pkg-config --cflags luajit)
+-        LUA_LIBS:=$(shell pkg-config --libs luajit)
+-          #
+-          # Debian: -I/usr/include/luajit-2.0
+-          #         -lluajit-5.1
+-      else
+-        ifeq "$(shell pkg-config --exists lua5.1 && echo 1)" "1"
+-          LUA_FLAGS:=$(shell pkg-config --cflags lua5.1)
+-          LUA_LIBS:=$(shell pkg-config --libs lua5.1)
+-            #
+-            # Ubuntu: -I/usr/include/lua5.1 
+-            #         -llua5.1
+-        else
+-          ifeq "$(shell pkg-config --exists lua && echo 1)" "1"
+-            LUA_FLAGS:=$(shell pkg-config --cflags lua)
+-            LUA_LIBS:=$(shell pkg-config --libs lua)
+-              #
+-              # OS X fink with pkg-config:
+-              #      -I/sw/include 
+-              #      -L/sw/lib -llua -lm
+-          else
+-            $(warning *** 'pkg-config' existed but did not know of 'lua[5.1]' - Good luck!)
+-            LUA_FLAGS:=
+-            LUA_LIBS:=-llua
+-          endif
+-        endif
+-      endif
+-    else
+-      # No 'pkg-config'; try defaults
+-      #
+-      ifeq "$(shell uname -s)" "Darwin"
+-        $(warning *** Assuming 'fink' at default path)
+-        LUA_FLAGS:=-I/sw/include
+-        LUA_LIBS:=-L/sw/lib -llua
+-      else
+-        $(warning *** Assuming an arbitrary Lua installation; try installing 'pkg-config')
+-        LUA_FLAGS:=
+-        LUA_LIBS:=-llua
+-      endif
+-    endif
++    LUA_FLAGS ?= $(shell pkg-config --cflags lua)
++    LUA_LIBS ?= $(shell pkg-config --libs lua)
+   endif
+ 
+   ifeq "$(shell uname -s)" "Darwin"
+@@ -92,7 +50,7 @@
+     LIBFLAG = -bundle -undefined dynamic_lookup
+   endif
+   
+-  CFLAGS=-Wall -Werror $(OPT_FLAGS) $(LUA_FLAGS)
++  CFLAGS=-Wall $(OPT_FLAGS) $(LUA_FLAGS)
+   LIBS=$(LUA_LIBS)
+ endif
+ 
+@@ -125,7 +83,7 @@
+ #
+ $(MODULE_DIR)/core.$(_SO): $(OBJ)
+ 	mkdir -p $(MODULE_DIR)
+-	$(CC) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@
++	$(CC) $(LDFLAGS) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@
+ 
+ clean:
+ 	-rm -rf $(MODULE)/core.$(_SO) *.o *.map
diff --git a/dev-lua/lanes/lanes-3.10.0.ebuild b/dev-lua/lanes/lanes-3.10.0.ebuild
index 0db398773e8e..b801dd2bd239 100644
--- a/dev-lua/lanes/lanes-3.10.0.ebuild
+++ b/dev-lua/lanes/lanes-3.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE=""
 
-COMMON_DEPEND=">=dev-lang/lua-5.1"
+COMMON_DEPEND=">=dev-lang/lua-5.1:0="
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
diff --git a/dev-lua/lanes/lanes-3.13.0-r100.ebuild b/dev-lua/lanes/lanes-3.13.0-r100.ebuild
new file mode 100644
index 000000000000..3c7d429b112e
--- /dev/null
+++ b/dev-lua/lanes/lanes-3.13.0-r100.ebuild
@@ -0,0 +1,87 @@
+# 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 toolchain-funcs
+
+DESCRIPTION="Lightweight, native, lazy evaluating multithreading library"
+HOMEPAGE="https://github.com/LuaLanes/lanes"
+SRC_URI="https://github.com/LuaLanes/lanes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+HTML_DOCS=( "docs/." )
+
+PATCHES=( "${FILESDIR}/${PN}-3.13.0-makefile.patch" )
+
+src_prepare() {
+	default
+
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LUA=${ELUA}"
+		"LUA_FLAGS=$(lua_get_CFLAGS)"
+		"LUA_LIBS="
+		"OPT_FLAGS=${CFLAGS}"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	pushd "${BUILD_DIR}" || die
+
+	emake LUA="${ELUA}" test
+
+	popd
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)"
+		"LUA_SHAREDIR=${ED}/$(lua_get_lmod_dir)"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/lanes/lanes-3.13.0.ebuild b/dev-lua/lanes/lanes-3.13.0.ebuild
new file mode 100644
index 000000000000..e3c4a87c18c9
--- /dev/null
+++ b/dev-lua/lanes/lanes-3.13.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lightweight, native, lazy evaluating multithreading library"
+HOMEPAGE="https://github.com/LuaLanes/lanes"
+SRC_URI="https://github.com/LuaLanes/lanes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="luajit test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( dev-lang/lua:0 )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+HTML_DOCS=( "docs/." )
+
+PATCHES=( "${FILESDIR}/${PN}-3.13.0-makefile.patch" )
+
+src_compile() {
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LUA=$(usex luajit 'luajit' 'lua')"
+		"LUA_FLAGS=-I$($(tc-getPKG_CONFIG) --variable $(usex luajit 'includedir' 'INSTALL_INC') $(usex luajit 'luajit' 'lua'))"
+		"LUA_LIBS="
+		"OPT_FLAGS=${CFLAGS}"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	emake LUA=$(usex luajit 'luajit' 'lua') test
+}
+
+src_install() {
+	local myemakeargs=(
+		"LUA_LIBDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
+		"LUA_SHAREDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	einstalldocs
+}
diff --git a/dev-lua/lanes/metadata.xml b/dev-lua/lanes/metadata.xml
index 5d8223a9b7be..b2c291b1b2b1 100644
--- a/dev-lua/lanes/metadata.xml
+++ b/dev-lua/lanes/metadata.xml
@@ -5,6 +5,10 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">LuaLanes/lanes</remote-id>
 	</upstream>