11 files changed, 110 insertions, 287 deletions
diff --git a/dev-lisp/cl-sql/ChangeLog b/dev-lisp/cl-sql/ChangeLog
index adf157925ca0..db7a6ba30bcd 100644
--- a/dev-lisp/cl-sql/ChangeLog
+++ b/dev-lisp/cl-sql/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lisp/cl-sql
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/ChangeLog,v 1.14 2004/10/14 18:47:48 mkennedy Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/ChangeLog,v 1.15 2005/02/09 07:48:05 mkennedy Exp $
+
+*cl-sql-3.1.6 (09 Feb 2005)
+
+  09 Feb 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  -files/1.8.8-no-shared-object-asdf-gentoo.patch,
+  -files/2.10.14-no-shared-object-asdf-gentoo.patch, -cl-sql-1.8.8.ebuild,
+  -cl-sql-2.10.14.ebuild, +cl-sql-3.1.6.ebuild:
+  Removed old ebuilds; New upstream version; Corrected broken clsql-sqlite3
+  symlink
 
 *cl-sql-3.0.8 (14 Oct 2004)
 
diff --git a/dev-lisp/cl-sql/Manifest b/dev-lisp/cl-sql/Manifest
index 917e50baabb2..cb011769b271 100644
--- a/dev-lisp/cl-sql/Manifest
+++ b/dev-lisp/cl-sql/Manifest
@@ -1,11 +1,7 @@
-MD5 2bb9ad882378d8f569ad89a99784d58f cl-sql-2.10.14.ebuild 3924
 MD5 759e51d1e1631a5fb32d2ff44db20d73 cl-sql-3.0.8.ebuild 3130
-MD5 11e621e4efd05263dd2d371b8e122b90 cl-sql-1.8.8.ebuild 3053
+MD5 9b261e649d6057b3c8abe92383d418bb cl-sql-3.1.6.ebuild 3327
 MD5 9606f5a9e6c88ef4f0b10b18dad9ad0c ChangeLog 2512
 MD5 25a7993f47b4e9b1261a9956a8d61d90 metadata.xml 431
 MD5 15b280a630747dce360856b8a3de3ec2 files/digest-cl-sql-3.0.8 63
-MD5 c2d0f38c439f62aaa1532c43c2d5874f files/digest-cl-sql-2.10.14 65
+MD5 c8506011d2acf7d2d4385ffe6995e9b2 files/digest-cl-sql-3.1.6 63
 MD5 715690ca4ea8546d3ab95d332887d3c3 files/3.0.8-no-shared-object-asdf-gentoo.patch 1560
