public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/lisp:master commit in: dev-lisp/clsql/
@ 2018-03-18 17:14 José María Alonso
  0 siblings, 0 replies; 9+ messages in thread
From: José María Alonso @ 2018-03-18 17:14 UTC (permalink / raw
  To: gentoo-commits

commit:     488efce04d5bcb2a8e60188e6bbe78cc9074c549
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 17:14:56 2018 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 17:14:56 2018 +0000
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..00000000
--- 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 <<EOF
-(clsql:push-library-path #p"/usr/$(get_libdir)/")
-(clsql:push-library-path #p"/usr/$(get_libdir)/clsql/")
-EOF
-}

diff --git a/dev-lisp/clsql/clsql-6.4.1.ebuild b/dev-lisp/clsql/clsql-6.4.1.ebuild
deleted file mode 100644
index d0680216..00000000
--- a/dev-lisp/clsql/clsql-6.4.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit common-lisp-3 flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A multi-platform SQL interface for Common Lisp"
-HOMEPAGE="http://clsql.b9.com/
-		http://www.cliki.net/CLSQL"
-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"
-
-RDEPEND="!dev-lisp/cl-sql
-	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 )"
-
-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() {
-	local pkgname="${1}"
-	local libname="${pkgname}/${PN}_${pkgname}.so"
-
-	cd "${S}" || die
-	common-lisp-install-sources db-${pkgname}
-	common-lisp-install-asdf ${PN}-${pkgname}
-	if [ -f db-${1}/${PN}_${1}.so ]; then
-		exeinto /usr/$(get_libdir)/${PN} ; doexe db-${pkgname}/${PN}_${pkgname}.so
-	fi
-}
-
-install_clsql_postgresql() {
-	install_clsql_pkg postgresql-socket
-	install_clsql_pkg postgresql-socket3
-	install_clsql_pkg postgresql
-}
-
-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
-
-	use postgres && install_clsql_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
-	if use doc ; then
-		dodoc doc/clsql.pdf
-		tar xfz doc/html.tar.gz -C "${T}" || die
-		dohtml "${T}"/html/*
-		docinto notes && dodoc notes/*
-	fi
-	use examples && docinto examples && dodoc -r examples/*
-
-	dodir /etc
-	cat > "${D}"/etc/clsql-init.lisp <<-EOF
-	(clsql:push-library-path #p"/usr/$(get_libdir)/")
-	(clsql:push-library-path #p"/usr/$(get_libdir)/clsql/")
-	EOF
-}

diff --git a/dev-lisp/clsql/clsql-6.4.0.ebuild b/dev-lisp/clsql/clsql-6.7.0.ebuild
similarity index 91%
rename from dev-lisp/clsql/clsql-6.4.0.ebuild
rename to dev-lisp/clsql/clsql-6.7.0.ebuild
index d0680216..3a160e87 100644
--- a/dev-lisp/clsql/clsql-6.4.0.ebuild
+++ b/dev-lisp/clsql/clsql-6.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,17 +6,16 @@ EAPI=6
 inherit common-lisp-3 flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="A multi-platform SQL interface for Common Lisp"
-HOMEPAGE="http://clsql.b9.com/
+HOMEPAGE="http://clsql.kpe.io/
 		http://www.cliki.net/CLSQL"
-SRC_URI="http://files.b9.com/clsql/${P}.tar.gz"
+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"
 
-RDEPEND="!dev-lisp/cl-sql
-	dev-lisp/md5
+RDEPEND="dev-lisp/md5
 	>=dev-lisp/uffi-2.0.0
 	mysql? ( virtual/mysql )
 	odbc? ( dev-db/unixODBC )
@@ -27,6 +26,7 @@ RDEPEND="!dev-lisp/cl-sql
 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
+	eapply_user
 }
 
 @cc() {
@@ -76,7 +76,7 @@ src_install() {
 	exeinto /usr/$(get_libdir)/${PN} ; doexe uffi/${PN}_uffi.so
 
 	use postgres && install_clsql_postgresql
-	for dbtype in mysql odbc oracle sqlite sqlite3; do
+	for dbtype in mysql odbc oracle sqlite ; do
 		use ${dbtype} && install_clsql_pkg ${dbtype}
 	done
 
@@ -88,7 +88,7 @@ src_install() {
 	if use doc ; then
 		dodoc doc/clsql.pdf
 		tar xfz doc/html.tar.gz -C "${T}" || die
-		dohtml "${T}"/html/*
+		dodoc "${T}"/html/*
 		docinto notes && dodoc notes/*
 	fi
 	use examples && docinto examples && dodoc -r examples/*


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/lisp:master commit in: dev-lisp/clsql/
@ 2022-04-01 14:56 Ulrich Müller
  0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Müller @ 2022-04-01 14:56 UTC (permalink / raw
  To: gentoo-commits

commit:     ae2a13cdadc6ebc66c2a0a3d37f5a42e786c4e9b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  1 14:45:20 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 14:45:20 2022 +0000
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 <ulm <AT> 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
 


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/lisp:master commit in: dev-lisp/clsql/
@ 2017-07-07 10:39 José María Alonso
  0 siblings, 0 replies; 9+ messages in thread
From: José María Alonso @ 2017-07-07 10:39 UTC (permalink / raw
  To: gentoo-commits

commit:     44f4035a5128acace766407bd8cfb21415359085
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  7 10:39:31 2017 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Fri Jul  7 10:39:31 2017 +0000
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 )
+	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() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/lisp:master commit in: dev-lisp/clsql/
@ 2016-12-03 22:25 José María Alonso
  0 siblings, 0 replies; 9+ messages in thread
From: José María Alonso @ 2016-12-03 22:25 UTC (permalink / raw
  To: gentoo-commits

commit:     77af3d9a127fee79b9f20af3c5c53cecaeaad554
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  3 22:25:33 2016 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Sat Dec  3 22:25:33 2016 +0000
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
 


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/lisp:master commit in: dev-lisp/clsql/
@ 2013-12-07 13:43 José María Alonso
  0 siblings, 0 replies; 9+ messages in thread
From: José María Alonso @ 2013-12-07 13:43 UTC (permalink / raw
  To: gentoo-commits

commit:     e7b2d021c00df7ccc156c9a88abd0623561562c4
Author:     Chema Alonso <nimiux <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  7 13:44:00 2013 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Sat Dec  7 13:44:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=e7b2d021

dev-lisp/clsql: bump to version 6.4.1

---
 dev-lisp/clsql/clsql-6.4.1.ebuild | 103 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/dev-lisp/clsql/clsql-6.4.1.ebuild b/dev-lisp/clsql/clsql-6.4.1.ebuild
new file mode 100644
index 0000000..397768d
--- /dev/null
+++ b/dev-lisp/clsql/clsql-6.4.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit common-lisp-3 flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="A multi-platform SQL interface for Common Lisp"
+HOMEPAGE="http://clsql.b9.com/
+		http://www.cliki.net/CLSQL"
+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"
+
+RDEPEND="!dev-lisp/cl-sql
+	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-base )
+	sqlite? ( dev-db/sqlite:0 )
+	sqlite3? ( 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
+}
+
+@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() {
+	local pkgname="${1}"
+	local libname="${pkgname}/${PN}_${pkgname}.so"
+
+	cd "${S}" || die
+	common-lisp-install-sources db-${pkgname}
+	common-lisp-install-asdf ${PN}-${pkgname}
+	if [ -f db-${1}/${PN}_${1}.so ]; then
+		exeinto /usr/$(get_libdir)/${PN} ; doexe db-${pkgname}/${PN}_${pkgname}.so
+	fi
+}
+
+install_clsql_postgresql() {
+	install_clsql_pkg postgresql-socket
+	install_clsql_pkg postgresql-socket3
+	install_clsql_pkg postgresql
+}
+
+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
+
+	use postgres && install_clsql_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
+	if use doc ; then
+		dodoc doc/clsql.pdf
+		tar xfz doc/html.tar.gz -C "${T}" || die
+		dohtml "${T}"/html/*
+		docinto notes && dodoc notes/*
+	fi
+	use examples && docinto examples && dodoc -r examples/*
+
+	dodir /etc
+	cat > "${D}"/etc/clsql-init.lisp <<-EOF
+	(clsql:push-library-path #p"/usr/$(get_libdir)/")
+	(clsql:push-library-path #p"/usr/$(get_libdir)/clsql/")
+	EOF
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/lisp:master commit in: dev-lisp/clsql/
@ 2013-04-01 11:42 José María Alonso
  0 siblings, 0 replies; 9+ messages in thread
From: José María Alonso @ 2013-04-01 11:42 UTC (permalink / raw
  To: gentoo-commits

commit:     0a0e8bbe10212ebcce3c7ca0f8399a269c58b5df
Author:     Chema Alonso <nimiux <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  1 11:43:47 2013 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Mon Apr  1 11:43:47 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=0a0e8bbe

dev-lisp/clsql: bump to version 6.4.0

---
 dev-lisp/clsql/clsql-6.4.0.ebuild |  103 +++++++++++++++++++++++++++++++++++++
 1 files changed, 103 insertions(+), 0 deletions(-)

diff --git a/dev-lisp/clsql/clsql-6.4.0.ebuild b/dev-lisp/clsql/clsql-6.4.0.ebuild
new file mode 100644
index 0000000..397768d
--- /dev/null
+++ b/dev-lisp/clsql/clsql-6.4.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit common-lisp-3 flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="A multi-platform SQL interface for Common Lisp"
+HOMEPAGE="http://clsql.b9.com/
+		http://www.cliki.net/CLSQL"
+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"
+
+RDEPEND="!dev-lisp/cl-sql
+	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-base )
+	sqlite? ( dev-db/sqlite:0 )
+	sqlite3? ( 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
+}
+
+@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() {
+	local pkgname="${1}"
+	local libname="${pkgname}/${PN}_${pkgname}.so"
+
+	cd "${S}" || die
+	common-lisp-install-sources db-${pkgname}
+	common-lisp-install-asdf ${PN}-${pkgname}
+	if [ -f db-${1}/${PN}_${1}.so ]; then
+		exeinto /usr/$(get_libdir)/${PN} ; doexe db-${pkgname}/${PN}_${pkgname}.so
+	fi
+}
+
+install_clsql_postgresql() {
+	install_clsql_pkg postgresql-socket
+	install_clsql_pkg postgresql-socket3
+	install_clsql_pkg postgresql
+}
+
+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
+
+	use postgres && install_clsql_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
+	if use doc ; then
+		dodoc doc/clsql.pdf
+		tar xfz doc/html.tar.gz -C "${T}" || die
+		dohtml "${T}"/html/*
+		docinto notes && dodoc notes/*
+	fi
+	use examples && docinto examples && dodoc -r examples/*
+
+	dodir /etc
+	cat > "${D}"/etc/clsql-init.lisp <<-EOF
+	(clsql:push-library-path #p"/usr/$(get_libdir)/")
+	(clsql:push-library-path #p"/usr/$(get_libdir)/clsql/")
+	EOF
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/lisp:master commit in: dev-lisp/clsql/
@ 2011-07-28 12:29 Stelian Ionescu
  0 siblings, 0 replies; 9+ messages in thread
From: Stelian Ionescu @ 2011-07-28 12:29 UTC (permalink / raw
  To: gentoo-commits

commit:     65f21fa2307d418af6b0b8a680cad2b2f967153a
Author:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
AuthorDate: Thu Jul 28 12:29:23 2011 +0000
Commit:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
CommitDate: Thu Jul 28 12:29:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=65f21fa2

dev-lisp/clsql: bump to 5.4.0

---
 .../{clsql-5.3.4.ebuild => clsql-5.4.0.ebuild}     |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dev-lisp/clsql/clsql-5.3.4.ebuild b/dev-lisp/clsql/clsql-5.4.0.ebuild
similarity index 97%
rename from dev-lisp/clsql/clsql-5.3.4.ebuild
rename to dev-lisp/clsql/clsql-5.4.0.ebuild
index a8a8aff..5f79f79 100644
--- a/dev-lisp/clsql/clsql-5.3.4.ebuild
+++ b/dev-lisp/clsql/clsql-5.4.0.ebuild
@@ -9,7 +9,8 @@ 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/${P}.tar.gz"
+SRC_URI="http://common-lisp.net/~sionescu/mirror/${P}.tar.gz"
+RESTRICT="mirror"
 
 LICENSE="LLGPL-2.1"
 SLOT="0"



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/lisp:master commit in: dev-lisp/clsql/
@ 2011-06-22 21:39 Stelian Ionescu
  0 siblings, 0 replies; 9+ messages in thread
From: Stelian Ionescu @ 2011-06-22 21:39 UTC (permalink / raw
  To: gentoo-commits

commit:     e592bcc4dbbea7eb98ae8931565b858645f9f4de
Author:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
AuthorDate: Wed Jun 22 21:27:17 2011 +0000
Commit:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
CommitDate: Wed Jun 22 21:27:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=e592bcc4

dev-lisp/clsql: bump to 5.3.4

---
 .../{clsql-5.3.2.ebuild => clsql-5.3.4.ebuild}     |   26 ++++++++++++++-----
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/dev-lisp/clsql/clsql-5.3.2.ebuild b/dev-lisp/clsql/clsql-5.3.4.ebuild
similarity index 74%
rename from dev-lisp/clsql/clsql-5.3.2.ebuild
rename to dev-lisp/clsql/clsql-5.3.4.ebuild
index aa1f9c2..a8a8aff 100644
--- a/dev-lisp/clsql/clsql-5.3.2.ebuild
+++ b/dev-lisp/clsql/clsql-5.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=3
-inherit common-lisp-3 eutils multilib
+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/
@@ -20,8 +20,7 @@ DEPEND="mysql? ( virtual/mysql )"
 RDEPEND="${DEPEND}
 		!dev-lisp/cl-sql
 		dev-lisp/md5
-		>=dev-lisp/uffi-1.5.7
-		>=dev-lisp/uffi-0.10.5
+		>=dev-lisp/uffi-2.0.0
 		oracle? ( dev-db/oracle-instantclient-basic )
 		postgres? ( dev-db/postgresql-base )
 		sqlite? ( dev-db/sqlite:0 )
@@ -33,10 +32,23 @@ src_prepare() {
 	sed -i 's,"usr" "lib","usr" "'$(get_libdir)'",g' "${S}"/${PN}-{mysql,uffi}.asd
 }
 
+@cc() {
+	local cc=$(tc-getCC)
+	echo "${cc}" "${@}"
+	"${cc}" "${@}"
+}
+
 src_compile() {
-	make -C uffi || die "Cannot build UFFI helper library"
+	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
-		make -C db-mysql || die "Cannot build foreign glue to libmysql"
+		@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
 }
 
@@ -55,7 +67,7 @@ src_install() {
 
 	common-lisp-install-sources uffi/*.lisp
 	common-lisp-install-asdf ${PN}-{uffi,cffi}
-	exeinto /usr/$(get_libdir)/${PN} ; doexe uffi/${PN}_uffi*.so
+	exeinto /usr/$(get_libdir)/${PN} ; doexe uffi/${PN}_uffi.so
 
 	install_clsql_pkg postgresql-socket
 	use postgres && install_clsql_pkg postgresql



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/lisp:master commit in: dev-lisp/clsql/
@ 2011-04-25 22:58 Stelian Ionescu
  0 siblings, 0 replies; 9+ messages in thread
From: Stelian Ionescu @ 2011-04-25 22:58 UTC (permalink / raw
  To: gentoo-commits

commit:     eb7d34677a889bcf72fd498b9d134a94626886f0
Author:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
AuthorDate: Mon Apr 25 22:56:04 2011 +0000
Commit:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
CommitDate: Mon Apr 25 22:56:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=eb7d3467

dev-lisp/clsql: bump to version 5.3.2

---
 .../{clsql-5.2.0.ebuild => clsql-5.3.2.ebuild}     |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-lisp/clsql/clsql-5.2.0.ebuild b/dev-lisp/clsql/clsql-5.3.2.ebuild
similarity index 100%
rename from dev-lisp/clsql/clsql-5.2.0.ebuild
rename to dev-lisp/clsql/clsql-5.3.2.ebuild



^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2022-04-01 14:56 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-18 17:14 [gentoo-commits] proj/lisp:master commit in: dev-lisp/clsql/ José María Alonso
  -- strict thread matches above, loose matches on Subject: below --
2022-04-01 14:56 Ulrich Müller
2017-07-07 10:39 José María Alonso
2016-12-03 22:25 José María Alonso
2013-12-07 13:43 José María Alonso
2013-04-01 11:42 José María Alonso
2011-07-28 12:29 Stelian Ionescu
2011-06-22 21:39 Stelian Ionescu
2011-04-25 22:58 Stelian Ionescu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox