Update gcc 4.3 patch borrowed from mandriva, fixing bug #230251. Fix some quoting.

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64)

8 files changed, 151 insertions, 46 deletions

diff --git a/dev-db/hk_classes/ChangeLog b/dev-db/hk_classes/ChangeLog
index 42b85cfba055..9c29031feb04 100644
--- a/dev-db/hk_classes/ChangeLog
+++ b/dev-db/hk_classes/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/hk_classes
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/ChangeLog,v 1.57 2008/05/21 15:54:06 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/ChangeLog,v 1.58 2008/08/26 22:52:57 tgurr Exp $
+
+  26 Aug 2008; Timo Gurr <tgurr@gentoo.org>
+  files/hk_classes-0.8.3-gcc43.patch, hk_classes-0.7.1.ebuild,
+  hk_classes-0.7.4a.ebuild, hk_classes-0.8.1_alpha3.ebuild,
+  hk_classes-0.8.1.ebuild, hk_classes-0.8.2_alpha3.ebuild,
+  hk_classes-0.8.3.ebuild:
+  Update gcc 4.3 patch borrowed from mandriva, fixing bug #230251. Fix some
+  quoting.
 
   21 May 2008; Tiziano Müller <dev-zero@gentoo.org>
   hk_classes-0.7.1.ebuild, hk_classes-0.7.4a.ebuild,
