Fix various issues, such as bundled sqlite or wrong configure options. Bugs #259100, #252542. Remove old.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

11 files changed, 100 insertions, 466 deletions

diff --git a/dev-db/hk_classes/ChangeLog b/dev-db/hk_classes/ChangeLog
index f55b8d09981f..dd82514d16e9 100644
--- a/dev-db/hk_classes/ChangeLog
+++ b/dev-db/hk_classes/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-db/hk_classes
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/ChangeLog,v 1.62 2009/06/14 09:57:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/ChangeLog,v 1.63 2009/06/14 10:30:56 scarabeus Exp $
+
+*hk_classes-0.8.3-r1 (14 Jun 2009)
+
+  14 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -hk_classes-0.7.4a.ebuild, -files/hk_classes-0.7.4a-amd64.patch,
+  -hk_classes-0.8.1_alpha3.ebuild, -files/hk_classes-amd64.patch,
+  -hk_classes-0.7.1.ebuild, -hk_classes-0.8.1.ebuild,
+  -hk_classes-0.8.2_alpha3.ebuild, +hk_classes-0.8.3-r1.ebuild,
+  metadata.xml:
+  Fix various issues, such as bundled sqlite or wrong configure options.
+  Bugs #259100, #252542. Remove old.
 
   14 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   hk_classes-0.8.3.ebuild:
diff --git a/dev-db/hk_classes/Manifest b/dev-db/hk_classes/Manifest
index 09ccf3709d12..4419737ed1f5 100644
--- a/dev-db/hk_classes/Manifest
+++ b/dev-db/hk_classes/Manifest
@@ -1,22 +1,8 @@
-AUX hk_classes-0.7.4a-amd64.patch 2997 RMD160 04853682d774bf7302884e84494829221052414d SHA1 f5f9767846730413582b6bcba6520a987c700b9a SHA256 60b849e51ed8f8a3271c1dde4aa15c376688ad509138e39cfb3c8076cc25f043
 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
-DIST hk_classes-0.8.1-test3.tar.bz2 1368378 RMD160 b4398e1dc9a28cc3e00705c68334f98e578364c2 SHA1 6521531deaf99027e70ddd760e244174d0bfedec SHA256 2703eace3f46b9dfefe10484e7303a59e83872797bd75d369d260b047479a07c
-DIST hk_classes-0.8.1a.tar.bz2 1415347 RMD160 965572899949ee5b1edb568f38b064f47166d6bc SHA1 423441d2f8b477571a503fc5f83d470f419d777b SHA256 5bdced58648aa0c76409cc6e3ff509f460448151364067e7ef507a2486a14a7c
-DIST hk_classes-0.8.2-test3.tar.bz2 1531314 RMD160 39558f85669e53d088541d6fee60172ff3381477 SHA1 1a254264becca3bc994e163afbc45cc8247acb5d SHA256 bdbd8788543a3c2e4052eff6c1f6014cf839e1da01912e285025fad07e4f4938
 DIST hk_classes-0.8.3.tar.bz2 1532249 RMD160 8e5f212bf589ffb9e74b3b7559d1fbb3b1cb713c SHA1 ebd2f7d6835436e2e08d1cf65e6c28ef9fc0e312 SHA256 d57a8a2f3c2fb534e01ee5d7b6c5bb650536f20cb7e88a721ec9da7b5befb593
-DIST hk_classes-htmldocumentation-0.7.3.tar.bz2 2915937 RMD160 0b91f78906fc762d026d836a3165dade39d1d7ab SHA1 8c104416114849c2f630829ff755eb6d6f4347c4 SHA256 9c76db6f13800ca2240928aed92a7e9cdf3403b97e39aa46a527e186f31bda91
 DIST hk_classes-htmldocumentation-0.8.tar.bz2 2815826 RMD160 92f0261d94f99ec014f6900b7da308d197a79209 SHA1 af4467de0773452b53ddeab49f4e9da132accc48 SHA256 74180c34ea61f2f9cf1b3b2db7a3fcf2694141d4f7de508518438de83048ca6c
