gentoo resync : 10.02.2019

3 files changed, 70 insertions, 3 deletions

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
+}