Include patch.

Package-Manager: portage-2.1_pre9-r4

3 files changed, 120 insertions, 8 deletions

diff --git a/dev-lisp/cl-sql/ChangeLog b/dev-lisp/cl-sql/ChangeLog
index ae05ab7e5a61..ff058da471d9 100644
--- a/dev-lisp/cl-sql/ChangeLog
+++ b/dev-lisp/cl-sql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lisp/cl-sql
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/ChangeLog,v 1.26 2006/04/30 05:48:53 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/ChangeLog,v 1.27 2006/04/30 05:54:00 mkennedy Exp $
+
+  30 Apr 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/3.5.6-gentoo.patch:
+  Include patch.
 
 *cl-sql-3.5.6 (30 Apr 2006)
 
diff --git a/dev-lisp/cl-sql/Manifest b/dev-lisp/cl-sql/Manifest
index e4a5dde7cb70..f1f2ca063422 100644
--- a/dev-lisp/cl-sql/Manifest
+++ b/dev-lisp/cl-sql/Manifest
@@ -9,6 +9,10 @@ AUX 3.5.5-gentoo.patch 4994 RMD160 174046f97e44f90c6d658c170c60e2e033c1c7ad SHA1
 MD5 5eb41d196dad1361f0af23e86554b673 files/3.5.5-gentoo.patch 4994
 RMD160 174046f97e44f90c6d658c170c60e2e033c1c7ad files/3.5.5-gentoo.patch 4994
 SHA256 674d85100f82eace5b5fae15f0b8d180e4cca9513d1f8848b4dd1a6141fef2cf files/3.5.5-gentoo.patch 4994
+AUX 3.5.6-gentoo.patch 4994 RMD160 3f2ce390674293ab236ce1c5f65f2d0098838129 SHA1 fe0d7c0e403b0b501ae427db27f852f790f21a7f SHA256 a87e18279c4480ca6d6516d853dd698f34f03691ad450c248854c20f18810084 size 4994
+MD5 46a266aae3cebff99520ce78e9877ec7 files/3.5.6-gentoo.patch 4994
+RMD160 3f2ce390674293ab236ce1c5f65f2d0098838129 files/3.5.6-gentoo.patch 4994
+SHA256 a87e18279c4480ca6d6516d853dd698f34f03691ad450c248854c20f18810084 files/3.5.6-gentoo.patch 4994
 DIST clsql-3.2.1.tar.gz 726430 size 726430
 DIST clsql-3.5.2.tar.gz 704510 size 704510
 DIST clsql-3.5.5.tar.gz 704920 RMD160 e7bf9b380af5ebc8116b9c6b2e2b8ec30a6dd0bc SHA256 67ca8607e5804af8ed032de3d74f58d109f692e8cabbb7bb2fe18610665b02dd size 704920
@@ -29,10 +33,10 @@ EBUILD cl-sql-3.5.6.ebuild 3623 RMD160 dbb799b8f29f549d468ceb8ded43649a1834d86b
 MD5 76da49223647f8978e56d089f5459ba6 cl-sql-3.5.6.ebuild 3623
 RMD160 dbb799b8f29f549d468ceb8ded43649a1834d86b cl-sql-3.5.6.ebuild 3623
 SHA256 791587a8d0a849844ff3a345b6926830143f2f35249358582035feb2795e9364 cl-sql-3.5.6.ebuild 3623
