| 1 |
commit: 44f4035a5128acace766407bd8cfb21415359085 |
| 2 |
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 7 10:39:31 2017 +0000 |
| 4 |
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 7 10:39:31 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/lisp.git/commit/?id=44f4035a |
| 7 |
|
| 8 |
dev-lisp/clsql: Updates ebuilds |
| 9 |
|
| 10 |
dev-lisp/clsql/clsql-5.4.0.ebuild | 19 +++++++++---------- |
| 11 |
dev-lisp/clsql/clsql-6.4.0.ebuild | 16 +++++++--------- |
| 12 |
dev-lisp/clsql/clsql-6.4.1.ebuild | 16 +++++++--------- |
| 13 |
3 files changed, 23 insertions(+), 28 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-lisp/clsql/clsql-5.4.0.ebuild b/dev-lisp/clsql/clsql-5.4.0.ebuild |
| 16 |
index d5765a17..72bdb6f8 100644 |
| 17 |
--- a/dev-lisp/clsql/clsql-5.4.0.ebuild |
| 18 |
+++ b/dev-lisp/clsql/clsql-5.4.0.ebuild |
| 19 |
@@ -1,8 +1,8 @@ |
| 20 |
-# Copyright 1999-2016 Gentoo Foundation |
| 21 |
+# Copyright 1999-2017 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
-# $Id$ |
| 24 |
|
| 25 |
-EAPI=3 |
| 26 |
+EAPI=6 |
| 27 |
+ |
| 28 |
inherit common-lisp-3 eutils toolchain-funcs flag-o-matic multilib |
| 29 |
|
| 30 |
DESCRIPTION="A multi-platform SQL interface for Common Lisp" |
| 31 |
@@ -15,7 +15,7 @@ RESTRICT="mirror" |
| 32 |
LICENSE="LLGPL-2.1" |
| 33 |
SLOT="0" |
| 34 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
| 35 |
-IUSE="doc oracle mysql postgres sqlite sqlite3 odbc" |
| 36 |
+IUSE="doc oracle mysql postgres sqlite odbc" |
| 37 |
|
| 38 |
DEPEND="mysql? ( virtual/mysql )" |
| 39 |
RDEPEND="${DEPEND} |
| 40 |
@@ -23,14 +23,13 @@ RDEPEND="${DEPEND} |
| 41 |
dev-lisp/md5 |
| 42 |
>=dev-lisp/uffi-2.0.0 |
| 43 |
oracle? ( dev-db/oracle-instantclient-basic ) |
| 44 |
- postgres? ( dev-db/postgresql-base ) |
| 45 |
- sqlite? ( dev-db/sqlite:0 ) |
| 46 |
- sqlite3? ( dev-db/sqlite:3 ) |
| 47 |
+ postgres? ( dev-db/postgresql ) |
| 48 |
+ sqlite? ( dev-db/sqlite:3 ) |
| 49 |
odbc? ( dev-db/unixODBC )" |
| 50 |
|
| 51 |
src_prepare() { |
| 52 |
- sed -i "s,/usr/lib,/usr/$(get_libdir),g" "${S}"/${PN}-{mysql,uffi}.asd |
| 53 |
- sed -i 's,"usr" "lib","usr" "'$(get_libdir)'",g' "${S}"/${PN}-{mysql,uffi}.asd |
| 54 |
+ sed -i "s,/usr/lib,/usr/$(get_libdir),g" "${S}"/${PN}-{mysql,uffi}.asd || die |
| 55 |
+ sed -i 's,"usr" "lib","usr" "'$(get_libdir)'",g' "${S}"/${PN}-{mysql,uffi}.asd || die |
| 56 |
} |
| 57 |
|
| 58 |
@cc() { |
| 59 |
@@ -54,7 +53,7 @@ src_compile() { |
| 60 |
} |
| 61 |
|
| 62 |
install_clsql_pkg() { |
| 63 |
- cd "${S}" |
| 64 |
+ cd "${S}" || die |
| 65 |
common-lisp-install-sources db-${1} |
| 66 |
common-lisp-install-asdf ${PN}-${1} |
| 67 |
if [ -f db-${1}/${PN}_${1}.so ]; then |
| 68 |
|
| 69 |
diff --git a/dev-lisp/clsql/clsql-6.4.0.ebuild b/dev-lisp/clsql/clsql-6.4.0.ebuild |
| 70 |
index 25c3195d..d0680216 100644 |
| 71 |
--- a/dev-lisp/clsql/clsql-6.4.0.ebuild |
| 72 |
+++ b/dev-lisp/clsql/clsql-6.4.0.ebuild |
| 73 |
@@ -1,8 +1,7 @@ |
| 74 |
-# Copyright 1999-2016 Gentoo Foundation |
| 75 |
+# Copyright 1999-2017 Gentoo Foundation |
| 76 |
# Distributed under the terms of the GNU General Public License v2 |
| 77 |
-# $Id$ |
| 78 |
|
| 79 |
-EAPI=5 |
| 80 |
+EAPI=6 |
| 81 |
|
| 82 |
inherit common-lisp-3 flag-o-matic multilib toolchain-funcs |
| 83 |
|
| 84 |
@@ -14,7 +13,7 @@ SRC_URI="http://files.b9.com/clsql/${P}.tar.gz" |
| 85 |
LICENSE="LLGPL-2.1" |
| 86 |
SLOT="0" |
| 87 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
| 88 |
-IUSE="doc examples mysql odbc oracle postgres sqlite sqlite3" |
| 89 |
+IUSE="doc examples mysql odbc oracle postgres sqlite" |
| 90 |
|
| 91 |
RDEPEND="!dev-lisp/cl-sql |
| 92 |
dev-lisp/md5 |
| 93 |
@@ -22,13 +21,12 @@ RDEPEND="!dev-lisp/cl-sql |
| 94 |
mysql? ( virtual/mysql ) |
| 95 |
odbc? ( dev-db/unixODBC ) |
| 96 |
oracle? ( dev-db/oracle-instantclient-basic ) |
| 97 |
- postgres? ( dev-db/postgresql-base ) |
| 98 |
- sqlite? ( dev-db/sqlite:0 ) |
| 99 |
- sqlite3? ( dev-db/sqlite:3 )" |
| 100 |
+ postgres? ( dev-db/postgresql ) |
| 101 |
+ sqlite? ( dev-db/sqlite:3 )" |
| 102 |
|
| 103 |
src_prepare() { |
| 104 |
- sed -i "s,/usr/lib,/usr/$(get_libdir),g" "${S}"/${PN}-{mysql,uffi}.asd |
| 105 |
- sed -i 's,"usr" "lib","usr" "'$(get_libdir)'",g' "${S}"/${PN}-{mysql,uffi}.asd |
| 106 |
+ sed -i "s,/usr/lib,/usr/$(get_libdir),g" "${S}"/${PN}-{mysql,uffi}.asd || die |
| 107 |
+ sed -i 's,"usr" "lib","usr" "'$(get_libdir)'",g' "${S}"/${PN}-{mysql,uffi}.asd || die |
| 108 |
} |
| 109 |
|
| 110 |
@cc() { |
| 111 |
|
| 112 |
diff --git a/dev-lisp/clsql/clsql-6.4.1.ebuild b/dev-lisp/clsql/clsql-6.4.1.ebuild |
| 113 |
index 25c3195d..d0680216 100644 |
| 114 |
--- a/dev-lisp/clsql/clsql-6.4.1.ebuild |
| 115 |
+++ b/dev-lisp/clsql/clsql-6.4.1.ebuild |
| 116 |
@@ -1,8 +1,7 @@ |
| 117 |
-# Copyright 1999-2016 Gentoo Foundation |
| 118 |
+# Copyright 1999-2017 Gentoo Foundation |
| 119 |
# Distributed under the terms of the GNU General Public License v2 |
| 120 |
-# $Id$ |
| 121 |
|
| 122 |
-EAPI=5 |
| 123 |
+EAPI=6 |
| 124 |
|
| 125 |
inherit common-lisp-3 flag-o-matic multilib toolchain-funcs |
| 126 |
|
| 127 |
@@ -14,7 +13,7 @@ SRC_URI="http://files.b9.com/clsql/${P}.tar.gz" |
| 128 |
LICENSE="LLGPL-2.1" |
| 129 |
SLOT="0" |
| 130 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
| 131 |
-IUSE="doc examples mysql odbc oracle postgres sqlite sqlite3" |
| 132 |
+IUSE="doc examples mysql odbc oracle postgres sqlite" |
| 133 |
|
| 134 |
RDEPEND="!dev-lisp/cl-sql |
| 135 |
dev-lisp/md5 |
| 136 |
@@ -22,13 +21,12 @@ RDEPEND="!dev-lisp/cl-sql |
| 137 |
mysql? ( virtual/mysql ) |
| 138 |
odbc? ( dev-db/unixODBC ) |
| 139 |
oracle? ( dev-db/oracle-instantclient-basic ) |
| 140 |
- postgres? ( dev-db/postgresql-base ) |
| 141 |
- sqlite? ( dev-db/sqlite:0 ) |
| 142 |
- sqlite3? ( dev-db/sqlite:3 )" |
| 143 |
+ postgres? ( dev-db/postgresql ) |
| 144 |
+ sqlite? ( dev-db/sqlite:3 )" |
| 145 |
|
| 146 |
src_prepare() { |
| 147 |
- sed -i "s,/usr/lib,/usr/$(get_libdir),g" "${S}"/${PN}-{mysql,uffi}.asd |
| 148 |
- sed -i 's,"usr" "lib","usr" "'$(get_libdir)'",g' "${S}"/${PN}-{mysql,uffi}.asd |
| 149 |
+ sed -i "s,/usr/lib,/usr/$(get_libdir),g" "${S}"/${PN}-{mysql,uffi}.asd || die |
| 150 |
+ sed -i 's,"usr" "lib","usr" "'$(get_libdir)'",g' "${S}"/${PN}-{mysql,uffi}.asd || die |
| 151 |
} |
| 152 |
|
| 153 |
@cc() { |
Archives