gentoo resync : 29.01.2021

3 files changed, 3 insertions, 69 deletions

diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index a6b08d26a6d0..8b8f35218b70 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -1,5 +1,4 @@
 AUX luadbi-0.7.2-mysql-8.patch 1920 BLAKE2B 5b8f65c9a6966df0bd18487e09effc073fb4ce9ed7913e1b9397ae722a2fe8cc04bcd8f5dce403fc5181fef8f95bdf71bffd00cb5b99932c6cf48e00daa49175 SHA512 436aa613eb420126f158103bc7c36cb3cc2a680c76d32e6239c2b310b7367bd5275c85640645d904ffee059b970095e8176df23dbca8b54aa13f436a619e2f6f
 DIST luadbi-0.7.2.tar.gz 36462 BLAKE2B 581c7353bfa36b3f6cabed2df78372f8810300bf4525bf8d370e61d469f9daa5a5c40c58916164a8d0a621a61e983e85c67b23ef03f51212be79f09ad8512047 SHA512 891f99cbc8f1b5327ef820641a1608abf41410f2f28584b975cc3cf65154b9bebf6f1b9ca7d1818b9c965738ad700dd17ae042dfd2a7146cf755871ebae535b9
-EBUILD luadbi-0.7.2-r102.ebuild 1814 BLAKE2B c84609d6d3948eed4f5f90685fdd7f04f740fd24e8f3217c24e559209292f6d639eed9dc5399ca3cddc13b8ea8f28689c3e6787d3ba74b7757272d50ec1c6359 SHA512 05cc330aab3d196130f87730d10d1c79199953ee7a1f1b5071d9a087232e0d89cab3bc2b99dfabf7c4b8c95fd62f1b9080abf0efccdb8315ba0673905ac0bea6
-EBUILD luadbi-0.7.2.ebuild 1580 BLAKE2B c496005647a4783c57f2a7cd7482a46dc92e5efbc8e1760e26255270f04d2bfa5947b8d7792bc8a8d3f6ac75d2db89ce36841e3f5a8094670f95a31da60ec513 SHA512 135ad359cf5c5e4a3ad2cec2c436f624d52e49954f6fd44f2b28a58733c14a63eb145574f1a5677cf3063c737a21cb25648fcfe32a01e2ca7ca6707b89b65eba
+EBUILD luadbi-0.7.2-r102.ebuild 1810 BLAKE2B 4edccbc8bef8ce374a5ed067f3765e6cb0e43059526d8c9c5dd72c9ff32b3cdf11c4500e749038bf72d75b44a2842f446a1084c61634e3c8589b9790e763ea82 SHA512 7890e40014646c6d52973caf0035705ee5a87c063c7d278744708f49d288bd502aa8c6500adc5820c73b1abf79589d3b6034346004f82d44e743a0050c40bc4b
 MISC metadata.xml 328 BLAKE2B c167ea2fe2bc0e9d84453ad1e1d7b703b862d927ea1ed775b68f6928f35d02f0d5b08ba5a910ae666fd826003dea923de1dfc7970d3a349943b6eb7a977cd137 SHA512 bfed24b1441ac6dad0a42125d1e3077e5f78a080bc6a495b9ef3447f423ea248b794650583a96681e7ad42802517309feabd268eb65af63e1c101503b418c030
diff --git a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
index 8958edd4d2c1..178c82c225c6 100644
--- a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2-r102.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/mwild1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="mysql postgres +sqlite test"
 REQUIRED_USE="
 	${LUA_REQUIRED_USE}
diff --git a/dev-lua/luadbi/luadbi-0.7.2.ebuild b/dev-lua/luadbi/luadbi-0.7.2.ebuild
deleted file mode 100644
index 2ddcc6056bdc..000000000000
--- a/dev-lua/luadbi/luadbi-0.7.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A database interface library for Lua"
-HOMEPAGE="https://github.com/mwild1/luadbi"
-SRC_URI="https://github.com/mwild1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="mysql postgres +sqlite test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-lang/lua-5.1:0=
-	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-0.7.2-mysql-8.patch" )
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-g //' -e 's/-O2 //g' -i Makefile || die
-}
-
-src_compile() {
-	tc-export AR CC
-
-	local myemakeargs=(
-		"LUA_INC=-I$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)/lua5.1"
-	)
-
-	use mysql && emake ${myemakeargs} MYSQL_INC="-I$(mariadb_config --libs)" mysql
-	use postgres && emake ${myemakeargs} PSQL_INC="-I$(pg_config --libdir)" psql
-	use sqlite emake ${myemakeargs} SQLITE3_INC="-I/usr/include" sqlite
-}
-
-src_test() {
-	cd "${S}"/tests && lua run_tests.lua || die
-}
-
-src_install() {
-	local myemakeargs=(
-		DESTDIR="${ED}"
-		LUA_CDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
-		LUA_LDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
-	)
-
-	use mysql && emake ${myemakeargs[@]} install_mysql
-	use postgres && emake ${myemakeargs[@]} install_psql
-	use sqlite && emake ${myemakeargs[@]} install_sqlite3
-}