restore accidentally deleted wrong patch

(Portage version: 2.0.51.22-r3)

3 files changed, 63 insertions, 118 deletions

diff --git a/dev-db/hk_classes/ChangeLog b/dev-db/hk_classes/ChangeLog
index affdf574455b..c8f22183ad1b 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/ChangeLog,v 1.35 2005/10/12 14:12:47 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/ChangeLog,v 1.36 2005/10/15 14:01:59 carlo Exp $
+
+  15 Oct 2005; Carsten Lohrke <carlo@gentoo.org>
+  -files/hk_classes-0.7.4-amd64.patch, +files/hk_classes-amd64.patch:
+  restore accidentally deleted wrong patch
 
 *hk_classes-0.7.4a (12 Oct 2005)
 
diff --git a/dev-db/hk_classes/files/hk_classes-0.7.4-amd64.patch b/dev-db/hk_classes/files/hk_classes-0.7.4-amd64.patch
deleted file mode 100644
index e1f49d0c7ddf..000000000000
--- a/dev-db/hk_classes/files/hk_classes-0.7.4-amd64.patch
+++ /dev/null
@@ -1,117 +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 8:0:0 @LTLIBICONV@
--AM_CXXFLAGS= -Wall @PYTHONINC@
-+AM_CXXFLAGS= -Wall @PYTHONINC@ -fPIC
- 
- SUBDIRS = .
- 
-diff -Naur hk_classes-0.7.orig/hk_firebirdclasses/Makefile.am hk_classes-0.7/hk_firebirdclasses/Makefile.am
---- hk_classes-0.7.orig/hk_firebirdclasses/Makefile.am 2005-05-26 19:39:09.000000000 +0100
-+++ hk_classes-0.7/hk_firebirdclasses/Makefile.am      2005-05-29 15:50:34.000000000 +0100
-@@ -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_CLASSESDIR@ -L@FIREBIRDLIBDIR@   -lhk_classes
-
-diff -Naur hk_classes-0.7.orig/hk_mdbclasses/Makefile.am hk_classes-0.7/hk_mdbclasses/Makefile.am
---- hk_classes-0.7.orig/hk_mdbclasses/Makefile.am      2005-03-27 17:33:44.000000000 +0100
-+++ hk_classes-0.7/hk_mdbclasses/Makefile.am   2005-05-29 15:53:39.000000000 +0100
-@@ -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
-
-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_paradoxclasses/Makefile.am hk_classes-0.7/hk_paradoxclasses/Makefile.am
---- hk_classes-0.7.orig/hk_paradoxclasses/Makefile.am  2005-05-05 14:56:52.000000000 +0100
-+++ hk_classes-0.7/hk_paradoxclasses/Makefile.am       2005-05-29 15:59:07.000000000 +0100
-@@ -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
- 
-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_sqlite3classes/Makefile.am hk_classes-0.7/hk_sqlite3classes/Makefile.am
---- hk_classes-0.7.orig/hk_sqlite3classes/Makefile.am  2004-10-07 17:24:02.000000000 +0100
-+++ hk_classes-0.7/hk_sqlite3classes/Makefile.am       2005-05-29 16:02:44.000000000 +0100
-@@ -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
- 
-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 -Naur hk_classes-0.7.orig/hk_xbaseclasses/Makefile.am hk_classes-0.7/hk_xbaseclasses/Makefile.am
---- hk_classes-0.7.orig/hk_xbaseclasses/Makefile.am    2005-04-10 10:55:26.000000000 +0100
-+++ hk_classes-0.7/hk_xbaseclasses/Makefile.am 2005-05-29 16:05:47.000000000 +0100
-@@ -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
diff --git a/dev-db/hk_classes/files/hk_classes-amd64.patch b/dev-db/hk_classes/files/hk_classes-amd64.patch
new file mode 100644
index 000000000000..1bb5ce9ab388
--- /dev/null
+++ b/dev-db/hk_classes/files/hk_classes-amd64.patch
@@ -0,0 +1,58 @@
+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
+