From 0cb02ba655c0c415dd05ca5b0c93ee13174e709d Mon Sep 17 00:00:00 2001 From: Conrad Kostecki Date: Thu, 4 Nov 2021 21:58:25 +0100 Subject: 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 --- dev-lua/luadbi/luadbi-0.7.2-r102.ebuild | 91 ---------------------------- dev-lua/luadbi/luadbi-0.7.2-r103.ebuild | 103 ++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 91 deletions(-) delete mode 100644 dev-lua/luadbi/luadbi-0.7.2-r102.ebuild create mode 100644 dev-lua/luadbi/luadbi-0.7.2-r103.ebuild (limited to 'dev-lua') diff --git a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild deleted file mode 100644 index a10d25b72e03..000000000000 --- a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" ) - -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 -} diff --git a/dev-lua/luadbi/luadbi-0.7.2-r103.ebuild b/dev-lua/luadbi/luadbi-0.7.2-r103.ebuild new file mode 100644 index 000000000000..0f05380ff39f --- /dev/null +++ b/dev-lua/luadbi/luadbi-0.7.2-r103.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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" ) + +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 + + die +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" || die + cd "${S}"/tests && ${ELUA} run_tests.lua || die + die +} + +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 + + die +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} -- cgit v1.2.3-65-gdbad