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

4 files changed, 9 insertions, 206 deletions

diff --git a/dev-lisp/clsql/Manifest b/dev-lisp/clsql/Manifest
index c3d189c8..93ade88d 100644
--- a/dev-lisp/clsql/Manifest
+++ b/dev-lisp/clsql/Manifest
@@ -1,6 +1,2 @@
-DIST clsql-5.4.0.tar.gz 892285 SHA256 cbed0fea66f3871ea4b78d577e73f026c99323d844b97ff3913e829f2f7a0fbb SHA512 ea4e230a4e1754ae8df9c1220f5ce09ba48633022a51c5426de6977e0a946f548cd599e9080740cc3680816c8fabcd3ecaa2a7193e479edae2b905bc0d8eb750 WHIRLPOOL ce5fdb0ec220832499a7df030dbd5333151581bb663529a439ea3c7f6898e388d1699c3011305b88820099cd00f0089163693632b63afde1385e8bd01a6baec0
-DIST clsql-6.4.0.tar.gz 920398 SHA256 db9be57082d0b7c36cd12934c3c51c2c2f573ca3dcea55c28a6b5cc1fcc85753 SHA512 9d2f83f45be1ecc3ab900101c76514f7c516d63fb5bc3911823cc9c0e452c182088fcafad90ba5d4527e24cb00120eb7e4c0e52462770cb57a04c47918897957 WHIRLPOOL 6d374cc3e53207e12459150439f7158e8228c653a3be2cd284550cfc721b8c0aa65fd00469f2a466d9813c6d76b523584793481b007916d3d59be8d9eaee1ad4
-DIST clsql-6.4.1.tar.gz 920462 SHA256 6b99c60e28d76e345144a46f0b878961439c873ab41fee602b2008b06535e805 SHA512 5bec6489e52a16d1bfdd6171cdad6a7f0d779e9f45e4ea567e5868ed0c02216d9df493947f8a2548d20c1c2a0b80551fc0b86a875bd1412a3d0acafa6b6cf552 WHIRLPOOL e56e09398b581d5fd359099cf3f46d6d5736b1b261a2d11010ba85ddb1bbd6e96be19ba4003d563ec6bd667a1c01804b521f24244bb77ec1fa6424fe069dd8d3
-EBUILD clsql-5.4.0.ebuild 2697 SHA256 50bad8552048d72e81561b8e456a8b0210c31ac4f5e229f75153781aabd7aef9 SHA512 79ca747065e922eabd2bfca5eeb9809cbf0aeefc9d295a20d94fa1536c5d3abdbe53e2d37abd0e30ed8f4ba4ff52d9015e3ac3ced94b9f6d87b1119904c6c627 WHIRLPOOL 5add382b01c0e21397182b251a52a2d869e6f7c8bfeb9d087641f302ea95298a4cbbb489b9fb304b75f6cd95fb386cb1b838f17d2578be53fcb92dc6d3b43617
-EBUILD clsql-6.4.0.ebuild 2821 SHA256 b32fb74d09acba61b0565d039252ce9880d02f143e0fa1bffb3011a5ce354997 SHA512 9c431dcbcbda0f339dc1202483269c81b3c1a9923e892e29806455a93e0d4d75b59a0b34be0c300b6eebcab09af78681b55a8a3d54efedef606016837358281c WHIRLPOOL 32e0c22078241b0360f5824d0acda0fd55faceaa2052b0a1e8a7bf36561fa2af2449e5e5fe33d21887da43aa6ae382e44512bcf4181f076daefa23939ebe89c6
-EBUILD clsql-6.4.1.ebuild 2821 SHA256 b32fb74d09acba61b0565d039252ce9880d02f143e0fa1bffb3011a5ce354997 SHA512 9c431dcbcbda0f339dc1202483269c81b3c1a9923e892e29806455a93e0d4d75b59a0b34be0c300b6eebcab09af78681b55a8a3d54efedef606016837358281c WHIRLPOOL 32e0c22078241b0360f5824d0acda0fd55faceaa2052b0a1e8a7bf36561fa2af2449e5e5fe33d21887da43aa6ae382e44512bcf4181f076daefa23939ebe89c6
+DIST clsql-6.7.0.tar.gz 967249 BLAKE2B 281c0daffe176de387bfce0fc6717143a7630bf61ebe80beeeb55a2d7f72ad3412b18499f31f44f9c131de3396d5f2cbdf7da67e11d4ad16e1516225696963c8 SHA512 e03bad68e2a03a88c9c50fa9e9be8f3ef781037ffc9eb636f513ad4d0fe2512ee9b7de2aae45b9671706f02cc606448a71e0fde66294a87b2c9a0e686552377d
+EBUILD clsql-6.7.0.ebuild 2808 BLAKE2B 78ef3d06786adc4e18dfa1943fc613e21a38a2052086dad0ba11622f264ec0f6778ae440efb2066e1883f7666982f927ecae58043fe24fe457a405069344c41e SHA512 332c647b8d7f1e25ed0de814a13ac14979c59827c27bdd63b7fa5157860d0821d1f8082bb8bb25b4aa20c94081dc9a15fadb979d62655c07f95a3f23ed374068
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
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/*