[gentoo-commits] repo/gentoo:master commit in: dev-lua/luadbi/, dev-lua/luadbi/files/

[gentoo-commits] repo/gentoo:master commit in: dev-lua/luadbi/, dev-lua/luadbi/files/

[Conrad Kostecki]

commit:     d39544820ac34032579eede76d9b8fa37967c2a0
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 16:02:20 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 16:02:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3954482

dev-lua/luadbi: drop old version

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-lua/luadbi/Manifest                        |  1 -
 dev-lua/luadbi/files/luadbi-0.5-makefile.patch | 47 ----------------
 dev-lua/luadbi/files/luadbi-0.5-mysql-8.patch  | 78 --------------------------
 dev-lua/luadbi/luadbi-0.5-r6.ebuild            | 69 -----------------------
 4 files changed, 195 deletions(-)

diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index b80720a8565..ad160c1bf20 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -1,2 +1 @@
 DIST luadbi-0.7.2.tar.gz 36462 BLAKE2B 581c7353bfa36b3f6cabed2df78372f8810300bf4525bf8d370e61d469f9daa5a5c40c58916164a8d0a621a61e983e85c67b23ef03f51212be79f09ad8512047 SHA512 891f99cbc8f1b5327ef820641a1608abf41410f2f28584b975cc3cf65154b9bebf6f1b9ca7d1818b9c965738ad700dd17ae042dfd2a7146cf755871ebae535b9
-DIST luadbi.0.5.tar.gz 22454 BLAKE2B 538fa935ece2a8e0f852cef33716570a6e85100ec26892d7a76c5b00a7fceb82411e2ebe29d25de42cf6ee6bdbfdf5102875bb4d04d65f86dfdc9d79fecef359 SHA512 4ed641e113e90acc8a4f6b3b2d0f5d5044c0fbbef3b2fdfb84d15e17115e45c553a33b19bfb165e5af11a2adce501d66859963e3363d3ab1c6a39b0b2ae92e62

diff --git a/dev-lua/luadbi/files/luadbi-0.5-makefile.patch b/dev-lua/luadbi/files/luadbi-0.5-makefile.patch
deleted file mode 100644
index 98e4988b281..00000000000
--- a/dev-lua/luadbi/files/luadbi-0.5-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.5-mysql-8.patch b/dev-lua/luadbi/files/luadbi-0.5-mysql-8.patch
deleted file mode 100644
index a75c9d46d07..00000000000
--- a/dev-lua/luadbi/files/luadbi-0.5-mysql-8.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/dbd/mysql/statement.c	2020-03-09 15:55:43.212010825 +0100
-+++ b/dbd/mysql/statement.c	2020-03-09 15:57:37.703464570 +0100
-@@ -200,7 +200,10 @@
- 	switch(type) {
- 	    case LUA_TNIL:
- 		bind[i].buffer_type = MYSQL_TYPE_NULL;
-+#if MYSQL_VERSION_ID >= 80000
-+#else
- 		bind[i].is_null = (my_bool*)1;
-+#endif
- 		break;
- 
- 	    case LUA_TBOOLEAN:
-@@ -209,7 +213,11 @@
- 		*boolean = lua_toboolean(L, p);
- 
- 		bind[i].buffer_type = MYSQL_TYPE_LONG;
--		bind[i].is_null = (my_bool*)0;
-+#if MYSQL_VERSION_ID >= 80000
-+                bind[i].is_null = (bool*) 0;
-+#else
-+                bind[i].is_null = (my_bool*)0;
-+#endif
- 		bind[i].buffer = (char *)boolean;
- 		bind[i].length = 0;
- 		break;
-@@ -224,7 +232,11 @@
- 		*num = lua_tonumber(L, p);
- 
- 		bind[i].buffer_type = MYSQL_TYPE_DOUBLE;
--		bind[i].is_null = (my_bool*)0;
-+#if MYSQL_VERSION_ID >= 80000
-+                bind[i].is_null = (bool*) 0;
-+#else
-+                bind[i].is_null = (my_bool*)0;
-+#endif
- 		bind[i].buffer = (char *)num;
- 		bind[i].length = 0;
- 		break;
-@@ -235,7 +247,11 @@
- 		str = lua_tolstring(L, p, str_len);
- 
- 		bind[i].buffer_type = MYSQL_TYPE_STRING;
--		bind[i].is_null = (my_bool*)0;
-+#if MYSQL_VERSION_ID >= 80000
-+                bind[i].is_null = (bool*) 0;
-+#else
-+                bind[i].is_null = (my_bool*)0;
-+#endif
- 		bind[i].buffer = (char *)str;
- 		bind[i].length = str_len;
- 		break;
-@@ -385,7 +385,7 @@
- 
- 		    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);
- 
-@@ -396,7 +396,7 @@
- 			}
- 		    } 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);
- 
-@@ -407,7 +407,7 @@
- 			}
- 		    } 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-r6.ebuild b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
deleted file mode 100644
index f4d024e8ba3..00000000000
--- a/dev-lua/luadbi/luadbi-0.5-r6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 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 arm64 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}"/${P}-makefile.patch
-	"${FILESDIR}"/${P}-mysql-8.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
-}