14 files changed, 47 insertions, 118 deletions
diff --git a/dev-db/hk_classes/ChangeLog b/dev-db/hk_classes/ChangeLog
index 9a3b6faf8550..fd4606079cde 100644
--- a/dev-db/hk_classes/ChangeLog
+++ b/dev-db/hk_classes/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/hk_classes
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/ChangeLog,v 1.14 2004/05/16 20:28:29 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/ChangeLog,v 1.15 2004/05/17 23:01:33 caleb Exp $
+
+*hk_classes-0.7_alpha1 (17 May 2004)
+
+  17 May 2004; Caleb Tennis <caleb@gentoo.org> -hk_classes-0.6.1.ebuild,
+  -hk_classes-0.6.3_alpha1.ebuild, +hk_classes-0.7_alpha1.ebuild:
+  Version bump, remove old versions
+  From bug #46758
 
   16 May 2004; Dominik Stadler <centic@gentoo.org> hk_classes-0.6.2a.ebuild:
   Remove unnecessary definition of S
diff --git a/dev-db/hk_classes/Manifest b/dev-db/hk_classes/Manifest
index 264268678f98..8d8d25e9d8eb 100644
--- a/dev-db/hk_classes/Manifest
+++ b/dev-db/hk_classes/Manifest
@@ -1,10 +1,8 @@
-MD5 7931de1585434332efdbb1f30d65da3f ChangeLog 2454
-MD5 d8d955f5639a80baa8fed23a1500194b hk_classes-0.6.1.ebuild 1672
+MD5 9d7a2846ade580af106a71c831410b39 hk_classes-0.7_alpha1.ebuild 1590
 MD5 073589f63f9d197f177f86f8b2e82a14 hk_classes-0.6.2a.ebuild 1676
-MD5 5784ebd3d0997297fa523bcf17ffa1ba hk_classes-0.6.3_alpha1.ebuild 1716
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 bce0f95e53256af1210f2e9d1ea5cdb5 hk_classes-0.6.3_alpha3.ebuild 1697
-MD5 cc451690af6eeeec0b690eba056fcf13 files/digest-hk_classes-0.6.1 197
+MD5 7931de1585434332efdbb1f30d65da3f ChangeLog 2454
+MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 564818a448fc0156b27207f45d5ab7a3 files/digest-hk_classes-0.6.2a 198
-MD5 df6c42c2b0f8ebc77c7916bc23c267d7 files/digest-hk_classes-0.6.3_alpha1 203
 MD5 94a5d9091edf7e4f782f3aa115233921 files/digest-hk_classes-0.6.3_alpha3 203
