gentoo resync : 10.02.2019

9 files changed, 75 insertions, 41 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index dda3a7fb62ff..32833817529d 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lua-zlib/Manifest b/dev-lua/lua-zlib/Manifest
index ab3d1a31cb90..7c52b282a927 100644
--- a/dev-lua/lua-zlib/Manifest
+++ b/dev-lua/lua-zlib/Manifest
@@ -1,5 +1,3 @@
-DIST lua-zlib-0.3.tgz 11220 BLAKE2B 49134507d74e552c4f8b50bb6fb17c4c336e809c95b92e90230b3c9be3b7f2f2ac1ac0785e5c2dbbd3d577d18491e680d43608ac22fd8243280865e662543e1d SHA512 99711166637d394c806dd16b86a3588ff84eb9180d2da05725ff6d4e86458d1ded7a5fbb303284fa442fd0925bc94fe34772057e0190c1a3e00cbb853865941d
 DIST lua-zlib-1.1.tar.gz 16572 BLAKE2B 22f504230616ea0df505c4aa00fc562c2cdfebd9f8e40b6000fdda883dbdefbeb10d22a2466386f1bfb314672aa17524420d047498346e5c980ebc6f5e175b41 SHA512 df9768efb96be8175b6afe1fd347b268565ecd93a71dd0f1f7ec1b710fd52bbd7a7c37a89f7c3d939906c7ac1578e9bdb542a0052673b6ac6eec7285d7f75633
-EBUILD lua-zlib-0.3.ebuild 606 BLAKE2B d03f086d416e5b7d3bc462d5d21b87611a9154310a7de1efdd8c913c697179ff3a69c5635874009c98926e200e6150429d55bf86f83deeb8cb655ec0d6e00e39 SHA512 1963c423ae02a4da94a904ad98f851aa9f725a79d6987b9681041dbc5de784401c9416d4a7bde6c0abea33796aa4172515d625ad640ff9aa54c108a35f676de7
-EBUILD lua-zlib-1.1.ebuild 569 BLAKE2B b724c6b39627b304d4b7ed67d1c002231176f5be5bef6771a140556b52a2b88798d4cef66819a0b100c07c24936c7387c266e0cb7c13f4d219f404722476c9e2 SHA512 7702870cd6a873857c01a9e76c391ebe0d9424b4354d43eb0d8e6eec4481e32776a3da1073935356aacae7b3d038cb50466b3056a17c1bb7b2870e4f95c500b3
+EBUILD lua-zlib-1.1.ebuild 565 BLAKE2B ac5f7d1ea868cfd2215de7772f071c2b33d3712e0cefd7bcb4bd41e574fe00f72efedcb0843bbcc52f3438a6f4353f567bd6cfe594b1b2c8edaa3e82f01410cb SHA512 49d7e482d1d7af71df1a9866e2354d34ec82f70c94da387887261e4dac10e7cf4eed6b60c28a1cd700492644ed3a8519ff6fd941c3c66700928b7368385de0a4
 MISC metadata.xml 255 BLAKE2B 820ddc4489fc6c4387305bcbc3b339e13be1230d100ef3e9b45e13dfb850c2be0e7968c9cbe1c15e8cf3a4887b05637615ca11d3358aa032f96f23edfccc5cd1 SHA512 3d46a3689375944f47933ce2af13543ecb79bce6a7eaad56083931111c277da45d3b8120bdc1643985cd746be3ffc84017da34038adc05367e90601e883e5b92
diff --git a/dev-lua/lua-zlib/lua-zlib-0.3.ebuild b/dev-lua/lua-zlib/lua-zlib-0.3.ebuild
deleted file mode 100644
index dfdba4a1a635..000000000000
--- a/dev-lua/lua-zlib/lua-zlib-0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Lua bindings to zlib"
-HOMEPAGE="https://github.com/brimworks/lua-zlib"
-SRC_URI="https://github.com/brimworks/${PN}/tarball/v${PV} -> ${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/lua:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	mv *-${PN}-* "${S}"
-}
-
-src_configure() {
-	MYCMAKEARGS="-DINSTALL_CMOD='$(pkg-config --variable INSTALL_CMOD lua)'"
-	cmake-utils_src_configure
-}
diff --git a/dev-lua/lua-zlib/lua-zlib-1.1.ebuild b/dev-lua/lua-zlib/lua-zlib-1.1.ebuild
index f036e0a8aea6..b51a835e97de 100644
--- a/dev-lua/lua-zlib/lua-zlib-1.1.ebuild
+++ b/dev-lua/lua-zlib/lua-zlib-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/brimworks/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE=""
 
 RDEPEND="dev-lang/lua:0
diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index d9b1702231d1..04841ca198ab 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -1,4 +1,5 @@
-AUX 0.5-r2-Makefile.patch 1785 BLAKE2B c626b6909496a48cf6d059028d882fba69947ceaf2cbb6b5f5ba8ce86ae7f31c240a4e502afb818a51144b97a63946859e1d3dd9396347a2a319f6fac71a1770 SHA512 c9eca24aac386d34dff68a61e538dd2c736569b62e1afc9b0ff2bad14f26c42d402ec1e0eba2f7e974d6e689c70f880c31cfbc955a4e2afa8ca4bebcd351ae58
+AUX 0.5-r2-Makefile.patch 1784 BLAKE2B 212e3b7c86b54d1633a95ed4a00c0c92cf10504c51ae173aa0fd1b77b98b44203f0b9b4994ef72b6879f281e3342806e84c85012bb522769b73f5292450a750b SHA512 c5399e53e124fbb6bf362bf6d1588c5afc02c12074e12a8208f5b7c97c155f4ba164118ab0ce2c93e8cf1195c12aa6c142a62cb9ba519a38ef0e01e080a8dce4
 DIST luadbi.0.5.tar.gz 22454 BLAKE2B 538fa935ece2a8e0f852cef33716570a6e85100ec26892d7a76c5b00a7fceb82411e2ebe29d25de42cf6ee6bdbfdf5102875bb4d04d65f86dfdc9d79fecef359 SHA512 4ed641e113e90acc8a4f6b3b2d0f5d5044c0fbbef3b2fdfb84d15e17115e45c553a33b19bfb165e5af11a2adce501d66859963e3363d3ab1c6a39b0b2ae92e62
 EBUILD luadbi-0.5-r5.ebuild 1806 BLAKE2B 04e53cad9497933fd81bdefead2de4093e8f8f778f4376a8da511e1af6d01a172f6b3d4a7d795e5797d92b2e74fc6b218d3376e79776a8053637f12770e623e3 SHA512 46a3f2a28f6cdbce7d89effa1a887e007ef360c6d73fd08d17361e43afd8f9dd87f287e4d67e95c1c64adeb4757b7870b2820c48524a02f54bd74dec7b741b5b
+EBUILD luadbi-0.5-r6.ebuild 1861 BLAKE2B f2536d15d61eec9ee55acae0c96a691ed46709378a6707495103efc338b73e24adf5891d5ecbc8a5788dd2e5f4fd994b8cf8a34aa972726483ddc001d3e0bdf4 SHA512 708b87a4230980c455be08a03b3e088d0d6215881d7d0031a8cf8e9d69feb05ba6b9e4cfd5f59290075110c12ac03bb80ec8c78db9a16ae8935bed54de90f468
 MISC metadata.xml 243 BLAKE2B ae629fd9f0637db05afd7749d7ecef15baf33f716d7a6f9972214040c75ab219283b85aab2721d88ae59eb24040af1e744f75f39c6c0a1bd2ff5c007a24f5eb9 SHA512 05ffe6ac7acff76e9dced367bfd8033602835e047e01f8a87decf2a05ff548395e56f8a1d3be5388b61df32d6bb329725141a0d356efa2651a1c555d882219cc
diff --git a/dev-lua/luadbi/files/0.5-r2-Makefile.patch b/dev-lua/luadbi/files/0.5-r2-Makefile.patch
index b37b3c00efe0..98e4988b281b 100644
--- a/dev-lua/luadbi/files/0.5-r2-Makefile.patch
+++ b/dev-lua/luadbi/files/0.5-r2-Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2013-02-01 13:34:54.490898002 +0400
-+++ Makefile	2013-02-01 13:44:25.927772130 +0400
+--- a/Makefile	2013-02-01 13:34:54.490898002 +0400
++++ b/Makefile	2013-02-01 13:44:25.927772130 +0400
 @@ -1,5 +1,6 @@
  CC=gcc
 -CFLAGS=-g -pedantic -Wall -O2 -shared -fpic -I /usr/include/lua5.1 -I /usr/include/mysql -I /usr/include/postgresql/ -I /opt/ibm/db2exc/V9.5/include/ -I /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/rdbms/public/ -I .
diff --git a/dev-lua/luadbi/luadbi-0.5-r6.ebuild b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
new file mode 100644
index 000000000000..2f194b5ab36c
--- /dev/null
+++ b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="DBI module for Lua"
+HOMEPAGE="https://code.google.com/p/luadbi/"
+SRC_URI="https://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND=">=dev-lang/lua-5.1
+		mysql? ( dev-db/mysql-connector-c:0= )
+		postgres? ( dev-db/postgresql )
+		sqlite? ( >=dev-db/sqlite-3 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"
+
+PATCHES=( "${FILESDIR}"/${PV}-r2-Makefile.patch )
+
+src_prepare() {
+	default
+	local pkgconf=$(tc-getPKG_CONFIG)
+	sed -i -e "s#^INSTALL_DIR_LUA=.*#INSTALL_DIR_LUA=$(${pkgconf} --variable INSTALL_LMOD lua)#" \
+		-e "s#^INSTALL_DIR_BIN=.*#INSTALL_DIR_BIN=$(${pkgconf} --variable INSTALL_CMOD lua)#" \
+		-e "s#^LUA_INC_DIR=.*#LUA_INC_DIR=$(${pkgconf} --variable INSTALL_INC lua)#" \
+		-e "s#^LUA_LIB_DIR=.*#LUA_LIB_DIR=$(${pkgconf} --variable INSTALL_LIB lua)#" \
+		-e "s#^LUA_LIB =.*#LUA_LIB=lua#" Makefile || die
+
+	drivers=""
+
+	if use mysql; then
+		drivers+="mysql "
+		sed -i -e "s#^\(INCLUDES.*\)#\1 $(mysql_config --include)#" \
+			-e "s#^\(MYSQL_LDFLAGS=\$(COMMON_LDFLAGS)\).*#\1 $(mysql_config --libs)#" Makefile || die
+	fi
+
+	if use postgres; then
+		drivers+="psql "
+		sed -i -e "s#^\(INCLUDES.*\)#\1 -I$(pg_config --includedir) -I$(pg_config --includedir-server)#" \
+			-e "s#^\(PSQL_LDFLAGS=\$(COMMON_LDFLAGS)\).*#\1 -L$(pg_config --libdir) -lpq#" Makefile || die
+	fi
+
+	use sqlite && drivers+="sqlite3"
+}
+
+src_compile() {
+	append-flags -fPIC
+	for driver in ${drivers}; do
+		emake CC="$(tc-getCC)" COMMON_LDFLAGS="${LDFLAGS}" ${driver}
+	done
+}
+
+src_install() {
+	for driver in ${drivers}; do
+		emake DESTDIR="${D}" "install_${driver// /}"
+	done
+}
diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index 9ffa3eaab2d9..45c7ad3a6416 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,5 +1,5 @@
 AUX proxy-fix.patch 1026 BLAKE2B 6dde53833c9b35e059a4c1e7052cb494b4e1ceb2dc496a2d090e80fc2a1bfd1a30d014bb4c9f04425665cc00faa29fd434077a13e54cb73af0699363602e3aab SHA512 8b1b440936eceea4352876b24099bd9250c28c78a104f3722a65690a756f831f025257d940f1d9189e8ac023ab4b226b16c901214de59306bac96353a5adfe12
 DIST luasocket-3.0_rc1.tar.gz 328598 BLAKE2B 9cc382d909cfa018edec237ac901220cccb0cf0e3a775b9cd8083487ace42a94dfd280f9423097f677f37ee9f85afcfff844250cd49c0f813b7c50c3adc532c5 SHA512 f6efce259aaacaa11472911471f8a13b118fe009b8953a82c6aa18b9ec829cd1293180904e56935cb130d36d267e3f27c91db2d78e03f7488f3e100571ed0540
 EBUILD luasocket-3.0_rc1-r3.ebuild 1107 BLAKE2B d7a6263f58f3db82491a132ce44e033c9db857eaedbafe3b015be1bff86073c58b932c072d2cf3c213e6a5bd003b0267cfa7ab6ef2e73c22aa402b379a20b73a SHA512 f85177c0f36e3dec2c7c2a92d0d31034877214bf4cb848901b04868321e5fed64b6b2b123dce3815be0f726975a3a074647f2fafd9dff893212bdc2a76a8f631
-EBUILD luasocket-3.0_rc1-r4.ebuild 1176 BLAKE2B be93c9f3f45c1f15e0458894664ff2fe3a2329527ff377e0443491b94efa0f0cc23f1fe99f299930540e7362ce93183600711315a5023e06bfe634ec5867941a SHA512 1ff370d00555c18735869b584db2324caf8788a59d85652e54de131ed88fe7f466da06ac8aebb696fbb867f220ab0bbea7a849cfd061c5038e5b5a6b61a30215
+EBUILD luasocket-3.0_rc1-r4.ebuild 1171 BLAKE2B facb8d4f97c7c238af4df4850ebecd8b8d66b6bc7f42dff90de28c263f84a3a8f6a05196eade5661d5bdcc34835ea451f4f170c92efeb3368f3740b905e88f84 SHA512 44e137d19fa21c317e101d7654118e760f3bd299b7373a71dba4f0ec7c7ba4a1a5b529cfa6aa60443154d535d65573ebfdf1d21998648277a6efb0f03d6c30fa
 MISC metadata.xml 257 BLAKE2B e834a8237ad7c56f7e94a41c634fd0bb34b3c6e21b04ecafb2394839ee3bec0b0d5ee3cdcb43f358894156aacbdc6566092e6f1a4034573b117cba3368214b97 SHA512 a14f4fdf4826065cc3c5bba386e790d97d31a4e5eb042d269bdc56c9d6122bd2d3322971a6ce7431e860538af861e675a57afd9fa100e63d6c35d36c68aacf7e
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
index 8a71a1358733..e94dc2ca5fb2 100644
--- a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
+++ b/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/diegonehab/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
 IUSE="debug"
 
 RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}]"