Fixed a depend string problem and removed older ebuilds

7 files changed, 11 insertions, 94 deletions

diff --git a/dev-db/hk_classes/ChangeLog b/dev-db/hk_classes/ChangeLog
index e9f57ee1fac9..44e46815723c 100644
--- a/dev-db/hk_classes/ChangeLog
+++ b/dev-db/hk_classes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/hk_classes
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/ChangeLog,v 1.4 2003/05/28 14:14:36 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/ChangeLog,v 1.5 2003/06/17 12:58:30 caleb Exp $
+
+  17 Jun 2003; Caleb Tennis <caleb@gentoo.org> hk_classes.0.6.ebuild:
+  Fixed a problem with the DEPEND string.  Closes bug #22472.
+  Also removed older ebuilds (0.5.6 and 0.6_pre3).
 
 *hk_classes-0.6 (28 May 2003)
 
diff --git a/dev-db/hk_classes/Manifest b/dev-db/hk_classes/Manifest
index 818718b0ac4c..c6f0fe01dee1 100644
--- a/dev-db/hk_classes/Manifest
+++ b/dev-db/hk_classes/Manifest
@@ -1,7 +1,3 @@
-MD5 513028e57ef8e66d24f8c8a46b6271d7 hk_classes-0.6_pre3.ebuild 1379
-MD5 5501224d0a1e9355f0a96dd201c4ee1a ChangeLog 912
-MD5 c5c2d00fbcaa544a5008ba2a540b26dd hk_classes-0.6.ebuild 1353
-MD5 cedde5d6f4c0c43cb7b4421db4480b02 hk_classes-0.5.6.ebuild 1369
-MD5 74b6d2436ba78e5ee3022c8c7f841d0f files/digest-hk_classes-0.6_pre3 72
-MD5 c5cc0649329cd6cc89fa51050ff34840 files/digest-hk_classes-0.5.6 68
+MD5 5fa57653cbd61071a22ab250665d9589 ChangeLog 1096
+MD5 9f84ad75931c2ebe0cbe2ae2522f8349 hk_classes-0.6.ebuild 1336
 MD5 e02187932d4f45e6052c4de58a39a739 files/digest-hk_classes-0.6 66
diff --git a/dev-db/hk_classes/files/digest-hk_classes-0.5.6 b/dev-db/hk_classes/files/digest-hk_classes-0.5.6
deleted file mode 100644
index a4386e322f8a..000000000000
--- a/dev-db/hk_classes/files/digest-hk_classes-0.5.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4b587961f0187b4810e2c44e3fdcc8bf hk_classes-0.5.6.tar.gz 355148
diff --git a/dev-db/hk_classes/files/digest-hk_classes-0.6_pre3 b/dev-db/hk_classes/files/digest-hk_classes-0.6_pre3
deleted file mode 100644
index 50e296964494..000000000000
--- a/dev-db/hk_classes/files/digest-hk_classes-0.6_pre3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8496427cc5c3bf08cd354882a85086f4 hk_classes-0.6-pre3a.tar.gz 401130
diff --git a/dev-db/hk_classes/hk_classes-0.5.6.ebuild b/dev-db/hk_classes/hk_classes-0.5.6.ebuild
deleted file mode 100644
index aabd45113386..000000000000
--- a/dev-db/hk_classes/hk_classes-0.5.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2002 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.5.6.ebuild,v 1.1 2003/04/23 13:36:11 pauldv Exp $
-
-DESCRIPTION="GUI-independent C++ libraries for database applications"
-HOMEPAGE="http://hk-classes.sourceforge.net/"
-SRC_URI="http://belnet.dl.sourceforge.net/sourceforge/hk-classes/${P}.tar.gz"
-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() {
-	local myconf
-	myconf="--host=${CHOST} --prefix=/usr/lib/hk_classes \
-  		--with-hk_classes-incdir=/usr/include/hk_classes \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man"
-
-	use mysql && myconf="${myconf} --with-mysql-incdir=/usr/include/mysql \
-  		--with-mysql-libdir=/usr/lib/mysql"
-	use postgres && myconf="${myconf} --with-postgres-incdir=/usr/include/postgresql \
-  		--with-postgres-libdir=/usr/lib/postgresql"
-	use odbc && myconf="${myconf} --with-odbc-incdir=/usr/include \
-  		--with-odbc-libdir=/usr/lib"
-	
-	./configure ${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/dev-db/hk_classes/hk_classes-0.6.ebuild b/dev-db/hk_classes/hk_classes-0.6.ebuild
index ea70e40d6a3a..26020dcade35 100644
--- a/dev-db/hk_classes/hk_classes-0.6.ebuild
+++ b/dev-db/hk_classes/hk_classes-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.ebuild,v 1.1 2003/05/28 14:14:36 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/hk_classes-0.6.ebuild,v 1.2 2003/06/17 12:58:31 caleb Exp $
 
 DESCRIPTION="GUI-independent C++ libraries for database applications"
 HOMEPAGE="http://hk-classes.sourceforge.net/"
@@ -11,9 +11,9 @@ 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 ) )"
+DEPEND="mysql? ( >=dev-db/mysql-3.23.54a )
+	postgres? ( >=dev-db/postgresql-7.3 ) 
+        odbc? ( >=dev-db/unixODBC-2.0.6 )"
 	
 S=${WORKDIR}/${P}
 
diff --git a/dev-db/hk_classes/hk_classes-0.6_pre3.ebuild b/dev-db/hk_classes/hk_classes-0.6_pre3.ebuild
deleted file mode 100644
index a61c4fb4bd82..000000000000
--- a/dev-db/hk_classes/hk_classes-0.6_pre3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2002 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_pre3.ebuild,v 1.1 2003/04/24 12:29:21 pauldv Exp $
-
-NEWP=${P/_pre3/-pre3a}
-DESCRIPTION="GUI-independent C++ libraries for database applications"
-HOMEPAGE="http://hk-classes.sourceforge.net/"
-SRC_URI="http://hk-classes.sourceforge.net/${NEWP}.tar.gz"
-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}/${NEWP}
-
-src_compile() {
-	local myconf
-	myconf="--host=${CHOST} --prefix=/usr/lib/hk_classes \
-  		--with-hk_classes-incdir=/usr/include/hk_classes \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man"
-
-	use mysql && myconf="${myconf} --with-mysql-incdir=/usr/include/mysql \
-  		--with-mysql-libdir=/usr/lib/mysql"
-	use postgres && myconf="${myconf} --with-postgres-incdir=/usr/include/postgresql \
-  		--with-postgres-libdir=/usr/lib/postgresql"
-	use odbc && myconf="${myconf} --with-odbc-incdir=/usr/include \
-  		--with-odbc-libdir=/usr/lib"
-	
-	./configure ${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}