Added fix for gcc-4.3 (bug #225923), dropped old version

(Portage version: 2.1.5.4)

4 files changed, 23 insertions, 48 deletions

diff --git a/dev-libs/ibpp/ChangeLog b/dev-libs/ibpp/ChangeLog
index 34bcced1f527..84863bacded9 100644
--- a/dev-libs/ibpp/ChangeLog
+++ b/dev-libs/ibpp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/ibpp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ibpp/ChangeLog,v 1.19 2008/06/04 18:09:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ibpp/ChangeLog,v 1.20 2008/06/11 22:47:15 dev-zero Exp $
+
+  11 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/ibpp-2.5.3.1-missing_include.patch, -ibpp-2.3.4.0.ebuild,
+  ibpp-2.5.3.1.ebuild:
+  Added fix for gcc-4.3 (bug #225923), dropped old version
 
   04 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
   files/ibpp-2.5.3.1-gentoo.patch, ibpp-2.5.3.1.ebuild:
diff --git a/dev-libs/ibpp/files/ibpp-2.5.3.1-missing_include.patch b/dev-libs/ibpp/files/ibpp-2.5.3.1-missing_include.patch
new file mode 100644
index 000000000000..35e2bb3a2ce6
--- /dev/null
+++ b/dev-libs/ibpp/files/ibpp-2.5.3.1-missing_include.patch
@@ -0,0 +1,10 @@
+--- core/_ibpp.h.orig	2007-12-11 17:00:58.000000000 +0100
++++ core/_ibpp.h	2007-12-11 17:01:07.000000000 +0100
+@@ -60,6 +60,7 @@
+ #endif

+ 

+ #include <limits>

++#include <cstring>
+ #include <string>

+ #include <vector>

+ #include <sstream>

diff --git a/dev-libs/ibpp/ibpp-2.3.4.0.ebuild b/dev-libs/ibpp/ibpp-2.3.4.0.ebuild
deleted file mode 100644
index 261e2d0f7d07..000000000000
--- a/dev-libs/ibpp/ibpp-2.3.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ibpp/ibpp-2.3.4.0.ebuild,v 1.3 2008/03/14 11:10:18 phreak Exp $
-
-inherit eutils
-
-MY_P=${P//./-}-src
-
-DESCRIPTION="IBPP, a C++ client API for firebird 1.0"
-HOMEPAGE="http://www.ibpp.org/"
-SRC_URI="mirror://sourceforge/ibpp/${MY_P}.zip"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-S="${WORKDIR}"
-
-RDEPEND=">=dev-db/firebird-1.5.1"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use amd64 && epatch "${FILESDIR}"/${P}-amd64.patch
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	insinto /usr/include
-	doins ibpp.h || die "doins failed"
-	cd release/linux
-	dolib.so libibpp.so || die "dolib.so failed"
-	dolib.a libibpp.a || die "dolib.a failed"
-}
diff --git a/dev-libs/ibpp/ibpp-2.5.3.1.ebuild b/dev-libs/ibpp/ibpp-2.5.3.1.ebuild
index 38557d469e37..19dba3cb2aa5 100644
--- a/dev-libs/ibpp/ibpp-2.5.3.1.ebuild
+++ b/dev-libs/ibpp/ibpp-2.5.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ibpp/ibpp-2.5.3.1.ebuild,v 1.3 2008/06/04 18:09:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ibpp/ibpp-2.5.3.1.ebuild,v 1.4 2008/06/11 22:47:15 dev-zero Exp $
 
 inherit eutils autotools
 
@@ -9,27 +9,28 @@ MY_P=${P//./-}-src
 DESCRIPTION="IBPP, a C++ client API for firebird 1.0"
 HOMEPAGE="http://www.ibpp.org/"
 SRC_URI="mirror://sourceforge/ibpp/${MY_P}.zip"
-
 LICENSE="MPL-1.1"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-S="${WORKDIR}"
-
 RDEPEND=">=dev-db/firebird-1.5.1"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
+S="${WORKDIR}"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch \
+		"${FILESDIR}/${P}-gentoo.patch" \
+		"${FILESDIR}/${P}-missing_include.patch"
 
 	eautoreconf
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed."
+	emake DESTDIR="${D}" install || die "make install failed."
 }