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

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64

9 files changed, 159 insertions, 54 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/Manifest b/dev-db/hk_classes/Manifest
index 99ac34d80f49..9af449542bd9 100644
--- a/dev-db/hk_classes/Manifest
+++ b/dev-db/hk_classes/Manifest
@@ -1,5 +1,5 @@
 AUX hk_classes-0.7.4a-amd64.patch 2997 RMD160 04853682d774bf7302884e84494829221052414d SHA1 f5f9767846730413582b6bcba6520a987c700b9a SHA256 60b849e51ed8f8a3271c1dde4aa15c376688ad509138e39cfb3c8076cc25f043
-AUX hk_classes-0.8.3-gcc43.patch 10262 RMD160 d3962b1476a8e22fe3fd4fdcb54350f08185cf0b SHA1 8f1f9ba6d95964fab8df99a0834f873000769776 SHA256 ba459f9d80204d20a0b6807878c6642b2f4f791d800c87bb28deebbf06b7233f
+AUX hk_classes-0.8.3-gcc43.patch 14225 RMD160 c9a383709841846a8b888f2144e837d4094afae2 SHA1 6b68e90473abbacfc3c71e789dc50d41231d302c SHA256 cb9d23ac8cf5405b9e713d488cb6c0d689ba98c13ac053262996abc2a221f3e0
 AUX hk_classes-amd64.patch 2569 RMD160 f3e89c4419e191722c5e564806235932f62d8ab3 SHA1 dbc18c3d0b3a9628962a4aa05bf55f4f0519331c SHA256 8d01900172c096b4651ef2588d57f5b2bd39ea16cea27b80138dee3b2eab999b
 DIST hk_classes-0.7.1.tar.bz2 518136 RMD160 f8ddf9bb271f034774aa871fdd6dc2948382b7d8 SHA1 5e926233af5a4f0bb1b28040590b9d8120a40851 SHA256 5c7f7cfbcdfa736f24f745ee19505561a14a3f1b3515af66a1c3f16028e7c929
 DIST hk_classes-0.7.4a.tar.bz2 725851 RMD160 0a4df1fe90a3d1e83e9c555527aa6d0dda72fe93 SHA1 e3db9347977b329a8b6780c4aa0c1e4b0848fb23 SHA256 3f1af081c94a73bbe6028c894880c4b5e3a58a7ad7fef2029c03987862bdb783
@@ -12,11 +12,11 @@ DIST hk_classes-htmldocumentation-0.8.tar.bz2 2815826 RMD160 92f0261d94f99ec014f
 DIST hk_docs-0.7.tar.bz2 2930613 RMD160 90d6ea3af55be69e8472b1c3973e26da255397dc SHA1 71899d44f62af734ecc5cf3d6b098f3367c2532b SHA256 d96e8de7d987256631675e281f779d660bb544734ca2e345a902cfba11b555fb
 DIST knodapython.tar.bz2 428940 RMD160 7750aa8c953f702cfcede9c43454347469f5b7b5 SHA1 b2d90b33732aebe2eb38997971fe98f28b974d57 SHA256 bec44fd0ce52bbd2b98e366887276548c531bfc2cb5cf85226d798b4d0d0847a
 DIST xbsql-hk_classes-0.13.tar.gz 365678 RMD160 e275e16761c092ea420b7813d61f5c9c348c0dd6 SHA1 fada8fb13d049cae63767df11aab4028686f0850 SHA256 21332e5c9c2ce969030351d254b688575fa9ba88f46f30f1b30e528e3ab429fb