-MISC ChangeLog 4751 RMD160 edcd615be9fb55fd0b143670b9f4b4e1e565fbf9 SHA1 e70f2fc405ea2f1b643a6da70d73bae3a4b1f108 SHA256 03413cab3e49d7e5324459ed0d74f29d9bd454ddfa6300a856f17746c865e38e size 4751
-MD5 2c10edd8e0254052f5660c4344d8f5ee ChangeLog 4751
-RMD160 edcd615be9fb55fd0b143670b9f4b4e1e565fbf9 ChangeLog 4751
-SHA256 03413cab3e49d7e5324459ed0d74f29d9bd454ddfa6300a856f17746c865e38e ChangeLog 4751
+MISC ChangeLog 4851 RMD160 ed4446d0a8db2c7ca3f34c2155e9cc3cb74ee7c7 SHA1 246e92aa85274a3519d6acd052a8b05fe3fe4ed4 SHA256 1c9c5efd11234f14bc282388ea53087e72d1558c11f069b88abf6016c70468ba size 4851
+MD5 c2ea6d28412481f027e2d0f2ca16f4ba ChangeLog 4851
+RMD160 ed4446d0a8db2c7ca3f34c2155e9cc3cb74ee7c7 ChangeLog 4851
+SHA256 1c9c5efd11234f14bc282388ea53087e72d1558c11f069b88abf6016c70468ba ChangeLog 4851
 MISC metadata.xml 431 RMD160 16820289e6c9c23574e24040b056fbf24c45a8fc SHA1 a5c9ee0519ce848158b6075659d3334ff3c842a7 SHA256 a136cab31b2b84259c0f30259808f20a82912b1cbbba6499d88f9b64f16bcf8e size 431
 MD5 25a7993f47b4e9b1261a9956a8d61d90 metadata.xml 431
 RMD160 16820289e6c9c23574e24040b056fbf24c45a8fc metadata.xml 431
@@ -52,7 +56,7 @@ SHA256 af9256e6c7268a7c6f8a7a805bf6f69770a13d58761feebca6544422f7039a73 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVE/PyiNZaEAZA+ARAl+gAJ9mVwkKKeWfc0qimLw6K4rRjVVj0ACfchZ/
-wA72eemjynnWPosmyFmUGDI=
-=Uw0/
+iD8DBQFEVFECyiNZaEAZA+ARAv3+AJwIIHMkhN6B0y3U6xdHFFP5dndwzACeOyBA
+nkjuS5jYzN8Ct+OqlWzLHVg=
+=s7EY
 -----END PGP SIGNATURE-----
