diff options
author | 2012-08-02 23:10:24 -0700 | |
---|---|---|
committer | 2012-08-02 23:10:24 -0700 | |
commit | 63ac90ecf328c66cb5948c602ed064ded38934fd (patch) | |
tree | 29a84058838654316fea5ef344739307ab1e409f | |
parent | Fix EAPI declaration (diff) | |
download | JoseQ-63ac90ecf328c66cb5948c602ed064ded38934fd.tar.gz JoseQ-63ac90ecf328c66cb5948c602ed064ded38934fd.tar.bz2 JoseQ-63ac90ecf328c66cb5948c602ed064ded38934fd.zip |
Proposed fix for Bug 427928
-rw-r--r-- | dev-lua/luadbi/ChangeLog | 25 | ||||
-rw-r--r-- | dev-lua/luadbi/Manifest | 6 | ||||
-rw-r--r-- | dev-lua/luadbi/files/0.5-Makefile.patch | 39 | ||||
-rw-r--r-- | dev-lua/luadbi/files/0.5-postgres-path.patch | 9 | ||||
-rw-r--r-- | dev-lua/luadbi/luadbi-0.5-r2.ebuild | 59 | ||||
-rw-r--r-- | dev-lua/luadbi/metadata.xml | 10 |
6 files changed, 148 insertions, 0 deletions
diff --git a/dev-lua/luadbi/ChangeLog b/dev-lua/luadbi/ChangeLog new file mode 100644 index 0000000..2874658 --- /dev/null +++ b/dev-lua/luadbi/ChangeLog @@ -0,0 +1,25 @@ +# ChangeLog for dev-lua/luadbi +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/ChangeLog,v 1.5 2012/05/04 04:01:52 jdhore Exp $ + + 04 May 2012; Jeff Horelick <jdhore@gentoo.org> luadbi-0.5-r1.ebuild: + dev-util/pkgconfig -> virtual/pkgconfig + + 01 Mar 2012; Dirkjan Ochtman <djc@gentoo.org> luadbi-0.5-r1.ebuild: + Depend on virtual/mysql instead of dev-db/mysql (bug 392395). + + 01 Mar 2012; Dirkjan Ochtman <djc@gentoo.org> -luadbi-0.5.ebuild: + Remove old version. + +*luadbi-0.5-r1 (02 May 2011) + + 02 May 2011; Dirkjan Ochtman <djc@gentoo.org> + +files/0.5-postgres-path.patch, +luadbi-0.5-r1.ebuild: + Fix path to postgres header (bug 364141). + +*luadbi-0.5 (08 Apr 2011) + + 08 Apr 2011; Dirkjan Ochtman <djc@gentoo.org> +files/0.5-Makefile.patch, + +luadbi-0.5.ebuild, +metadata.xml: + Initial version of luadbi, bug 352379. + diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest new file mode 100644 index 0000000..286afa9 --- /dev/null +++ b/dev-lua/luadbi/Manifest @@ -0,0 +1,6 @@ +AUX 0.5-Makefile.patch 1293 RMD160 1503f79f30bb438e562e78ed11217bbfc4405638 SHA1 b92c87a66ad6bb296d2b43552b5c949c575579b4 SHA256 a9b8a3429f09855aff8b803659a72be2e80a94152f846d1c17cfedcf363ae630 +AUX 0.5-postgres-path.patch 277 RMD160 49f6350645b7d1da446fb0fc918d3f111e7fed12 SHA1 9e52f4e853959429ac05d299d4f0b27d5891d7a0 SHA256 09ab48339a671083ac18ac42248a380f92722bee35b21e1412dc27d669e27385 +DIST luadbi.0.5.tar.gz 22454 SHA256 49116458dd80052536bf5d7e2b2a1f5a0fa42a671ce77f1cb7355ef7faeb331e SHA512 4ed641e113e90acc8a4f6b3b2d0f5d5044c0fbbef3b2fdfb84d15e17115e45c553a33b19bfb165e5af11a2adce501d66859963e3363d3ab1c6a39b0b2ae92e62 WHIRLPOOL 6f1384d562adb7f874b9df6d42ebbe689fbd200ca57881ab76847eae818ffbb85765bfdbeb810511e8cff05170ba104bfc029f9cc969e8799a6971207f4bce4e +EBUILD luadbi-0.5-r2.ebuild 1810 RMD160 ee18bbd6eeaaae70a814fe00e5660f03aed1b9c6 SHA1 3e9958b819fa29d3b06fd809b1dec64be5ea5a03 SHA256 afe61554f469b361c3a1ae3c940fd331d6e39e62203588355b363d19140ff568 +MISC ChangeLog 902 RMD160 fc37eeaa6a5c0ee92e11457e9e264ae078ad33a2 SHA1 2ebc0a5aa1180b5a04d5983606ccbff0f517615f SHA256 146d64bc364bf38908debb4e17967baf488d2f86e4080424c9baf4203d06c134 +MISC metadata.xml 276 RMD160 4949f3a14eeb66e28425825ae2b4775644a34287 SHA1 5595b3f8366867468100e89deab6a0730c1eba82 SHA256 b10e02a00f58e53475aacff4e0d4f754e2eb135c6232d7a63fe5352e1700c13a diff --git a/dev-lua/luadbi/files/0.5-Makefile.patch b/dev-lua/luadbi/files/0.5-Makefile.patch new file mode 100644 index 0000000..e24cb34 --- /dev/null +++ b/dev-lua/luadbi/files/0.5-Makefile.patch @@ -0,0 +1,39 @@ +--- Makefile.old 2010-07-16 08:22:13.000000000 +0200 ++++ Makefile 2011-01-08 11:35:16.000000000 +0100 +@@ -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: mysql install_lua ++ $(INSTALL_PROGRAM) -D $(DBDMYSQL) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDMYSQL) ++ ++install_psql: psql install_lua ++ $(INSTALL_PROGRAM) -D $(DBDPSQL) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDPSQL) ++ ++install_sqlite3: sqlite3 install_lua ++ $(INSTALL_PROGRAM) -D $(DBDSQLITE3) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDSQLITE3) ++ ++install_db2: db2 install_lua ++ $(INSTALL_PROGRAM) -D $(DBDDB2) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDDB2) ++ ++install_oracle: oracle install_lua ++ $(INSTALL_PROGRAM) -D $(DBDORACLE) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDORACLE) ++ diff --git a/dev-lua/luadbi/files/0.5-postgres-path.patch b/dev-lua/luadbi/files/0.5-postgres-path.patch new file mode 100644 index 0000000..87a0e88 --- /dev/null +++ b/dev-lua/luadbi/files/0.5-postgres-path.patch @@ -0,0 +1,9 @@ +--- dbd/postgresql/dbd_postgresql.h.old 2010-05-01 06:25:12.000000000 +0200 ++++ dbd/postgresql/dbd_postgresql.h 2011-04-19 16:59:53.364944209 +0200 +@@ -1,5 +1,5 @@ + #include <libpq-fe.h> +-#include <postgres_fe.h> ++#include <server/postgres_fe.h> + #include <dbd/common.h> + + /*
\ No newline at end of file diff --git a/dev-lua/luadbi/luadbi-0.5-r2.ebuild b/dev-lua/luadbi/luadbi-0.5-r2.ebuild new file mode 100644 index 0000000..46317ed --- /dev/null +++ b/dev-lua/luadbi/luadbi-0.5-r2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/luadbi-0.5-r1.ebuild,v 1.3 2012/05/04 04:01:52 jdhore Exp $ + +EAPI=4 + +inherit multilib toolchain-funcs flag-o-matic eutils + +DESCRIPTION="DBI module for Lua" +HOMEPAGE="http://code.google.com/p/luadbi/" +SRC_URI="http://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="mysql postgres sqlite" +REQUIRED_USE="|| ( mysql postgres sqlite )" + +RDEPEND=">=dev-lang/lua-5.1 + mysql? ( virtual/mysql ) + postgres? ( dev-db/postgresql-base ) + sqlite? ( >=dev-db/sqlite-3 )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}" + +src_prepare() { + epatch "${FILESDIR}/${PV}-Makefile.patch" + epatch "${FILESDIR}/${PV}-postgres-path.patch" + sed -i -e "s#^INSTALL_DIR_LUA=.*#INSTALL_DIR_LUA=$(pkg-config --variable INSTALL_LMOD lua)#" "${S}/Makefile" + sed -i -e "s#^INSTALL_DIR_BIN=.*#INSTALL_DIR_BIN=$(pkg-config --variable INSTALL_CMOD lua)#" "${S}/Makefile" + sed -i -e "s#^LUA_INC_DIR=.*#LUA_INC_DIR=$(pkg-config --variable INSTALL_INC lua)#" "${S}/Makefile" + sed -i -e "s#^LUA_LIB_DIR=.*#LUA_LIB_DIR=$(pkg-config --variable INSTALL_LIB lua)#" "${S}/Makefile" + sed -i -e "s#^LUA_LIB =.*#LUA_LIB=lua#" "${S}/Makefile" +} + +src_compile() { + local drivers="" + use mysql && drivers="${drivers} mysql" + use postgres && drivers="${drivers} psql" + use sqlite && drivers="${drivers} sqlite3" + + append-flags -fPIC -c + for driver in "${drivers}" ; do + emake ${driver} + done +} + +src_install() { + local drivers="" + use mysql && drivers="${drivers} mysql" + use postgres && drivers="${drivers} psql" + use sqlite && drivers="${drivers} sqlite3" + + for driver in ${drivers} ; do + emake DESTDIR="${D}" "install_${driver// /}" + done +} diff --git a/dev-lua/luadbi/metadata.xml b/dev-lua/luadbi/metadata.xml new file mode 100644 index 0000000..0c6db2c --- /dev/null +++ b/dev-lua/luadbi/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>djc@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="google-code">luadbi</remote-id> + </upstream> +</pkgmetadata> |