Package-Manager: portage-2.0.51.19

5 files changed, 110 insertions, 14 deletions

diff --git a/dev-lisp/cl-sql/ChangeLog b/dev-lisp/cl-sql/ChangeLog
index 1d172bbb6f9d..64dc94841b31 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/ChangeLog,v 1.17 2005/04/14 07:35:16 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/ChangeLog,v 1.18 2005/04/14 07:47:04 mkennedy Exp $
+
+*cl-sql-3.1.10-r1 (14 Apr 2005)
+
+  14 Apr 2005; Matthew Kennedy <mkennedy@gentoo.org> cl-sql-3.1.10.ebuild,
+  +cl-sql-3.1.10-r1.ebuild:
+  Moved sqlite3 support out until dev-db/sqlite-3* is marked stable x86.
 
 *cl-sql-3.1.10 (14 Apr 2005)
 
diff --git a/dev-lisp/cl-sql/Manifest b/dev-lisp/cl-sql/Manifest
index a4477c62ffcb..84033003de30 100644
--- a/dev-lisp/cl-sql/Manifest
+++ b/dev-lisp/cl-sql/Manifest
@@ -1,4 +1,6 @@
-MD5 576ab2ebc2545359b47a7ffed4206cd3 ChangeLog 3384
+MD5 3f4b028f8ae21de267e2e026cfecd5f7 ChangeLog 3594
+MD5 6f727256718ed635146d7d755ad70872 cl-sql-3.1.10-r1.ebuild 3380
 MD5 25a7993f47b4e9b1261a9956a8d61d90 metadata.xml 431
-MD5 46d05b816dca35b8bf7aa0da3af0a66c cl-sql-3.1.10.ebuild 3350
+MD5 e74b9e85af390b95998d6d53fadbb436 cl-sql-3.1.10.ebuild 3072
+MD5 6f0cca850627210bc6677fc498ec5235 files/digest-cl-sql-3.1.10-r1 64
 MD5 6f0cca850627210bc6677fc498ec5235 files/digest-cl-sql-3.1.10 64
diff --git a/dev-lisp/cl-sql/cl-sql-3.1.10-r1.ebuild b/dev-lisp/cl-sql/cl-sql-3.1.10-r1.ebuild
new file mode 100644
index 000000000000..ec50326706a4
--- /dev/null
+++ b/dev-lisp/cl-sql/cl-sql-3.1.10-r1.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.10-r1.ebuild,v 1.1 2005/04/14 07:47:04 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 ~amd64"
+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 clsql-sqlite clsql-sqlite3'
+
+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/cl-sql-3.1.10.ebuild b/dev-lisp/cl-sql/cl-sql-3.1.10.ebuild
index ceed3efe117d..61476af44a61 100644
--- a/dev-lisp/cl-sql/cl-sql-3.1.10.ebuild
+++ b/dev-lisp/cl-sql/cl-sql-3.1.10.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.1.10.ebuild,v 1.1 2005/04/14 07:35:16 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/cl-sql-3.1.10.ebuild,v 1.2 2005/04/14 07:47:04 mkennedy Exp $
 
 inherit common-lisp eutils
 
@@ -11,8 +11,8 @@ HOMEPAGE="http://clsql.b9.com/
 SRC_URI="http://files.b9.com/clsql/clsql-${PV}.tar.gz"
 LICENSE="LLGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="postgres mysql sqlite sqlite3 odbc"
+KEYWORDS="x86 ~ppc ~amd64"
+IUSE="postgres mysql sqlite odbc"
 DEPEND="dev-lisp/common-lisp-controller
 	virtual/commonlisp
 	dev-lisp/cl-md5
@@ -20,14 +20,13 @@ DEPEND="dev-lisp/common-lisp-controller
 	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'
+CLPACKAGE='clsql clsql-uffi clsql-postgresql clsql-postgresql-socket clsql-mysql clsql-odbc clsql-sqlite'
 
 src_compile() {
 	make -C uffi || die
@@ -79,12 +78,6 @@ src_install() {
 		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}/
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
new file mode 100644
index 000000000000..f131b35996a0
--- /dev/null
+++ b/dev-lisp/cl-sql/files/digest-cl-sql-3.1.10-r1
@@ -0,0 +1 @@
+MD5 594801ff367ef4637efbd1d19de86c78 clsql-3.1.10.tar.gz 695899