+MD5 c15c1e3670648d13a012dadcfc4a757e files/digest-hk_classes-0.7_alpha1 201
diff --git a/dev-db/hk_classes/files/digest-hk_classes-0.6.1 b/dev-db/hk_classes/files/digest-hk_classes-0.6.1
deleted file mode 100644
index 24e1a01999aa..000000000000
--- a/dev-db/hk_classes/files/digest-hk_classes-0.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 053054de7d99908c0f4eff25c570b53a hk_classes-0.6.1.tar.bz2 450125
-MD5 1a04460493dc0d8f5dce45f658ee9519 knodapython.tar.bz2 424350
-MD5 48c293d62b4f279e2ce37aa0785fa24d hk_docs-0.6.tar.gz 1762072
diff --git a/dev-db/hk_classes/files/digest-hk_classes-0.6.3_alpha1 b/dev-db/hk_classes/files/digest-hk_classes-0.6.3_alpha1
deleted file mode 100644
index 5fff73ddd937..000000000000
--- a/dev-db/hk_classes/files/digest-hk_classes-0.6.3_alpha1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2657ad80494d7b6f4224b1288a6f1ce1 hk_classes-0.6.3-test1.tar.bz2 447484
-MD5 1a04460493dc0d8f5dce45f658ee9519 knodapython.tar.bz2 424350
-MD5 48c293d62b4f279e2ce37aa0785fa24d hk_docs-0.6.tar.gz 1762072
diff --git a/dev-db/hk_classes/files/digest-hk_classes-0.7_alpha1 b/dev-db/hk_classes/files/digest-hk_classes-0.7_alpha1
new file mode 100644
index 000000000000..6842c964e705
--- /dev/null
+++ b/dev-db/hk_classes/files/digest-hk_classes-0.7_alpha1
@@ -0,0 +1,3 @@
+MD5 3ebb72204dbf67a69cab7775177b32a8 hk_classes-0.7-test1.tar.bz2 497219
+MD5 74fc61d361e2bef8e747a49210aee94a knodapython.tar.bz2 428940
+MD5 48c293d62b4f279e2ce37aa0785fa24d hk_docs-0.6.tar.gz 1762072
diff --git a/dev-db/hk_classes/hk_classes-0.6.1.ebuild b/dev-db/hk_classes/hk_classes-0.6.1.ebuild
deleted file mode 100644
index b496757e9f1e..000000000000
--- a/dev-db/hk_classes/hk_classes-0.6.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/hk_classes-0.6.1.ebuild,v 1.2 2004/03/24 23:54:53 mholzer Exp $
-
-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/hk_docs-0.6.tar.gz"
-RESTRICT="nomirror"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="mysql postgres odbc"
-
-# At least one of the following is required
-DEPEND="mysql? ( >=dev-db/mysql-3.23.54a )
-	postgres? ( >=dev-db/postgresql-7.3 )
-	odbc? ( >=dev-db/unixODBC-2.0.6 )"
-
-S=${WORKDIR}/${P}
-
-src_compile() {
-	./configure || die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	use doc && dohtml -r ${WORKDIR}/hk_docs-0.6
-	use doc && dohtml -r ${WORKDIR}/knodapythondoc
-	make DESTDIR=${D} install || die
-}
-
-pkg_postinst() {
-	echo
-	einfo "hk_classes has been installed in /usr/lib/hk_classes"
-	if [ `use mysql` ]; then
-		einfo "MySQL driver is installed in /usr/lib/hk_classes/drivers"
-	fi
-	if [ `use postgres` ]; then
-		einfo "PostgreSQL driver is installed in /usr/lib/hk_classes/drivers"
-	fi
-	if [ `use odbc` ]; then
-		einfo "ODBC driver is installed in /usr/lib/hk_classes/drivers"
-	fi
-	if [ `use doc` ]; then
-		echo
-		einfo "API documentation and tutorial are installed in"
-		einfo " /usr/share/doc/${P}/html/hk_docs-0.6"
-		einfo "A small Python tutorial is installed in"
-		einfo " /usr/share/doc/${P}/html/knodapythondoc"
-	fi
-	echo
-}
diff --git a/dev-db/hk_classes/hk_classes-0.6.3_alpha1.ebuild b/dev-db/hk_classes/hk_classes-0.7_alpha1.ebuild
index d74b613441d4..d3d1d3d423f6 100644
--- a/dev-db/hk_classes/hk_classes-0.6.3_alpha1.ebuild
+++ b/dev-db/hk_classes/hk_classes-0.7_alpha1.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/hk_classes-0.6.3_alpha1.ebuild,v 1.2 2004/03/24 23:54:53 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/hk_classes-0.7_alpha1.ebuild,v 1.1 2004/05/17 23:01:33 caleb Exp $
+
+MY_P=${P/_alpha1/-test1}
+S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="GUI-independent C++ libraries for database applications, including API documentation and tutorials."
 HOMEPAGE="http://hk-classes.sourceforge.net/"
 
-MY_P=${P/_alpha1/-test1}
-
 SRC_URI="mirror://sourceforge/hk-classes/${MY_P}.tar.bz2
 		 mirror://sourceforge/knoda/knodapython.tar.bz2
 		 mirror://sourceforge/knoda/hk_docs-0.6.tar.gz"
 RESTRICT="nomirror"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE="mysql postgres odbc doc"
 
 # At least one of the following is required
