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

(Portage version: 2.2_rc33/cvs/Linux x86_64)

10 files changed, 97 insertions, 449 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/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>