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

2024-11-02 Thread Conrad Kostecki
commit: 0c8acec6295e0741a5028637aa961a48187b57d8
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Nov  2 12:33:19 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Nov  2 12:33:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c8acec6

dev-lua/luadbi: add 0.7.4

Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/luadbi/Manifest|   1 +
 dev-lua/luadbi/luadbi-0.7.4.ebuild | 101 +
 2 files changed, 102 insertions(+)

diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index 23aa0bde67b4..c3af87f74868 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -1 +1,2 @@
 DIST luadbi-0.7.3.tar.gz 35753 BLAKE2B 
ff5fdd144560153fc74733131b48a60a14b7e95de5d6faaa982588cc5df28aa979aa805c5000fdc76fae98b99be4cc4ccb82938c8f6222bcdfe4fca4d12c9bfa
 SHA512 
1122bc9e83cf7071aff8685163a2dc387b40d2fb28aeb57e9c19e14afa6dcb0fb05fa76ea700f69751fdc79b0f1155235195d525041124fed5cefab0d50835bb
+DIST luadbi-0.7.4.tar.gz 39077 BLAKE2B 
9d7a91c5b8e92e181eb874a9a3f91b82434833cbf428f3c17a0d69693c7881c97646290c98533ee0f83bcbdfc5b9f42b727154db526c766105f1e04df55ee58c
 SHA512 
9614b19c4e2fd134ec4bb196fa67f498a58ff66f06144a42d390ac7a52bab66293e4961f4d4227ea3b24b0662764de2e6497bc40d4976933aa75ec0929ec

diff --git a/dev-lua/luadbi/luadbi-0.7.4.ebuild 
b/dev-lua/luadbi/luadbi-0.7.4.ebuild
new file mode 100644
index ..be8445e6d2da
--- /dev/null
+++ b/dev-lua/luadbi/luadbi-0.7.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} 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 ~hppa ~ppc ~ppc64 ~sparc ~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[${LUA_USEDEP}]
+   dev-lua/luarocks
+   )
+"
+
+src_prepare() {
+   default
+
+   # Respect users CFLAGS
+   sed -e 's/-g //' -e 's/-O2 //g' -i Makefile || die
+
+   lua_copy_sources
+}
+
+lua_src_compile() {
+   pushd "${BUILD_DIR}" || die
+
+   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
+
+   popd
+}
+
+src_compile() {
+   lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+   pushd "${BUILD_DIR}" || die
+   cd "${S}"/tests && ${ELUA} run_tests.lua || die
+   popd
+}
+
+src_test() {
+   lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+   pushd "${BUILD_DIR}" || die
+
+   local myemakeargs=(
+   DESTDIR="${ED}"
+   LUA_CDIR="$(lua_get_cmod_dir)"
+   LUA_INC="$(lua_get_CFLAGS)"
+   LUA_LDIR="$(lua_get_lmod_dir)"
+   )
+
+   use mysql && emake ${myemakeargs[@]} install_mysql
+   use postgres && emake ${myemakeargs[@]} install_psql
+   use sqlite && emake ${myemakeargs[@]} install_sqlite3
+
+   popd
+}
+
+src_install() {
+   lua_foreach_impl lua_src_install
+
+   einstalldocs
+}



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

2024-06-27 Thread Conrad Kostecki
commit: 6221e84ae6735871a9234389ccc1337c943dd04f
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Jun 24 17:19:57 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Jun 27 15:40:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6221e84a

dev-lua/luadbi: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../luadbi-0.7.2-incompatible-pointer-type.patch   | 163 -
 .../luadbi-0.7.2-incompatible-pointer-type2.patch  |  29 
 dev-lua/luadbi/files/luadbi-0.7.2-mysql-8.patch|  55 ---
 3 files changed, 247 deletions(-)

diff --git a/dev-lua/luadbi/files/luadbi-0.7.2-incompatible-pointer-type.patch 
b/dev-lua/luadbi/files/luadbi-0.7.2-incompatible-pointer-type.patch
deleted file mode 100644
index dfe3db4b030d..
--- a/dev-lua/luadbi/files/luadbi-0.7.2-incompatible-pointer-type.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 7f9c10e753325e3cc00d4955bf9d6a77a896bdcb Mon Sep 17 00:00:00 2001
-From: Matthew Wild 
-Date: Thu, 5 Sep 2019 14:25:20 +0100
-Subject: [PATCH 1/3] MySQL: Don't set (unused) field is_null to nonsense
- value, fixes #56
-

- dbd/mysql/statement.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/dbd/mysql/statement.c b/dbd/mysql/statement.c
-index aca865a..dd01c1e 100644
 a/dbd/mysql/statement.c