diff --git a/dev-db/hk_classes/files/hk_classes-0.8.3-gcc43.patch b/dev-db/hk_classes/files/hk_classes-0.8.3-gcc43.patch
index 3b1ead41d781..5f28742f5321 100644
--- a/dev-db/hk_classes/files/hk_classes-0.8.3-gcc43.patch
+++ b/dev-db/hk_classes/files/hk_classes-0.8.3-gcc43.patch
@@ -225,3 +225,97 @@ diff -u --recursive --new-file hk_classes-0.8.3/hk_sqliteclasses/hk_sqlitedataso
  {
  #ifdef HK_DEBUG
 
+--- hk_classes-0.8.3/hk_dbaseclasses/xbase/xblock.cpp~	2008-07-31 05:24:53.000000000 +0200
++++ hk_classes-0.8.3/hk_dbaseclasses/xbase/xblock.cpp	2008-07-31 05:25:00.000000000 +0200
+@@ -48,7 +48,7 @@
+ 
+ 
+ #include "xbase64.h"
+-
++#include <cerrno>
+ #ifdef HAVE_IO_H     // windows locking
+ #include <io.h>
+ #endif
+@@ -124,7 +124,7 @@
+   return 0;
+ }
+ 
+-#elif HAVE_FCNTL_H
++#else
+ 
+ xbShort xbLock::LockFile( int fn, xbShort LockType, xbOffT lockLen )
+ {
+--- hk_classes-0.8.3/hk_paradoxclasses/hk_paradoxcolumn.cpp~	2006-04-19 15:11:18.000000000 +0200
++++ hk_classes-0.8.3/hk_paradoxclasses/hk_paradoxcolumn.cpp	2008-07-31 05:33:42.000000000 +0200
+@@ -10,7 +10,7 @@
+ // ****************************************************************************
+ #include "hk_paradoxcolumn.h"
+ #include "hk_paradoxdatasource.h"
+-
++#include <cstring>
+ 
+ hk_paradoxcolumn::hk_paradoxcolumn(hk_paradoxdatasource* ds, const hk_string& tTRUE,const hk_string& tFALSE)
+ :hk_storagecolumn(ds,tTRUE,tFALSE)
+--- hk_classes-0.8.3/hk_paradoxclasses/hk_paradoxtable.cpp~	2006-06-29 20:10:18.000000000 +0200
++++ hk_classes-0.8.3/hk_paradoxclasses/hk_paradoxtable.cpp	2008-07-31 05:34:19.000000000 +0200
+@@ -16,6 +16,7 @@
+ #include "hk_paradoxconnection.h"
+ #include "hk_paradoxdatabase.h"
+ #include "hk_url.h"
++#include <cstring>
+ //#include <pxversion.h>
+ 
+ hk_paradoxtable::hk_paradoxtable(hk_paradoxdatabase* db,hk_presentation* p):hk_paradoxdatasource(db,p)
+--- hk_classes-0.8.3/hk_firebirdclasses/hk_firebirdcolumn.cpp~	2005-07-02 16:15:04.000000000 +0200
++++ hk_classes-0.8.3/hk_firebirdclasses/hk_firebirdcolumn.cpp	2008-07-31 07:53:52.000000000 +0200
+@@ -10,7 +10,7 @@
+ // ****************************************************************************
+ #include "hk_firebirdcolumn.h"
+ #include "hk_firebirddatasource.h"
+-
++#include <cstring>
+ 
+ hk_firebirdcolumn::hk_firebirdcolumn(hk_firebirddatasource* ds, const hk_string& tTRUE,const hk_string& tFALSE)
+ :hk_storagecolumn(ds,tTRUE,tFALSE)
+--- hk_classes-0.8.3/hk_firebirdclasses/hk_firebirdconnection.cpp~	2006-07-16 21:11:52.000000000 +0200
++++ hk_classes-0.8.3/hk_firebirdclasses/hk_firebirdconnection.cpp	2008-07-31 07:52:59.000000000 +0200
+@@ -14,6 +14,7 @@
+ #include <dirent.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
++#include <cstring>
+ #ifdef HAVE_SSTREAM
+ #include <sstream>
+ #else
+--- hk_classes-0.8.3/hk_firebirdclasses/hk_firebirddatasource.cpp~	2006-06-29 20:10:17.000000000 +0200
++++ hk_classes-0.8.3/hk_firebirdclasses/hk_firebirddatasource.cpp	2008-07-31 07:53:29.000000000 +0200
+@@ -15,6 +15,7 @@
+ #include "hk_firebirdactionquery.h"
+ #include <hk_datetime.h>
+ #include <time.h>
++#include <cstring>
+ #include <exception>
+ #include <new>
+ 
+--- hk_classes-0.8.3/hk_xbaseclasses/Makefile.in~	2006-12-17 15:27:52.000000000 +0100
++++ hk_classes-0.8.3/hk_xbaseclasses/Makefile.in	2008-07-31 11:08:48.000000000 +0200
+@@ -233,7 +233,7 @@
+ AM_CPPFLAGS = 
+ AM_CXXFLAGS = -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings -I@XMLINCLUDE@ @BITARCHITECTURE@
+ libhk_xbasedriver_la_LDFLAGS = -version-info 0:0:0 -L@XBASELIBDIR@
+-libhk_xbasedriver_la_LIBADD = -lxbsql ../hk_classes/libhk_classes.la
++libhk_xbasedriver_la_LIBADD = -lxbase -lxbsql ../hk_classes/libhk_classes.la
+ lib_LTLIBRARIES = libhk_xbasedriver.la
+ noinst_HEADERS = hk_xbaseconnection.h	 hk_xbaseactionquery.h hk_xbaseconnection.h \
+ 		 hk_xbasedatabase.h hk_xbasedatasource.h hk_xbasecolumn.h \
+--- hk_classes-0.8.3/hk_xbaseclasses/Makefile.am~	2006-10-02 19:54:20.000000000 +0200
++++ hk_classes-0.8.3/hk_xbaseclasses/Makefile.am	2008-07-31 11:08:24.000000000 +0200
+@@ -6,7 +6,7 @@
+ AM_CXXFLAGS=  -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings -I@XMLINCLUDE@ @BITARCHITECTURE@
+ 
+ libhk_xbasedriver_la_LDFLAGS = -version-info 0:0:0 -L@XBASELIBDIR@
+-libhk_xbasedriver_la_LIBADD = -lxbsql ../hk_classes/libhk_classes.la
++libhk_xbasedriver_la_LIBADD = -lxbase -lxbsql ../hk_classes/libhk_classes.la
+ 
+ lib_LTLIBRARIES = 	libhk_xbasedriver.la
+ 
diff --git a/dev-db/hk_classes/hk_classes-0.7.1.ebuild b/dev-db/hk_classes/hk_classes-0.7.1.ebuild
index 8c1f1f167b91..2d22377969d2 100644
--- a/dev-db/hk_classes/hk_classes-0.7.1.ebuild
+++ b/dev-db/hk_classes/hk_classes-0.7.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-db/hk_classes/hk_classes-0.7.1.ebuild,v 1.9 2008/05/21 15:54:06 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/hk_classes-0.7.1.ebuild,v 1.10 2008/08/26 22:52:57 tgurr Exp $
 
 inherit eutils
 
@@ -27,9 +27,9 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/${PN}-amd64.patch
+	epatch "${FILESDIR}"/${PN}-amd64.patch
 }
 
 src_compile() {
@@ -38,7 +38,7 @@ src_compile() {
 }
 
 src_install() {
-	use doc && dohtml -r ${WORKDIR}/${P_DOCS}/*
-	use doc && dohtml -r ${WORKDIR}/knodapythondoc
-	make DESTDIR=${D} install || die
+	use doc && dohtml -r "${WORKDIR}"/${P_DOCS}/*
+	use doc && dohtml -r "${WORKDIR}"/knodapythondoc
+	make DESTDIR="${D}" install || die
 }
diff --git a/dev-db/hk_classes/hk_classes-0.7.4a.ebuild b/dev-db/hk_classes/hk_classes-0.7.4a.ebuild
index 987daeb025fc..a6c3f2e503d1 100644
--- a/dev-db/hk_classes/hk_classes-0.7.4a.ebuild
+++ b/dev-db/hk_classes/hk_classes-0.7.4a.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/hk_classes-0.7.4a.ebuild,v 1.8 2008/05/21 15:54:06 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/hk_classes-0.7.4a.ebuild,v 1.9 2008/08/26 22:52:57 tgurr Exp $
 
 inherit eutils python
 
 P_DOCS="hk_classes-htmldocumentation-0.7.3"
 
 MY_P=${P/_alpha/-test}
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="GUI-independent C++ libraries for database applications, including API documentation and tutorials."
 HOMEPAGE="http://hk-classes.sourceforge.net/"
@@ -34,11 +34,11 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
-	epatch ${FILESDIR}/${P}-amd64.patch
+	unpack ${A} ; cd "${S}"
+	epatch "${FILESDIR}"/${P}-amd64.patch
 
 	if use doc ; then
-		cd ${WORKDIR}
+		cd "${WORKDIR}"
 		local docdirs="`ls -1`"
 		mkdir ${P_DOCS}
 		for I in "${docdirs/${P}/}" ; do
@@ -66,6 +66,6 @@ src_compile() {
 }
 
 src_install() {
-	use doc && dohtml -r ${WORKDIR}/${P_DOCS}/*
-	make DESTDIR=${D} install || die "make install failed"
+	use doc && dohtml -r "${WORKDIR}"/${P_DOCS}/*
+	make DESTDIR="${D}" install || die "make install failed"
 }
diff --git a/dev-db/hk_classes/hk_classes-0.8.1.ebuild b/dev-db/hk_classes/hk_classes-0.8.1.ebuild
index bc9786b77bf1..519e835ee9a3 100644
--- a/dev-db/hk_classes/hk_classes-0.8.1.ebuild
+++ b/dev-db/hk_classes/hk_classes-0.8.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-db/hk_classes/hk_classes-0.8.1.ebuild,v 1.11 2008/05/21 15:54:06 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/hk_classes-0.8.1.ebuild,v 1.12 2008/08/26 22:52:57 tgurr Exp $
 
 inherit eutils python
 
@@ -10,7 +10,7 @@ RESTRICT="strip test"
 P_DOCS="hk_classes-htmldocumentation-0.8"
 
 MY_P=${P/_alpha/-test}a
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="GUI-independent C++ libraries for database applications, including API documentation and tutorials."
 HOMEPAGE="http://hk-classes.sourceforge.net/"
@@ -45,12 +45,12 @@ src_compile() {
 }
 
 src_install() {
-	use doc && dohtml -r ${WORKDIR}/${MY_P}/documentation/api
-	use doc && dohtml -r ${WORKDIR}/hk_classestutorial
-	use doc && dohtml -r ${WORKDIR}/hk_kdeclssestutorial
-	use doc && dohtml -r ${WORKDIR}/knodascriptingtutorial
-	use doc && dohtml -r ${WORKDIR}/knodatutorial
-	use doc && dohtml -r ${WORKDIR}/pythonreference
-
-	make DESTDIR=${D} install || die "make install failed"
+	use doc && dohtml -r "${WORKDIR}"/${MY_P}/documentation/api
+	use doc && dohtml -r "${WORKDIR}"/hk_classestutorial
+	use doc && dohtml -r "${WORKDIR}"/hk_kdeclssestutorial
+	use doc && dohtml -r "${WORKDIR}"/knodascriptingtutorial
+	use doc && dohtml -r "${WORKDIR}"/knodatutorial
+	use doc && dohtml -r "${WORKDIR}"/pythonreference
+
+	make DESTDIR="${D}" install || die "make install failed"
 }
diff --git a/dev-db/hk_classes/hk_classes-0.8.1_alpha3.ebuild b/dev-db/hk_classes/hk_classes-0.8.1_alpha3.ebuild
index 36c4150cb8c9..9393b1571f4e 100644
--- a/dev-db/hk_classes/hk_classes-0.8.1_alpha3.ebuild
+++ b/dev-db/hk_classes/hk_classes-0.8.1_alpha3.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-db/hk_classes/hk_classes-0.8.1_alpha3.ebuild,v 1.6 2008/05/21 15:54:06 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/hk_classes-0.8.1_alpha3.ebuild,v 1.7 2008/08/26 22:52:57 tgurr Exp $
 
 inherit eutils python
 
@@ -10,7 +10,7 @@ RESTRICT="strip test"
 P_DOCS="hk_classes-htmldocumentation-0.8"
 
 MY_P=${P/_alpha/-test}
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="GUI-independent C++ libraries for database applications, including API documentation and tutorials."
 HOMEPAGE="http://hk-classes.sourceforge.net/"
@@ -55,12 +55,12 @@ src_compile() {
 }
 
 src_install() {
-	use doc && dohtml -r ${WORKDIR}/${MY_P}/documentation/api
-	use doc && dohtml -r ${WORKDIR}/hk_classestutorial
-	use doc && dohtml -r ${WORKDIR}/hk_kdeclssestutorial
-	use doc && dohtml -r ${WORKDIR}/knodascriptingtutorial
-	use doc && dohtml -r ${WORKDIR}/knodatutorial
-	use doc && dohtml -r ${WORKDIR}/pythonreference
+	use doc && dohtml -r "${WORKDIR}"/${MY_P}/documentation/api
+	use doc && dohtml -r "${WORKDIR}"/hk_classestutorial
+	use doc && dohtml -r "${WORKDIR}"/hk_kdeclssestutorial
+	use doc && dohtml -r "${WORKDIR}"/knodascriptingtutorial
+	use doc && dohtml -r "${WORKDIR}"/knodatutorial
+	use doc && dohtml -r "${WORKDIR}"/pythonreference
 
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 }
diff --git a/dev-db/hk_classes/hk_classes-0.8.2_alpha3.ebuild b/dev-db/hk_classes/hk_classes-0.8.2_alpha3.ebuild
index d3946845b973..c273ace2cd90 100644
--- a/dev-db/hk_classes/hk_classes-0.8.2_alpha3.ebuild
+++ b/dev-db/hk_classes/hk_classes-0.8.2_alpha3.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-db/hk_classes/hk_classes-0.8.2_alpha3.ebuild,v 1.6 2008/05/21 15:54:06 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/hk_classes-0.8.2_alpha3.ebuild,v 1.7 2008/08/26 22:52:57 tgurr Exp $
 
 inherit eutils python
 
@@ -10,7 +10,7 @@ RESTRICT="strip test"
 P_DOCS="hk_classes-htmldocumentation-0.8"
 
 MY_P=${P/_alpha/-test}
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="GUI-independent C++ libraries for database applications, including API documentation and tutorials."
 HOMEPAGE="http://hk-classes.sourceforge.net/"
@@ -55,12 +55,12 @@ src_compile() {
 }
 
 src_install() {
-	use doc && dohtml -r ${WORKDIR}/${MY_P}/documentation/api
-	use doc && dohtml -r ${WORKDIR}/hk_classestutorial
-	use doc && dohtml -r ${WORKDIR}/hk_kdeclssestutorial
-	use doc && dohtml -r ${WORKDIR}/knodascriptingtutorial
-	use doc && dohtml -r ${WORKDIR}/knodatutorial
-	use doc && dohtml -r ${WORKDIR}/pythonreference
+	use doc && dohtml -r "${WORKDIR}"/${MY_P}/documentation/api
+	use doc && dohtml -r "${WORKDIR}"/hk_classestutorial
+	use doc && dohtml -r "${WORKDIR}"/hk_kdeclssestutorial
+	use doc && dohtml -r "${WORKDIR}"/knodascriptingtutorial
+	use doc && dohtml -r "${WORKDIR}"/knodatutorial
+	use doc && dohtml -r "${WORKDIR}"/pythonreference
 
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 }
diff --git a/dev-db/hk_classes/hk_classes-0.8.3.ebuild b/dev-db/hk_classes/hk_classes-0.8.3.ebuild
index 31bc6bc7402c..0d1f7ef36e46 100644
--- a/dev-db/hk_classes/hk_classes-0.8.3.ebuild
+++ b/dev-db/hk_classes/hk_classes-0.8.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/hk_classes-0.8.3.ebuild,v 1.4 2008/05/21 15:54:06 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/hk_classes-0.8.3.ebuild,v 1.5 2008/08/26 22:52:57 tgurr Exp $
 
-inherit eutils python
+inherit autotools eutils python
 
 # The tests themselves are broken.
 RESTRICT="strip test"
@@ -10,7 +10,7 @@ RESTRICT="strip test"
 P_DOCS="hk_classes-htmldocumentation-0.8"
 
 MY_P=${P/_alpha/-test}
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="GUI-independent C++ libraries for database applications, including API documentation and tutorials."
 HOMEPAGE="http://hk-classes.sourceforge.net/"
@@ -31,9 +31,12 @@ DEPEND=">=media-libs/fontconfig-2.5.0-r1
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 
-	# gcc-4.3 compatibility. Fixes bug 218913.
+	# gcc-4.3 compatibility. Fixes bug 218913 and 230251.
 	epatch "${FILESDIR}/${P}-gcc43.patch"
+
+	eautoreconf
 }
 
 src_compile() {