Dropped old version and patches.

(Portage version: 2.1.5.4)

4 files changed, 6 insertions, 170 deletions

diff --git a/dev-libs/ibpp/ChangeLog b/dev-libs/ibpp/ChangeLog
index 205ae566c6b4..2fd8d6bb769a 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.21 2008/06/13 07:35:49 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ibpp/ChangeLog,v 1.22 2008/06/13 09:34:50 dev-zero Exp $
+
+  13 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
+  -files/ibpp-1.0.5.2.patch, -files/ibpp-2.3.4.0-amd64.patch,
+  -ibpp-1.0.5.2-r1.ebuild:
+  Dropped old version and patches.
 
   13 Jun 2008; Christian Faulhammer <opfer@gentoo.org> ibpp-2.5.3.1.ebuild:
   stable x86, bug 225991
diff --git a/dev-libs/ibpp/files/ibpp-1.0.5.2.patch b/dev-libs/ibpp/files/ibpp-1.0.5.2.patch
deleted file mode 100644
index 262c84f2a80b..000000000000
--- a/dev-libs/ibpp/files/ibpp-1.0.5.2.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -r -u ibpp-1.0.5.2_orig/database.cpp ibpp-1.0.5.2/database.cpp
---- ibpp-1.0.5.2_orig/database.cpp	2001-11-10 13:52:58.000000000 +0100
-+++ ibpp-1.0.5.2/database.cpp	2002-03-22 10:34:07.000000000 +0100
-@@ -354,9 +354,7 @@
- 		throw ExceptionImpl("Database::Create", "Database is already connected.");

- 	if (_DatabaseName == NULL)

- 		throw ExceptionImpl("Database::Create", "Unspecified database name.");

--	if (_UserName == NULL)

--		throw ExceptionImpl("Database::Create", "Unspecified user name.");

--	if (_UserPassword == NULL)

-+	if (_UserName != NULL && _UserPassword == NULL)

- 		throw ExceptionImpl("Database::Create", "Unspecified user password.");

- 

-     // Create a new database

-@@ -374,8 +372,11 @@
- 	else connect[0] = '\0';

- 	strcat(connect, _DatabaseName);

- 

--	sprintf(create, "CREATE DATABASE \"%s\" USER \"%s\" PASSWORD \"%s\" ",

--		connect, _UserName, _UserPassword);

-+	if (_UserName != NULL)

-+		sprintf(create, "CREATE DATABASE \"%s\" USER \"%s\" PASSWORD \"%s\" ",

-+			connect, _UserName, _UserPassword);

-+	else

-+		sprintf(create, "CREATE DATABASE \"%s\" ", connect);

- 	if (_CreateParams != NULL)

