[gentoo-commits] proj/lisp:master commit in: dev-lisp/clsql/

2022-04-01 Thread Ulrich Müller
commit: ae2a13cdadc6ebc66c2a0a3d37f5a42e786c4e9b
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Apr  1 14:45:20 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Apr  1 14:45:20 2022 +
URL:https://gitweb.gentoo.org/proj/lisp.git/commit/?id=ae2a13cd

dev-lisp/clsql: Drop dependency on dev-db/oracle-instantclient-basic

Signed-off-by: Ulrich Müller  gentoo.org>

 dev-lisp/clsql/clsql-6.7.0.ebuild | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/dev-lisp/clsql/clsql-6.7.0.ebuild 
b/dev-lisp/clsql/clsql-6.7.0.ebuild
index 3a160e87..8f5a84ae 100644
--- a/dev-lisp/clsql/clsql-6.7.0.ebuild
+++ b/dev-lisp/clsql/clsql-6.7.0.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit common-lisp-3 flag-o-matic multilib toolchain-funcs
+inherit common-lisp-3 flag-o-matic toolchain-funcs
 
 DESCRIPTION="A multi-platform SQL interface for Common Lisp"
-HOMEPAGE="http://clsql.kpe.io/
-   http://www.cliki.net/CLSQL;
+HOMEPAGE="https://clsql.kpe.io/
+   https://www.cliki.net/CLSQL;
 SRC_URI="http://files.kpe.io/clsql/${P}.tar.gz;
 
 LICENSE="LLGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc examples mysql odbc oracle postgres sqlite"
+IUSE="doc examples mysql odbc postgres sqlite"
 
 RDEPEND="dev-lisp/md5
