*** empty log message ***

5 files changed, 172 insertions, 6 deletions

diff --git a/dev-lisp/cl-sql/ChangeLog b/dev-lisp/cl-sql/ChangeLog
index 8c10fcf09448..d276ebc4eb45 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/ChangeLog,v 1.3 2003/10/17 16:51:14 mkennedy Exp $
+# 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 $
+
+*cl-sql-1.8.7 (27 Jan 2004)
+
+  27 Jan 2004; <mkennedy@gentoo.org> cl-sql-1.8.7.ebuild,
+  files/1.8.7-no-shared-object-asdf-gentoo.patch:
+  New upstream; Refactored ebuild; Don't build share-objects with ASDF
 
   17 Oct 2003; Matthew Kennedy <mkennedy@gentoo.org> cl-sql-1.7.6.ebuild,
   metadata.xml:
diff --git a/dev-lisp/cl-sql/Manifest b/dev-lisp/cl-sql/Manifest
index aa20e6dd24f6..7a2e1b8ff3a1 100644
--- a/dev-lisp/cl-sql/Manifest
+++ b/dev-lisp/cl-sql/Manifest
@@ -1,6 +1,8 @@
-MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
-MD5 4af7c3279e5a13021ca38b20fdc5768a cl-sql-1.7.6.ebuild 3178
-MD5 4efc54044d3c0b58216c199b9a302154 cl-sql-1.6.4.ebuild 2382
 MD5 32c56b688a1eb0ccfd0957c9f44b7897 ChangeLog 579
-MD5 f1d552471358205bfd6e93fea6094ae1 files/digest-cl-sql-1.7.6 134
+MD5 4efc54044d3c0b58216c199b9a302154 cl-sql-1.6.4.ebuild 2382
+MD5 4af7c3279e5a13021ca38b20fdc5768a cl-sql-1.7.6.ebuild 3178
+MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
+MD5 4af7c3279e5a13021ca38b20fdc5768a cl-sql-1.8.7.ebuild 3178
 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
diff --git a/dev-lisp/cl-sql/cl-sql-1.8.7.ebuild b/dev-lisp/cl-sql/cl-sql-1.8.7.ebuild
new file mode 100644
index 000000000000..86a84f23189c
--- /dev/null
+++ b/dev-lisp/cl-sql/cl-sql-1.8.7.ebuild
@@ -0,0 +1,126 @@
+# 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.7.ebuild,v 1.1 2004/01/27 21:44:41 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://ftp.debian.org/debian/pool/main/c/cl-sql/cl-sql_${PV}.orig.tar.gz
+	http://ftp.debian.org/debian/pool/main/c/cl-sql/cl-sql_${PV}-${DEB_PV}.diff.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}/cl-sql-${PV}
+
+modules='clsql-base clsql clsql-postgresql-socket clsql-uffi'
+
+src_unpack() {
+	unpack ${A}
+	epatch cl-sql_${PV}-${DEB_PV}.diff
+	# prevent shared-objects from being rebuilt -- we really need
+	# portage help for reverse dependencies :(
+	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
+}
+
+pkg_postinst() {
+	for i in $modules ; do
+		/usr/sbin/register-common-lisp-source $i
+	done
+	use postgres && /usr/sbin/register-common-lisp-source clsql-postgresql
+	use mysql && /usr/sbin/register-common-lisp-source clsql-mysql
+}
+
+pkg_prerm() {
+	for i in $modules ; do
+		/usr/sbin/unregister-common-lisp-source $i
+	done
+	use postgres && /usr/sbin/unregister-common-lisp-source clsql-postgresql
+	use mysql && /usr/sbin/unregister-common-lisp-source clsql-mysql
+}
+
+
+pkg_preinst() {
+	rm -rf /usr/lib/common-lisp/*/clsql* || true
+}
+
+pkg_postrm() {
+	rm -rf /usr/lib/common-lisp/*/clsql* || true
+}
diff --git a/dev-lisp/cl-sql/files/1.8.7-no-shared-object-asdf-gentoo.patch b/dev-lisp/cl-sql/files/1.8.7-no-shared-object-asdf-gentoo.patch
new file mode 100644
index 000000000000..c5f2cd4a7ffa
--- /dev/null
+++ b/dev-lisp/cl-sql/files/1.8.7-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.7 b/dev-lisp/cl-sql/files/digest-cl-sql-1.8.7
new file mode 100644
index 000000000000..70bc97e6e546
--- /dev/null
+++ b/dev-lisp/cl-sql/files/digest-cl-sql-1.8.7
@@ -0,0 +1,2 @@
+MD5 9c6ebc96e6fd7e232badb4826ef28ea1 cl-sql_1.8.7.orig.tar.gz 207102
+MD5 bec54ebdfb5e0a28f99ea1719b424839 cl-sql_1.8.7-1.diff.gz 8842