New upstream version.

(Portage version: 2.1_pre6-r3)

5 files changed, 241 insertions, 12 deletions

diff --git a/dev-lisp/cl-sql/ChangeLog b/dev-lisp/cl-sql/ChangeLog
index 91464707146b..7d286ae79edd 100644
--- a/dev-lisp/cl-sql/ChangeLog
+++ b/dev-lisp/cl-sql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/cl-sql
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/ChangeLog,v 1.24 2005/12/31 19:48:15 mkennedy Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/ChangeLog,v 1.25 2006/03/17 08:37:31 mkennedy Exp $
+
+*cl-sql-3.5.5 (17 Mar 2006)
+
+  17 Mar 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/3.5.5-gentoo.patch, +cl-sql-3.5.5.ebuild:
+  New upstream version.
 
   31 Dec 2005; Matthew Kennedy <mkennedy@gentoo.org>
   files/3.5.2-gentoo.patch:
diff --git a/dev-lisp/cl-sql/Manifest b/dev-lisp/cl-sql/Manifest
index 2348a49ccf98..99f0ff4d5693 100644
--- a/dev-lisp/cl-sql/Manifest
+++ b/dev-lisp/cl-sql/Manifest
@@ -1,17 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f78859108832f7541ade733e0bb36f6c ChangeLog 4464
+RMD160 7b6e80f96060c1f5812e122444bf59a137840eb9 ChangeLog 4464
+SHA256 a8366af57628967b00b4e7e23a7641e9872ef8fc539ce15b6f0655c2b6a0813b ChangeLog 4464
 MD5 7fd94c2ad4c4d306b0983a349aeadd3d cl-sql-3.2.1.ebuild 3432
+RMD160 74dc2f3d0b8e7657584d1d13b24864f6da7c9cfb cl-sql-3.2.1.ebuild 3432
+SHA256 bdd1f2253e06008dadf7c46a0fb15f53b378259b37b45df5f0c6a7ad34a1e76f cl-sql-3.2.1.ebuild 3432
 MD5 e3a1c06893a5c99d5eba302a883b288f cl-sql-3.5.2.ebuild 3623
+RMD160 8cca52246ccc0600a74be54bbd513e8c7d913958 cl-sql-3.5.2.ebuild 3623
+SHA256 f871acaaa831bbea2b1535ebe6186658e0f80a7e6d8074deca7c42fff9c46c11 cl-sql-3.5.2.ebuild 3623
+MD5 e3a1c06893a5c99d5eba302a883b288f cl-sql-3.5.5.ebuild 3623
+RMD160 8cca52246ccc0600a74be54bbd513e8c7d913958 cl-sql-3.5.5.ebuild 3623
+SHA256 f871acaaa831bbea2b1535ebe6186658e0f80a7e6d8074deca7c42fff9c46c11 cl-sql-3.5.5.ebuild 3623
 MD5 bfcc907523913bfffcd2cf4f0cdb95e1 files/3.5.2-gentoo.patch 4994
+RMD160 57d945be8405f949f18c531d75542f894df82709 files/3.5.2-gentoo.patch 4994
+SHA256 4789f408ef6250e18f4bf6731d1e1710a60d207c88dfb94fe4591d8d48ad2809 files/3.5.2-gentoo.patch 4994
+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
 MD5 3cba61937a7bfeb858a4f8fcfede7989 files/digest-cl-sql-3.2.1 63
+RMD160 78a3c85ab7f7bc6325ac4c4aaac8e48bf7d83f13 files/digest-cl-sql-3.2.1 63
+SHA256 312c56985bf05760195b444504a7927ba9c5ee3111351015ecf2aa8e0bbd4dfc files/digest-cl-sql-3.2.1 63
 MD5 6b9586a907723dd600daf91000ed6184 files/digest-cl-sql-3.5.2 63