>=dev-lisp/uffi-2.0.0
mysql? ( virtual/mysql )
odbc? ( dev-db/unixODBC )
-   oracle? ( dev-db/oracle-instantclient-basic )
postgres? ( dev-db/postgresql )
sqlite? ( dev-db/sqlite:3 )"
+   #oracle? ( dev-db/oracle-instantclient-basic )
 
 src_prepare() {
sed -i "s,/usr/lib,/usr/$(get_libdir),g" "${S}"/${PN}-{mysql,uffi}.asd 
|| die
@@ -76,7 +76,8 @@ src_install() {
exeinto /usr/$(get_libdir)/${PN} ; doexe uffi/${PN}_uffi.so
 
use postgres && install_clsql_postgresql
-   for dbtype in mysql odbc oracle sqlite ; do
+   for dbtype in mysql odbc sqlite #oracle
+   do
use ${dbtype} && install_clsql_pkg ${dbtype}
done
 



[gentoo-commits] proj/lisp:master commit in: dev-lisp/clsql/

2018-03-18 Thread José María Alonso
commit: 488efce04d5bcb2a8e60188e6bbe78cc9074c549
Author: Chema Alonso Josa  gentoo  org>
AuthorDate: Sun Mar 18 17:14:56 2018 +
Commit: José María Alonso  gentoo  org>
CommitDate: Sun Mar 18 17:14:56 2018 +
URL:https://gitweb.gentoo.org/proj/lisp.git/commit/?id=488efce0

dev-lisp/clsql: Bumps version to 6.7.0. Drops old versions

 dev-lisp/clsql/clsql-5.4.0.ebuild  |  92 ---
 dev-lisp/clsql/clsql-6.4.1.ebuild  | 101 -
 .../{clsql-6.4.0.ebuild => clsql-6.7.0.ebuild} |  14 +--
 3 files changed, 7 insertions(+), 200 deletions(-)

diff --git a/dev-lisp/clsql/clsql-5.4.0.ebuild 
b/dev-lisp/clsql/clsql-5.4.0.ebuild
deleted file mode 100644
index 72bdb6f8..
--- a/dev-lisp/clsql/clsql-5.4.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit common-lisp-3 eutils toolchain-funcs flag-o-matic multilib
-
-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://common-lisp.net/~sionescu/mirror/${P}.tar.gz;
-RESTRICT="mirror"
-
-LICENSE="LLGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc oracle mysql postgres sqlite odbc"
-
-DEPEND="mysql? ( virtual/mysql )"
-RDEPEND="${DEPEND}
-   !dev-lisp/cl-sql
-   dev-lisp/md5
-   >=dev-lisp/uffi-2.0.0
-   oracle? ( dev-db/oracle-instantclient-basic )
-   postgres? ( dev-db/postgresql )
-   sqlite? ( dev-db/sqlite:3 )
-   odbc? ( dev-db/unixODBC )"
-
-src_prepare() {
-   sed -i "s,/usr/lib,/usr/$(get_libdir),g" "${S}"/${PN}-{mysql,uffi}.asd 
|| die
-   sed -i 's,"usr" "lib","usr" "'$(get_libdir)'",g' 
"${S}"/${PN}-{mysql,uffi}.asd || die
-}
-
-@cc() {
-   local cc=$(tc-getCC)
-   echo "${cc}" "${@}"
-   "${cc}" "${@}"
-}
-
-src_compile() {
-   strip-flags
-   @cc uffi/clsql_uffi.c \
-   ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -rdynamic \
-   -fPIC -DPIC -shared -Wl,-soname=clsql_uffi -o 
uffi/clsql_uffi.so \
-   || die "Cannot build UFFI helper library"
-   if use mysql; then
-   @cc db-mysql/clsql_mysql.c \
-   ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} $(mysql_config 
--cflags) -rdynamic \
-   -fPIC -DPIC -shared -Wl,-soname=clsql_mysql -o 
db-mysql/clsql_mysql.so \
-   || die "Cannot build foreign glue to libmysqlclient"
-   fi
-}
-
-install_clsql_pkg() {
-   cd "${S}" || die
-   common-lisp-install-sources db-${1}
-   common-lisp-install-asdf ${PN}-${1}
-   if [ -f db-${1}/${PN}_${1}.so ]; then
-   exeinto /usr/$(get_libdir)/${PN} ; doexe db-${1}/${PN}_${1}.so
-   fi
-}
-
-src_install() {
-   common-lisp-install-sources sql/*.lisp tests
-   common-lisp-install-asdf ${PN} ${PN}-tests
-
-   common-lisp-install-sources uffi/*.lisp
-   common-lisp-install-asdf ${PN}-{uffi,cffi}
-   exeinto /usr/$(get_libdir)/${PN} ; doexe uffi/${PN}_uffi.so
-
-   install_clsql_pkg postgresql-socket
-   use postgres && install_clsql_pkg postgresql
-   for dbtype in mysql odbc oracle sqlite sqlite3; do
-   use ${dbtype} && install_clsql_pkg ${dbtype}
-   done
-   # TODO: figure out the dependencies
-   install_clsql_pkg aodbc
-   install_clsql_pkg db2
-
-   dodoc BUGS CONTRIBUTORS ChangeLog INSTALL LATEST-TEST-RESULTS NEWS 
README TODO
-   use doc && dodoc doc/clsql.pdf
-   tar xfz doc/html.tar.gz -C "${T}" && dohtml "${T}"/html/*
-   docinto examples && dodoc examples/*
-   docinto notes && dodoc notes/*
-
-   dodir /etc
-   cat > "${D}"/etc/clsql-init.lisp 

[gentoo-commits] proj/lisp:master commit in: dev-lisp/clsql/

2017-07-07 Thread José María Alonso
commit: 44f4035a5128acace766407bd8cfb21415359085
Author: Chema Alonso Josa  gentoo  org>
AuthorDate: Fri Jul  7 10:39:31 2017 +
Commit: José María Alonso  gentoo  org>
CommitDate: Fri Jul  7 10:39:31 2017 +
URL:https://gitweb.gentoo.org/proj/lisp.git/commit/?id=44f4035a

dev-lisp/clsql: Updates ebuilds

 dev-lisp/clsql/clsql-5.4.0.ebuild | 19 +--
 dev-lisp/clsql/clsql-6.4.0.ebuild | 16 +++-
 dev-lisp/clsql/clsql-6.4.1.ebuild | 16 +++-
 3 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/dev-lisp/clsql/clsql-5.4.0.ebuild 
b/dev-lisp/clsql/clsql-5.4.0.ebuild
index d5765a17..72bdb6f8 100644
--- a/dev-lisp/clsql/clsql-5.4.0.ebuild
+++ b/dev-lisp/clsql/clsql-5.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=3
+EAPI=6
+
 inherit common-lisp-3 eutils toolchain-funcs flag-o-matic multilib
 
 DESCRIPTION="A multi-platform SQL interface for Common Lisp"
@@ -15,7 +15,7 @@ RESTRICT="mirror"
 LICENSE="LLGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc oracle mysql postgres sqlite sqlite3 odbc"
+IUSE="doc oracle mysql postgres sqlite odbc"
 
 DEPEND="mysql? ( virtual/mysql )"
 RDEPEND="${DEPEND}
@@ -23,14 +23,13 @@ RDEPEND="${DEPEND}
dev-lisp/md5
>=dev-lisp/uffi-2.0.0
oracle? ( dev-db/oracle-instantclient-basic )
-   postgres? ( dev-db/postgresql-base )
-   sqlite? ( dev-db/sqlite:0 )
-   sqlite3? ( dev-db/sqlite:3 )
+   postgres? ( dev-db/postgresql )
+   sqlite? ( dev-db/sqlite:3 )
odbc? ( dev-db/unixODBC )"
 
 src_prepare() {
-   sed -i "s,/usr/lib,/usr/$(get_libdir),g" "${S}"/${PN}-{mysql,uffi}.asd
-   sed -i 's,"usr" "lib","usr" "'$(get_libdir)'",g' 
"${S}"/${PN}-{mysql,uffi}.asd
+   sed -i "s,/usr/lib,/usr/$(get_libdir),g" "${S}"/${PN}-{mysql,uffi}.asd 
|| die
+   sed -i 's,"usr" "lib","usr" "'$(get_libdir)'",g' 
"${S}"/${PN}-{mysql,uffi}.asd || die
 }
 
 @cc() {
@@ -54,7 +53,7 @@ src_compile() {
 }
 
 install_clsql_pkg() {
-   cd "${S}"
+   cd "${S}" || die
common-lisp-install-sources db-${1}
common-lisp-install-asdf ${PN}-${1}
if [ -f db-${1}/${PN}_${1}.so ]; then

diff --git a/dev-lisp/clsql/clsql-6.4.0.ebuild 
b/dev-lisp/clsql/clsql-6.4.0.ebuild
index 25c3195d..d0680216 100644
--- a/dev-lisp/clsql/clsql-6.4.0.ebuild
+++ b/dev-lisp/clsql/clsql-6.4.0.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
+EAPI=6
 
 inherit common-lisp-3 flag-o-matic multilib toolchain-funcs
 
@@ -14,7 +13,7 @@ SRC_URI="http://files.b9.com/clsql/${P}.tar.gz;
 LICENSE="LLGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc examples mysql odbc oracle postgres sqlite sqlite3"
+IUSE="doc examples mysql odbc oracle postgres sqlite"
 
 RDEPEND="!dev-lisp/cl-sql
dev-lisp/md5
@@ -22,13 +21,12 @@ RDEPEND="!dev-lisp/cl-sql
mysql? ( virtual/mysql )
odbc? ( dev-db/unixODBC )
oracle? ( dev-db/oracle-instantclient-basic )
-   postgres? ( dev-db/postgresql-base )
-   sqlite? ( dev-db/sqlite:0 )
-   sqlite3? ( dev-db/sqlite:3 )"
+   postgres? ( dev-db/postgresql )
+   sqlite? ( dev-db/sqlite:3 )"
 
 src_prepare() {
-   sed -i "s,/usr/lib,/usr/$(get_libdir),g" "${S}"/${PN}-{mysql,uffi}.asd
-   sed -i 's,"usr" "lib","usr" "'$(get_libdir)'",g' 
"${S}"/${PN}-{mysql,uffi}.asd
+   sed -i "s,/usr/lib,/usr/$(get_libdir),g" "${S}"/${PN}-{mysql,uffi}.asd 
|| die
+   sed -i 's,"usr" "lib","usr" "'$(get_libdir)'",g' 
"${S}"/${PN}-{mysql,uffi}.asd || die
 }
 
 @cc() {

diff --git a/dev-lisp/clsql/clsql-6.4.1.ebuild 
b/dev-lisp/clsql/clsql-6.4.1.ebuild
index 25c3195d..d0680216 100644
--- a/dev-lisp/clsql/clsql-6.4.1.ebuild
+++ b/dev-lisp/clsql/clsql-6.4.1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
+EAPI=6
 
 inherit common-lisp-3 flag-o-matic multilib toolchain-funcs
 
@@ -14,7 +13,7 @@ SRC_URI="http://files.b9.com/clsql/${P}.tar.gz;
 LICENSE="LLGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc examples mysql odbc oracle postgres sqlite sqlite3"
+IUSE="doc examples mysql odbc oracle postgres sqlite"
 
 RDEPEND="!dev-lisp/cl-sql
dev-lisp/md5
@@ -22,13 +21,12 @@ RDEPEND="!dev-lisp/cl-sql
mysql? ( virtual/mysql )
odbc? ( dev-db/unixODBC )
oracle? ( dev-db/oracle-instantclient-basic )
-   postgres? ( dev-db/postgresql-base )
-   sqlite? ( dev-db/sqlite:0 )
-   sqlite3? ( dev-db/sqlite:3 )"
+   postgres? ( dev-db/postgresql )
+   

[gentoo-commits] proj/lisp:master commit in: dev-lisp/clsql/

2016-12-03 Thread José María Alonso
commit: 77af3d9a127fee79b9f20af3c5c53cecaeaad554
Author: Chema Alonso Josa  gentoo  org>
AuthorDate: Sat Dec  3 22:25:33 2016 +
Commit: José María Alonso  gentoo  org>
CommitDate: Sat Dec  3 22:25:33 2016 +
URL:https://gitweb.gentoo.org/proj/lisp.git/commit/?id=77af3d9a

dev-lisp/clsql: Updates header

 dev-lisp/clsql/clsql-5.4.0.ebuild | 4 ++--
 dev-lisp/clsql/clsql-6.4.0.ebuild | 4 ++--
 dev-lisp/clsql/clsql-6.4.1.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-lisp/clsql/clsql-5.4.0.ebuild 
b/dev-lisp/clsql/clsql-5.4.0.ebuild
index 5f79f79..d5765a1 100644
--- a/dev-lisp/clsql/clsql-5.4.0.ebuild
+++ b/dev-lisp/clsql/clsql-5.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=3
 inherit common-lisp-3 eutils toolchain-funcs flag-o-matic multilib

diff --git a/dev-lisp/clsql/clsql-6.4.0.ebuild 
b/dev-lisp/clsql/clsql-6.4.0.ebuild
index 397768d..25c3195 100644
--- a/dev-lisp/clsql/clsql-6.4.0.ebuild
+++ b/dev-lisp/clsql/clsql-6.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 

diff --git a/dev-lisp/clsql/clsql-6.4.1.ebuild 
b/dev-lisp/clsql/clsql-6.4.1.ebuild
index 397768d..25c3195 100644
--- a/dev-lisp/clsql/clsql-6.4.1.ebuild
+++ b/dev-lisp/clsql/clsql-6.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5