@@ -21,8 +22,6 @@ DEPEND="mysql? ( >=dev-db/mysql-3.23.54a )
 	postgres? ( >=dev-db/postgresql-7.3 )
 	odbc? ( >=dev-db/unixODBC-2.0.6 )"
 
-S=${WORKDIR}/${MY_P}
-
 src_compile() {
 	./configure || die "./configure failed"
 	emake || die
@@ -37,16 +36,20 @@ src_install() {
 pkg_postinst() {
 	echo
 	einfo "hk_classes has been installed in /usr/lib/hk_classes"
-	if [ `use mysql` ]; then
+	if use mysql
+	then
 		einfo "MySQL driver is installed in /usr/lib/hk_classes/drivers"
 	fi
-	if [ `use postgres` ]; then
+	if use postgres
+	then
 		einfo "PostgreSQL driver is installed in /usr/lib/hk_classes/drivers"
 	fi
-	if [ `use odbc` ]; then
+	if use odbc
+	then
 		einfo "ODBC driver is installed in /usr/lib/hk_classes/drivers"
 	fi
-	if [ `use doc` ]; then
+	if use doc
+	then
 		echo
 		einfo "API documentation and tutorial are installed in"
 		einfo " /usr/share/doc/${P}/html/hk_docs-0.6"
diff --git a/dev-db/knoda/ChangeLog b/dev-db/knoda/ChangeLog
index d961a4e51558..042b372a7ade 100644
--- a/dev-db/knoda/ChangeLog
+++ b/dev-db/knoda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/knoda
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/knoda/ChangeLog,v 1.13 2004/05/16 20:32:07 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/knoda/ChangeLog,v 1.14 2004/05/17 23:03:26 caleb Exp $
+
+  17 May 2004; Caleb Tennis <caleb@gentoo.org> -knoda-0.6.1.ebuild,
+  -knoda-0.6.3_alpha1.ebuild:
+  Version bump, remove old versions
 
   16 May 2004; Dominik Stadler <centic@gentoo.org> knoda-0.6.2a.ebuild:
   Remove obsolete definition of Variable S.
diff --git a/dev-db/knoda/Manifest b/dev-db/knoda/Manifest
index 860e22c2b29b..f64573d35596 100644
--- a/dev-db/knoda/Manifest
+++ b/dev-db/knoda/Manifest
@@ -1,10 +1,12 @@
-MD5 5027cb4d49e63cd2744a7e5246bf696e ChangeLog 2163
-MD5 75254c3be94e1f51cce5d816fa97be50 knoda-0.6.1.ebuild 710
-MD5 eef5396d901bb8525502681b4d70b82b knoda-0.6.2a.ebuild 531
 MD5 1b928034bdbcea4dd3cd20435f68c3dd knoda-0.6.3_alpha1.ebuild 567
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 0a1981dfb9ff90b457d4ad4d2792dde7 knoda-0.6.3_alpha3.ebuild 591
-MD5 69e9eda336f7e3adab0c60710837dce2 files/digest-knoda-0.6.1 64
-MD5 c9c0c3d4377e30205f2c2b49aa56b88c files/digest-knoda-0.6.2a 65
+MD5 eef5396d901bb8525502681b4d70b82b knoda-0.6.2a.ebuild 531
+MD5 abf3f7d8c1db697df63f1797405f33b9 knoda-0.7_alpha1.ebuild 495
+MD5 75254c3be94e1f51cce5d816fa97be50 knoda-0.6.1.ebuild 710
+MD5 5027cb4d49e63cd2744a7e5246bf696e ChangeLog 2163
+MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 6dce9f26485ea7952b20341b00285571 files/digest-knoda-0.6.3_alpha1 70
 MD5 ddfe62e8ef34851bab8c8445153f785c files/digest-knoda-0.6.3_alpha3 70
+MD5 69e9eda336f7e3adab0c60710837dce2 files/digest-knoda-0.6.1 64
+MD5 c0170e36d2d0368a98e3e283370cbbe1 files/digest-knoda-0.7_alpha1 68
+MD5 c9c0c3d4377e30205f2c2b49aa56b88c files/digest-knoda-0.6.2a 65
diff --git a/dev-db/knoda/files/digest-knoda-0.6.1 b/dev-db/knoda/files/digest-knoda-0.6.1
deleted file mode 100644
index 6018c1f75c06..000000000000
--- a/dev-db/knoda/files/digest-knoda-0.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 726335a3dd3fd3f7ef8308eef61a39bf knoda-0.6.1.tar.bz2 650354
diff --git a/dev-db/knoda/files/digest-knoda-0.6.3_alpha1 b/dev-db/knoda/files/digest-knoda-0.6.3_alpha1
deleted file mode 100644
index 17f54f700e38..000000000000
--- a/dev-db/knoda/files/digest-knoda-0.6.3_alpha1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2952bbe15c78690f18162e18fd7b8633 knoda-0.6.3-test1.tar.bz2 664275
diff --git a/dev-db/knoda/files/digest-knoda-0.7_alpha1 b/dev-db/knoda/files/digest-knoda-0.7_alpha1
new file mode 100644
index 000000000000..f406468492eb
--- /dev/null
+++ b/dev-db/knoda/files/digest-knoda-0.7_alpha1
@@ -0,0 +1 @@
+MD5 f688511580d7120056531cdf62985608 knoda-0.7-test1.tar.bz2 664497
diff --git a/dev-db/knoda/knoda-0.6.1.ebuild b/dev-db/knoda/knoda-0.6.1.ebuild
deleted file mode 100644
index 344371a1dce8..000000000000
--- a/dev-db/knoda/knoda-0.6.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/knoda/knoda-0.6.1.ebuild,v 1.3 2004/03/24 23:52:45 mholzer Exp $
-
-inherit kde
-need-kde 3
-
-S=${WORKDIR}/${P}
-
-IUSE=""
-DESCRIPTION="KDE database frontend based on the hk_classes library"
-SRC_URI="mirror://sourceforge/knoda/${P}.tar.bz2"
-RESTRICT="nomirror"
-HOMEPAGE="http://hk-classes.sourceforge.net/"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-src_unpack() {
-	kde_src_unpack
-	cd ${S}
-	sed "s:-pedantic::" < acinclude.m4 > acinclude.m4.new
-	sed "s:-Wall::" < acinclude.m4.new > acinclude.m4
-	rm acinclude.m4.new
-	autoconf
-}
-
-newdepend ">=dev-db/hk_classes-0.6.1"
diff --git a/dev-db/knoda/knoda-0.6.3_alpha1.ebuild b/dev-db/knoda/knoda-0.7_alpha1.ebuild
index 1600cc965603..f6d2957b6415 100644
--- a/dev-db/knoda/knoda-0.6.3_alpha1.ebuild
+++ b/dev-db/knoda/knoda-0.7_alpha1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/knoda/knoda-0.6.3_alpha1.ebuild,v 1.3 2004/04/16 01:21:41 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/knoda/knoda-0.7_alpha1.ebuild,v 1.1 2004/05/17 23:03:26 caleb Exp $
 
-inherit kde
+inherit kde-base
+DEPEND=">=kde-base/kdelibs-3
+	>=dev-db/hk_classes-${PV}"
 need-kde 3
 
 MY_P=${P/_alpha1/-test1}
-
 S=${WORKDIR}/${MY_P}
 
 IUSE=""
@@ -15,6 +16,5 @@ SRC_URI="mirror://sourceforge/knoda/${MY_P}.tar.bz2"
 RESTRICT="nomirror"
 HOMEPAGE="http://hk-classes.sourceforge.net/"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
-newdepend ">=dev-db/hk_classes-${PV}"
+KEYWORDS="~x86 ~ppc"