gentoo resync : 27.03.2021

8 files changed, 90 insertions, 131 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index a7d2baf7c7b3..794095cf75de 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lgi/Manifest b/dev-lua/lgi/Manifest
index 704521faf3e9..faa1c1794d38 100644
--- a/dev-lua/lgi/Manifest
+++ b/dev-lua/lgi/Manifest
@@ -1,5 +1,4 @@
 AUX lgi-0.9.2-lua54.patch 886 BLAKE2B f2163836ca359d91f2f36d6b9fa0bd4aeeebed80a27c0ea8f11c3d025f8e84393b7e5f82cf87de7c567fad34285de8d40da32dae85dbba9efe34b2596801b059 SHA512 9b43ea4ae0e6844f33ab2fe71d04443c4336b91d287aee31ed438c9fb63a201674b160aa8e4593c90459115f60d64e27633e63db9e0466cc7ce2ce244920c431
 DIST lgi-0.9.2.tar.gz 291463 BLAKE2B d89752e7c56f9a695f97f90680515fd9acab57991121ec3455fcd88aa0b64828f060d9bf222fb1ab14bdfc956ec3ad296af848168532d09694a0cacbb55dac71 SHA512 755a96b78530f42da6d4e2664f8e37cb07a356419e7e6448003c3f841c9d98ad18b851715d9eb203ea7eb27b13ec46223fa8a1c90a99fd12960ce85b0a695335
 EBUILD lgi-0.9.2-r100.ebuild 2590 BLAKE2B 62cb3ab1e4b7dda27d6388c42fb44492f473a4132c2a9efb53d23d5ff1b91d4a26c05a2b8166a5c66e99e6004f634e950b80514845346d9c3806903ab2463434 SHA512 daf47e83d7ccb3c29f8f229ef5d18edba3261da91c4edc043d453b5ac61416185d3c269d251cca8f76e8c28a1fb8c018e053c90d0ebb285318be6a31cf55ddd6
-EBUILD lgi-0.9.2.ebuild 1374 BLAKE2B f5133eb162c385d7c00e5bc037219781329449abeaa09bec7ddd9990f6f18f4f72df7d98f8b62cf30019f947ff81f165bdbb21c4030d285afb1b57179907b5af SHA512 f7ceabdf5190a744af5e5325e04d205f3782756493849d234b7ede4cda5af8019fa816cf780d1125137404b8b91fe8f8a3e508716e6bf5217f215a18a847cc85
 MISC metadata.xml 301 BLAKE2B 972432d1e9e34193df27c31d01aa620d72350b1bbcf383894e65aa0fdf207bc5ad4064f289c4feb7cbe7522aefa157b5cf2d25d00df09fd62c1ffa45db9ce377 SHA512 295eba832f4a3e1c9bd1ff7349fadff65a0d887ec4df25fcd7ce975504ddaf7efe5789492bdd54f3c6e077e8612dab3f3b8abba710bbabeb2ead89d60f0370f3
