Use proper toolchain compiler and multilib fixes. Honor CXXFLAGS.

(Portage version: 2.0.51.19)

6 files changed, 101 insertions, 6 deletions

diff --git a/dev-cpp/libpqpp/ChangeLog b/dev-cpp/libpqpp/ChangeLog
index 296027850d2f..1df799b8f4da 100644
--- a/dev-cpp/libpqpp/ChangeLog
+++ b/dev-cpp/libpqpp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/libpqpp
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/ChangeLog,v 1.12 2005/01/01 17:29:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/ChangeLog,v 1.13 2005/04/13 20:05:53 eradicator Exp $
+
+*libpqpp-4.0-r5 (13 Apr 2005)
+
+  13 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/libpqpp-4.0-Makefile.patch, +libpqpp-4.0-r5.ebuild:
+  Use proper toolchain compiler and multilib fixes.  Honor CXXFLAGS.
 
   24 Nov 2004; Sven Wegener <swegener@gentoo.org> -libpqpp-4.0-r1.ebuild:
   Removed old version that has broken SRC_URI and missing patch.
diff --git a/dev-cpp/libpqpp/Manifest b/dev-cpp/libpqpp/Manifest
index 6ef2083d241f..fffc9a2ecda7 100644
--- a/dev-cpp/libpqpp/Manifest
+++ b/dev-cpp/libpqpp/Manifest
@@ -1,10 +1,12 @@
-MD5 88b93b1b2d54141718f0a3e1092d10a3 ChangeLog 2004
+MD5 f0da5f3ce2c7ca7440e8f5cbdec7f8aa ChangeLog 2139
 MD5 ad4af0f11384bf56f14833595a485bd9 libpqpp-4.0-r2.ebuild 1151
 MD5 d46771dfdc1943739cfd8a5db0fe2585 libpqpp-4.0-r3.ebuild 1215
-MD5 1ea20adecd9d5a618e13c77e03da41ad libpqpp-4.0-r4.ebuild 1215
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 93b97ba73e6757f7120e1a76bd74d7ab libpqpp-4.0-r5.ebuild 912
+MD5 1ea20adecd9d5a618e13c77e03da41ad libpqpp-4.0-r4.ebuild 1215
 MD5 312b07ad4bf840d75840b7410d48f268 files/digest-libpqpp-4.0-r2 62
 MD5 312b07ad4bf840d75840b7410d48f268 files/digest-libpqpp-4.0-r3 62
 MD5 312b07ad4bf840d75840b7410d48f268 files/digest-libpqpp-4.0-r4 62
-MD5 530daffcb76569636aa08cb163318b88 files/libpqpp-4.0-gentoo.patch 3559
 MD5 69fc4a69b78cb8cf9b4f69bb49e71363 files/libpqpp-4.0-PIC.patch 941
