From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4DE81138334 for ; Thu, 7 Feb 2019 18:10:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4246EE0BB3; Thu, 7 Feb 2019 18:10:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F232BE0BB3 for ; Thu, 7 Feb 2019 18:10:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18DC7335DC3 for ; Thu, 7 Feb 2019 18:10:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2E07F463 for ; Thu, 7 Feb 2019 18:10:36 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1549563009.51b32bb9d4bd111a3400fab7cdc68c2c881ba29c.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lua/luadbi/files/, dev-lua/luadbi/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lua/luadbi/files/0.5-r2-Makefile.patch dev-lua/luadbi/luadbi-0.5-r6.ebuild X-VCS-Directories: dev-lua/luadbi/files/ dev-lua/luadbi/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 51b32bb9d4bd111a3400fab7cdc68c2c881ba29c X-VCS-Branch: master Date: Thu, 7 Feb 2019 18:10:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 66b9e8bb-a5b8-4e65-ac8c-464a3882c90d X-Archives-Hash: 931e4259c15ebf329399fc0d953c3f51 commit: 51b32bb9d4bd111a3400fab7cdc68c2c881ba29c Author: Brian Evans gentoo org> AuthorDate: Thu Feb 7 18:10:09 2019 +0000 Commit: Brian Evans gentoo org> CommitDate: Thu Feb 7 18:10:09 2019 +0000 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 00000000000..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 +}