version bump and Python 2.4 compatibility

(Portage version: 2.0.51.19)

6 files changed, 134 insertions, 11 deletions

diff --git a/dev-db/hk_classes/ChangeLog b/dev-db/hk_classes/ChangeLog
index 4cb952a14ed6..6845501a73a1 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/ChangeLog,v 1.29 2005/02/25 02:08:58 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/ChangeLog,v 1.30 2005/03/22 21:58:46 carlo Exp $
+
+*hk_classes-0.7.3 (22 Mar 2005)
+
+  22 Mar 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/hk_classes-0.7.3-amd64.patch, hk_classes-0.7.2-r1.ebuild,
+  +hk_classes-0.7.3.ebuild:
+  version bump and Python 2.4 compatibility thanks to Rob Cakebread, #85721
 
   24 Feb 2005; Jason Wever <weeve@gentoo.org> hk_classes-0.7.2-r1.ebuild:
   Added ~sparc keyword.
diff --git a/dev-db/hk_classes/Manifest b/dev-db/hk_classes/Manifest
index d50564208629..e56b7b835045 100644
--- a/dev-db/hk_classes/Manifest
+++ b/dev-db/hk_classes/Manifest
@@ -1,13 +1,16 @@
-MD5 45a17152c145599f53e403e6a2672436 ChangeLog 4487
+MD5 d371ec37f6b35fb2c8264f9e66526565 hk_classes-0.7.2.ebuild 1202
+MD5 31a058b019506a1f324b1cecf5c0eea0 hk_classes-0.7.2-r1.ebuild 1381
 MD5 e708185e31fbf1b071be94f4b3ba5f57 hk_classes-0.6.2a.ebuild 1647
 MD5 832e2e5e9a0387a8b1ee457e2aa1d70d hk_classes-0.7.1.ebuild 1152
 MD5 2dcc319450160699603ac7c4903c9466 hk_classes-0.7.ebuild 1106
+MD5 3faf495c55c395624d8d2123c72346e1 hk_classes-0.7.3.ebuild 1385
+MD5 3f2986a3822a6e1fdbe3c9144f69626a ChangeLog 4741
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 7f2894df46b8d89aa480fe1f2b3780ce hk_classes-0.7.2-r1.ebuild 1363
-MD5 d371ec37f6b35fb2c8264f9e66526565 hk_classes-0.7.2.ebuild 1202
-MD5 63250076b187f1feb6dd60af946bf54b files/digest-hk_classes-0.7 196
-MD5 567cad53853adfda1ae7f205966523a8 files/digest-hk_classes-0.6.2a 198
-MD5 85913ee0452ca03c30bc07640aa4926e files/digest-hk_classes-0.7.1 198
 MD5 9a8287b2b5ae901849742e71aed36a1b files/digest-hk_classes-0.7.2-r1 198
-MD5 3986d92d3fe87dfac8646b3527e465cb files/hk_classes-amd64.patch 2569
+MD5 85913ee0452ca03c30bc07640aa4926e files/digest-hk_classes-0.7.1 198
 MD5 9a8287b2b5ae901849742e71aed36a1b files/digest-hk_classes-0.7.2 198