+MD5 530daffcb76569636aa08cb163318b88 files/libpqpp-4.0-gentoo.patch 3559
+MD5 312b07ad4bf840d75840b7410d48f268 files/digest-libpqpp-4.0-r5 62
diff --git a/dev-cpp/libpqpp/files/digest-libpqpp-4.0-r5 b/dev-cpp/libpqpp/files/digest-libpqpp-4.0-r5
new file mode 100644
index 000000000000..b94211985780
--- /dev/null
+++ b/dev-cpp/libpqpp/files/digest-libpqpp-4.0-r5
@@ -0,0 +1 @@
+MD5 da71cb79ef45cef55f4bc97a33a0857d libpq++-4.0.tar.gz 25809
diff --git a/dev-cpp/libpqpp/files/libpqpp-4.0-Makefile.patch b/dev-cpp/libpqpp/files/libpqpp-4.0-Makefile.patch
new file mode 100644
index 000000000000..4f0f8e2773b6
--- /dev/null
+++ b/dev-cpp/libpqpp/files/libpqpp-4.0-Makefile.patch
@@ -0,0 +1,51 @@
+--- Makefile.orig	2005-04-13 12:57:52.000000000 -0700
++++ Makefile	2005-04-13 13:01:02.000000000 -0700
+@@ -11,33 +11,37 @@
+ SO_MAJOR_VERSION= 4
+ SO_MINOR_VERSION= 0
+ 
+-POSTGRES_HOME=/usr/local/pgsql
++PREFIX=/usr
++LIBDIR=lib
++DESTDIR=
++
+ CXXOPTS= -DHAVE_NAMESPACE_STD -DHAVE_CXX_STRING_HEADER -DDLLIMPORT=""
+ 
+ TARGET= libpq++
+-CFLAGS= -O -Wall
++CXXFLAGS= -O -Wall
+ LIBS=pq
+ 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,$(PREFIX)/$(LIBDIR)
+ soname=$(TARGET).so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+ 
+ all:  $(soname)
+ 
+ $(soname) : $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(OBJS) -L$(POSTGRES_HOME)/lib -l$(LIBS) $(SHARED) -o $(soname)
++	$(CXX) $(CXXFLAGS) $(OBJS) -L$(PREFIX)/$(LIBDIR) -l$(LIBS) $(SHARED) -o $(soname)
+ 
+ %.o	: %.cc
+-	$(CXX) -c $(CXXFLAGS) $(CXXOPTS) -I$(POSTGRES_HOME)/include $<
++	$(CXX) -c $(CXXFLAGS) $(CXXOPTS) -I$(PREFIX)/include $< -fPIC -DPIC
+ 
+ clean:
+ 	rm -f $(OBJS) $(soname)
+ 
+ install:
+-	install $(soname) $(POSTGRES_HOME)/lib
+-	rm -f $(POSTGRES_HOME)/lib/$(TARGET).so
+-	ln -s $(POSTGRES_HOME)/lib/$(soname) $(POSTGRES_HOME)/lib/$(TARGET).so
+-	install -c $(TARGET).h $(POSTGRES_HOME)/include
+-	-mkdir $(POSTGRES_HOME)/include/libpq++
+-	for i in $(LIBPGXXHEADERS); do install -c $$i $(POSTGRES_HOME)/include/libpq++ || exit 1; done
++	-mkdir -p $(DESTDIR)$(PREFIX)/include/libpq++
++	-mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	install $(soname) $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	rm -f $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(TARGET).so
++	ln -s $(soname) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(TARGET).so
++	install -c $(TARGET).h $(DESTDIR)$(PREFIX)/include
++	for i in $(LIBPGXXHEADERS); do install -c $$i $(DESTDIR)$(PREFIX)/include/libpq++ || exit 1; done
diff --git a/dev-cpp/libpqpp/libpqpp-4.0-r4.ebuild b/dev-cpp/libpqpp/libpqpp-4.0-r4.ebuild
index c85035d8a835..644a0890a377 100644
--- a/dev-cpp/libpqpp/libpqpp-4.0-r4.ebuild
+++ b/dev-cpp/libpqpp/libpqpp-4.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.9 2005/01/01 17:29:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/libpqpp-4.0-r4.ebuild,v 1.10 2005/04/13 20:05:53 eradicator Exp $
 
 inherit eutils
 IUSE=""
@@ -10,7 +10,7 @@ HOMEPAGE="http://gborg.postgresql.org/"
 SRC_URI="ftp://gborg.postgresql.org/pub/libpqpp/stable/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 amd64 sparc"
+KEYWORDS="sparc x86"
 
 DEPEND="virtual/libc >=dev-db/postgresql-7.3
 	>=sys-apps/sed-4"
diff --git a/dev-cpp/libpqpp/libpqpp-4.0-r5.ebuild b/dev-cpp/libpqpp/libpqpp-4.0-r5.ebuild
new file mode 100644
index 000000000000..a71e97a2ab35
--- /dev/null
+++ b/dev-cpp/libpqpp/libpqpp-4.0-r5.ebuild
@@ -0,0 +1,35 @@
+	# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/libpqpp-4.0-r5.ebuild,v 1.1 2005/04/13 20:05:53 eradicator Exp $
+
+inherit eutils toolchain-funcs multilib
+
+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="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~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}-Makefile.patch
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LIBDIR="$(get_libdir)" || die
+}
+
+src_install() {
+	make DESTDIR="${D}" LIBDIR="$(get_libdir)" install || die
+	dodoc README CHANGES
+}