summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-11-23 15:02:21 +0000
committerPacho Ramos <pacho@gentoo.org>2014-11-23 15:02:21 +0000
commitb470ea1f5b45d82ace6139ba625baf7d618c316b (patch)
tree43370a1c002539582b64935db1b632cf1b7844b4
parentDrop old (diff)
downloadgentoo-2-b470ea1f5b45d82ace6139ba625baf7d618c316b.tar.gz
gentoo-2-b470ea1f5b45d82ace6139ba625baf7d618c316b.tar.bz2
gentoo-2-b470ea1f5b45d82ace6139ba625baf7d618c316b.zip
Drop old
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
-rw-r--r--dev-db/libdbi-drivers/ChangeLog10
-rw-r--r--dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-doc-build-fix.patch15
-rw-r--r--dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch25
-rw-r--r--dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-fix-ac-macro.patch12
-rw-r--r--dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch12
-rw-r--r--dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild87
-rw-r--r--dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild95
7 files changed, 9 insertions, 247 deletions
diff --git a/dev-db/libdbi-drivers/ChangeLog b/dev-db/libdbi-drivers/ChangeLog
index a637e9da6f8d..c7c79a96da92 100644
--- a/dev-db/libdbi-drivers/ChangeLog
+++ b/dev-db/libdbi-drivers/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for dev-db/libdbi-drivers
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/ChangeLog,v 1.68 2014/11/03 11:22:20 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/ChangeLog,v 1.69 2014/11/23 15:02:21 pacho Exp $
+
+ 23 Nov 2014; Pacho Ramos <pacho@gentoo.org>
+ -files/libdbi-drivers-0.8.3-doc-build-fix.patch,
+ -files/libdbi-drivers-0.8.3-firebird-fix.patch,
+ -files/libdbi-drivers-0.8.3-fix-ac-macro.patch,
+ -files/libdbi-drivers-0.8.3-oracle-build-fix.patch,
+ -libdbi-drivers-0.8.3-r2.ebuild, -libdbi-drivers-0.8.3.ebuild:
+ Drop old
03 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org>
libdbi-drivers-0.8.3.ebuild, libdbi-drivers-0.8.3-r2.ebuild,
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
deleted file mode 100644
index f3caedb1dbc6..000000000000
--- a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-doc-build-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 6a5047466c2b..000000000000
--- a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index d6509560468a..000000000000
--- a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-fix-ac-macro.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index ad73595a462b..000000000000
--- a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index de2a1246d16d..000000000000
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 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.6 2014/11/03 11:22:20 titanofold 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? ( virtual/postgresql )
- 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/libdbi-drivers-0.8.3.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild
deleted file mode 100644
index c08baeb2e0fd..000000000000
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2014 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.ebuild,v 1.22 2014/11/03 11:22:20 titanofold Exp $
-
-inherit eutils autotools
-
-MY_PV="${PV}-1"
-MY_P="${PN}-${MY_PV}"
-
-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"
-DEPEND=">=dev-db/libdbi-0.8.3
- mysql? ( virtual/mysql )
- postgres? ( virtual/postgresql )
- sqlite? ( <dev-db/sqlite-3 )
- sqlite3? ( >=dev-db/sqlite-3 )
- !bindist? ( firebird? ( dev-db/firebird ) )
- doc? ( app-text/openjade )"
-
-IUSE="mysql postgres sqlite oci8 firebird sqlite3 bindist doc"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-SLOT=0
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- epatch "${FILESDIR}"/${PN}-0.8.3-doc-build-fix.patch
- epatch "${FILESDIR}"/${PN}-0.8.3-oracle-build-fix.patch
- epatch "${FILESDIR}"/${PN}-0.8.3-firebird-fix.patch
- cd "${S}"
- eautoreconf
-}
-
-pkg_setup() {
- local drivers=""
- use mysql && drivers="${drivers} mysql"
- use postgres && drivers="${drivers} pgsql"
- use sqlite && drivers="${drivers} sqlite"
- use sqlite3 && drivers="${drivers} sqlite3"
- if use firebird; then
- if use bindist; then
- eerror "The Interbase Public License is incompatible with LGPL, see bug #200284."
- eerror "Disabling firebird in the build"
- else
- drivers="${drivers} firebird"
- fi
- fi
- if use oci8; then
- if [ -z "${ORACLE_HOME}" ]; then
- die "\$ORACLE_HOME is not set!"
- fi
- drivers="${drivers} oracle"
- fi
- # safety check
- if [ -z "${drivers// /}" ]; then
- die "No supported databases in your USE flags! (mysql, postgres, sqlite, sqlite3, oracle, firebird)"
- fi
-}
-
-src_compile() {
- local myconf=""
- # WARNING: the configure script does NOT work correctly
- # --without-$driver does NOT work
- # so do NOT use `use_with...`
- use mysql && myconf="${myconf} --with-mysql"
- use postgres && myconf="${myconf} --with-pgsql"
- use sqlite && myconf="${myconf} --with-sqlite"
- use sqlite3 && myconf="${myconf} --with-sqlite3"
- use !bindist && use firebird && myconf="${myconf} --with-firebird"
- if use oci8; then
- if [ -z "${ORACLE_HOME}" ]; then
- die "\$ORACLE_HOME is not set!"
- fi
- myconf="${myconf} --with-oracle-dir=${ORACLE_HOME} --with-oracle"
- fi
-
- econf $(use_enable doc docs) ${myconf} || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install () {
- emake install DESTDIR="${D}" || die "make install failed"
- dodoc AUTHORS ChangeLog NEWS README README.osx TODO
-}
-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 || die "Tests failed"
-}