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

["José María Alonso" <nimiux@gentoo.org>]

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/*