Fire in the hole!

6 files changed, 150 insertions, 2 deletions

diff --git a/dev-lisp/cl-sql/ChangeLog b/dev-lisp/cl-sql/ChangeLog
index d276ebc4eb45..3fdbea4ce30a 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.4 2004/01/27 21:44:41 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/ChangeLog,v 1.5 2004/02/12 09:13:20 mkennedy Exp $
+
+*cl-sql-1.8.8 (12 Feb 2004)
+
+  12 Feb 2004; <mkennedy@gentoo.org> cl-sql-1.8.8.ebuild, metadata.xml,
+  files/1.8.8-no-shared-object-asdf-gentoo.patch:
+  Cleanup for eclass changes.
 
 *cl-sql-1.8.7 (27 Jan 2004)
 
diff --git a/dev-lisp/cl-sql/Manifest b/dev-lisp/cl-sql/Manifest
index 388e804a25a1..52316959c814 100644
--- a/dev-lisp/cl-sql/Manifest
+++ b/dev-lisp/cl-sql/Manifest
@@ -1,9 +1,11 @@
+MD5 67743fba47d790778290235cbb2f3c8d cl-sql-1.8.8.ebuild 3051
 MD5 4efc54044d3c0b58216c199b9a302154 cl-sql-1.6.4.ebuild 2382
 MD5 13b12f689cc5cb41283f6e97a40599e8 cl-sql-1.8.7.ebuild 3671
 MD5 6de9c4aeb9488503b48a4957e394a0fe ChangeLog 788
 MD5 4af7c3279e5a13021ca38b20fdc5768a cl-sql-1.7.6.ebuild 3178
-MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
+MD5 25a7993f47b4e9b1261a9956a8d61d90 metadata.xml 431
 MD5 a6466e9446f1925d56f3da03cde724ac files/digest-cl-sql-1.6.4 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
diff --git a/dev-lisp/cl-sql/cl-sql-1.8.8.ebuild b/dev-lisp/cl-sql/cl-sql-1.8.8.ebuild
new file mode 100644
index 000000000000..ab9a6a660bba
--- /dev/null
+++ b/dev-lisp/cl-sql/cl-sql-1.8.8.ebuild
@@ -0,0 +1,103 @@
+# 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.8.8.ebuild,v 1.1 2004/02/12 09:13:20 mkennedy Exp $
+
+inherit common-lisp
+
+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="postgres mysql"
+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 postgresql && CLPACKAGE="${CLPACKAGE} clsql-postgresql"
+use msql &&	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/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
new file mode 100644
index 000000000000..c5f2cd4a7ffa
--- /dev/null
+++ b/dev-lisp/cl-sql/files/1.8.8-no-shared-object-asdf-gentoo.patch
@@ -0,0 +1,30 @@
+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/digest-cl-sql-1.8.8 b/dev-lisp/cl-sql/files/digest-cl-sql-1.8.8
new file mode 100644
index 000000000000..3f20fec995d5
--- /dev/null
+++ b/dev-lisp/cl-sql/files/digest-cl-sql-1.8.8
@@ -0,0 +1 @@
+MD5 443ccec86bfa2b03377e2be427dd7b68 clsql-1.8.8.tar.gz 207222
diff --git a/dev-lisp/cl-sql/metadata.xml b/dev-lisp/cl-sql/metadata.xml
index f418045b09c8..543a7ccdcff1 100644
--- a/dev-lisp/cl-sql/metadata.xml
+++ b/dev-lisp/cl-sql/metadata.xml
@@ -2,4 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>common-lisp</herd>
+<longdescription>
+CLSQL is a SQL database for Common Lisp interface written by Kevin
+M. Rosenberg. It is based on Pierre R. Mai's excellent MaiSQL
+package. CLSQL uses the Universal Foreign Function Interface (UFFI)
+library for broad compatibility.
+</longdescription>
 </pkgmetadata>