Changed dependency for postgresql to virtual/postgresql-base. Dropped old version.

(Portage version: 2.1.5_rc7)

4 files changed, 11 insertions, 67 deletions

diff --git a/dev-cpp/libpqpp/ChangeLog b/dev-cpp/libpqpp/ChangeLog
index 83189f3c46cf..fa7fabd609b0 100644
--- a/dev-cpp/libpqpp/ChangeLog
+++ b/dev-cpp/libpqpp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/libpqpp
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/ChangeLog,v 1.19 2007/05/24 14:59:48 gustavoz Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/ChangeLog,v 1.20 2008/05/19 18:06:22 dev-zero Exp $
+
+  19 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+  -files/libpqpp-4.0-PIC.patch, -libpqpp-4.0-r4.ebuild,
+  libpqpp-4.0-r6.ebuild:
+  Changed dependency for postgresql to virtual/postgresql-base. Dropped old
+  version.
 
   24 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> libpqpp-4.0-r6.ebuild:
   Stable on sparc
diff --git a/dev-cpp/libpqpp/files/libpqpp-4.0-PIC.patch b/dev-cpp/libpqpp/files/libpqpp-4.0-PIC.patch
deleted file mode 100644
index 173796869be6..000000000000
--- a/dev-cpp/libpqpp/files/libpqpp-4.0-PIC.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur libpq++-4.0.orig/Makefile libpq++-4.0/Makefile
---- libpq++-4.0.orig/Makefile	2002-11-26 20:46:08.000000000 -0800
-+++ libpq++-4.0/Makefile	2004-07-12 22:42:41.293567000 -0700
-@@ -20,7 +20,7 @@
- OBJS= pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.o
- LIBPGXXHEADERS = pgconnection.h pgdatabase.h pgtransdb.h pgcursordb.h pglobject.h
- 
--SHARED= -fpic -shared -Wl,-x,-soname,$(TARGET).so.$(SO_MAJOR_VERSION) -Wl,-rpath,$(POSTGRES_HOME)/lib
-+SHARED= -fPIC -shared -Wl,-x,-soname,$(TARGET).so.$(SO_MAJOR_VERSION) -Wl,-rpath,$(POSTGRES_HOME)/lib
- soname=$(TARGET).so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
- 
- all:  $(soname)
-@@ -29,7 +29,7 @@
- 	$(CXX) $(CXXFLAGS) $(OBJS) -L$(POSTGRES_HOME)/lib -l$(LIBS) $(SHARED) -o $(soname)
- 
- %.o	: %.cc
--	$(CXX) -c $(CXXFLAGS) $(CXXOPTS) -I$(POSTGRES_HOME)/include $<
-+	$(CXX) -c $(CXXFLAGS) $(CXXOPTS) -I$(POSTGRES_HOME)/include $< -fPIC -DPIC
- 
- clean:
- 	rm -f $(OBJS) $(soname)
diff --git a/dev-cpp/libpqpp/libpqpp-4.0-r4.ebuild b/dev-cpp/libpqpp/libpqpp-4.0-r4.ebuild
deleted file mode 100644
index 28fb3b811e36..000000000000
--- a/dev-cpp/libpqpp/libpqpp-4.0-r4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/libpqpp-4.0-r4.ebuild,v 1.11 2006/11/11 02:19:53 dev-zero Exp $
-
-inherit eutils
-IUSE=""
-MY_P=${P/pp/++}
-DESCRIPTION="C++ wrapper for the libpq Postgresql library"
-HOMEPAGE="http://gborg.postgresql.org/"
-SRC_URI="ftp://gborg.postgresql.org/pub/libpqpp/stable/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="sparc x86"
-
-DEPEND="virtual/libc >=dev-db/postgresql-7.3
-	>=sys-apps/sed-4"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	epatch ${FILESDIR}/${P}-PIC.patch
-}
-
-src_compile() {
-	cp Makefile Makefile.backup
-	sed -i "s|\$(POSTGRES_HOME)/lib|/usr/lib|g" Makefile || die
-	sed -i "s|\$(POSTGRES_HOME)/include|/usr/include|g" Makefile || die
-	emake || die
-	cp Makefile.backup Makefile
-}
-
-src_install() {
-	sed -i "s|ln -s \$(POSTGRES_HOME)/lib/|ln -s |" Makefile || die
-	sed -i "s|\$(POSTGRES_HOME)/lib|${D}/usr/lib|" Makefile || die
-	sed -i "s|\$(POSTGRES_HOME)/include|${D}/usr/include|g" Makefile || die
-	dodir /usr/lib/postgresql /usr/include/postgresql
-	einstall || die "Install failed"
-}
diff --git a/dev-cpp/libpqpp/libpqpp-4.0-r6.ebuild b/dev-cpp/libpqpp/libpqpp-4.0-r6.ebuild
index 165ba574081f..69d1db17b176 100644
--- a/dev-cpp/libpqpp/libpqpp-4.0-r6.ebuild
+++ b/dev-cpp/libpqpp/libpqpp-4.0-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/libpqpp-4.0-r6.ebuild,v 1.6 2007/05/24 14:59:48 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/libpqpp-4.0-r6.ebuild,v 1.7 2008/05/19 18:06:22 dev-zero Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -15,7 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="examples"
 
-DEPEND="dev-db/libpq"
+DEPEND="virtual/postgresql-base"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}