New upstream version; Remove old ebuilds; Resolves Bug #104945 (multilib fixes).

(Portage version: 2.1_pre2)

7 files changed, 136 insertions, 16 deletions

diff --git a/dev-lisp/cl-sql/ChangeLog b/dev-lisp/cl-sql/ChangeLog
index 3c3e72b037e7..4a6808e98f77 100644
--- a/dev-lisp/cl-sql/ChangeLog
+++ b/dev-lisp/cl-sql/ChangeLog
@@ -1,6 +1,14 @@
 # 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.22 2005/12/26 19:00:36 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/ChangeLog,v 1.23 2005/12/29 23:33:36 mkennedy Exp $
+
+*cl-sql-3.5.2 (29 Dec 2005)
+
+  29 Dec 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/3.5.2-gentoo.patch, -cl-sql-3.1.10-r1.ebuild, cl-sql-3.2.1.ebuild,
+  +cl-sql-3.5.2.ebuild:
+  New upstream version; Remove old ebuilds; Resolves Bug #104945 (multilib
+  fixes).
 
   26 Dec 2005; Simon Stelling <blubb@gentoo.org> cl-sql-3.2.1.ebuild:
   fix multilib-strict wise
diff --git a/dev-lisp/cl-sql/Manifest b/dev-lisp/cl-sql/Manifest
index e43e3e8cfede..c1c30aeb0b44 100644
--- a/dev-lisp/cl-sql/Manifest
+++ b/dev-lisp/cl-sql/Manifest
@@ -1,6 +1,7 @@
 MD5 551c1104281591124cbc726c52646ff3 ChangeLog 4071
-MD5 ff064f760141928cbcc89e41f4d16e2d cl-sql-3.1.10-r1.ebuild 3387
-MD5 7d118e207728d2a6c292a723ad5126ef cl-sql-3.2.1.ebuild 3423
-MD5 25a7993f47b4e9b1261a9956a8d61d90 metadata.xml 431
-MD5 6f0cca850627210bc6677fc498ec5235 files/digest-cl-sql-3.1.10-r1 64
+MD5 f604ab616e069f002be4b72af7b9d130 cl-sql-3.2.1.ebuild 3429
+MD5 b88e68b0f423cc1b66577cc22cc6af7f cl-sql-3.5.2.ebuild 3623
+MD5 cb900f5b6b8b3eefc4051914f7b893e3 files/3.5.2-gentoo.patch 4948
 MD5 3cba61937a7bfeb858a4f8fcfede7989 files/digest-cl-sql-3.2.1 63
+MD5 6b9586a907723dd600daf91000ed6184 files/digest-cl-sql-3.5.2 63
+MD5 25a7993f47b4e9b1261a9956a8d61d90 metadata.xml 431
diff --git a/dev-lisp/cl-sql/cl-sql-3.2.1.ebuild b/dev-lisp/cl-sql/cl-sql-3.2.1.ebuild
index c2529f99d41a..d40099082792 100644
--- a/dev-lisp/cl-sql/cl-sql-3.2.1.ebuild
+++ b/dev-lisp/cl-sql/cl-sql-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.2.1.ebuild,v 1.3 2005/12/26 19:00:36 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/cl-sql-3.2.1.ebuild,v 1.4 2005/12/29 23:33:36 mkennedy Exp $
 
 inherit common-lisp eutils multilib
 