-EBUILD hk_classes-0.7.1.ebuild 1187 RMD160 bd3da198fd61aaa14a9654b7fd13358340aae945 SHA1 c50d7637e6c525d50b5dc7d7603f69307caff1f1 SHA256 980491279cd42d123fe75c2df19e35bacac026236dd7bc9f50da50994e125ce8
-EBUILD hk_classes-0.7.4a.ebuild 1968 RMD160 68629f9c3a5e7baa8e9979c8b4fdc9c618460148 SHA1 2004de893cda51f7506ecd0a15ae7dbe9ca0ca61 SHA256 f0dc4e451d60623b602838b9228229e1a5f27963d60a1a5e1a7f796115f42e27
-EBUILD hk_classes-0.8.1.ebuild 1704 RMD160 a561ee1cd034b7199e7d636891c8f3947792c9a2 SHA1 fc6fe50a1f15f91251222453776413e1a378f865 SHA256 3261af833e033f3214cbf2e4dabaab0ad4f8e978bf2d8a1b69ae96070581a38c
-EBUILD hk_classes-0.8.1_alpha3.ebuild 2044 RMD160 ffe933fc218cbb2b69ab20df295da54024854bd4 SHA1 9b664a3a22e17ee92736c1a33423704d0be86d66 SHA256 d0713b4debdc960f6e3abeaeea08e1021706b1c2fa9e1d40f4d0d80a1ded679b
-EBUILD hk_classes-0.8.2_alpha3.ebuild 2044 RMD160 e333a8314008045a78b338a343475e98c83313d4 SHA1 294d92957a477af1d9abe093c69cef7dc8152be6 SHA256 05a280b478a729778db48db355b6b0ba471ee27bb9b33bb80f883189f6e6eb5a
-EBUILD hk_classes-0.8.3.ebuild 1847 RMD160 80c207f042bb3337a2ee67f0b301dfe26bcf39ef SHA1 e5ac9a9a508aaf186f48956bd0c2db6fa696e388 SHA256 1688539332aa7344e7330dfc520537abf8f087831d06bda930c5e020c43c45de
-MISC ChangeLog 8929 RMD160 a6d64fa592732ebaacb7a82316e90487582b1eb7 SHA1 d614317d89041a72dd91f0f9d1cb7e7b58c3c5fc SHA256 d4f36235a07615f9814d99a5c1ae24c063e73360cd5f9c52660a6144a66bb151
+EBUILD hk_classes-0.7.1.ebuild 1195 RMD160 cb80b36fd90ee35d85867039171e584e3454db21 SHA1 08961184b79083b09191c3d40d65b7d3730d9a8a SHA256 da683e8128b3b82794a2909693ff4fab6ef9d515f0a379c0b8755ddc43cc72a8
+EBUILD hk_classes-0.7.4a.ebuild 1977 RMD160 30c6b680ea0ff0ecb2e43ee67aac1bf54cbd6c92 SHA1 358b18e165bce64230cb92aea97a99245be7115d SHA256 8fa5f340b5a4ffe2aad2918e9d8beaac490e50cbc1c4c7685a3b9e350c157c96
+EBUILD hk_classes-0.8.1.ebuild 1717 RMD160 c405541394960609d6fcd79f7ea7d1143000be77 SHA1 2e6fb0220582af8f1b480ad2911e1261385776e7 SHA256 4e95c8bd20ca6110972260fbbe6980deed7d8debcad69340879a5baf9870cec4
+EBUILD hk_classes-0.8.1_alpha3.ebuild 2057 RMD160 fd715916ea5d601ce9aa81f979c0911877684547 SHA1 d3db35b367544eec45f0870aacf33c7034993d15 SHA256 f4f8d3dd314565ecfbccf13751f86673a253e189bfcf72c3b5d16d936f6a6504
+EBUILD hk_classes-0.8.2_alpha3.ebuild 2057 RMD160 8eb7f43cac9ca1ecdbc98e21043689c22a4fea03 SHA1 c4fc5e27ff6b7552258424fce75eaeb29afb863a SHA256 e494eb2682b0ce4e7eb3e65e95700cbfd912b73ca8cca8e5a872e3d76dde55fd
+EBUILD hk_classes-0.8.3.ebuild 1892 RMD160 9776e379d5d52b5ae672d10881ff177aa296864d SHA1 b34e8a0c76fa97c4114cff06620fef7b16001a0d SHA256 710b1d28eba0f450f1e09eac02cf29e7b1e428a749ec795235de54f08cb31135
+MISC ChangeLog 9267 RMD160 d42ea0ecc6d61e8b62b56986e132da1af03c7198 SHA1 1343c507a2c161c4e490a7d4e2e029b5ab03902c SHA256 e0ed9698691be5bfdac9de3972164b3b7a32685a122c7ea8bf7a2e7fc34f821d
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
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() {