+RMD160 4fd0640fb4a5edf0176b0f52f41ec46317840604 files/digest-cl-sql-3.5.2 63
+SHA256 0f90223dc7b6eee53ce3b9637c47a030aaf6806b20fe8422dd7efd660a00964e files/digest-cl-sql-3.5.2 63
+MD5 18105bc9a4ee186706ba7648d2209bfc files/digest-cl-sql-3.5.5 235
+RMD160 ac40877c54256087cd511407c442c038287bd877 files/digest-cl-sql-3.5.5 235
+SHA256 702efd4549592f1289306e700bfc44240a116ba768bcedde9d757dbd0db924cd files/digest-cl-sql-3.5.5 235
 MD5 25a7993f47b4e9b1261a9956a8d61d90 metadata.xml 431
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDtuD7yiNZaEAZA+ARAicsAJ4wO3K9u5V0MnBo2W2cafDdQD+QmACeJ16N
-i5h9l+bKR5888XI01IDC6GE=
-=xwdG
------END PGP SIGNATURE-----
+RMD160 16820289e6c9c23574e24040b056fbf24c45a8fc metadata.xml 431
+SHA256 a136cab31b2b84259c0f30259808f20a82912b1cbbba6499d88f9b64f16bcf8e metadata.xml 431
diff --git a/dev-lisp/cl-sql/cl-sql-3.5.5.ebuild b/dev-lisp/cl-sql/cl-sql-3.5.5.ebuild
new file mode 100644
index 000000000000..63479870de21
--- /dev/null
+++ b/dev-lisp/cl-sql/cl-sql-3.5.5.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/cl-sql-3.5.5.ebuild,v 1.1 2006/03/17 08:37:31 mkennedy Exp $
+
+inherit common-lisp eutils multilib
+
+DESCRIPTION="A multi-platform SQL interface for Common Lisp"
+HOMEPAGE="http://clsql.b9.com/
+	http://packages.debian.org/unstable/devel/cl-sql.html
+	http://www.cliki.net/CLSQL"
+SRC_URI="http://files.b9.com/clsql/clsql-${PV}.tar.gz"
+LICENSE="LLGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="postgres mysql sqlite sqlite3 odbc"
+DEPEND="dev-lisp/common-lisp-controller
+	virtual/commonlisp
+	dev-lisp/cl-md5
+	>=dev-lisp/cl-uffi-1.5.7
+	postgres? ( dev-db/postgresql )
+	mysql? ( dev-db/mysql )
+	sqlite? ( =dev-db/sqlite-2* )
+	sqlite3? ( =dev-db/sqlite-3* )
+	odbc? ( dev-db/unixODBC )"
+
+S=${WORKDIR}/clsql-${PV}
+
+CLPACKAGE='clsql clsql-uffi clsql-postgresql clsql-postgresql-socket clsql-mysql clsql-odbc clsql-sqlite clsql-sqlite3'
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-gentoo.patch
+}
+
+src_compile() {
+	make -C uffi || die
+	if use mysql; then
+		make -C db-mysql || die
+	fi
+}
+
+src_install() {
+	dodir $CLSYSTEMROOT
+	dodir $CLSOURCEROOT
+
+	insinto $CLSOURCEROOT/clsql/sql; doins sql/*.lisp
+	insinto $CLSOURCEROOT/clsql; doins clsql.asd
+	dosym $CLSOURCEROOT/clsql/clsql.asd $CLSYSTEMROOT/clsql.asd
+
+	insinto $CLSOURCEROOT/clsql-uffi/uffi; doins uffi/*.lisp
+	insinto $CLSOURCEROOT/clsql-uffi; doins clsql-uffi.asd
+	dosym $CLSOURCEROOT/clsql-uffi/clsql-uffi.asd $CLSYSTEMROOT/clsql-uffi.asd
+	exeinto /usr/$(get_libdir)/clsql/; doexe uffi/clsql_uffi.so
+
+	if use postgres; then
+		insinto $CLSOURCEROOT/clsql-postgresql/db-postgresql; doins db-postgresql/*.lisp
+		insinto $CLSOURCEROOT/clsql-postgresql; doins clsql-postgresql.asd
+		dosym $CLSOURCEROOT/clsql-postgresql/clsql-postgresql.asd $CLSYSTEMROOT/clsql-postgresql.asd
+	fi
+
+	insinto $CLSOURCEROOT/clsql-postgresql-socket/db-postgresql-socket
+	doins db-postgresql-socket/*.lisp
+	insinto $CLSOURCEROOT/clsql-postgresql-socket
+	doins clsql-postgresql-socket.asd
+	dosym $CLSOURCEROOT/clsql-postgresql-socket/clsql-postgresql-socket.asd \
+		$CLSYSTEMROOT/clsql-postgresql-socket.asd
+
+	if use mysql; then
+		insinto $CLSOURCEROOT/clsql-mysql/db-mysql; doins db-mysql/*.lisp db-mysql/*.c
+		insinto $CLSOURCEROOT/clsql-mysql; doins clsql-mysql.asd
+		dosym $CLSOURCEROOT/clsql-mysql/clsql-mysql.asd $CLSYSTEMROOT/clsql-mysql.asd
+		exeinto /usr/$(get_libdir)/clsql/; doexe db-mysql/clsql_mysql.so
+	fi
+
+	if use odbc; then
+		insinto $CLSOURCEROOT/clsql-odbc/db-odbc; doins db-odbc/*.lisp
+		insinto $CLSOURCEROOT/clsql-odbc; doins clsql-odbc.asd
+		dosym $CLSOURCEROOT/clsql-odbc/clsql-odbc.asd $CLSYSTEMROOT/clsql-odbc.asd
+	fi
+
+	if use sqlite; then
+		insinto $CLSOURCEROOT/clsql-sqlite/db-sqlite; doins db-sqlite/*.lisp
+		insinto $CLSOURCEROOT/clsql-sqlite; doins clsql-sqlite.asd
+		dosym $CLSOURCEROOT/clsql-sqlite/clsql-sqlite.asd $CLSYSTEMROOT/clsql-sqlite.asd
+	fi
+
+	if use sqlite3; then
+		insinto $CLSOURCEROOT/clsql-sqlite3/db-sqlite3; doins db-sqlite3/*.lisp
+		insinto $CLSOURCEROOT/clsql-sqlite3; doins clsql-sqlite3.asd
+		dosym $CLSOURCEROOT/clsql-sqlite3/clsql-sqlite3.asd $CLSYSTEMROOT/clsql-sqlite3.asd
+	fi
+
+	dodoc BUGS CONTRIBUTORS COPYING* ChangeLog INSTALL LATEST-TEST-RESULTS NEWS README TODO
+	dodoc doc/clsql.pdf
+	tar xfz doc/html.tar.gz -C ${D}/usr/share/doc/${PF}/
+	do-debian-credits
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/*
+
+	dosed "s,@LIBDIR@,$(get_libdir),g" \
+		$CLSOURCEROOT/clsql-uffi/uffi/clsql-uffi-loader.lisp \
+		$CLSOURCEROOT/clsql-mysql/db-mysql/mysql-loader.lisp
+}
diff --git a/dev-lisp/cl-sql/files/3.5.5-gentoo.patch b/dev-lisp/cl-sql/files/3.5.5-gentoo.patch
new file mode 100644
index 000000000000..c6fa8dc8fefe
--- /dev/null
+++ b/dev-lisp/cl-sql/files/3.5.5-gentoo.patch
@@ -0,0 +1,104 @@
+diff -ur clsql-3.5.5.orig/db-mysql/mysql-loader.lisp clsql-3.5.5/db-mysql/mysql-loader.lisp
+--- clsql-3.5.5.orig/db-mysql/mysql-loader.lisp	2005-07-05 19:51:52.000000000 -0500
++++ clsql-3.5.5/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.5.orig/uffi/clsql-uffi-loader.lisp clsql-3.5.5/uffi/clsql-uffi-loader.lisp
+--- clsql-3.5.5.orig/uffi/clsql-uffi-loader.lisp	2005-08-22 15:24:22.000000000 -0500
++++ clsql-3.5.5/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)
diff --git a/dev-lisp/cl-sql/files/digest-cl-sql-3.5.5 b/dev-lisp/cl-sql/files/digest-cl-sql-3.5.5
new file mode 100644
index 000000000000..0e8f18d3e859
--- /dev/null
+++ b/dev-lisp/cl-sql/files/digest-cl-sql-3.5.5
@@ -0,0 +1,3 @@
+MD5 4864bec72e08b1787e983ef704f5e92a clsql-3.5.5.tar.gz 704920
+RMD160 e7bf9b380af5ebc8116b9c6b2e2b8ec30a6dd0bc clsql-3.5.5.tar.gz 704920
+SHA256 67ca8607e5804af8ed032de3d74f58d109f692e8cabbb7bb2fe18610665b02dd clsql-3.5.5.tar.gz 704920