From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 184351381F3 for ; Tue, 14 May 2013 02:43:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73CE3E0837; Tue, 14 May 2013 02:43:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EAB63E0837 for ; Tue, 14 May 2013 02:43:51 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C18A233DB75 for ; Tue, 14 May 2013 02:43:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CA423E5308 for ; Tue, 14 May 2013 02:43:47 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <1368499266.3ee04ff54e6899d5e08d04a296bf1eff4b5cd0f0.jmbsvicetto@gentoo> Subject: [gentoo-commits] dev/jmbsvicetto:master commit in: dev-db/libdbi-drivers/files/, dev-db/libdbi-drivers/ X-VCS-Repository: dev/jmbsvicetto X-VCS-Files: dev-db/libdbi-drivers/Manifest dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-doc-build-fix.patch dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-fix-ac-macro.patch dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild dev-db/libdbi-drivers/metadata.xml X-VCS-Directories: dev-db/libdbi-drivers/files/ dev-db/libdbi-drivers/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: 3ee04ff54e6899d5e08d04a296bf1eff4b5cd0f0 X-VCS-Branch: master Date: Tue, 14 May 2013 02:43:47 +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-Archives-Salt: 0ad38603-3c66-4361-9765-48fa8d09c51a X-Archives-Hash: 9dda33047c29e83caac6f433a2e96654 commit: 3ee04ff54e6899d5e08d04a296bf1eff4b5cd0f0 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Tue May 14 02:41:06 2013 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Tue May 14 02:41:06 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=3ee04ff5 [dev-db/libdbi-drivers] Add libdbi-drivers to the overlay and apply a patch to replace AM_CONFIG_HEADER with AC_CONFIG_HEADERS to fix the build of the package. message for your changes. Lines starting --- dev-db/libdbi-drivers/Manifest | 1 + .../files/libdbi-drivers-0.8.3-doc-build-fix.patch | 15 ++++ .../files/libdbi-drivers-0.8.3-firebird-fix.patch | 25 ++++++ .../files/libdbi-drivers-0.8.3-fix-ac-macro.patch | 12 +++ .../libdbi-drivers-0.8.3-oracle-build-fix.patch | 12 +++ .../libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild | 87 ++++++++++++++++++++ dev-db/libdbi-drivers/metadata.xml | 7 ++ 7 files changed, 159 insertions(+), 0 deletions(-) diff --git a/dev-db/libdbi-drivers/Manifest b/dev-db/libdbi-drivers/Manifest new file mode 100644 index 0000000..7265a69 --- /dev/null +++ b/dev-db/libdbi-drivers/Manifest @@ -0,0 +1 @@ +DIST libdbi-drivers-0.8.3-1.tar.gz 1534420 SHA256 4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72 SHA512 c2cb76234b9137cc4a05af42a69ea7d5b08586287378406cbd4d114598598057f29cccb368bfbe0f86e19846ceab88ed636cccff6555ef9f7eebbb98bbcd3824 WHIRLPOOL fc8df681ccdf6995727b0bf7aa315090dc4af2849c02e6b78913f6d5ecdc51c5e60b7eba3f515050a4ae93e74dfa7f1dcc1f7aca7fe3c12e3f02ecfd04184700 diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-doc-build-fix.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-doc-build-fix.patch new file mode 100644 index 0000000..f3caedb --- /dev/null +++ b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-doc-build-fix.patch @@ -0,0 +1,15 @@ +diff -Nuar libdbi-drivers-0.8.3-1.orig/configure.in libdbi-drivers-0.8.3-1/configure.in +--- libdbi-drivers-0.8.3-1.orig/configure.in 2008-10-09 17:09:09.303141877 -0700 ++++ libdbi-drivers-0.8.3-1/configure.in 2008-10-09 17:10:48.100635797 -0700 +@@ -149,7 +149,8 @@ +-ac_docs="YES" ++ac_docs="no" + AC_ARG_ENABLE(docs, + [ --disable-docs do not build and install the documentation.], +- [ ac_docs="NO" ]) ++ [ ac_docs="$enableval" ], ++ [ ac_docs="no" ]) + +-if test "$ac_docs" = "YES"; then ++if test "$ac_docs" = "yes"; then + dnl AC_PATH_PROGS(myjade, openjade jade) diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch new file mode 100644 index 0000000..6a50474 --- /dev/null +++ b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch @@ -0,0 +1,25 @@ +diff -Nuar libdbi-drivers-0.8.3-1.orig/acinclude.m4 libdbi-drivers-0.8.3-1/acinclude.m4 +--- libdbi-drivers-0.8.3-1.orig/acinclude.m4 2007-12-30 11:05:40.000000000 +0000 ++++ libdbi-drivers-0.8.3-1/acinclude.m4 2009-10-26 06:50:49.823477194 +0000 +@@ -450,8 +450,8 @@ + firebird_incdirs="/opt/firebird/include /usr/include /usr/local/include /usr/include/firebird /usr/local/include/firebird /usr/local/firebird/include /opt/firebird/include" + AC_FIND_FILE(ibase.h, $firebird_incdirs, ac_firebird_incdir) + firebird_libdirs="/opt/firebird/lib /usr/lib /usr/local/lib /usr/lib/firebird /usr/local/lib/firebird /usr/local/firebird/lib /opt/firebird/lib" +-dnl AC_FIND_FILE(libfbclient.so, $firebird_libdirs, ac_firebird_libdir) +- AC_FIND_FILE(libfbembed.so, $firebird_libdirs, ac_firebird_libdir) ++ AC_FIND_FILE(libfbclient.so, $firebird_libdirs, ac_firebird_libdir) ++dnl AC_FIND_FILE(libfbembed.so, $firebird_libdirs, ac_firebird_libdir) + if test "$ac_firebird_incdir" = "no"; then + AC_MSG_RESULT(no) + AC_MSG_ERROR([Invalid Firebird/Interbase directory - include files not found.]) +@@ -479,8 +479,8 @@ + [SCHAR_MSG="no"]) + AC_MSG_RESULT([$SCHAR_MSG]) + +-dnl FIREBIRD_LIBS="-lfbclient" +- FIREBIRD_LIBS="-lfbembed" ++ FIREBIRD_LIBS="-lfbclient" ++dnl FIREBIRD_LIBS="-lfbembed" + FIREBIRD_INCLUDE="-I$ac_firebird_incdir" + FIREBIRD_LDFLAGS="-L$ac_firebird_libdir" + diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-fix-ac-macro.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-fix-ac-macro.patch new file mode 100644 index 0000000..d650956 --- /dev/null +++ b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-fix-ac-macro.patch @@ -0,0 +1,12 @@ +diff -ur libdbi-drivers-0.8.3-1-old/configure.in libdbi-drivers-0.8.3-1/configure.in +--- libdbi-drivers-0.8.3-1-old/configure.in 2013-05-14 02:28:23.315926087 +0000 ++++ libdbi-drivers-0.8.3-1/configure.in 2013-05-14 02:29:05.655762313 +0000 +@@ -3,7 +3,7 @@ + AM_MAINTAINER_MODE + + AM_INIT_AUTOMAKE(libdbi-drivers, 0.8.3-1) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_LIBTOOL_WIN32_DLL + + dnl library versioning currently unnecessary... diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch new file mode 100644 index 0000000..ad73595 --- /dev/null +++ b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch @@ -0,0 +1,12 @@ +diff -urN libdbi-drivers-0.8.3-1.orig/drivers/oracle/dbd_oracle.c libdbi-drivers-0.8.3-1/drivers/oracle/dbd_oracle.c +--- libdbi-drivers-0.8.3-1.orig/drivers/oracle/dbd_oracle.c 2009-01-26 16:31:42.000000000 +0300 ++++ libdbi-drivers-0.8.3-1/drivers/oracle/dbd_oracle.c 2009-01-26 16:32:38.000000000 +0300 +@@ -841,7 +841,7 @@ + { + struct tm tmt; + /* char stime[101], *cp = NULL; */ +-/* time_t loct = 0L; */ ++ time_t loct = 0L; + + /* memset(stime, 0, sizeof(stime)); */ + diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild new file mode 100644 index 0000000..b9e4bab --- /dev/null +++ b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild,v 1.3 2012/09/13 18:43:48 scarabeus Exp $ + +EAPI=4 + +inherit eutils autotools + +MY_P="${P}-1" + +DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi." +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +HOMEPAGE="http://libdbi-drivers.sourceforge.net/" +LICENSE="LGPL-2.1" + +IUSE="bindist doc firebird mysql oci8 postgres +sqlite static-libs" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +SLOT=0 + +RDEPEND=" + >=dev-db/libdbi-0.8.3 + firebird? ( dev-db/firebird ) + mysql? ( virtual/mysql ) + postgres? ( dev-db/postgresql-base ) + sqlite? ( dev-db/sqlite:3 ) +" +DEPEND="${RDEPEND} + doc? ( app-text/openjade ) +" + +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + firebird? ( !bindist ) + || ( mysql postgres sqlite firebird oci8 ) +" + +DOCS="AUTHORS ChangeLog NEWS README README.osx TODO" + +pkg_setup() { + use oci8 && [[ -z "${ORACLE_HOME}" ]] && die "\$ORACLE_HOME is not set!" +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-fix-ac-macro.patch \ + "${FILESDIR}"/${PN}-0.8.3-doc-build-fix.patch \ + "${FILESDIR}"/${PN}-0.8.3-oracle-build-fix.patch \ + "${FILESDIR}"/${PN}-0.8.3-firebird-fix.patch + eautoreconf +} + +src_configure() { + local myconf="" + # WARNING: the configure script does NOT work correctly + # --without-$driver does NOT work + # so do NOT use `use_with...` + use mysql && myconf+=" --with-mysql" + use postgres && myconf+=" --with-pgsql" + use sqlite && myconf+=" --with-sqlite3" + use firebird && myconf+=" --with-firebird" + if use oci8; then + [[ -z "${ORACLE_HOME}" ]] && die "\$ORACLE_HOME is not set!" + myconf+=" --with-oracle-dir=${ORACLE_HOME} --with-oracle" + fi + + econf \ + $(use_enable doc docs) \ + $(use_enable static-libs static) \ + ${myconf} +} + +src_test() { + if [[ -z "${WANT_INTERACTIVE_TESTS}" ]]; then + ewarn "Tests disabled due to interactivity." + ewarn "Run with WANT_INTERACTIVE_TESTS=1 if you want them." + return 0 + fi + einfo "Running interactive tests" + emake check +} + +src_install() { + default + + prune_libtool_files --all +} diff --git a/dev-db/libdbi-drivers/metadata.xml b/dev-db/libdbi-drivers/metadata.xml new file mode 100644 index 0000000..c6d8628 --- /dev/null +++ b/dev-db/libdbi-drivers/metadata.xml @@ -0,0 +1,7 @@ + + + + + robbat2@gentoo.org + +