diff --git a/dev-lisp/cl-sql/files/3.5.6-gentoo.patch b/dev-lisp/cl-sql/files/3.5.6-gentoo.patch
new file mode 100644
index 000000000000..acc51208777a
--- /dev/null
+++ b/dev-lisp/cl-sql/files/3.5.6-gentoo.patch
@@ -0,0 +1,104 @@
+diff -ur clsql-3.5.6.orig/db-mysql/mysql-loader.lisp clsql-3.5.6/db-mysql/mysql-loader.lisp
+--- clsql-3.5.6.orig/db-mysql/mysql-loader.lisp	2005-07-05 19:51:52.000000000 -0500
++++ clsql-3.5.6/db-mysql/mysql-loader.lisp	2005-12-31 13:29:19.000000000 -0600
+@@ -18,17 +18,6 @@
+ 
+ (in-package #:mysql)
+ 
+-(defparameter *clsql-mysql-library-candidate-names* 
+-  (list #+(or 64bit x86-64) "clsql_mysql64"
+-        #+(or 64bit x86-64) (make-pathname :name "clsql_mysql64"
+-                                           :directory (pathname-directory *load-truename*))
+-        "clsql_mysql"
+-        (make-pathname :name "clsql_mysql"
+-                       :directory (pathname-directory *load-truename*))))
+-
+-(defvar *mysql-library-candidate-names*
+-  '("libmysqlclient" "libmysql"))
+-
+ (defvar *mysql-supporting-libraries* '("c")
+   "Used only by CMU. List of library flags needed to be passed to ld to
+ load the MySQL client library succesfully.  If this differs at your site,
+@@ -41,14 +30,17 @@
+   *mysql-library-loaded*)
+ 				      
+ (defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql)))
+-  (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
+-                                            :module "mysql" 
+-                                            :supporting-libraries *mysql-supporting-libraries*)
+-  (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
+-                                            :module "clsql-mysql" 
+-                                            :supporting-libraries *mysql-supporting-libraries*)
++  (uffi:load-foreign-library (make-pathname :directory '(:absolute "usr" "@LIBDIR@")
++					    :name "libmysqlclient"
++					    :type "so")
++			     :module "mysql"
++			     :supporting-libraries *mysql-supporting-libraries*)
++  (uffi:load-foreign-library (make-pathname :directory '(:absolute "usr" "@LIBDIR@" "clsql")
++					    :name "clsql_mysql"
++					    :type "so")
++			     :module "clsql-mysql"
++			     :supporting-libraries *mysql-supporting-libraries*)
+   (setq *mysql-library-loaded* t))
+ 
+ 
+ (clsql-sys:database-type-load-foreign :mysql)
+-
+diff -ur clsql-3.5.6.orig/uffi/clsql-uffi-loader.lisp clsql-3.5.6/uffi/clsql-uffi-loader.lisp
+--- clsql-3.5.6.orig/uffi/clsql-uffi-loader.lisp	2005-08-22 15:24:22.000000000 -0500
++++ clsql-3.5.6/uffi/clsql-uffi-loader.lisp	2005-12-31 13:28:56.000000000 -0600
+@@ -18,37 +18,6 @@
+ 
+ (in-package #:clsql-uffi)
+ 
+-(defun find-and-load-foreign-library (filenames &key module supporting-libraries (errorp t))
+-  (setq filenames (if (listp filenames) filenames (list filenames))
+-        filenames
+-          (append
+-           (loop for search-path in clsql:*foreign-library-search-paths*
+-                 nconc (loop for filename in filenames
+-                             collect (merge-pathnames filename search-path)))
+-           filenames))
+-  (or (loop for type in (uffi:foreign-library-types)
+-            for suffix = (make-pathname :type type)
+-            thereis (loop for filename in filenames
+-                          thereis (handler-case
+-                                    (uffi:load-foreign-library (merge-pathnames filename suffix)
+-                                                               :module module
+-                                                               :supporting-libraries supporting-libraries)
+-                                    (error (c)
+-                                      (warn "~A" c)
+-                                      nil))))
+-      (when errorp
+-	(error "Couldn't load foreign librar~@P ~{~S~^, ~}. (searched ~S)"
+-               (length filenames) filenames
+-	       'clsql:*foreign-library-search-paths*))))
+-
+-(defvar *clsql-uffi-library-filenames*
+-    (list #+(or 64bit x86-64) "clsql_uffi64"
+-          #+(or 64bit x86-64) (make-pathname :name "clsql_uffi64"
+-                                             :directory clsql-uffi-system::*library-file-dir*)
+-          "clsql_uffi"
+-          (make-pathname :name "clsql_uffi"
+-                         :directory clsql-uffi-system::*library-file-dir*)))
+-
+ (defvar *clsql-uffi-supporting-libraries* '("c")
+   "Used only by CMU. List of library flags needed to be passed to ld to
+ load the MySQL client library succesfully.  If this differs at your site,
+@@ -58,10 +27,12 @@
+   "T if foreign library was able to be loaded successfully")
+ 
+ (defun load-uffi-foreign-library ()
+-  (find-and-load-foreign-library *clsql-uffi-library-filenames*
+-                                 :module "clsql-uffi"
+-                                 :supporting-libraries
+-                                 *clsql-uffi-supporting-libraries*)
++  (uffi:load-foreign-library (make-pathname :directory '(:absolute "usr" "@LIBDIR@" "clsql")
++						:name "clsql_uffi"
++						:type "so")
++			     :module "clsql-uffi"
++			     :supporting-libraries
++			     *clsql-uffi-supporting-libraries*)
+   (setq *uffi-library-loaded* t))
+ 
+ (load-uffi-foreign-library)