-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 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-r1.ebuild 2116 RMD160 f8f38aee36eb421c14ccd6b9e64ac02ef10acc27 SHA1 ea1e60c2c43559d068d9545eec9bce5fca6f170c SHA256 cf11918c9ce703f7b1cb27dfc1516bca67f6ffd891b5cb38d9eff51a7c1b1e87
 EBUILD hk_classes-0.8.3.ebuild 1859 RMD160 f854b51203c9d05d2028ead86767a3abb22fb334 SHA1 7dfcaca731a41c7459e9022098ca02689de7c51f SHA256 66a30b92a15ee499de45036eb8aef656f642614529392b04b7eedbe63e0f704d
-MISC ChangeLog 9754 RMD160 aeffbab044ce272537bbc379d98efd241d8d4b19 SHA1 35fa582b6b4eea98e4423df1ba3fa1f2bcfa2320 SHA256 a33dc4ee158b2fdce91c926b711ab12a4d7e60b7683c07e96b2cc2d97e01882c
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+MISC ChangeLog 10223 RMD160 36a86b4c5f124db99c0a941bc9ae9a26d534aaba SHA1 cb6b9bef76d23bc76627cdac5ed5a64ed7831bab SHA256 a910c6e4b070537d3ae107f03f0a21aa5fcc9314df8fdd7d1c95337068c89f7f
+MISC metadata.xml 254 RMD160 6bb42c9bd1821fbfaf3d0df597d0ed488a7642fc SHA1 f63d32c84aef325495de54eb0e9421ccfe7ca885 SHA256 f99cc3f1345e9401eb41e7a66bf4971e092d3b8c979374d66130ef2dffbf589f
diff --git a/dev-db/hk_classes/files/hk_classes-0.7.4a-amd64.patch b/dev-db/hk_classes/files/hk_classes-0.7.4a-amd64.patch
deleted file mode 100644
index 211d3613c60c..000000000000
--- a/dev-db/hk_classes/files/hk_classes-0.7.4a-amd64.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- ./hk_xbaseclasses/Makefile.am.orig	2005-10-12 14:51:50.000000000 +0200
-+++ ./hk_xbaseclasses/Makefile.am	2005-10-12 14:56:24.000000000 +0200
-@@ -3,7 +3,7 @@
- 
- AM_CPPFLAGS=
- 
--AM_CXXFLAGS= -Wall
-+AM_CXXFLAGS= -Wall -fPIC
- 
- libhk_xbasedriver_la_LDFLAGS = -version-info 0:0:0  -lxbsql -L../hk_classes -L@XBASELIBDIR@   -lhk_classes
- 
---- ./hk_paradoxclasses/Makefile.am.orig	2005-10-12 14:51:50.000000000 +0200
-+++ ./hk_paradoxclasses/Makefile.am	2005-10-12 14:56:24.000000000 +0200
-@@ -3,7 +3,7 @@
- 
- AM_CPPFLAGS=
- 
--AM_CXXFLAGS= -Wall
-+AM_CXXFLAGS= -Wall -fPIC
- 
- libhk_paradoxdriver_la_LDFLAGS = -version-info 0:0:0  -lpx -L../hk_classes -L@PARADOXLIBDIR@   -lhk_classes
- 
---- ./hk_odbcclasses/Makefile.am.orig	2005-10-12 14:51:50.000000000 +0200
-+++ ./hk_odbcclasses/Makefile.am	2005-10-12 14:56:24.000000000 +0200
-@@ -1,6 +1,6 @@
- libdir=@HK_CLASSESDIR@/drivers
- INCLUDES= -I../hk_classes -I@ODBCINCDIR@ 
--AM_CXXFLAGS= -Wall
-+AM_CXXFLAGS= -Wall -fPIC
- 
- libhk_odbcdriver_la_LDFLAGS = -version-info 0:0:0 -l@ODBCLIBRARY@  -L@ODBCLIBDIR@ -lhk_classes  -L../hk_classes 
- 
---- ./hk_sqliteclasses/Makefile.am.orig	2005-10-12 14:51:51.000000000 +0200
-+++ ./hk_sqliteclasses/Makefile.am	2005-10-12 14:56:25.000000000 +0200
-@@ -1,7 +1,7 @@
- libdir=@HK_CLASSESDIR@/drivers
- INCLUDES= -I../hk_classes -I@SQLITEINCDIR@
- 
--AM_CXXFLAGS= -Wall
-+AM_CXXFLAGS= -Wall -fPIC
- 
- libhk_sqlite2driver_la_LDFLAGS = -version-info 0:0:0 -lsqlite -L../hk_classes -L@SQLITELIBDIR@ -lhk_classes
- 
---- ./hk_mdbclasses/Makefile.am.orig	2005-10-12 14:51:51.000000000 +0200
-+++ ./hk_mdbclasses/Makefile.am	2005-10-12 14:56:25.000000000 +0200
-@@ -3,7 +3,7 @@
- 
- AM_CPPFLAGS=$(GLIB_CFLAGS)
- 
--AM_CXXFLAGS= -Wall
-+AM_CXXFLAGS= -Wall -fPIC
- 
- libhk_mdbdriver_la_LDFLAGS = -version-info 0:0:0  -lmdb -lmdbsql -L../hk_classes -L@MDBLIBDIR@ $(GLIB_LIBADD)  -lhk_classes
- 
---- ./hk_sqlite3classes/Makefile.am.orig	2005-10-12 14:51:51.000000000 +0200
-+++ ./hk_sqlite3classes/Makefile.am	2005-10-12 14:56:25.000000000 +0200
-@@ -1,7 +1,7 @@
- libdir=@HK_CLASSESDIR@/drivers
- INCLUDES= -I../hk_classes -I@SQLITE3INCDIR@
- 
--AM_CXXFLAGS= -Wall
-+AM_CXXFLAGS= -Wall -fPIC
- 
- libhk_sqlite3driver_la_LDFLAGS = -version-info 0:0:0 -lsqlite3 -L../hk_classes -L@SQLITE3LIBDIR@ -lhk_classes
- 
---- ./hk_mysqlclasses/Makefile.am.orig	2005-10-12 14:51:52.000000000 +0200
-+++ ./hk_mysqlclasses/Makefile.am	2005-10-12 14:56:25.000000000 +0200
-@@ -1,7 +1,7 @@
- libdir=@HK_CLASSESDIR@/drivers
- INCLUDES= -I../hk_classes -I@MYSQLINCDIR@
- 
--AM_CXXFLAGS= -Wall
-+AM_CXXFLAGS= -Wall -fPIC
- 
- libhk_mysqldriver_la_LDFLAGS = -version-info 3:4:0 -lmysqlclient -L../hk_classes -L@MYSQLLIBDIR@ -lhk_classes
- 
---- ./hk_firebirdclasses/Makefile.am.orig	2005-10-12 14:51:52.000000000 +0200
-+++ ./hk_firebirdclasses/Makefile.am	2005-10-12 14:56:25.000000000 +0200
-@@ -3,7 +3,7 @@
- 
- AM_CPPFLAGS=
- 
--AM_CXXFLAGS= -Wall
-+AM_CXXFLAGS= -Wall -fPIC
- 
- libhk_firebirddriver_la_LDFLAGS = -version-info 0:0:0  -lfbclient -L../hk_classes -L@FIREBIRDLIBDIR@   -lhk_classes
- 
diff --git a/dev-db/hk_classes/files/hk_classes-amd64.patch b/dev-db/hk_classes/files/hk_classes-amd64.patch
deleted file mode 100644
index 1bb5ce9ab388..000000000000
--- a/dev-db/hk_classes/files/hk_classes-amd64.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur hk_classes-0.7.orig/hk_classes/Makefile.am hk_classes-0.7/hk_classes/Makefile.am
---- hk_classes-0.7.orig/hk_classes/Makefile.am	2004-06-20 15:48:48.000000000 +0200
-+++ hk_classes-0.7/hk_classes/Makefile.am	2004-11-21 23:10:13.670882088 +0100
-@@ -1,7 +1,7 @@
- libdir=@HK_CLASSESDIR@
- includedir=@HK_CLASSESINCDIR@
- libhk_classes_la_LDFLAGS = -version-info 6:0:0 @LTLIBICONV@
--AM_CXXFLAGS= -Wall @PYTHONINC@
-+AM_CXXFLAGS= -Wall @PYTHONINC@ -fPIC
- 
- SUBDIRS = .
- 
-diff -Naur hk_classes-0.7.orig/hk_mysqlclasses/Makefile.am hk_classes-0.7/hk_mysqlclasses/Makefile.am
---- hk_classes-0.7.orig/hk_mysqlclasses/Makefile.am	2003-05-22 20:27:14.000000000 +0200
-+++ hk_classes-0.7/hk_mysqlclasses/Makefile.am	2004-11-21 23:10:19.127052624 +0100
-@@ -1,7 +1,7 @@
- libdir=@HK_CLASSESDIR@/drivers
- INCLUDES= -I../hk_classes -I@MYSQLINCDIR@
- 
--AM_CXXFLAGS= -Wall
-+AM_CXXFLAGS= -Wall -fPIC
- 
- libhk_mysqldriver_la_LDFLAGS = -version-info 3:4:0 -lmysqlclient -L../hk_classes -L@MYSQLLIBDIR@ -lhk_classes
- 
-diff -Naur hk_classes-0.7.orig/hk_odbcclasses/Makefile.am hk_classes-0.7/hk_odbcclasses/Makefile.am
---- hk_classes-0.7.orig/hk_odbcclasses/Makefile.am	2003-05-22 20:27:14.000000000 +0200
-+++ hk_classes-0.7/hk_odbcclasses/Makefile.am	2004-11-21 23:10:24.672209632 +0100
-@@ -1,6 +1,6 @@
- libdir=@HK_CLASSESDIR@/drivers
- INCLUDES= -I../hk_classes -I@ODBCINCDIR@ 
--AM_CXXFLAGS= -Wall
-+AM_CXXFLAGS= -Wall -fPIC
- 
- libhk_odbcdriver_la_LDFLAGS = -version-info 0:0:0 -l@ODBCLIBRARY@  -L@ODBCLIBDIR@ -lhk_classes  -L../hk_classes 
- 
-diff -Naur hk_classes-0.7.orig/hk_postgresclasses/Makefile.am hk_classes-0.7/hk_postgresclasses/Makefile.am
---- hk_classes-0.7.orig/hk_postgresclasses/Makefile.am	2003-05-22 20:27:11.000000000 +0200
-+++ hk_classes-0.7/hk_postgresclasses/Makefile.am	2004-11-21 23:11:02.304488656 +0100
-@@ -1,6 +1,7 @@
- libdir=@HK_CLASSESDIR@/drivers
- INCLUDES=   -I../hk_classes -I@POSTGRESINCDIR@
- 
-+AM_CXXFLAGS= -fPIC
- 
- libhk_postgresdriver_la_LDFLAGS = -version-info 0:1:0 -lpq  -lhk_classes -L../hk_classes -L@POSTGRESLIBDIR@
- 
-diff -Naur hk_classes-0.7.orig/hk_sqliteclasses/Makefile.am hk_classes-0.7/hk_sqliteclasses/Makefile.am
---- hk_classes-0.7.orig/hk_sqliteclasses/Makefile.am	2004-07-11 10:04:53.000000000 +0200
-+++ hk_classes-0.7/hk_sqliteclasses/Makefile.am	2004-11-21 23:11:09.117452928 +0100
-@@ -1,7 +1,7 @@
- libdir=@HK_CLASSESDIR@/drivers
- INCLUDES= -I../hk_classes -I@SQLITEINCDIR@
- 
--AM_CXXFLAGS= -Wall
-+AM_CXXFLAGS= -Wall -fPIC
- 
- libhk_sqlite2driver_la_LDFLAGS = -version-info 0:0:0 -lsqlite -L../hk_classes -L@SQLITELIBDIR@ -lhk_classes
- 
diff --git a/dev-db/hk_classes/hk_classes-0.7.1.ebuild b/dev-db/hk_classes/hk_classes-0.7.1.ebuild
deleted file mode 100644
index 2d22377969d2..000000000000
--- a/dev-db/hk_classes/hk_classes-0.7.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.10 2008/08/26 22:52:57 tgurr Exp $
-
-inherit eutils
-
-P_DOCS="hk_docs-0.7"
-
-DESCRIPTION="GUI-independent C++ libraries for database applications, including API documentation and tutorials."
-HOMEPAGE="http://hk-classes.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hk-classes/${P}.tar.bz2
-		 mirror://sourceforge/knoda/knodapython.tar.bz2
-		 mirror://sourceforge/knoda/${P_DOCS}.tar.bz2"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="x86 ppc amd64"
-IUSE="mysql postgres sqlite odbc doc"
-
-# At least one of the following is required
-RDEPEND="mysql? ( virtual/mysql )
-	postgres? ( >=virtual/postgresql-server-7.3 )
-	sqlite? ( =dev-db/sqlite-2* )
-	odbc? ( >=dev-db/unixODBC-2.0.6 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-amd64.patch
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	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
deleted file mode 100644
index a6c3f2e503d1..000000000000
--- a/dev-db/hk_classes/hk_classes-0.7.4a.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.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}"
-
-DESCRIPTION="GUI-independent C++ libraries for database applications, including API documentation and tutorials."
-HOMEPAGE="http://hk-classes.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hk-classes/${MY_P}.tar.bz2
-	doc? ( mirror://sourceforge/knoda/${P_DOCS}.tar.bz2 )"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="doc firebird mysql odbc postgres sqlite sqlite3"
-
-# pxlib is not in portage yet, but there's no reason not add paradox
-# (readonly) support by request - speak: if you really need it
-
-# with mdb and xbase will be dealt in another revision
-
-RDEPEND="firebird? ( dev-db/firebird )
-	mysql? ( virtual/mysql )
-	postgres? ( >=virtual/postgresql-server-7.3 )
-	sqlite? ( =dev-db/sqlite-2* )
-	sqlite3? ( =dev-db/sqlite-3* )
-	odbc? ( >=dev-db/unixODBC-2.0.6 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A} ; cd "${S}"
-	epatch "${FILESDIR}"/${P}-amd64.patch
-
-	if use doc ; then
-		cd "${WORKDIR}"
-		local docdirs="`ls -1`"
-		mkdir ${P_DOCS}
-		for I in "${docdirs/${P}/}" ; do
-			mv ${I} ${P_DOCS}
-		done
-		find ${P_DOCS} -iname CVS -type d -exec rm -rf '{}' \; 2> /dev/null
-	fi
-}
-
-src_compile() {
-	python_version
-	export LIBPYTHON="-lpython${PYVER} -lz"
-
-	myconf="--with-pythondir=/usr/$(get_libdir)/python${PYVER}/\
-		`use_with mysql`\
-		`use_with firebird`\
-		`use_with odbc`\
-		`use_with postgres`\
-		`use_with sqlite`\
-		`use_with sqlite3`\
-		--without-mdb --without-paradox --without-xbase"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "make failes"
-}
-
-src_install() {
-	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
deleted file mode 100644
index 519e835ee9a3..000000000000
--- a/dev-db/hk_classes/hk_classes-0.8.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.12 2008/08/26 22:52:57 tgurr Exp $
-
-inherit eutils python
-
-# The tests themselves are broken.
-RESTRICT="strip test"
-
-P_DOCS="hk_classes-htmldocumentation-0.8"
-
-MY_P=${P/_alpha/-test}a
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="GUI-independent C++ libraries for database applications, including API documentation and tutorials."
-HOMEPAGE="http://hk-classes.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hk-classes/${MY_P}.tar.bz2
-	mirror://sourceforge/hk-classes/xbsql-hk_classes-0.13.tar.gz
-	doc? ( mirror://sourceforge/knoda/${P_DOCS}.tar.bz2 )"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="doc firebird mysql odbc postgres"
-
-RDEPEND="firebird? ( dev-db/firebird )
-	mysql? ( virtual/mysql )
-	postgres? ( >=virtual/postgresql-server-7.3 )
-	odbc? ( >=dev-db/unixODBC-2.0.6 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	python_version
-	export LIBPYTHON="-lpython${PYVER} -lz"
-
-	myconf="--with-pythondir=/usr/$(get_libdir)/python${PYVER}/\
-		`use_with mysql`\
-		`use_with firebird`\
-		`use_with odbc`\
-		`use_with postgres`"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "make failes"
-}
-
-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"
-}
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
deleted file mode 100644
index 9393b1571f4e..000000000000
--- a/dev-db/hk_classes/hk_classes-0.8.1_alpha3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.7 2008/08/26 22:52:57 tgurr Exp $
-
-inherit eutils python
-
-# The tests themselves are broken.
-RESTRICT="strip test"
-
-P_DOCS="hk_classes-htmldocumentation-0.8"
-
-MY_P=${P/_alpha/-test}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="GUI-independent C++ libraries for database applications, including API documentation and tutorials."
-HOMEPAGE="http://hk-classes.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hk-classes/${MY_P}.tar.bz2
-	mirror://sourceforge/hk-classes/xbsql-hk_classes-0.13.tar.gz
-	doc? ( mirror://sourceforge/knoda/${P_DOCS}.tar.bz2 )"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc firebird mysql odbc postgres sqlite sqlite3"
-
-# pxlib is not in portage yet, but there's no reason not add paradox
-# (readonly) support by request - speak: if you really need it
-
-# with mdb and xbase will be dealt in another revision
-
-RDEPEND="firebird? ( dev-db/firebird )
-	mysql? ( virtual/mysql )
-	postgres? ( >=virtual/postgresql-server-7.3 )
-	sqlite? ( =dev-db/sqlite-2* )
-	sqlite3? ( =dev-db/sqlite-3* )
-	odbc? ( >=dev-db/unixODBC-2.0.6 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	python_version
-	export LIBPYTHON="-lpython${PYVER} -lz"
-
-	myconf="--with-pythondir=/usr/$(get_libdir)/python${PYVER}/\
-		`use_with mysql`\
-		`use_with firebird`\
-		`use_with odbc`\
-		`use_with postgres`\
-		`use_with sqlite`\
-		`use_with sqlite3`\
-		--without-paradox"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "make failes"
-}
-
-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"
-}
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
deleted file mode 100644
index c273ace2cd90..000000000000
--- a/dev-db/hk_classes/hk_classes-0.8.2_alpha3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.7 2008/08/26 22:52:57 tgurr Exp $
-
-inherit eutils python
-
-# The tests themselves are broken.
-RESTRICT="strip test"
-
-P_DOCS="hk_classes-htmldocumentation-0.8"
-
-MY_P=${P/_alpha/-test}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="GUI-independent C++ libraries for database applications, including API documentation and tutorials."
-HOMEPAGE="http://hk-classes.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hk-classes/${MY_P}.tar.bz2
-	mirror://sourceforge/hk-classes/xbsql-hk_classes-0.13.tar.gz
-	doc? ( mirror://sourceforge/knoda/${P_DOCS}.tar.bz2 )"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc firebird mysql odbc postgres sqlite sqlite3"
-
-# pxlib is not in portage yet, but there's no reason not add paradox
-# (readonly) support by request - speak: if you really need it
-
-# with mdb and xbase will be dealt in another revision
-
-RDEPEND="firebird? ( dev-db/firebird )
-	mysql? ( virtual/mysql )
-	postgres? ( >=virtual/postgresql-server-7.3 )
-	sqlite? ( =dev-db/sqlite-2* )
-	sqlite3? ( =dev-db/sqlite-3* )
-	odbc? ( >=dev-db/unixODBC-2.0.6 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	python_version
-	export LIBPYTHON="-lpython${PYVER} -lz"
-
-	myconf="--with-pythondir=/usr/$(get_libdir)/python${PYVER}/\
-		`use_with mysql`\
-		`use_with firebird`\
-		`use_with odbc`\
-		`use_with postgres`\
-		`use_with sqlite`\
-		`use_with sqlite3`\
-		--without-paradox"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "make failes"
-}
-
-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"
-}
diff --git a/dev-db/hk_classes/hk_classes-0.8.3-r1.ebuild b/dev-db/hk_classes/hk_classes-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..8b33b161f5cc
--- /dev/null
+++ b/dev-db/hk_classes/hk_classes-0.8.3-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2009 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-r1.ebuild,v 1.1 2009/06/14 10:30:56 scarabeus Exp $
+
+EAPI="1"
+
+inherit autotools eutils python
+
+# The tests themselves are broken.
+RESTRICT="strip test"
+
+P_DOCS="${PN}-htmldocumentation-0.8"
+
+MY_P=${P/_alpha/-test}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="GUI-independent C++ libraries for database applications, including API documentation and tutorials."
+HOMEPAGE="http://hk-classes.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hk-classes/${MY_P}.tar.bz2
+	mirror://sourceforge/hk-classes/xbsql-hk_classes-0.13.tar.gz
+	doc? ( mirror://sourceforge/knoda/${P_DOCS}.tar.bz2 )"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc firebird mysql odbc postgres sqlite xbase"
+
+RDEPEND=">=media-libs/fontconfig-2.5.0-r1
+	firebird? ( dev-db/firebird )
+	mysql? ( >=dev-db/mysql-3.23.54a )
+	odbc? ( >=dev-db/unixODBC-2.0.6 )
+	postgres? ( >=virtual/postgresql-server-7.3 )
+	sqlite? ( dev-db/sqlite:3 )
+	xbase? ( dev-db/xbase )
+"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# gcc-4.3 compatibility. Fixes bug 218913 and 230251.
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	python_version
+	export LIBPYTHON="-lpython${PYVER} -lz"
+	use sqlite && myopts="--with-sqlite3systemlibrary"
+	econf \
+		--disable-dependency-tracking \
+		--without-sqlite \
+		--without-mdb \
+		--without-dbase \
+		--without-paradox \
+		$(use_with sqlite sqlite3) \
+		$(use_with mysql) \
+		$(use_with firebird) \
+		$(use_with odbc) \
+		$(use_with postgres) \
+		$(use_with xbase) \
+		${myopts}
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	if use doc; then
+		dohtml -r "${WORKDIR}"/${MY_P}/documentation/api
+		dohtml -r "${WORKDIR}"/hk_classestutorial
+		dohtml -r "${WORKDIR}"/hk_kdeclssestutorial
+		dohtml -r "${WORKDIR}"/knodascriptingtutorial
+		dohtml -r "${WORKDIR}"/knodatutorial
+		dohtml -r "${WORKDIR}"/pythonreference
+	fi
+
+	emake DESTDIR="${D}" install || die "make install failed"
+}
diff --git a/dev-db/hk_classes/metadata.xml b/dev-db/hk_classes/metadata.xml
index 8d1e86a9cefb..6ffca450298d 100644
--- a/dev-db/hk_classes/metadata.xml
+++ b/dev-db/hk_classes/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
+<use>
+	<flag name="xbase">Enables support for xbase databases (dBase, FoxPro, etc.)</flag>
+</use>
 </pkgmetadata>