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() {
