*** empty log message ***

7 files changed, 171 insertions, 13 deletions

diff --git a/dev-lisp/cl-sql/ChangeLog b/dev-lisp/cl-sql/ChangeLog
index 3fdbea4ce30a..1e6b0b28c082 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/ChangeLog,v 1.5 2004/02/12 09:13:20 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/ChangeLog,v 1.6 2004/04/21 16:47:06 mkennedy Exp $
+
+*cl-sql-2.8.2 (21 Apr 2004)
+
+  21 Apr 2004; <mkennedy@gentoo.org>
+  +files/2.8.2-no-shared-object-asdf-gentoo.patch, +cl-sql-2.8.2.ebuild:
+  New upstream version
 
 *cl-sql-1.8.8 (12 Feb 2004)
 
diff --git a/dev-lisp/cl-sql/Manifest b/dev-lisp/cl-sql/Manifest
index be3bf071fccd..818341b8a675 100644
--- a/dev-lisp/cl-sql/Manifest
+++ b/dev-lisp/cl-sql/Manifest
@@ -1,12 +1,15 @@
+MD5 84f61f801f801ec2d9f676269f700cee cl-sql-2.8.2.ebuild 2838
+MD5 ca6f906341e852bd00af230d5d5dffc7 cl-sql-2.8.2.ebuild~ 3056
+MD5 4af7c3279e5a13021ca38b20fdc5768a cl-sql-1.7.6.ebuild 3178
+MD5 13b12f689cc5cb41283f6e97a40599e8 cl-sql-1.8.7.ebuild 3671
+MD5 ca6f906341e852bd00af230d5d5dffc7 cl-sql-1.8.8.ebuild 3056
+MD5 f562574b0df6e943adba6bc0d7fcf959 ChangeLog 970
+MD5 4efc54044d3c0b58216c199b9a302154 cl-sql-1.6.4.ebuild 2382
+MD5 25a7993f47b4e9b1261a9956a8d61d90 metadata.xml 431
+MD5 de2b9641b677108d8e00952e4a7a2624 files/digest-cl-sql-2.8.2 63
+MD5 c085e2590aaf031dbf0d529f01aa9404 files/1.8.7-no-shared-object-asdf-gentoo.patch 1386
 MD5 a6466e9446f1925d56f3da03cde724ac files/digest-cl-sql-1.6.4 63
+MD5 d597ac23163a77e95913eb578f472834 files/digest-cl-sql-1.8.8 63
 MD5 f1d552471358205bfd6e93fea6094ae1 files/digest-cl-sql-1.7.6 134
 MD5 c3ca6ba1399bc5ec660033d6695ee667 files/digest-cl-sql-1.8.7 134
-MD5 d597ac23163a77e95913eb578f472834 files/digest-cl-sql-1.8.8 63
-MD5 c085e2590aaf031dbf0d529f01aa9404 files/1.8.7-no-shared-object-asdf-gentoo.patch 1386
 MD5 c085e2590aaf031dbf0d529f01aa9404 files/1.8.8-no-shared-object-asdf-gentoo.patch 1386
-MD5 ca6f906341e852bd00af230d5d5dffc7 cl-sql-1.8.8.ebuild 3056
-MD5 4efc54044d3c0b58216c199b9a302154 cl-sql-1.6.4.ebuild 2382
-MD5 13b12f689cc5cb41283f6e97a40599e8 cl-sql-1.8.7.ebuild 3671
-MD5 f562574b0df6e943adba6bc0d7fcf959 ChangeLog 970
-MD5 4af7c3279e5a13021ca38b20fdc5768a cl-sql-1.7.6.ebuild 3178
-MD5 25a7993f47b4e9b1261a9956a8d61d90 metadata.xml 431
diff --git a/dev-lisp/cl-sql/cl-sql-1.6.4.ebuild b/dev-lisp/cl-sql/cl-sql-1.6.4.ebuild
index f2322027c10e..0753d36ca4cf 100644
--- a/dev-lisp/cl-sql/cl-sql-1.6.4.ebuild
+++ b/dev-lisp/cl-sql/cl-sql-1.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/cl-sql-1.6.4.ebuild,v 1.3 2003/09/11 01:10:52 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/cl-sql-1.6.4.ebuild,v 1.4 2004/04/21 16:47:06 mkennedy Exp $
 
 inherit common-lisp
 
diff --git a/dev-lisp/cl-sql/cl-sql-1.7.6.ebuild b/dev-lisp/cl-sql/cl-sql-1.7.6.ebuild
index 7418f0710e1c..0495d81aa5c6 100644
--- a/dev-lisp/cl-sql/cl-sql-1.7.6.ebuild
+++ b/dev-lisp/cl-sql/cl-sql-1.7.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/cl-sql-1.7.6.ebuild,v 1.2 2003/10/17 16:51:14 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/cl-sql-1.7.6.ebuild,v 1.3 2004/04/21 16:47:06 mkennedy Exp $
 
 inherit common-lisp
 
diff --git a/dev-lisp/cl-sql/cl-sql-2.8.2.ebuild b/dev-lisp/cl-sql/cl-sql-2.8.2.ebuild
new file mode 100644
index 000000000000..b744e0f20b40
--- /dev/null
+++ b/dev-lisp/cl-sql/cl-sql-2.8.2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/cl-sql-2.8.2.ebuild,v 1.1 2004/04/21 16:47:06 mkennedy Exp $
+
+inherit common-lisp
+
+DEB_PV=1
+
+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"
+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 )
+	odbc? ( dev-db/unixODBC )"
+
+S=${WORKDIR}/clsql-${PV}
+
+# CLPACKAGE='clsql-base clsql clsql-uffi'
+# use postgresql && CLPACKAGE="${CLPACKAGE} clsql-postgresql clsql-postgresql-socket"
+# use msql &&	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/files/2.8.2-no-shared-object-asdf-gentoo.patch b/dev-lisp/cl-sql/files/2.8.2-no-shared-object-asdf-gentoo.patch
new file mode 100644
index 000000000000..fc8fc1f0164c
--- /dev/null
+++ b/dev-lisp/cl-sql/files/2.8.2-no-shared-object-asdf-gentoo.patch
@@ -0,0 +1,30 @@
+diff -ur clsql-2.8.2.orig/clsql-mysql.asd clsql-2.8.2/clsql-mysql.asd
+--- clsql-2.8.2.orig/clsql-mysql.asd	2004-04-19 14:01:40.000000000 -0500
++++ clsql-2.8.2/clsql-mysql.asd	2004-04-20 14:37:13.541134965 -0500
+@@ -81,9 +81,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-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.8.2: clsql-mysql.asd~
+diff -ur clsql-2.8.2.orig/clsql-uffi.asd clsql-2.8.2/clsql-uffi.asd
+--- clsql-2.8.2.orig/clsql-uffi.asd	2004-04-19 14:01:41.000000000 -0500
++++ clsql-2.8.2/clsql-uffi.asd	2004-04-20 14:39:25.033483874 -0500
+@@ -86,7 +86,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 clsql-2.8.2: clsql-uffi.asd~
diff --git a/dev-lisp/cl-sql/files/digest-cl-sql-2.8.2 b/dev-lisp/cl-sql/files/digest-cl-sql-2.8.2
new file mode 100644
index 000000000000..36bd96525f7c
--- /dev/null
+++ b/dev-lisp/cl-sql/files/digest-cl-sql-2.8.2
@@ -0,0 +1 @@
+MD5 ea9ca7c2aa454f02ab1c01fc49496a4b clsql-2.8.2.tar.gz 359051