- 	{

- 		strcat(create, " ");

-@@ -395,9 +396,7 @@
- 		throw ExceptionImpl("Database::Connect", "Database is already connected.");

- 	if (_DatabaseName == NULL)

- 		throw ExceptionImpl("Database::Connect", "Unspecified database name.");

--	if (_UserName == NULL)

--		throw ExceptionImpl("Database::Connect", "Unspecified user name.");

--	if (_UserPassword == NULL)

-+	if (_UserName != NULL && _UserPassword == NULL)

- 		throw ExceptionImpl("Database::Connect", "Unspecified user password.");

- 

- 	// Attach to the database

-@@ -406,8 +405,8 @@
- 	char connect[1024];

- 

-     // Build a DPB based on the properties

--    dpb.Insert(isc_dpb_user_name, _UserName);

--    dpb.Insert(isc_dpb_password, _UserPassword);

-+    if (_UserName != NULL) dpb.Insert(isc_dpb_user_name, _UserName);

-+    if (_UserPassword != NULL) dpb.Insert(isc_dpb_password, _UserPassword);

-     dpb.Insert(isc_dpb_force_write, (short)0);

-     if (_RoleName != NULL) dpb.Insert(isc_dpb_sql_role_name, _RoleName);

- 

-diff -r -u ibpp-1.0.5.2_orig/exception.cpp ibpp-1.0.5.2/exception.cpp
---- ibpp-1.0.5.2_orig/exception.cpp	2001-11-10 13:52:58.000000000 +0100
-+++ ibpp-1.0.5.2/exception.cpp	2002-03-22 10:34:07.000000000 +0100
-@@ -47,6 +47,7 @@
- #endif

- 

- #include <stdio.h>

-+#include <stdarg.h>

- 

- using namespace ibpp_internals;

- 

-diff -r -u ibpp-1.0.5.2_orig/_internals.h ibpp-1.0.5.2/_internals.h
---- ibpp-1.0.5.2_orig/_internals.h	2001-11-10 13:52:58.000000000 +0100
-+++ ibpp-1.0.5.2/_internals.h	2002-03-22 10:33:07.000000000 +0100
-@@ -832,7 +832,7 @@
- 	//	(((((((( OBJECT INTERNALS ))))))))

- 

- private:

--	friend TransactionImpl;

-+	friend class TransactionImpl;

- 

- 	isc_stmt_handle _Handle;	// Référence d'accès au statement InterBase API

- 

-diff -r -u ibpp-1.0.5.2_orig/Makefile ibpp-1.0.5.2/Makefile
---- ibpp-1.0.5.2_orig/Makefile	2001-06-08 18:26:30.000000000 +0200
-+++ ibpp-1.0.5.2/Makefile	2002-03-22 10:34:07.000000000 +0100
-@@ -147,7 +147,7 @@
- release:

- 	$(MAKE) DEBUG=0 BUILDDEPENDANCIES=1 targets

- 

--targets: ctags

-+targets:

- 	# build targets

- 	if [ ! -d $(TARGETDIR)/$(PLATFORM) ]; then mkdir -p $(TARGETDIR)/$(PLATFORM); fi

- 

-diff -r -u ibpp-1.0.5.2_orig/tests/Makefile ibpp-1.0.5.2/tests/Makefile
---- ibpp-1.0.5.2_orig/tests/Makefile	2001-06-08 18:26:34.000000000 +0200
-+++ ibpp-1.0.5.2/tests/Makefile	2002-03-22 10:34:07.000000000 +0100
-@@ -52,7 +52,7 @@
- 	#LIBS+=$(IBPPDIR)/$(TARGETDIR)/$(PLATFORM)/libibpp_core.a

- 	#LIBS+=$(IBPPDIR)/$(TARGETDIR)/$(PLATFORM)/libibpp_helper.a

- 

--	LIBS+=-lm -lcrypt -lgds

-+	LIBS+=-lm -lcrypt -lgds -ldl

- 

- 	ifeq ($(TARGETDIR),release)

- 		CXXFLAGS+= -O2

diff --git a/dev-libs/ibpp/files/ibpp-2.3.4.0-amd64.patch b/dev-libs/ibpp/files/ibpp-2.3.4.0-amd64.patch
deleted file mode 100644
index 92c194e24d7c..000000000000
--- a/dev-libs/ibpp/files/ibpp-2.3.4.0-amd64.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur ibpp.orig/Makefile ibpp/Makefile
---- ibpp.orig/Makefile	2004-09-27 14:08:44.000000000 +0200
-+++ ibpp/Makefile	2004-10-25 22:53:52.000000000 +0200
-@@ -164,7 +164,7 @@
- # building on linux (any flavour, I suppose)

- ifeq ($(PLATFORM),linux)

- 	CXXOUTPUT =	-o

--	CXXFLAGS =-DIBPP_LINUX

-+	CXXFLAGS =-DIBPP_LINUX -fPIC

- 	CXXFLAGS+=-DIBPP_GCC

- 	CXXFLAGS+=-I./ -I./fbheaders

- 	#

-diff -Naur ibpp.orig/array.cpp ibpp/array.cpp
---- ibpp.orig/array.cpp	2004-09-23 17:34:08.000000000 +0200
-+++ ibpp/array.cpp	2004-10-25 22:51:01.000000000 +0200
-@@ -289,7 +289,7 @@
- 		throw ExceptionImpl("Array::ReadTo", "Wrong count of array elements");

- 

- 	IBS status;

--	long lenbuf = mBufferSize;

-+	ISC_LONG lenbuf = mBufferSize;

- 	(*gds.Call()->m_array_get_slice)(status.Self(), mDatabase->GetHandlePtr(),

- 		mTransaction->GetHandlePtr(), &mId, &mDesc, mBuffer, &lenbuf);

- 	if (status.Errors())

-@@ -1088,7 +1088,7 @@
- 	}

- 

- 	IBS status;

--	long lenbuf = mBufferSize;

-+	ISC_LONG lenbuf = mBufferSize;

- 	(*gds.Call()->m_array_put_slice)(status.Self(), mDatabase->GetHandlePtr(),

- 		mTransaction->GetHandlePtr(), &mId, &mDesc, mBuffer, &lenbuf);

- 	if (status.Errors())

diff --git a/dev-libs/ibpp/ibpp-1.0.5.2-r1.ebuild b/dev-libs/ibpp/ibpp-1.0.5.2-r1.ebuild
deleted file mode 100644
index 11acf86e3542..000000000000
--- a/dev-libs/ibpp/ibpp-1.0.5.2-r1.ebuild
+++ /dev/null
@@ -1,39 +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-1.0.5.2-r1.ebuild,v 1.17 2008/03/14 11:10:18 phreak Exp $
-
-inherit eutils
-
-DESCRIPTION="IBPP, a C++ client API for firebird 1.0"
-HOMEPAGE="http://www.ibpp.org/"
-SRC_URI="mirror://sourceforge/ibpp/${P//./-}-src.zip"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="x86 -sparc"
-IUSE=""
-
-S="${WORKDIR}"
-
-RDEPEND=">=dev-db/firebird-1.0"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}.patch
-	rm ibase.h iberror.h
-}
-
-src_compile() {
-	emake PLATFORM="linux" || die "emake failed!"
-}
-
-src_install() {
-	insinto /usr/include
-	doins ibpp.h || die "doins failed"
-	cd release/linux
-	dolib.so libibpp.so libibpp_core.so libibpp_helper.so || die "dolib.so failed"
-	dolib.a libibpp.a libibpp_core.a libibpp_helper.a || die "dolib.a failed"
-}