+MD5 24b5944ef78b0d8aa0111b2008467175 files/digest-hk_classes-0.7.3 198
+MD5 d814ff5d08373a9f2aae3023ada1503c files/hk_classes-0.7.3-amd64.patch 2749
+MD5 567cad53853adfda1ae7f205966523a8 files/digest-hk_classes-0.6.2a 198
+MD5 3986d92d3fe87dfac8646b3527e465cb files/hk_classes-amd64.patch 2569
+MD5 63250076b187f1feb6dd60af946bf54b files/digest-hk_classes-0.7 196
diff --git a/dev-db/hk_classes/files/digest-hk_classes-0.7.3 b/dev-db/hk_classes/files/digest-hk_classes-0.7.3
new file mode 100644
index 000000000000..7d3b4b5d8254
--- /dev/null
+++ b/dev-db/hk_classes/files/digest-hk_classes-0.7.3
@@ -0,0 +1,3 @@
+MD5 722ef942d896dce8febe7b949c6c39e1 hk_classes-0.7.3.tar.bz2 623251
+MD5 74fc61d361e2bef8e747a49210aee94a knodapython.tar.bz2 428940
+MD5 074f486c5d7da5fa74445573396617c0 hk_docs-0.7.tar.bz2 2930613
diff --git a/dev-db/hk_classes/files/hk_classes-0.7.3-amd64.patch b/dev-db/hk_classes/files/hk_classes-0.7.3-amd64.patch
new file mode 100644
index 000000000000..dc9cee358f09
--- /dev/null
+++ b/dev-db/hk_classes/files/hk_classes-0.7.3-amd64.patch
@@ -0,0 +1,58 @@
+diff -Naur hk_classes-0.7.3_alpha2.orig/hk_classes/Makefile.am hk_classes-0.7.3_alpha2/hk_classes/Makefile.am
+--- hk_classes-0.7.3_alpha2.orig/hk_classes/Makefile.am	2004-06-20 15:48:48.000000000 +0200
++++ hk_classes-0.7.3_alpha2/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 7:0:0 @LTLIBICONV@
+-AM_CXXFLAGS= -Wall @PYTHONINC@
++AM_CXXFLAGS= -Wall @PYTHONINC@ -fPIC
+ 
+ SUBDIRS = .
+ 
+diff -Naur hk_classes-0.7.3_alpha2.orig/hk_mysqlclasses/Makefile.am hk_classes-0.7.3_alpha2/hk_mysqlclasses/Makefile.am
+--- hk_classes-0.7.3_alpha2.orig/hk_mysqlclasses/Makefile.am	2003-05-22 20:27:14.000000000 +0200
++++ hk_classes-0.7.3_alpha2/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.3_alpha2.orig/hk_odbcclasses/Makefile.am hk_classes-0.7.3_alpha2/hk_odbcclasses/Makefile.am
+--- hk_classes-0.7.3_alpha2.orig/hk_odbcclasses/Makefile.am	2003-05-22 20:27:14.000000000 +0200
++++ hk_classes-0.7.3_alpha2/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.3_alpha2.orig/hk_postgresclasses/Makefile.am hk_classes-0.7.3_alpha2/hk_postgresclasses/Makefile.am
+--- hk_classes-0.7.3_alpha2.orig/hk_postgresclasses/Makefile.am	2003-05-22 20:27:11.000000000 +0200
++++ hk_classes-0.7.3_alpha2/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.3_alpha2.orig/hk_sqliteclasses/Makefile.am hk_classes-0.7.3_alpha2/hk_sqliteclasses/Makefile.am
+--- hk_classes-0.7.3_alpha2.orig/hk_sqliteclasses/Makefile.am	2004-07-11 10:04:53.000000000 +0200
++++ hk_classes-0.7.3_alpha2/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.2-r1.ebuild b/dev-db/hk_classes/hk_classes-0.7.2-r1.ebuild
index 0ed577cb3d05..17b5535c27ad 100644
--- a/dev-db/hk_classes/hk_classes-0.7.2-r1.ebuild
+++ b/dev-db/hk_classes/hk_classes-0.7.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 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.2-r1.ebuild,v 1.3 2005/02/25 02:08:58 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/hk_classes-0.7.2-r1.ebuild,v 1.4 2005/03/22 21:58:46 carlo Exp $
 
-inherit eutils
+inherit eutils python
 
 P_DOCS="hk_docs-0.7"
 
@@ -35,8 +35,10 @@ src_unpack() {
 }
 
 src_compile() {
+	python_version
 	myconf="$myconf `use_with mysql` `use_with postgres` `use_with odbc` `use_with sqlite` `use_with sqlite3`"
-
+	myconf="$myconf --with-pythondir=/usr/lib/python${PYVER}/"
+	export LIBPYTHON="-lpython${PYVER} -lz"
 	econf $myconf || die "econf failed"
 	emake || die
 }
diff --git a/dev-db/hk_classes/hk_classes-0.7.3.ebuild b/dev-db/hk_classes/hk_classes-0.7.3.ebuild
new file mode 100644
index 000000000000..95bb85cebf21
--- /dev/null
+++ b/dev-db/hk_classes/hk_classes-0.7.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 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.3.ebuild,v 1.1 2005/03/22 21:58:46 carlo Exp $
+
+inherit eutils python
+
+P_DOCS="hk_docs-0.7"
+
+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/knoda/knodapython.tar.bz2
+		 mirror://sourceforge/knoda/${P_DOCS}.tar.bz2"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+IUSE="mysql postgres sqlite sqlite3 odbc doc"
+
+# At least one of the following is required
+DEPEND="mysql? ( >=dev-db/mysql-3.23.54a )
+	postgres? ( >=dev-db/postgresql-7.3 )
+	sqlite? ( =dev-db/sqlite-2* )
+	sqlite3? ( =dev-db/sqlite-3* )
+	odbc? ( >=dev-db/unixODBC-2.0.6 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-amd64.patch
+}
+
+src_compile() {
+	python_version
+	myconf="$myconf `use_with mysql` `use_with postgres` `use_with odbc` `use_with sqlite` `use_with sqlite3`"
+	myconf="$myconf --with-pythondir=/usr/lib/python${PYVER}/"
+	export LIBPYTHON="-lpython${PYVER} -lz"
+	econf $myconf || 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
+}