diff --git a/dev-lua/lgi/lgi-0.9.2.ebuild b/dev-lua/lgi/lgi-0.9.2.ebuild
deleted file mode 100644
index aa535b2deae0..000000000000
--- a/dev-lua/lgi/lgi-0.9.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED="manual"
-
-inherit eutils toolchain-funcs flag-o-matic virtualx
-
-DESCRIPTION="Lua bindings using gobject-introspection"
-HOMEPAGE="https://github.com/pavouk/lgi"
-SRC_URI="https://github.com/pavouk/lgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND=">=dev-lang/lua-5.1:0=
-		dev-libs/gobject-introspection
-		dev-libs/glib
-		dev-libs/libffi:0="
-DEPEND="${RDEPEND}
-		test? (
-			x11-libs/cairo[glib]
-			x11-libs/gtk+[introspection]
-			${VIRTUALX_DEPEND}
-		)"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:^LUA_LIBDIR.*$:LUA_LIBDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua):" \
-		-e "s:^LUA_SHAREDIR.*$:LUA_SHAREDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua):" \
-		"${S}"/lgi/Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" COPTFLAGS="-Wall -Wextra ${CFLAGS}" LIBFLAG="-shared ${LDFLAGS}"
-}
-
-src_test() {
-	virtx emake CC="$(tc-getCC)" COPTFLAGS="-Wall -Wextra ${CFLAGS}" LIBFLAG="-shared ${LDFLAGS}" check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	docompress -x /usr/share/doc/${PF}
-	dodoc README.md
-	dodoc -r docs/*
-	if use examples; then
-		dodoc -r samples
-	fi
-}
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index 02835a932020..182e305114af 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,3 +1,5 @@
 DIST luasec-0.9.tar.gz 52163 BLAKE2B fa95ae63b36f138f923dc412f527ff527e4f7562ad177ca7f450ef889e75c204d1bfec3773523fb68865c3846a0edc583cbf903db5233ff080074147f33bfb30 SHA512 ea601016328232ca0ff12be72897eeedac88a78834a63e1c36d2828a3187039665a2c60597b5af1fa6917b6fe87cd292fbcdfabcd67bab968f587e038d52a933
+DIST luasec-1.0.tar.gz 52264 BLAKE2B 0537592ec9a33559c233448bee84a5b1b4e84448e89d50adbef75ba9b67c175e8a10739d727991051e48afca9bf78b0b115f70b2a341d25217b5b730a66a690f SHA512 70e81291b71111fb4976477d1c8ddbdaace17f017476b4e74b0ed88498e9e016d4ece1658f7fcce30f21aecab8dcf3734ce620940f61f2c70efb911c09a95bb9
 EBUILD luasec-0.9-r102.ebuild 1575 BLAKE2B 6ea2e96306ace47a14d6ec22e80b4f617ddddfafe1d2839751604d4a9689ebba2990f6735233ed07b2f241d08b93178713fa3303e4acb1c589f0b4732ac2f67c SHA512 5fc569a958729781f1b6450b5200c88fc50423f432d3944c2436b5bc1dbe093811e4190337a6e68de043df9729d339772630dac45c730a15ecaf6b9bc1144eb7
+EBUILD luasec-1.0.ebuild 1579 BLAKE2B 38f35b5cf4934e2239f5dfe9fed7e1b0db192ddf7c32d4b85926f85ba92441a9360ddde77111eeda0ced339d07c07833fca2d5390284f54510c05cb5b551c4f8 SHA512 6570ea76807f930cd2f55b15c3abd4767260cf4ce372238a4f3331bfe6c38a41950c2350877b169b8cfae552ac0660e458a85d6acfdd40e6ba64bcea224be361
 MISC metadata.xml 596 BLAKE2B 0116422318c66247af5add321ba97b4d48a27b5871a2edb2eab81f03611ddad4f6e616c16070e89f8df7ef1dba6fdc94a070325e24f90df6f6095c2afb0af9f7 SHA512 97f09d268b8bb90d82707f6a39a2339a8cdab827b4fbf70292904e580f15b3503d0473855dfb9141c9384579339df4073ad2926662ff8839ffbe73ce009b3402
diff --git a/dev-lua/luasec/luasec-1.0.ebuild b/dev-lua/luasec/luasec-1.0.ebuild
new file mode 100644
index 000000000000..5e9cb6e51a10
--- /dev/null
+++ b/dev-lua/luasec/luasec-1.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+LUA_REQ_USE="deprecated(+)"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
+HOMEPAGE="https://github.com/brunoos/luasec"
+SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libressl"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	dev-lua/luasocket[${LUA_USEDEP}]
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+lua_src_prepare() {
+	pushd "${BUILD_DIR}" || die
+
+	${ELUA} src/options.lua -g /usr/include/openssl/ssl.h > src/options.c || die
+
+	popd
+}
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-O2//g' -i src/Makefile || die
+
+	lua_copy_sources
+
+	lua_foreach_impl lua_src_prepare
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LD=$(tc-getCC)"
+		"INC_PATH=-I$(lua_get_include_dir)"
+		"LIB_PATH=$(lua_get_CFLAGS)"
+		"MYCFLAGS=${CFLAGS}"
+		"MYLDFLAGS=${LDFLAGS}"
+	)
+
+	emake "${myemakeargs[@]}" linux
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	local emakeargs=(
+		"DESTDIR=${ED}"
+		"LUAPATH=$(lua_get_lmod_dir)"
+		"LUACPATH=$(lua_get_cmod_dir)"
+	)
+
+	emake "${emakeargs[@]}" install
+
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/lutok/Manifest b/dev-lua/lutok/Manifest
index ac515e97c766..275e33b45148 100644
--- a/dev-lua/lutok/Manifest
+++ b/dev-lua/lutok/Manifest
@@ -1,5 +1,3 @@
 DIST lutok-0.4.tar.gz 489570 BLAKE2B b4bc26d9a4901901e6ca66a41bc42ccc2f82697ff14e64c1bea35b4a9ed08b6f13ecfa9aaabb54e25fb3e4f3aea03791c225c4c8fc6ed3e0387d34d933a228e9 SHA512 664f30099bfbb30978e24068a9232a4ff1b5b1839c601bf784f35f6bb1394558067495093a3b0343c94e756d2e4186a32a8227baf5934c15c45905f7c0a5d19c
-EBUILD lutok-0.4-r1.ebuild 744 BLAKE2B be400b4a53226306db9c68a8155b6bfc902fce0f25e137224249e68be3b046a0fe384e92bb46101b5026399196c5fcb162cd246f430fd8b60c696065d7429885 SHA512 590a82ef2c70b45fcdf349f82410d3f7a71b5219ccd2baaa52ed01134ceaabe4bbe58ef27f77d5d58bb7c4823eba017de7acfad7008410d7cf586711ea14342e
 EBUILD lutok-0.4-r10.ebuild 1006 BLAKE2B dd75ed81ad2ee69dd801beed2378490a5d4797323bb9df2da40e9254990c39488bdc7aa3fd14a2cd0bc1d535d4c971d798c9d03d002e6b99b90c31011cc74574 SHA512 cd4a7287d4df50af8df759969c35042af57410c7aa116a1b55b62ae5a289e05b7e353de082540ae9f141ab03ad2a9b7f6b6c41cb91ba205a7489848895c6c115
-EBUILD lutok-0.4-r2.ebuild 826 BLAKE2B ccf9433d02deb2f67b523bb8a46139fcea4da8957d47f2a6f1bf65a2fc6b9f7f641371ad2b489230e0089e9ed1db4e754acfbef6b791c57f4495cb83e4807ff4 SHA512 327ec4a80919cae9504c165f384b0852147d47c66f89df6f5fc0f7cd213311b46c05ff554d0f12cb028c875080dd2c5d38fc100d41132f98a5ab835ba75c694a
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-lua/lutok/lutok-0.4-r1.ebuild b/dev-lua/lutok/lutok-0.4-r1.ebuild
deleted file mode 100644
index fc940eb573a2..000000000000
--- a/dev-lua/lutok/lutok-0.4-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2017-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune
-
-DESCRIPTION="Lightweight C++ API library for Lua"
-HOMEPAGE="https://github.com/jmmv/lutok"
-SRC_URI="https://github.com/jmmv/lutok/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/lua:0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		dev-libs/atf
-		dev-util/kyua
-	)
-"
-
-src_configure() {
-	econf --disable-shared --enable-static
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-lua/lutok/lutok-0.4-r2.ebuild b/dev-lua/lutok/lutok-0.4-r2.ebuild
deleted file mode 100644
index 1060307ceb2d..000000000000
--- a/dev-lua/lutok/lutok-0.4-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2017-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Lightweight C++ API library for Lua"
-HOMEPAGE="https://github.com/jmmv/lutok"
-SRC_URI="https://github.com/jmmv/lutok/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/lua:0[static-libs(+)?]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		dev-libs/atf
-		dev-util/kyua
-	)
-"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	rm -rf "${ED}"/usr/tests || die
-	find "${ED}" -name '*.la' -type f -delete || die
-}