Version bump per bug #237991. Also fix bug #238514 for pkgconfig.

(Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64)

4 files changed, 72 insertions, 2 deletions

diff --git a/dev-db/libdbi/ChangeLog b/dev-db/libdbi/ChangeLog
index 8d688b4def4d..ba6cc44c3af3 100644
--- a/dev-db/libdbi/ChangeLog
+++ b/dev-db/libdbi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/libdbi
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/ChangeLog,v 1.19 2007/06/20 07:43:03 opfer Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/ChangeLog,v 1.20 2008/09/29 02:42:10 robbat2 Exp $
+
+*libdbi-0.8.3 (29 Sep 2008)
+
+  29 Sep 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/libdbi-0.8.1-pkg-config.patch, +files/dbi.pc.in,
+  +libdbi-0.8.3.ebuild:
+  Version bump per bug #237991. Also fix bug #238514 for pkgconfig.
 
   20 Jun 2007; Christian Faulhammer <opfer@gentoo.org> libdbi-0.8.1.ebuild:
   stable x86, bug 181577
diff --git a/dev-db/libdbi/files/dbi.pc.in b/dev-db/libdbi/files/dbi.pc.in
new file mode 100644
index 000000000000..a0144549db9b
--- /dev/null
+++ b/dev-db/libdbi/files/dbi.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/dbi
+
+Name: libdbi
+Description: database-independent abstraction layer in C
+Version: @VERSION@
+Libs: -L${libdir} -ldbi
+Cflags: -I${includedir} -I${includedir}/dbi
diff --git a/dev-db/libdbi/files/libdbi-0.8.1-pkg-config.patch b/dev-db/libdbi/files/libdbi-0.8.1-pkg-config.patch
new file mode 100644
index 000000000000..a770ef3ceb51
--- /dev/null
+++ b/dev-db/libdbi/files/libdbi-0.8.1-pkg-config.patch
@@ -0,0 +1,8 @@
+--- configure.in.orig	2008-09-23 15:16:20.000000000 -0400
++++ configure.in	2008-09-23 15:16:39.000000000 -0400
+@@ -149,4 +149,5 @@
+ 	doc/Makefile
+ 	include/Makefile
+ 	include/dbi/Makefile
++	dbi.pc
+ 	])
diff --git a/dev-db/libdbi/libdbi-0.8.3.ebuild b/dev-db/libdbi/libdbi-0.8.3.ebuild
new file mode 100644
index 000000000000..a160d199bb51
--- /dev/null
+++ b/dev-db/libdbi/libdbi-0.8.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.8.3.ebuild,v 1.1 2008/09/29 02:42:10 robbat2 Exp $
+
+inherit eutils autotools multilib
+
+DESCRIPTION="libdbi implements a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://libdbi.sourceforge.net/"
+LICENSE="LGPL-2.1"
+RDEPEND="virtual/libc"
+DEPEND=">=sys-apps/sed-4
+		dev-util/pkgconfig
+		${RDEPEND}"
+PDEPEND=">=dev-db/libdbi-drivers-0.8.3"
+IUSE=""
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+SLOT=0
+
+src_unpack() {
+	unpack ${A}
+	chown -R portage:portage "${S}"
+	cd "${S}"
+	epatch "${FILESDIR}"/libdbi-0.8.1-pkg-config.patch
+	cp -f "${FILESDIR}"/dbi.pc.in ${S}/dbi.pc.in
+
+	# configure.in has been changed
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_compile() {
+	# should append CFLAGS, not replace them
+	sed -i.orig -e 's/^CFLAGS = /CFLAGS += /g' src/Makefile.in
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake install DESTDIR="${D}" || die "make install failed"
+	dodoc AUTHORS ChangeLog README README.osx TODO
+
+	# syslog-ng requires dbi.pc
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins dbi.pc
+}