@@ -64,7 +64,7 @@ src_install() {
 		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/mysql.so
+		exeinto /usr/$(get_libdir)/clsql/; doexe db-mysql/clsql_mysql.so
 	fi
 
 	if use odbc; then
diff --git a/dev-lisp/cl-sql/cl-sql-3.1.10-r1.ebuild b/dev-lisp/cl-sql/cl-sql-3.5.2.ebuild
index e96107e26f79..ad53c39f1e6a 100644
--- a/dev-lisp/cl-sql/cl-sql-3.1.10-r1.ebuild
+++ b/dev-lisp/cl-sql/cl-sql-3.5.2.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-lisp/cl-sql/cl-sql-3.1.10-r1.ebuild,v 1.2 2005/05/24 18:48:35 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/cl-sql-3.5.2.ebuild,v 1.1 2005/12/29 23:33:36 mkennedy Exp $
 
-inherit common-lisp eutils
+inherit common-lisp eutils multilib
 
 DESCRIPTION="A multi-platform SQL interface for Common Lisp"
 HOMEPAGE="http://clsql.b9.com/
@@ -16,7 +16,7 @@ IUSE="postgres mysql sqlite sqlite3 odbc"
 DEPEND="dev-lisp/common-lisp-controller
 	virtual/commonlisp
 	dev-lisp/cl-md5
-	dev-lisp/cl-uffi
+	>=dev-lisp/cl-uffi-1.5.7
 	postgres? ( dev-db/postgresql )
 	mysql? ( dev-db/mysql )
 	sqlite? ( =dev-db/sqlite-2* )
@@ -25,13 +25,18 @@ DEPEND="dev-lisp/common-lisp-controller
 
 S=${WORKDIR}/clsql-${PV}
 
-# Have to do this in a static manner, it seems.
-
 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
-	use mysql && make -C db-mysql
+	if use mysql; then
+		make -C db-mysql || die
+	fi
 }
 
 src_install() {
@@ -45,7 +50,7 @@ src_install() {
 	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/lib/clsql/; doexe uffi/uffi.so
+	exeinto /usr/$(get_libdir)/clsql/; doexe uffi/clsql_uffi.so
 
 	if use postgres; then
 		insinto $CLSOURCEROOT/clsql-postgresql/db-postgresql; doins db-postgresql/*.lisp
@@ -64,7 +69,7 @@ src_install() {
 		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/lib/clsql/; doexe db-mysql/mysql.so
+		exeinto /usr/$(get_libdir)/clsql/; doexe db-mysql/clsql_mysql.so
 	fi
 
 	if use odbc; then
@@ -91,4 +96,8 @@ src_install() {
 	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.2-gentoo.patch b/dev-lisp/cl-sql/files/3.5.2-gentoo.patch
new file mode 100644
index 000000000000..89294125bfb5
--- /dev/null
+++ b/dev-lisp/cl-sql/files/3.5.2-gentoo.patch
@@ -0,0 +1,102 @@
+diff -ur clsql-3.5.2.orig/db-mysql/mysql-loader.lisp clsql-3.5.2/db-mysql/mysql-loader.lisp
+--- clsql-3.5.2.orig/db-mysql/mysql-loader.lisp	2005-07-05 19:51:52.000000000 -0500
++++ clsql-3.5.2/db-mysql/mysql-loader.lisp	2005-12-29 16:34:32.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,12 +30,16 @@
+   *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.so"
++					    :type "so")
++			     :module "clsql-mysql"
++			     :supporting-libraries *mysql-supporting-libraries*)
+   (setq *mysql-library-loaded* t))
+ 
+ 
+diff -ur clsql-3.5.2.orig/uffi/clsql-uffi-loader.lisp clsql-3.5.2/uffi/clsql-uffi-loader.lisp
+--- clsql-3.5.2.orig/uffi/clsql-uffi-loader.lisp	2005-08-22 15:24:22.000000000 -0500
++++ clsql-3.5.2/uffi/clsql-uffi-loader.lisp	2005-12-29 16:22:44.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.1.10-r1 b/dev-lisp/cl-sql/files/digest-cl-sql-3.1.10-r1
deleted file mode 100644
index f131b35996a0..000000000000
--- a/dev-lisp/cl-sql/files/digest-cl-sql-3.1.10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 594801ff367ef4637efbd1d19de86c78 clsql-3.1.10.tar.gz 695899
diff --git a/dev-lisp/cl-sql/files/digest-cl-sql-3.5.2 b/dev-lisp/cl-sql/files/digest-cl-sql-3.5.2
new file mode 100644
index 000000000000..4013a56c86d2
--- /dev/null
+++ b/dev-lisp/cl-sql/files/digest-cl-sql-3.5.2
@@ -0,0 +1 @@
+MD5 a032f99b8fa8d9c6aaeefd536b4bd20d clsql-3.5.2.tar.gz 704510