gentoo resync : 25.11.2020

8 files changed, 220 insertions, 183 deletions

diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index 04841ca198ab..d1763d331a89 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -1,5 +1,5 @@
-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
+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-r100.ebuild 1769 BLAKE2B 6d5c67dde0eb5a59636789f74e3263cc7ff76dd023cb9c926c449b10e3c4ba89e36e569bda3f47e1dbe1a24ce70dc39e2b08b9c8acb0150b9d9ab95d24e6be13 SHA512 bbb89034fd723046ba26256251df95c5828bf1d73d81b32ba684ee6d8b840676203aa5531373d0dc0c5b27c2f402e3074ae5e27ac4a5783603b980ec83d6a8e6
+EBUILD luadbi-0.7.2.ebuild 1579 BLAKE2B fa7b1bd1ae6913826966f6687ae8af24f62f3cc4771133ddc17cf72b1b2ff87dfe6a7b0034defe931e7cf5062efcb101609664e6be1a2de04648360141bff7b6 SHA512 923534935b8aa20d437fcf65b62a75853e7c80c00b43f48455ffe9f050cf0fef3e2828afee2b402faa7713c035c484f6dba982357f42a344ba6800cf147e09df
+MISC metadata.xml 328 BLAKE2B c167ea2fe2bc0e9d84453ad1e1d7b703b862d927ea1ed775b68f6928f35d02f0d5b08ba5a910ae666fd826003dea923de1dfc7970d3a349943b6eb7a977cd137 SHA512 bfed24b1441ac6dad0a42125d1e3077e5f78a080bc6a495b9ef3447f423ea248b794650583a96681e7ad42802517309feabd268eb65af63e1c101503b418c030
diff --git a/dev-lua/luadbi/files/0.5-r2-Makefile.patch b/dev-lua/luadbi/files/0.5-r2-Makefile.patch
deleted file mode 100644
index 98e4988b281b..000000000000
--- a/dev-lua/luadbi/files/0.5-r2-Makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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 .
-+INCLUDES=-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 .
-+CFLAGS+=-pedantic -shared -fpic $(INCLUDES)
- AR=ar rcu
- RANLIB=ranlib
- RM=rm -rf
-@@ -27,6 +27,14 @@
- DB2_OBJS=$(OBJS) build/dbd_db2_main.o build/dbd_db2_connection.o build/dbd_db2_statement.o
- ORACLE_OBJS=$(OBJS) build/dbd_oracle_main.o build/dbd_oracle_connection.o build/dbd_oracle_statement.o
- 
-+INSTALL = install
-+INSTALL_PROGRAM = $(INSTALL)
-+INSTALL_DATA = $(INSTALL) -m 644
-+LUA_INC_DIR=/usr/include/lua5.1
-+LUA_LIB_DIR=/usr/lib
-+INSTALL_DIR_LUA=/usr/share/lua/5.1
-+INSTALL_DIR_BIN=/usr/lib/lua/5.1
-+
- free: mysql psql sqlite3
- 
- all:  mysql psql sqlite3 db2 oracle
-@@ -90,3 +98,21 @@
- build:
- 	$(MKDIR) ${BUILDDIR}
- 
-+install_lua:
-+	$(INSTALL_DATA) -D DBI.lua $(DESTDIR)$(INSTALL_DIR_LUA)/DBI.lua
-+
-+install_mysql: install_lua
-+	$(INSTALL_PROGRAM) -D $(DBDMYSQL) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDMYSQL)
-+
-+install_psql: install_lua
-+	$(INSTALL_PROGRAM) -D $(DBDPSQL) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDPSQL)
-+
-+install_sqlite3: install_lua
-+	$(INSTALL_PROGRAM) -D $(DBDSQLITE3) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDSQLITE3)
-+
-+install_db2: install_lua
-+	$(INSTALL_PROGRAM) -D $(DBDDB2) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDDB2)
-+
-+install_oracle: install_lua
-+	$(INSTALL_PROGRAM) -D $(DBDORACLE) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDORACLE)
-+
diff --git a/dev-lua/luadbi/files/luadbi-0.7.2-mysql-8.patch b/dev-lua/luadbi/files/luadbi-0.7.2-mysql-8.patch
new file mode 100644
index 000000000000..ef463433357e
--- /dev/null
+++ b/dev-lua/luadbi/files/luadbi-0.7.2-mysql-8.patch
@@ -0,0 +1,55 @@
+From b72503cad0654878841172451b2ea860a59e30c1 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Tue, 13 Oct 2020 07:34:16 +0200
+Subject: [PATCH] dbd/mysql/statement.c: fix compilation with mysql-8
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ dbd/mysql/dbd_mysql.h | 2 +-
+ dbd/mysql/statement.c | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/dbd/mysql/dbd_mysql.h b/dbd/mysql/dbd_mysql.h
+index 233bc35..4777289 100644
+--- a/dbd/mysql/dbd_mysql.h
++++ b/dbd/mysql/dbd_mysql.h
+@@ -3,7 +3,7 @@
+ #endif
+ 
+ 
+-#include <mysql.h>
++#include <mysql/mysql.h>
+ #include <dbd/common.h>
+ 
+ #define DBD_MYSQL_CONNECTION	"DBD.MySQL.Connection"
+diff --git a/dbd/mysql/statement.c b/dbd/mysql/statement.c
+index aca865a..6af4c39 100644
+--- a/dbd/mysql/statement.c
++++ b/dbd/mysql/statement.c
+@@ -424,7 +424,7 @@ static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_
+ 
+ 		    if (fields[i].type == MYSQL_TYPE_TIMESTAMP || fields[i].type == MYSQL_TYPE_DATETIME) {
+ 			char str[20];
+-			struct st_mysql_time *t = bind[i].buffer;
++			MYSQL_TIME *t = bind[i].buffer;
+ 
+ 			snprintf(str, 20, "%d-%02d-%02d %02d:%02d:%02d", t->year, t->month, t->day, t->hour, t->minute, t->second);
+ 
+@@ -435,7 +435,7 @@ static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_
+ 			}
+ 		    } else if (fields[i].type == MYSQL_TYPE_TIME) {
+ 			char str[9];
+-			struct st_mysql_time *t = bind[i].buffer;
++			MYSQL_TIME *t = bind[i].buffer;
+ 
+ 			snprintf(str, 9, "%02d:%02d:%02d", t->hour, t->minute, t->second);
+ 
+@@ -446,7 +446,7 @@ static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_
+ 			}
+ 		    } else if (fields[i].type == MYSQL_TYPE_DATE) {
+ 			char str[20];
+-			struct st_mysql_time *t = bind[i].buffer;
++			MYSQL_TIME *t = bind[i].buffer;
+ 
+ 			snprintf(str, 11, "%d-%02d-%02d", t->year, t->month, t->day);
+ 
diff --git a/dev-lua/luadbi/luadbi-0.5-r5.ebuild b/dev-lua/luadbi/luadbi-0.5-r5.ebuild
deleted file mode 100644
index e1cdb2f76572..000000000000
--- a/dev-lua/luadbi/luadbi-0.5-r5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic eutils
-
-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? ( virtual/mysql )
-		postgres? ( dev-db/postgresql )
-		sqlite? ( >=dev-db/sqlite-3 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-r2-Makefile.patch
-	sed -i -e "s#^INSTALL_DIR_LUA=.*#INSTALL_DIR_LUA=$(pkg-config --variable INSTALL_LMOD lua)#" \
-		-e "s#^INSTALL_DIR_BIN=.*#INSTALL_DIR_BIN=$(pkg-config --variable INSTALL_CMOD lua)#" \
-		-e "s#^LUA_INC_DIR=.*#LUA_INC_DIR=$(pkg-config --variable INSTALL_INC lua)#" \
-		-e "s#^LUA_LIB_DIR=.*#LUA_LIB_DIR=$(pkg-config --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/luadbi/luadbi-0.5-r6.ebuild b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
deleted file mode 100644
index 2f194b5ab36c..000000000000
--- a/dev-lua/luadbi/luadbi-0.5-r6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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/luadbi/luadbi-0.7.2-r100.ebuild b/dev-lua/luadbi/luadbi-0.7.2-r100.ebuild
new file mode 100644
index 000000000000..f7f3c1fdcab6
--- /dev/null
+++ b/dev-lua/luadbi/luadbi-0.7.2-r100.ebuild
@@ -0,0 +1,90 @@
+# 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="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="
+	${LUA_REQUIRED_USE}
+	|| ( mysql postgres sqlite )
+"
+RESTRICT="test"
+
+RDEPEND="
+	${LUA_DEPS}
+	mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-lua/busted
+		dev-lua/luarocks
+	)
+"
+
+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
+}
+
+lua_src_compile() {
+	tc-export AR CC
+
+	local myemakeargs=(
+		"LUA_INC=$(lua_get_CFLAGS)"
+	)
+
+	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_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	cd "${S}"/tests && ${ELUA} run_tests.lua || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	local myemakeargs=(
+		DESTDIR="${ED}"
+		LUA_CDIR="$(lua_get_cmod_dir)"
+		LUA_LDIR="$(lua_get_lmod_dir)"
+	)
+
+	use mysql && emake ${myemakeargs[@]} install_mysql
+	use postgres && emake ${myemakeargs[@]} install_psql
+	use sqlite && emake ${myemakeargs[@]} install_sqlite3
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/luadbi/luadbi-0.7.2.ebuild b/dev-lua/luadbi/luadbi-0.7.2.ebuild
new file mode 100644
index 000000000000..338881effc6e
--- /dev/null
+++ b/dev-lua/luadbi/luadbi-0.7.2.ebuild
@@ -0,0 +1,65 @@
+# 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:=
+	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
+}
diff --git a/dev-lua/luadbi/metadata.xml b/dev-lua/luadbi/metadata.xml
index 2ff9f66c8898..1dbf53904c3d 100644
--- a/dev-lua/luadbi/metadata.xml
+++ b/dev-lua/luadbi/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="google-code">luadbi</remote-id>
+		<remote-id type="github">mwild1/luadbi</remote-id>
 	</upstream>
 </pkgmetadata>