-MD5 d597ac23163a77e95913eb578f472834 files/digest-cl-sql-1.8.8 63
-MD5 c085e2590aaf031dbf0d529f01aa9404 files/1.8.8-no-shared-object-asdf-gentoo.patch 1386
-MD5 63fc4e1cb5deb413818b19b07c8d07d2 files/2.10.14-no-shared-object-asdf-gentoo.patch 1364
diff --git a/dev-lisp/cl-sql/cl-sql-1.8.8.ebuild b/dev-lisp/cl-sql/cl-sql-1.8.8.ebuild
deleted file mode 100644
index 1aa4a0088ac9..000000000000
--- a/dev-lisp/cl-sql/cl-sql-1.8.8.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/cl-sql-1.8.8.ebuild,v 1.4 2004/07/14 16:15:34 agriffis Exp $
-
-inherit common-lisp eutils
-
-DEB_PV=1
-
-DESCRIPTION="A multi-platform SQL interface for Common Lisp"
-HOMEPAGE="http://clsql.med-info.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="~x86"
-IUSE="mysql postgres"
-
-DEPEND="dev-lisp/common-lisp-controller
-	virtual/commonlisp
-	dev-lisp/cl-md5
-	dev-lisp/cl-uffi
-	postgres? ( dev-db/postgresql )
-	mysql? ( dev-db/mysql )"
-
-S=${WORKDIR}/clsql-${PV}
-
-CLPACKAGE='clsql-base clsql clsql-postgresql-socket clsql-uffi'
-
-use postgres && CLPACKAGE="${CLPACKAGE} clsql-postgresql"
-use mysql &&	CLPACKAGE="${CLPACKAGE} clsql-mysql"
-
-src_unpack() {
-	unpack ${A}
-	# prevent shared-objects from being rebuilt -- we really need
-	# portage help for reverse dependencies :(
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-no-shared-object-asdf-gentoo.patch
-}
-
-src_compile() {
-	make -C uffi
-	use mysql && make -C db-mysql
-	use postgres && make -C db-postgresql
-
-	# db-postgresql-socket doesn't depend on libraries, so we build
-	# support for it regardless of postgres USE flag
-}
-
-src_install() {
-	local clsrc=/usr/share/common-lisp/source
-	local clsys=/usr/share/common-lisp/systems
-
-	dodir $clsys
-
-	# cl-sql-base
-
-	insinto $clsrc/clsql-base/base ; doins base/*.lisp
-	insinto $clsrc/clsql-base ; doins clsql-base.asd
-	dosym $clsrc/clsql-base/clsql-base.asd $clsys/clsql-base.asd
-
-	# cl-sql-uffi
-
-	exeinto /usr/lib/clsql/
-	doexe uffi/uffi.so
-	insinto $clsrc/clsql-uffi/uffi ; doins uffi/*.lisp uffi/uffi.c
-	insinto $clsrc/clsql-uffi ; doins clsql-uffi.asd
-	dosym $clsrc/clsql-uffi/clsql-uffi.asd $clsys/clsql-uffi.asd
-
-	# cl-sql
-
-	insinto $clsrc/clsql/sql ; doins sql/*.lisp
-	insinto $clsrc/clsql ; doins clsql.asd
-	dosym $clsrc/clsql/clsql.asd $clsys/clsql.asd
-
-	# cl-sql-postgresql-socket
-
-	insinto $clsrc/clsql-postgresql-socket/db-postgresql-socket ; doins db-postgresql-socket/*.lisp
-	insinto $clsrc/clsql-postgresql-socket ; doins clsql-postgresql-socket.asd
-	dosym $clsrc/clsql-postgresql-socket/clsql-postgresql-socket.asd \
-		$clsys/clsql-postgresql-socket.asd
-
-	# cl-sql-postgresql (UFFI interface)
-
-	if use postgres; then
-		insinto $clsrc/clsql-postgresql/db-postgresql ; doins db-postgresql/*.lisp
-		insinto $clsrc/clsql-postgresql ; doins clsql-postgresql.asd
-		dosym $clsrc/clsql-postgresql/clsql-postgresql.asd $clsys/clsql-postgresql.asd
-	fi
-
-	# cl-sql-mysql (UFFI interface)
-
-	if use mysql; then
-		insinto $clsrc/clsql-mysql/db-mysql; doins db-mysql/*.lisp db-mysql/mysql.c
-		insinto $clsrc/clsql-mysql; doins clsql-mysql.asd
-		dosym $clsrc/clsql-mysql/clsql-mysql.asd $clsys/clsql-mysql.asd
-		exeinto /usr/lib/clsql
-		doexe db-mysql/mysql.so
-	fi
-
-	dodoc COPYING* ChangeLog INSTALL NEWS README TODO
-	tar xfz doc/html.tar.gz -C ${D}/usr/share/doc/${P}/
-	do-debian-credits
-}
diff --git a/dev-lisp/cl-sql/cl-sql-2.10.14.ebuild b/dev-lisp/cl-sql/cl-sql-2.10.14.ebuild
deleted file mode 100644
index 0ba1a53e6515..000000000000
--- a/dev-lisp/cl-sql/cl-sql-2.10.14.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/cl-sql-2.10.14.ebuild,v 1.4 2004/08/05 23:26:47 arj Exp $
-
-inherit common-lisp eutils
-
-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="~x86 ~ppc"
-IUSE="postgres mysql sqlite odbc"
-DEPEND="dev-lisp/common-lisp-controller
-	virtual/commonlisp
-	dev-lisp/cl-md5
-	dev-lisp/cl-uffi
-	postgres? ( dev-db/postgresql )
-	mysql? ( dev-db/mysql )
-	sqlite? ( =dev-db/sqlite-2* )
-	odbc? ( dev-db/unixODBC )"
-
-S=${WORKDIR}/clsql-${PV}
-
-# CLPACKAGE='clsql-base clsql clsql-uffi'
-# use postgresql && CLPACKAGE="${CLPACKAGE} clsql-postgresql clsql-postgresql-socket"
-# use mysql &&	CLPACKAGE="${CLPACKAGE} clsql-mysql"
-# use sqlite && CLPACKAGE="${CLPACKAGE} clsql-sqlite"
-
-# Have to do this in a static manner, it seems???
-
-CLPACKAGE='clsql-base clsql clsql-uffi clsql-postgresql clsql-postgresql-socket clsql-mysql clsql-sqlite clsql-odbc clsql-classic'
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}-no-shared-object-asdf-gentoo.patch
-}
-
-src_compile() {
-	make -C uffi
-	use mysql && make -C db-mysql
-	use postgres && make -C db-postgresql
-}
-
-src_install() {
-	dodir $CLSYSTEMROOT
-	dodir $CLSOURCEROOT
-	# cl-sql-base
-	insinto $CLSOURCEROOT/clsql-base/base; doins base/*.lisp
-	insinto $CLSOURCEROOT/clsql-base; doins clsql-base.asd
-	dosym $CLSOURCEROOT/clsql-base/clsql-base.asd $CLSYSTEMROOT/clsql-base.asd
-	# cl-sql
-	insinto $CLSOURCEROOT/clsql/sql; doins sql/*.lisp
-	insinto $CLSOURCEROOT/clsql; doins clsql.asd
-	dosym $CLSOURCEROOT/clsql/clsql.asd $CLSYSTEMROOT/clsql.asd
-	# cl-sql-classic
-	insinto $CLSOURCEROOT/clsql-classic/classic; doins classic/*.lisp
-	insinto $CLSOURCEROOT/clsql-classic; doins clsql-classic.asd
-	dosym $CLSOURCEROOT/clsql-classic/clsql-classic.asd $CLSYSTEMROOT/clsql-classic.asd
-	# cl-sql-uffi
-	exeinto /usr/lib/clsql
-	doexe uffi/uffi.so
-	insinto $CLSOURCEROOT/clsql-uffi/uffi; doins uffi/*.lisp uffi/uffi.c
-	insinto $CLSOURCEROOT/clsql-uffi; doins clsql-uffi.asd
-	dosym $CLSOURCEROOT/clsql-uffi/clsql-uffi.asd $CLSYSTEMROOT/clsql-uffi.asd
-
-	if use postgres; then
-		# cl-sql-postgresql-socket
-		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
-		# cl-sql-postgresql (UFFI interface)
-		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
-
-	if use mysql; then
-		# cl-sql-mysql
-		insinto $CLSOURCEROOT/clsql-mysql/db-mysql
-		doins db-mysql/*.lisp db-mysql/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
-	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 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
-
-	dodoc CONTRIBUTORS COPYING* ChangeLog INSTALL NEWS README TODO
-	tar xfz doc/html.tar.gz -C ${D}/usr/share/doc/${PF}/
-#	do-debian-credits
-}
diff --git a/dev-lisp/cl-sql/cl-sql-3.0.8.ebuild b/dev-lisp/cl-sql/cl-sql-3.0.8.ebuild
index 38a12ebd9fac..e1746b729b39 100644
--- a/dev-lisp/cl-sql/cl-sql-3.0.8.ebuild
+++ b/dev-lisp/cl-sql/cl-sql-3.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.0.8.ebuild,v 1.1 2004/10/14 18:47:48 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/cl-sql-3.0.8.ebuild,v 1.2 2005/02/09 07:48:05 mkennedy Exp $
 
 inherit common-lisp eutils
 
diff --git a/dev-lisp/cl-sql/cl-sql-3.1.6.ebuild b/dev-lisp/cl-sql/cl-sql-3.1.6.ebuild
new file mode 100644
index 000000000000..d2c5aed9e79c
--- /dev/null
+++ b/dev-lisp/cl-sql/cl-sql-3.1.6.ebuild
@@ -0,0 +1,94 @@
+# 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.6.ebuild,v 1.1 2005/02/09 07:48:05 mkennedy Exp $
+
+inherit common-lisp eutils
+
+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="~x86 ~ppc"
+IUSE="postgres mysql sqlite sqlite3 odbc"
+DEPEND="dev-lisp/common-lisp-controller
+	virtual/commonlisp
+	dev-lisp/cl-md5
+	dev-lisp/cl-uffi
+	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}
+
+# Have to do this in a static manner, it seems.
+
+CLPACKAGE='clsql clsql-uffi clsql-postgresql clsql-postgresql-socket clsql-mysql clsql-odbc'
+
+src_compile() {
+	make -C uffi || die
+	use mysql && make -C db-mysql
+}
+
+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/lib/clsql/; doexe uffi/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/lib/clsql/; doexe db-mysql/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/*
+}
diff --git a/dev-lisp/cl-sql/files/1.8.8-no-shared-object-asdf-gentoo.patch b/dev-lisp/cl-sql/files/1.8.8-no-shared-object-asdf-gentoo.patch
deleted file mode 100644
index c5f2cd4a7ffa..000000000000
--- a/dev-lisp/cl-sql/files/1.8.8-no-shared-object-asdf-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur cl-sql-1.8.7.original/clsql-mysql.asd cl-sql-1.8.7/clsql-mysql.asd
---- cl-sql-1.8.7.original/clsql-mysql.asd	2003-11-25 00:37:14.000000000 -0600
-+++ cl-sql-1.8.7/clsql-mysql.asd	2004-01-27 15:26:01.380148528 -0600
-@@ -65,9 +65,8 @@
-   :components
-   ((:module :db-mysql
- 	    :components
--	    ((:clsql-mysql-source-file "mysql")
--	     (:file "mysql-package")
--	     (:file "mysql-loader" :depends-on ("mysql-package" "mysql"))
-+	    ((:file "mysql-package")
-+	     (:file "mysql-loader" :depends-on ("mysql-package"))
- 	     (:file "mysql-api" :depends-on ("mysql-loader"))
- 	     (:file "mysql-sql" :depends-on ("mysql-api"))
- 	     (:file "mysql-usql" :depends-on ("mysql-sql")))))
-Only in cl-sql-1.8.7: clsql-mysql.asd~
-diff -ur cl-sql-1.8.7.original/clsql-uffi.asd cl-sql-1.8.7/clsql-uffi.asd
---- cl-sql-1.8.7.original/clsql-uffi.asd	2003-11-12 23:58:22.000000000 -0600
-+++ cl-sql-1.8.7/clsql-uffi.asd	2004-01-27 15:25:47.842206608 -0600
-@@ -75,7 +75,6 @@
-   :components
-   ((:module :uffi
- 	    :components
--	    ((:clsql-uffi-source-file "uffi")
--	     (:file "clsql-uffi-package")
--	     (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package" "uffi"))
-+	    ((:file "clsql-uffi-package")
-+	     (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
- 	     (:file "clsql-uffi" :depends-on ("clsql-uffi-loader"))))))
-Only in cl-sql-1.8.7: clsql-uffi.asd~
diff --git a/dev-lisp/cl-sql/files/2.10.14-no-shared-object-asdf-gentoo.patch b/dev-lisp/cl-sql/files/2.10.14-no-shared-object-asdf-gentoo.patch
deleted file mode 100644
index e59878e8176a..000000000000
--- a/dev-lisp/cl-sql/files/2.10.14-no-shared-object-asdf-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur clsql-2.10.14.orig/clsql-mysql.asd clsql-2.10.14/clsql-mysql.asd
---- clsql-2.10.14.orig/clsql-mysql.asd	2004-04-21 16:49:20.000000000 -0500
-+++ clsql-2.10.14/clsql-mysql.asd	2004-05-02 02:11:11.882864680 -0500
-@@ -86,8 +86,7 @@
-   ((:module :db-mysql
- 	    :components
- 	    ((:file "mysql-package")
--	     (:clsql-mysql-source-file "mysql" :depends-on ("mysql-package"))
--	     (:file "mysql-loader" :depends-on ("mysql-package" "mysql"))
-+	     (:file "mysql-loader" :depends-on ("mysql-package"))
- 	     (:file "mysql-client-info" :depends-on ("mysql-loader"))
- 	     (:file "mysql-api" :depends-on ("mysql-client-info"))
- 	     (:file "mysql-sql" :depends-on ("mysql-api"))))))
-Only in clsql-2.10.14: clsql-mysql.asd~
-diff -ur clsql-2.10.14.orig/clsql-uffi.asd clsql-2.10.14/clsql-uffi.asd
---- clsql-2.10.14.orig/clsql-uffi.asd	2004-04-21 16:49:21.000000000 -0500
-+++ clsql-2.10.14/clsql-uffi.asd	2004-05-02 02:11:41.968291000 -0500
-@@ -91,6 +91,5 @@
-   ((:module :uffi
- 	    :components
- 	    ((:file "clsql-uffi-package")
--	     (:clsql-uffi-source-file "uffi" :depends-on ("clsql-uffi-package"))
--	     (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package" "uffi"))
-+	     (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
- 	     (:file "clsql-uffi" :depends-on ("clsql-uffi-loader"))))))
-Only in clsql-2.10.14: clsql-uffi.asd~
diff --git a/dev-lisp/cl-sql/files/digest-cl-sql-1.8.8 b/dev-lisp/cl-sql/files/digest-cl-sql-1.8.8
deleted file mode 100644
index 3f20fec995d5..000000000000
--- a/dev-lisp/cl-sql/files/digest-cl-sql-1.8.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 443ccec86bfa2b03377e2be427dd7b68 clsql-1.8.8.tar.gz 207222
diff --git a/dev-lisp/cl-sql/files/digest-cl-sql-2.10.14 b/dev-lisp/cl-sql/files/digest-cl-sql-2.10.14
deleted file mode 100644
index 764541a249cf..000000000000
--- a/dev-lisp/cl-sql/files/digest-cl-sql-2.10.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49eed6e81ccad902a8e8a4f2e4bbd4e8 clsql-2.10.14.tar.gz 375359
diff --git a/dev-lisp/cl-sql/files/digest-cl-sql-3.1.6 b/dev-lisp/cl-sql/files/digest-cl-sql-3.1.6
new file mode 100644
index 000000000000..4c4e50bcefdd
--- /dev/null
+++ b/dev-lisp/cl-sql/files/digest-cl-sql-3.1.6
@@ -0,0 +1 @@
+MD5 4e34642557c08fae813e25fa5398cc0e clsql-3.1.6.tar.gz 421613