-+++ b/dbd/mysql/statement.c
-@@ -218,7 +218,6 @@ static int statement_execute(lua_State *L) {
-   switch(type) {
-   case LUA_TNIL:
-   bind[i].buffer_type = MYSQL_TYPE_NULL;
--  bind[i].is_null = (int*)1;
-   break;
- 
-   case LUA_TBOOLEAN:
-
-From 83954fe0ba8c83fbe9351937e0d30b9c842dadb1 Mon Sep 17 00:00:00 2001
-From: Matthew Wild 
-Date: Thu, 5 Sep 2019 14:26:04 +0100
-Subject: [PATCH 2/3] Add test for handling of NULL values
-

- tests/run_tests.lua | 48 +
- 1 file changed, 48 insertions(+)
-
-diff --git a/tests/run_tests.lua b/tests/run_tests.lua
-index 0dd9f72..80526b6 100755
 a/tests/run_tests.lua
-+++ b/tests/run_tests.lua
-@@ -301,6 +301,51 @@ local function test_insert_multi()
- 
- end
- 
-+local function test_insert_null()
-+
-+  local sth, sth2, err, success
-+  local stringy = os.date()
-+
-+
-+  sth, err = dbh:prepare(code('insert'))
-+
-+  assert.is_nil(err)
-+  assert.is_not_nil(sth)
-+
-+  success, err = sth:execute(nil)
-+
-+  assert.is_true(success)
-+  assert.is_nil(err)
-+
-+  assert.is_equal(1, sth:affected())
-+
-+  --
-+  -- Grab it back, make sure it's all good
-+  --
-+
-+  local id = dbh:last_id()
-+  assert.is_not_nil(id)
-+  sth:close()
-+
-+  sth2, err = dbh:prepare(code('insert_select'))
-+
-+  assert.is_nil(err)
-+  assert.is_not_nil(sth)
-+
-+  success, err = sth2:execute(id)
-+
-+  assert.is_true(success)
-+  assert.is_nil(err)
-+
-+  local row = sth2:rows(false)()
-+  assert.is_not_nil(row)
-+  assert.are_equal(id, row[1])
-+  assert.is_nil(row[2])
-+
-+  sth:close()
-+  sth2:close()
-+
-+end
- 
- local function test_insert_returning()
- 
-@@ -494,6 +539,7 @@ describe("PostgreSQL #psql", function()
-   it( "Tests a simple select", test_select )
-   it( "Tests multi-row selects", test_select_multi )
-   it( "Tests inserts", test_insert_returning )
-+  it( "Tests inserts of NULL", test_insert_null )
-   it( "Tests statement reuse", test_insert_multi )
-   it( "Tests no insert_id", test_no_insert_id )
-   it( "Tests affected rows", test_update )
-@@ -514,6 +560,7 @@ describe("SQLite3 #sqlite3", function()
-   it( "Tests simple selects", test_select )
-   it( "Tests multi-row selects", test_select_multi )
-   it( "Tests inserts", test_insert )
-+  it( "Tests inserts of NULL", test_insert_null )
-   it( "Tests statement reuse", test_insert_multi )
-   it( "Tests no rowcount", test_no_rowcount )
-   it( "Tests affected rows", test_update )
-@@ -534,6 +581,7 @@ describe("MySQL #mysql", function()
-   it( "Tests simple selects", test_select )
-   it( "Tests multi-row selects", test_select_multi )
-   it( "Tests inserts", test_insert )
-+  it( "Tests inserts of NULL", test_insert_null )
-   it( "Tests statement reuse", test_insert_multi )
-   it( "Tests affected rows", test_update )
-   it( "Tests closing dbh doesn't segfault", test_db_close_doesnt_segfault 
)
-
-From 4555eb0a63945e829ffba635cac87b9e22155ffc Mon Sep 17 00:00:00 2001
-From: Matthew Wild 
-Date: Thu, 5 Sep 2019 14:35:52 +0100
-Subject: [PATCH 3/3] tests/schemas: allow null inserts for testing
-

- tests/schemas/mysql.sql  | 2 +-
- tests/schemas/postgresql.sql | 2 +-
- tests/schemas/sqlite3.sql| 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/schemas/mysql.sql b/tests/schemas/mysql.sql
-i

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

2024-06-22 Thread Conrad Kostecki
commit: 6686af0e4c2a56ca9e4faea32addca1c7d8f30ff
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Jun 22 19:40:08 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Jun 22 20:00:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6686af0e

dev-lua/luadbi: drop 0.7.2-r2

Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/luadbi/Manifest   |   1 -
 dev-lua/luadbi/luadbi-0.7.2-r2.ebuild | 107 --
 2 files changed, 108 deletions(-)

diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index a23ac9b7eccf..23aa0bde67b4 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.7.3.tar.gz 35753 BLAKE2B 
ff5fdd144560153fc74733131b48a60a14b7e95de5d6faaa982588cc5df28aa979aa805c5000fdc76fae98b99be4cc4ccb82938c8f6222bcdfe4fca4d12c9bfa
 SHA512 
1122bc9e83cf7071aff8685163a2dc387b40d2fb28aeb57e9c19e14afa6dcb0fb05fa76ea700f69751fdc79b0f1155235195d525041124fed5cefab0d50835bb

diff --git a/dev-lua/luadbi/luadbi-0.7.2-r2.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2-r2.ebuild
deleted file mode 100644
index f6a6bb822552..
--- a/dev-lua/luadbi/luadbi-0.7.2-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc 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[${LUA_USEDEP}]
-   dev-lua/luarocks
-   )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.7.2-mysql-8.patch"
-   "${FILESDIR}/${PN}-0.7.2-incompatible-pointer-type.patch"
-   "${FILESDIR}/${PN}-0.7.2-incompatible-pointer-type2.patch"
-)
-
-src_prepare() {
-   default
-
-   # Respect users CFLAGS
-   sed -e 's/-g //' -e 's/-O2 //g' -i Makefile || die
-
-   lua_copy_sources
-}
-
-lua_src_compile() {
-   pushd "${BUILD_DIR}" || die
-
-   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
-
-   popd
-}
-
-src_compile() {
-   lua_foreach_impl lua_src_compile
-}
-
-lua_src_test() {
-   pushd "${BUILD_DIR}" || die
-   cd "${S}"/tests && ${ELUA} run_tests.lua || die
-   popd
-}
-
-src_test() {
-   lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
-   pushd "${BUILD_DIR}" || die
-
-   local myemakeargs=(
-   DESTDIR="${ED}"
-   LUA_CDIR="$(lua_get_cmod_dir)"
-   LUA_INC="$(lua_get_CFLAGS)"
-   LUA_LDIR="$(lua_get_lmod_dir)"
-   )
-
-   use mysql && emake ${myemakeargs[@]} install_mysql
-   use postgres && emake ${myemakeargs[@]} install_psql
-   use sqlite && emake ${myemakeargs[@]} install_sqlite3
-
-   popd
-}
-
-src_install() {
-   lua_foreach_impl lua_src_install
-
-   einstalldocs
-}



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

2024-04-19 Thread Arthur Zamarin
commit: 09ebab710c51ad7d53fded9f51bfff54415137d0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Apr 19 11:13:17 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Apr 19 11:13:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ebab71

dev-lua/luadbi: Stabilize 0.7.3 arm64, #930136

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.3.ebuild 
b/dev-lua/luadbi/luadbi-0.7.3.ebuild
index 2b452334267a..a018a850e8e3 100644
--- a/dev-lua/luadbi/luadbi-0.7.3.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.3.ebuild
@@ -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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="mysql postgres +sqlite test"
 REQUIRED_USE="
${LUA_REQUIRED_USE}



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

2024-04-17 Thread Sam James
commit: 3cd67f6672467704a34b7a86ba092d327fdd836e
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 17 23:59:13 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 17 23:59:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cd67f66

dev-lua/luadbi: Stabilize 0.7.3 amd64, #930136

Signed-off-by: Sam James  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.3.ebuild 
b/dev-lua/luadbi/luadbi-0.7.3.ebuild
index 3b67bd3b3b57..2b452334267a 100644
--- a/dev-lua/luadbi/luadbi-0.7.3.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.3.ebuild
@@ -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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="mysql postgres +sqlite test"
 REQUIRED_USE="
${LUA_REQUIRED_USE}



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

2024-04-17 Thread Sam James
commit: d7fa2e1e18a33623fe5cca39b1008977c5964df3
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 17 22:01:31 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 17 22:01:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7fa2e1e

dev-lua/luadbi: Stabilize 0.7.3 x86, #930136

Signed-off-by: Sam James  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.3.ebuild 
b/dev-lua/luadbi/luadbi-0.7.3.ebuild
index ceace5bd8ac6..df570987d1f4 100644
--- a/dev-lua/luadbi/luadbi-0.7.3.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.3.ebuild
@@ -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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="mysql postgres +sqlite test"
 REQUIRED_USE="
${LUA_REQUIRED_USE}



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

2024-04-17 Thread Sam James
commit: 7e341eeda416543d4e7b03d16aa31b8897442ac3
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 17 22:01:32 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 17 22:01:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e341eed

dev-lua/luadbi: Stabilize 0.7.3 arm, #930136

Signed-off-by: Sam James  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.3.ebuild 
b/dev-lua/luadbi/luadbi-0.7.3.ebuild
index df570987d1f4..3b67bd3b3b57 100644
--- a/dev-lua/luadbi/luadbi-0.7.3.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.3.ebuild
@@ -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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="mysql postgres +sqlite test"
 REQUIRED_USE="
${LUA_REQUIRED_USE}



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

2024-03-15 Thread Conrad Kostecki
commit: b498913620fb96d27d7c36e11ba463973a5d937a
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Fri Mar 15 22:40:49 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Mar 15 23:58:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4989136

dev-lua/luadbi: add 0.7.3

Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/luadbi/Manifest|   1 +
 dev-lua/luadbi/luadbi-0.7.3.ebuild | 101 +
 2 files changed, 102 insertions(+)

diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index ad160c1bf206..a23ac9b7eccf 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -1 +1,2 @@
 DIST luadbi-0.7.2.tar.gz 36462 BLAKE2B 
581c7353bfa36b3f6cabed2df78372f8810300bf4525bf8d370e61d469f9daa5a5c40c58916164a8d0a621a61e983e85c67b23ef03f51212be79f09ad8512047
 SHA512 
891f99cbc8f1b5327ef820641a1608abf41410f2f28584b975cc3cf65154b9bebf6f1b9ca7d1818b9c965738ad700dd17ae042dfd2a7146cf755871ebae535b9
+DIST luadbi-0.7.3.tar.gz 35753 BLAKE2B 
ff5fdd144560153fc74733131b48a60a14b7e95de5d6faaa982588cc5df28aa979aa805c5000fdc76fae98b99be4cc4ccb82938c8f6222bcdfe4fca4d12c9bfa
 SHA512 
1122bc9e83cf7071aff8685163a2dc387b40d2fb28aeb57e9c19e14afa6dcb0fb05fa76ea700f69751fdc79b0f1155235195d525041124fed5cefab0d50835bb

diff --git a/dev-lua/luadbi/luadbi-0.7.3.ebuild 
b/dev-lua/luadbi/luadbi-0.7.3.ebuild
new file mode 100644
index ..ceace5bd8ac6
--- /dev/null
+++ b/dev-lua/luadbi/luadbi-0.7.3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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[${LUA_USEDEP}]
+   dev-lua/luarocks
+   )
+"
+
+src_prepare() {
+   default
+
+   # Respect users CFLAGS
+   sed -e 's/-g //' -e 's/-O2 //g' -i Makefile || die
+
+   lua_copy_sources
+}
+
+lua_src_compile() {
+   pushd "${BUILD_DIR}" || die
+
+   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
+
+   popd
+}
+
+src_compile() {
+   lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+   pushd "${BUILD_DIR}" || die
+   cd "${S}"/tests && ${ELUA} run_tests.lua || die
+   popd
+}
+
+src_test() {
+   lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+   pushd "${BUILD_DIR}" || die
+
+   local myemakeargs=(
+   DESTDIR="${ED}"
+   LUA_CDIR="$(lua_get_cmod_dir)"
+   LUA_INC="$(lua_get_CFLAGS)"
+   LUA_LDIR="$(lua_get_lmod_dir)"
+   )
+
+   use mysql && emake ${myemakeargs[@]} install_mysql
+   use postgres && emake ${myemakeargs[@]} install_psql
+   use sqlite && emake ${myemakeargs[@]} install_sqlite3
+
+   popd
+}
+
+src_install() {
+   lua_foreach_impl lua_src_install
+
+   einstalldocs
+}



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

2024-01-06 Thread Conrad Kostecki
commit: fa80a50168c30e8c3c9d7f68494ee2e54ab29658
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Jan  6 13:06:14 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Jan  6 13:07:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa80a501

dev-lua/luadbi: rebvump due modern C porting

Bug: https://bugs.gentoo.org/919307
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/luadbi/{luadbi-0.7.2-r1.ebuild => luadbi-0.7.2-r2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.2-r1.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2-r2.ebuild
similarity index 100%
rename from dev-lua/luadbi/luadbi-0.7.2-r1.ebuild
rename to dev-lua/luadbi/luadbi-0.7.2-r2.ebuild



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

2024-01-05 Thread Conrad Kostecki
commit: 2b37dc824d13625662d79bfa6ab97c59e3419124
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Fri Jan  5 23:04:36 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Jan  5 23:04:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b37dc82

dev-lua/luadbi: fix incompatible-pointer-types

Closes: https://bugs.gentoo.org/919307
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../luadbi-0.7.2-incompatible-pointer-type.patch   | 163 +
 .../luadbi-0.7.2-incompatible-pointer-type2.patch  |  29 
 dev-lua/luadbi/luadbi-0.7.2-r1.ebuild  |   8 +-
 3 files changed, 198 insertions(+), 2 deletions(-)

diff --git a/dev-lua/luadbi/files/luadbi-0.7.2-incompatible-pointer-type.patch 
b/dev-lua/luadbi/files/luadbi-0.7.2-incompatible-pointer-type.patch
new file mode 100644
index ..dfe3db4b030d
--- /dev/null
+++ b/dev-lua/luadbi/files/luadbi-0.7.2-incompatible-pointer-type.patch
@@ -0,0 +1,163 @@
+From 7f9c10e753325e3cc00d4955bf9d6a77a896bdcb Mon Sep 17 00:00:00 2001
+From: Matthew Wild 
+Date: Thu, 5 Sep 2019 14:25:20 +0100
+Subject: [PATCH 1/3] MySQL: Don't set (unused) field is_null to nonsense
+ value, fixes #56
+
+---
+ dbd/mysql/statement.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/dbd/mysql/statement.c b/dbd/mysql/statement.c
+index aca865a..dd01c1e 100644
+--- a/dbd/mysql/statement.c
 b/dbd/mysql/statement.c
+@@ -218,7 +218,6 @@ static int statement_execute(lua_State *L) {
+   switch(type) {
+   case LUA_TNIL:
+   bind[i].buffer_type = MYSQL_TYPE_NULL;
+-  bind[i].is_null = (int*)1;
+   break;
+ 
+   case LUA_TBOOLEAN:
+
+From 83954fe0ba8c83fbe9351937e0d30b9c842dadb1 Mon Sep 17 00:00:00 2001
+From: Matthew Wild 
+Date: Thu, 5 Sep 2019 14:26:04 +0100
+Subject: [PATCH 2/3] Add test for handling of NULL values
+
+---
+ tests/run_tests.lua | 48 +
+ 1 file changed, 48 insertions(+)
+
+diff --git a/tests/run_tests.lua b/tests/run_tests.lua
+index 0dd9f72..80526b6 100755
+--- a/tests/run_tests.lua
 b/tests/run_tests.lua
+@@ -301,6 +301,51 @@ local function test_insert_multi()
+ 
+ end
+ 
++local function test_insert_null()
++
++  local sth, sth2, err, success
++  local stringy = os.date()
++
++
++  sth, err = dbh:prepare(code('insert'))
++
++  assert.is_nil(err)
++  assert.is_not_nil(sth)
++
++  success, err = sth:execute(nil)
++
++  assert.is_true(success)
++  assert.is_nil(err)
++
++  assert.is_equal(1, sth:affected())
++
++  --
++  -- Grab it back, make sure it's all good
++  --
++
++  local id = dbh:last_id()
++  assert.is_not_nil(id)
++  sth:close()
++
++  sth2, err = dbh:prepare(code('insert_select'))
++
++  assert.is_nil(err)
++  assert.is_not_nil(sth)
++
++  success, err = sth2:execute(id)
++
++  assert.is_true(success)
++  assert.is_nil(err)
++
++  local row = sth2:rows(false)()
++  assert.is_not_nil(row)
++  assert.are_equal(id, row[1])
++  assert.is_nil(row[2])
++
++  sth:close()
++  sth2:close()
++
++end
+ 
+ local function test_insert_returning()
+ 
+@@ -494,6 +539,7 @@ describe("PostgreSQL #psql", function()
+   it( "Tests a simple select", test_select )
+   it( "Tests multi-row selects", test_select_multi )
+   it( "Tests inserts", test_insert_returning )
++  it( "Tests inserts of NULL", test_insert_null )
+   it( "Tests statement reuse", test_insert_multi )
+   it( "Tests no insert_id", test_no_insert_id )
+   it( "Tests affected rows", test_update )
+@@ -514,6 +560,7 @@ describe("SQLite3 #sqlite3", function()
+   it( "Tests simple selects", test_select )
+   it( "Tests multi-row selects", test_select_multi )
+   it( "Tests inserts", test_insert )
++  it( "Tests inserts of NULL", test_insert_null )
+   it( "Tests statement reuse", test_insert_multi )
+   it( "Tests no rowcount", test_no_rowcount )
+   it( "Tests affected rows", test_update )
+@@ -534,6 +581,7 @@ describe("MySQL #mysql", function()
+   it( "Tests simple selects", test_select )
+   it( "Tests multi-row selects", test_select_multi )
+   it( "Tests inserts", test_insert )
++  it( "Tests inserts of NULL", test_insert_null )
+   it( "Tests statement reuse", test_insert_multi )
+   it( "Tests affected rows", test_update )
+   it( "Tests closing dbh doesn't segfault", test_db_close_doesnt_segfault 
)
+
+From 4555eb0a63945e829ffba635cac87b9e22155ffc Mon Sep 17 00:00:00 2001
+From: Matthew Wild 
+Date: Thu, 5 Sep 2019 14:35:52 +0100
+Subject: [PATCH 3/3] tests/schemas: allow null inserts for testing
+
+---
+ tests/schemas/mysql.sql  | 2 +-
+ tests/schemas/postgresql.sql | 2 +-
+ tests/schemas/sqlite3.sql| 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/schemas/mysql.sql b/tests/schemas/mysql.sql
+index 1134e

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

2021-11-04 Thread Conrad Kostecki
commit: e04a74d0358e6aa6f19b8cadbb5504b81af0e52a
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Thu Nov  4 21:56:10 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Nov  4 21:57:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e04a74d0

dev-lua/luadbi: fix die

Closes: https://bugs.gentoo.org/821724
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.2-r103.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.2-r103.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2-r103.ebuild
index 0f05380ff39..c158bd4ebfd 100644
--- a/dev-lua/luadbi/luadbi-0.7.2-r103.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2-r103.ebuild
@@ -62,7 +62,7 @@ lua_src_compile() {
use postgres && emake ${myemakeargs} PSQL_INC="-I$(pg_config --libdir)" 
psql
use sqlite emake ${myemakeargs} SQLITE3_INC="-I/usr/include" sqlite
 
-   die
+   popd
 }
 
 src_compile() {
@@ -72,7 +72,7 @@ src_compile() {
 lua_src_test() {
pushd "${BUILD_DIR}" || die
cd "${S}"/tests && ${ELUA} run_tests.lua || die
-   die
+   popd
 }
 
 src_test() {
@@ -93,7 +93,7 @@ lua_src_install() {
use postgres && emake ${myemakeargs[@]} install_psql
use sqlite && emake ${myemakeargs[@]} install_sqlite3
 
-   die
+   popd
 }
 
 src_install() {



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

2021-11-04 Thread Conrad Kostecki
commit: 0cb02ba655c0c415dd05ca5b0c93ee13174e709d
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Thu Nov  4 20:58:25 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Nov  4 20:58:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb02ba6

dev-lua/luadbi: fix runtime

Closes: https://bugs.gentoo.org/820431
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../{luadbi-0.7.2-r102.ebuild => luadbi-0.7.2-r103.ebuild}   | 12 
 1 file changed, 12 insertions(+)

diff --git a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2-r103.ebuild
similarity index 93%
rename from dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
rename to dev-lua/luadbi/luadbi-0.7.2-r103.ebuild
index a10d25b72e0..0f05380ff39 100644
--- a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2-r103.ebuild
@@ -45,9 +45,13 @@ src_prepare() {
 
# Respect users CFLAGS
sed -e 's/-g //' -e 's/-O2 //g' -i Makefile || die
+
+   lua_copy_sources
 }
 
 lua_src_compile() {
+   pushd "${BUILD_DIR}" || die
+
tc-export AR CC
 
local myemakeargs=(
@@ -57,6 +61,8 @@ lua_src_compile() {
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
+
+   die
 }
 
 src_compile() {
@@ -64,7 +70,9 @@ src_compile() {
 }
 
 lua_src_test() {
+   pushd "${BUILD_DIR}" || die
cd "${S}"/tests && ${ELUA} run_tests.lua || die
+   die
 }
 
 src_test() {
@@ -72,6 +80,8 @@ src_test() {
 }
 
 lua_src_install() {
+   pushd "${BUILD_DIR}" || die
+
local myemakeargs=(
DESTDIR="${ED}"
LUA_CDIR="$(lua_get_cmod_dir)"
@@ -82,6 +92,8 @@ lua_src_install() {
use mysql && emake ${myemakeargs[@]} install_mysql
use postgres && emake ${myemakeargs[@]} install_psql
use sqlite && emake ${myemakeargs[@]} install_sqlite3
+
+   die
 }
 
 src_install() {



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

2021-04-22 Thread Sergei Trofimovich
commit: e8086696356c52a88d411e8b6eef38328efe3bac
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Apr 22 19:28:43 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Apr 22 19:30:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8086696

dev-lua/luadbi: keyworded 0.7.2-r102 for hppa/sparc, bug #783420

Package-Manager: Portage-3.0.17, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.2-r102.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
index 4eeb7d93542..a10d25b72e0 100644
--- a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
@@ -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 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="mysql postgres +sqlite test"
 REQUIRED_USE="
${LUA_REQUIRED_USE}



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

2021-04-21 Thread Conrad Kostecki
commit: 598f6272bab4151b4c34e053af1cb2caec90ae37
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Apr 21 20:23:54 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Apr 21 20:29:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=598f6272

dev-lua/luadbi: add ~ppc ~ppc64 keyword

Bug: https://bugs.gentoo.org/783423
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.2-r102.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
index 7e0a8cdd05c..4eeb7d93542 100644
--- a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
@@ -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 ~ia64 x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="mysql postgres +sqlite test"
 REQUIRED_USE="
${LUA_REQUIRED_USE}



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

2021-04-20 Thread Sergei Trofimovich
commit: af8a820b8a48d861e3c4149f3a493d42cd0ff6d1
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Apr 20 21:17:35 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Apr 20 21:20:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af8a820b

dev-lua/luadbi: keyworded 0.7.2-r102 for ia64

keyworded wrt bug #783420

Package-Manager: Portage-3.0.18, Repoman-3.0.3
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.2-r102.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
index 64e47e01ff3..7e0a8cdd05c 100644
--- a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
@@ -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 ~ia64 x86"
 IUSE="mysql postgres +sqlite test"
 REQUIRED_USE="
${LUA_REQUIRED_USE}



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

2021-03-16 Thread Conrad Kostecki
commit: 3b132effc2a09fb74a8f2c5b9ff83ee5ab7c20e9
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Tue Mar 16 17:03:09 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Mar 16 17:28:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b132eff

dev-lua/luadbi: add lua5-4 support

Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.2-r102.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
index 178c82c225c..64e47e01ff3 100644
--- a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit lua toolchain-funcs
 



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

2021-01-27 Thread Conrad Kostecki
commit: 67edd7bbec39255f7784ff73d457ecb4a0c49679
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Jan 24 18:05:38 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Jan 27 19:40:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67edd7bb

dev-lua/luadbi: drop old version

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.2.ebuild | 65 --
 1 file changed, 65 deletions(-)

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 2ddcc6056bd..000
--- 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
-}



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

2021-01-23 Thread Sam James
commit: ec0f885a99783616e69ee845ea93a8f915ec83e6
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 23 22:51:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 23 22:51:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec0f885a

dev-lua/luadbi: Stabilize 0.7.2-r102 arm64, #766528

Signed-off-by: Sam James  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.2-r102.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
index ba2524de91b..178c82c225c 100644
--- a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
@@ -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}



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

2020-12-25 Thread Conrad Kostecki
commit: 9fe1abc55c349ca9ede7193294e6e522e9f1a7a5
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Fri Dec 25 12:42:51 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Dec 25 12:43:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe1abc5

dev-lua/luadbi: drop old version

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.2-r101.ebuild | 90 -
 1 file changed, 90 deletions(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild
deleted file mode 100644
index 03742f99877..000
--- a/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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[${LUA_USEDEP}]
-   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
-}



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

2020-12-25 Thread Conrad Kostecki
commit: dfb046ee97fbdb91fec68eca02ca28f7c3224026
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Fri Dec 25 12:40:57 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Dec 25 12:43:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfb046ee

dev-lua/luadbi: fix lua slots >=5.2

Closes: https://bugs.gentoo.org/761595
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.2-r102.ebuild | 91 +
 1 file changed, 91 insertions(+)

diff --git a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
new file mode 100644
index 000..8958edd4d2c
--- /dev/null
+++ b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
@@ -0,0 +1,91 @@
+# 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[${LUA_USEDEP}]
+   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_INC="$(lua_get_CFLAGS)"
+   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
+}



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

2020-12-03 Thread Marek Szuba
commit: d25ce311187fa31cdfa894c8d67a7a4c3b469bb4
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Dec  3 12:49:00 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Dec  3 12:54:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d25ce311

dev-lua/luadbi: limit unmigrated ebuilds to dev-lang/lua:0

Signed-off-by: Marek Szuba  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.2.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2.ebuild
index 338881effc6..2ddcc6056bd 100644
--- a/dev-lua/luadbi/luadbi-0.7.2.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="|| ( mysql postgres sqlite )"
 RESTRICT="test"
 
 RDEPEND="
-   >=dev-lang/lua-5.1:=
+   >=dev-lang/lua-5.1:0=
mysql? ( dev-db/mysql-connector-c:0= )
postgres? ( dev-db/postgresql:= )
sqlite? ( dev-db/sqlite )



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

2020-11-30 Thread Conrad Kostecki
commit: fc798bd0b555e44d5f4b0accc77218532a6ba9e4
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Mon Nov 30 11:51:50 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon Nov 30 13:32:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc798bd0

dev-lua/luadbi: remove lua deps version requirement

The LUA_USEDEP bit is sufficient to pull in a version migrated to Lua
eclasses, regardless of whether either of these gets updated to a new
release before we unmask slotted Lua or not.

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

 dev-lua/luadbi/luadbi-0.7.2-r101.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild
index f19a4a0b67f..03742f99877 100644
--- a/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
virtual/pkgconfig
test? (
-   >=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}]
+   dev-lua/busted[${LUA_USEDEP}]
dev-lua/luarocks
)
 "



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

2020-11-28 Thread Conrad Kostecki
commit: 29e1aacb4aca42e7ff1eab524f937b9336a36a2e
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Nov 28 17:34:23 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Nov 28 17:44:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e1aacb

dev-lua/luadbi: drop old version

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

 dev-lua/luadbi/luadbi-0.7.2-r100.ebuild | 90 -
 1 file changed, 90 deletions(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.2-r100.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2-r100.ebuild
deleted file mode 100644
index f7f3c1fdcab..000
--- a/dev-lua/luadbi/luadbi-0.7.2-r100.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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
-}



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

2020-11-28 Thread Conrad Kostecki
commit: bd5e6af5899d23c545e6a80c5d0b4e116e4b28d0
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Nov 28 17:33:45 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Nov 28 17:44:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd5e6af5

dev-lua/luadbi: fix lua deps

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

 dev-lua/luadbi/luadbi-0.7.2-r101.ebuild | 90 +
 1 file changed, 90 insertions(+)

diff --git a/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild
new file mode 100644
index 000..f19a4a0b67f
--- /dev/null
+++ b/dev-lua/luadbi/luadbi-0.7.2-r101.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-2.0.0-r100[${LUA_USEDEP}]
+   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
+}



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

2020-11-15 Thread Conrad Kostecki
commit: d39544820ac34032579eede76d9b8fa37967c2a0
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Nov 15 16:02:20 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Nov 15 16:02:20 2020 +
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  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..000
--- 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..000
--- a/dev-lua/luadbi/files/luadbi-0.5-mysql-8.patch
+++ /dev/null
@@ -1,78 +0,0 @@
 a/dbd/mysql/statement.c2020-03-09 15:55:43.212010825 +0100
-+++ b/dbd/mysql/statement.c2020-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 >= 8
-+#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 >= 8
-+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 >= 8
-+bind[i].is_null = (bool*) 0;

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

2020-11-15 Thread Sam James
commit: ec8815dcddd91f8107268614367768e39514ccd7
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 15 09:28:36 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 15 09:28:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec8815dc

dev-lua/luadbi: Stabilize 0.7.2 amd64, #754183

Signed-off-by: Sam James  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.2.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2.ebuild
index d6338e4edde..338881effc6 100644
--- a/dev-lua/luadbi/luadbi-0.7.2.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2.ebuild
@@ -11,7 +11,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="|| ( mysql postgres sqlite )"
 RESTRICT="test"



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

2020-11-14 Thread Sam James
commit: bdc1e8ecc04832d5a4330c96aa547a7be9b4b242
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 15 05:47:06 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 15 05:47:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdc1e8ec

dev-lua/luadbi: Stabilize 0.7.2 arm, #754183

Signed-off-by: Sam James  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.2.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2.ebuild
index 5136ecb9fc3..d6338e4edde 100644
--- a/dev-lua/luadbi/luadbi-0.7.2.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2.ebuild
@@ -11,7 +11,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="|| ( mysql postgres sqlite )"
 RESTRICT="test"



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

2020-11-14 Thread Sam James
commit: 072f6a247ac14f8ea2e1b3e36edda8b0dc19cda6
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 14 22:49:47 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 14 22:50:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072f6a24

dev-lua/luadbi: Stabilize 0.7.2 arm64, #754183

Signed-off-by: Sam James  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.2.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2.ebuild
index be0d0803b56..5136ecb9fc3 100644
--- a/dev-lua/luadbi/luadbi-0.7.2.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2.ebuild
@@ -11,7 +11,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="|| ( mysql postgres sqlite )"
 RESTRICT="test"



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

2020-11-12 Thread Thomas Deutschmann
commit: a9911a34061f16c9e43d7f37f291decf2888781a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Nov 12 22:51:54 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Nov 12 22:54:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9911a34

dev-lua/luadbi: x86 stable (bug #754183)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.2.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2.ebuild
index 3c01ee07123..be0d0803b56 100644
--- a/dev-lua/luadbi/luadbi-0.7.2.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2.ebuild
@@ -11,7 +11,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="|| ( mysql postgres sqlite )"
 RESTRICT="test"



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

2020-10-17 Thread Sam James
commit: 1aadf5110052abc7f14cc47655c6cec6697cdf5c
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 17 23:45:16 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 17 23:45:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aadf511

dev-lua/luadbi: arm64 stable (bug #747913)

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 dev-lua/luadbi/luadbi-0.5-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.5-r6.ebuild 
b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
index 0ee5f038ad1..f4d024e8ba3 100644
--- a/dev-lua/luadbi/luadbi-0.5-r6.ebuild
+++ b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 



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

2020-10-14 Thread Conrad Kostecki
commit: ae4cdb501d80da917dece46e914a2806519a3cd7
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Oct 14 21:21:31 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Oct 14 21:23:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae4cdb50

dev-lua/luadbi: add support for slotted lua

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.2-r100.ebuild | 90 +
 1 file changed, 90 insertions(+)

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 000..f7f3c1fdcab
--- /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
+}



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

2020-10-14 Thread Conrad Kostecki
commit: 28b8e9958bbe72c59568bb9348029b90839a2b8f
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Oct 14 21:00:52 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Oct 14 21:23:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28b8e995

dev-lua/luadbi: drop old version

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/luadbi/luadbi-0.5-r5.ebuild | 64 -
 1 file changed, 64 deletions(-)

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 f2dd0d9452f..000
--- a/dev-lua/luadbi/luadbi-0.5-r5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 ~arm64 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}"/${P}-makefile.patch
-   epatch "${FILESDIR}"/${P}-mysql-8.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
-}



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

2020-10-14 Thread Conrad Kostecki
commit: 4160186131fc18a6497c98762341eb3ab6ec88f5
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Oct 14 21:08:49 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Oct 14 21:23:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41601861

dev-lua/luadbi: add tests

Uunfortunately, the tests must be restricted,
as they need a real database for execution.

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/luadbi/luadbi-0.7.2.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.7.2.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2.ebuild
index 63e97642ea1..3c01ee07123 100644
--- a/dev-lua/luadbi/luadbi-0.7.2.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2.ebuild
@@ -12,8 +12,9 @@ 
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"
+IUSE="mysql postgres +sqlite test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
+RESTRICT="test"
 
 RDEPEND="
>=dev-lang/lua-5.1:=
@@ -47,6 +48,10 @@ src_compile() {
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}"



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

2020-10-13 Thread Conrad Kostecki
commit: b90c6060daebfd53490d906618c3c9db401d65e7
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Tue Oct 13 07:55:39 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Oct 13 07:55:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b90c6060

dev-lua/luadbi: bump to version 0.7.2

Closes: https://bugs.gentoo.org/709736
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/luadbi/Manifest |  1 +
 dev-lua/luadbi/files/luadbi-0.7.2-mysql-8.patch | 55 +++
 dev-lua/luadbi/luadbi-0.7.2.ebuild  | 60 +
 3 files changed, 116 insertions(+)

diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index 197912a6166..b80720a8565 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -1 +1,2 @@
+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.7.2-mysql-8.patch 
b/dev-lua/luadbi/files/luadbi-0.7.2-mysql-8.patch
new file mode 100644
index 000..ef463433357
--- /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 
+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 
+---
+ 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 
++#include 
+ #include 
+ 
+ #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.7.2.ebuild 
b/dev-lua/luadbi/luadbi-0.7.2.ebuild
new file mode 100644
index 000..63e97642ea1
--- /dev/null
+++ b/dev-lua/luadbi/luadbi-0.7.2.ebuild
@@ -0,0 +1,60 @@
+# 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"
+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 )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-0.7.2-mysql-8.patch" )
+
+src_prepare() {
+   default
+
+   # Respect users CFLAGS
+   sed -e 's/-

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

2020-10-12 Thread Agostino Sarubbo
commit: 0cb6a645cf857f8ae3549b2c797158e0aa6f0ba6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Oct 12 10:20:48 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Oct 12 10:20:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb6a645

dev-lua/luadbi: amd64 stable wrt bug #747913

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-lua/luadbi/luadbi-0.5-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.5-r6.ebuild 
b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
index 0f3720538cc..0ee5f038ad1 100644
--- a/dev-lua/luadbi/luadbi-0.5-r6.ebuild
+++ b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 



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

2020-10-12 Thread Agostino Sarubbo
commit: b2f6cefdbdc9be4f74b4997c65d2047555a7550b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Oct 12 07:01:41 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Oct 12 07:01:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2f6cefd

dev-lua/luadbi: x86 stable wrt bug #747913

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-lua/luadbi/luadbi-0.5-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.5-r6.ebuild 
b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
index 1a12f771f59..0f3720538cc 100644
--- a/dev-lua/luadbi/luadbi-0.5-r6.ebuild
+++ b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 x86"
 IUSE="mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 



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

2020-10-11 Thread Agostino Sarubbo
commit: 8f3f9f431e3b738f19247c1d7a21a96c54a4f4eb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Oct 12 06:57:32 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Oct 12 06:57:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f3f9f43

dev-lua/luadbi: arm stable wrt bug #747913

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-lua/luadbi/luadbi-0.5-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/luadbi-0.5-r6.ebuild 
b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
index 6a338b541a1..1a12f771f59 100644
--- a/dev-lua/luadbi/luadbi-0.5-r6.ebuild
+++ b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~x86"
 IUSE="mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 



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

2020-10-11 Thread Conrad Kostecki
commit: 0d4034f4e0addbafaa641320c137abaa7e8da529
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Oct 11 23:49:50 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Oct 11 23:54:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d4034f4

dev-lua/luadbi: add myself as maintainer

Also changed upstream from google to github.

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/luadbi/metadata.xml | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-lua/luadbi/metadata.xml b/dev-lua/luadbi/metadata.xml
index 2ff9f66c889..1dbf53904c3 100644
--- a/dev-lua/luadbi/metadata.xml
+++ b/dev-lua/luadbi/metadata.xml
@@ -1,8 +1,11 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
+   
+   conik...@gentoo.org
+   Conrad Kostecki
+   

-   luadbi
+   mwild1/luadbi

 



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

2020-10-11 Thread Conrad Kostecki
commit: af72c733c6f6687dde699b73c9197c20ab5cf97d
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Oct 11 23:33:07 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Oct 11 23:33:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af72c733

dev-lua/luadbi: fix compilation with mysql-8

Closes: https://bugs.gentoo.org/695378
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/luadbi/files/luadbi-0.5-mysql-8.patch | 78 +++
 dev-lua/luadbi/luadbi-0.5-r5.ebuild   |  1 +
 dev-lua/luadbi/luadbi-0.5-r6.ebuild   |  5 +-
 3 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/dev-lua/luadbi/files/luadbi-0.5-mysql-8.patch 
b/dev-lua/luadbi/files/luadbi-0.5-mysql-8.patch
new file mode 100644
index 000..a75c9d46d07
--- /dev/null
+++ b/dev-lua/luadbi/files/luadbi-0.5-mysql-8.patch
@@ -0,0 +1,78 @@
+--- a/dbd/mysql/statement.c2020-03-09 15:55:43.212010825 +0100
 b/dbd/mysql/statement.c2020-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 >= 8
++#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 >= 8
++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 >= 8
++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 >= 8
++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-r5.ebuild 
b/dev-lua/luadbi/luadbi-0.5-r5.ebuild
index e46445c3b8f..a2d657fb7d5 100644
--- a/dev-lua/luadbi/luadbi-0.5-r5.ebuild
+++ b/dev-lua/luadbi/luadbi-0.5-r5.ebuild
@@ -26,6 +26,7 @@ S="${WORKDIR}"
 
 src_prepare() {
epatch "${FILESDIR}"/${PV}-r2-Makefile.patch
+   epatch "${FILESDIR}"/${P}-mysql-8.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)#" \

diff --git a/dev-lua/luadbi/luadbi-0.5-r6.ebuild 
b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
index 2a24cb49017..44ae7c129ca 100644
--- a/dev-lua/luadbi/luadbi-0.5-r6.ebuild
+++ b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
@@ -24,7 +24,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"
 
-PATCHES=( "${FILESDIR}"/${PV}-r2-Makefile.patch )
+PATCHES=(
+   "${FILESDIR}"/${PV}-r2-Makefile.patch
+   "${FILESDIR}"/${P}-mysql-8.patch
+)
 
 src_prepare() {
default



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

2020-10-11 Thread Conrad Kostecki
commit: feb82f1dc59083265cd0d6b70dbbe5dfe533f19c
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Oct 11 23:36:17 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Oct 11 23:36:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feb82f1d

dev-lua/luadbi: use proper patch name

Renamed patch for fit the default naming convention.

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../luadbi/files/{0.5-r2-Makefile.patch => luadbi-0.5-makefile.patch}   | 0
 dev-lua/luadbi/luadbi-0.5-r5.ebuild | 2 +-
 dev-lua/luadbi/luadbi-0.5-r6.ebuild | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lua/luadbi/files/0.5-r2-Makefile.patch 
b/dev-lua/luadbi/files/luadbi-0.5-makefile.patch
similarity index 100%
rename from dev-lua/luadbi/files/0.5-r2-Makefile.patch
rename to dev-lua/luadbi/files/luadbi-0.5-makefile.patch

diff --git a/dev-lua/luadbi/luadbi-0.5-r5.ebuild 
b/dev-lua/luadbi/luadbi-0.5-r5.ebuild
index a2d657fb7d5..f2dd0d9452f 100644
--- a/dev-lua/luadbi/luadbi-0.5-r5.ebuild
+++ b/dev-lua/luadbi/luadbi-0.5-r5.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"
 
 src_prepare() {
-   epatch "${FILESDIR}"/${PV}-r2-Makefile.patch
+   epatch "${FILESDIR}"/${P}-makefile.patch
epatch "${FILESDIR}"/${P}-mysql-8.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)#" \

diff --git a/dev-lua/luadbi/luadbi-0.5-r6.ebuild 
b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
index 44ae7c129ca..6a338b541a1 100644
--- a/dev-lua/luadbi/luadbi-0.5-r6.ebuild
+++ b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"
 
 PATCHES=(
-   "${FILESDIR}"/${PV}-r2-Makefile.patch
+   "${FILESDIR}"/${P}-makefile.patch
"${FILESDIR}"/${P}-mysql-8.patch
 )
 



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

2020-10-11 Thread Conrad Kostecki
commit: 94ad38ecdc0957cb2ad93a652a4b1f440fca9384
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Oct 11 23:21:30 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Oct 11 23:21:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ad38ec

dev-lua/luadbi: add ~arm64 keyword

Tested on packet-at.
All tests passed.

Bug: https://bugs.gentoo.org/747907
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/luadbi/luadbi-0.5-r5.ebuild | 4 ++--
 dev-lua/luadbi/luadbi-0.5-r6.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-lua/luadbi/luadbi-0.5-r5.ebuild 
b/dev-lua/luadbi/luadbi-0.5-r5.ebuild
index e1cdb2f7657..e46445c3b8f 100644
--- a/dev-lua/luadbi/luadbi-0.5-r5.ebuild
+++ b/dev-lua/luadbi/luadbi-0.5-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ 
SRC_URI="https://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 

diff --git a/dev-lua/luadbi/luadbi-0.5-r6.ebuild 
b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
index 2f194b5ab36..2a24cb49017 100644
--- a/dev-lua/luadbi/luadbi-0.5-r6.ebuild
+++ b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 
SRC_URI="https://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 



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

2019-02-07 Thread Brian Evans
commit: 51b32bb9d4bd111a3400fab7cdc68c2c881ba29c
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Feb  7 18:10:09 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Feb  7 18:10:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51b32bb9

dev-lua/luadbi: Revbump for dependency and EAPI change

Bug: https://bugs.gentoo.org/665884
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Brian Evans  gentoo.org>

 dev-lua/luadbi/files/0.5-r2-Makefile.patch |  4 +-
 dev-lua/luadbi/luadbi-0.5-r6.ebuild| 66 ++
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/dev-lua/luadbi/files/0.5-r2-Makefile.patch 
b/dev-lua/luadbi/files/0.5-r2-Makefile.patch
index b37b3c00efe..98e4988b281 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 000..2f194b5ab36
--- /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
+}



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

2017-07-23 Thread Manuel Rüger
commit: 1993234c22f970acaba42723ce865c97645726a3
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun Jul 23 12:10:41 2017 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Jul 23 12:12:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1993234c

dev-lua/luadbi: Drop myself as a maintainer

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-lua/luadbi/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev-lua/luadbi/metadata.xml b/dev-lua/luadbi/metadata.xml
index 1781c6ad20d..2ff9f66c889 100644
--- a/dev-lua/luadbi/metadata.xml
+++ b/dev-lua/luadbi/metadata.xml
@@ -1,10 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   mr...@gentoo.org
-   Manuel Rüger
-   
+   

luadbi