| 1 |
commit: bb07d154b32c83f3e29fc6dee2d15602d639ce4f |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 2 15:30:45 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 2 15:56:41 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb07d154 |
| 7 |
|
| 8 |
dev-db/tora: Switch to +postgres default, drop obsolete warning |
| 9 |
|
| 10 |
Thanks-to: Sergey S. Starikoff <Ikonta <AT> yandex.ru> |
| 11 |
Closes: https://bugs.gentoo.org/645242 |
| 12 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
| 13 |
|
| 14 |
.../tora/{tora-9999.ebuild => tora-3.2-r1.ebuild} | 22 ++++++---------------- |
| 15 |
dev-db/tora/tora-9999.ebuild | 20 ++++---------------- |
| 16 |
2 files changed, 10 insertions(+), 32 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-3.2-r1.ebuild |
| 19 |
similarity index 79% |
| 20 |
copy from dev-db/tora/tora-9999.ebuild |
| 21 |
copy to dev-db/tora/tora-3.2-r1.ebuild |
| 22 |
index 41ee84ac7f5..dd82fa3785b 100644 |
| 23 |
--- a/dev-db/tora/tora-9999.ebuild |
| 24 |
+++ b/dev-db/tora/tora-3.2-r1.ebuild |
| 25 |
@@ -1,4 +1,4 @@ |
| 26 |
-# Copyright 1999-2017 Gentoo Foundation |
| 27 |
+# Copyright 1999-2018 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
EAPI=6 |
| 31 |
@@ -15,7 +15,8 @@ fi |
| 32 |
|
| 33 |
DESCRIPTION="SQL IDE for Oracle, MySQL and PostgreSQL dbs" |
| 34 |
HOMEPAGE="https://github.com/tora-tool/tora/wiki" |
| 35 |
-IUSE="doc mysql oracle pch postgres" |
| 36 |
+IUSE="doc mysql oracle +postgres" |
| 37 |
+REQUIRED_USE="|| ( mysql oracle postgres )" |
| 38 |
|
| 39 |
SLOT="0" |
| 40 |
LICENSE="GPL-2" |
| 41 |
@@ -29,7 +30,7 @@ RDEPEND=" |
| 42 |
dev-qt/qtsql:5[mysql?,postgres?] |
| 43 |
dev-qt/qtwidgets:5 |
| 44 |
>=x11-libs/qscintilla-2.10.1:=[qt5(+)] |
| 45 |
- oracle? ( =dev-db/oracle-instantclient-basic-11* ) |
| 46 |
+ oracle? ( || ( =dev-db/oracle-instantclient-basic-11* dev-db/oracle-instantclient ) ) |
| 47 |
postgres? ( dev-db/postgresql:* ) |
| 48 |
" |
| 49 |
DEPEND="${RDEPEND} |
| 50 |
@@ -38,18 +39,7 @@ DEPEND="${RDEPEND} |
| 51 |
doc? ( app-doc/doxygen ) |
| 52 |
" |
| 53 |
|
| 54 |
-pkg_setup() { |
| 55 |
- if use oracle && [[ -z "$ORACLE_HOME" ]]; then |
| 56 |
- eerror "ORACLE_HOME variable is not set." |
| 57 |
- eerror |
| 58 |
- eerror "You must install Oracle >= 8i client for Linux in" |
| 59 |
- eerror "order to compile TOra with Oracle support." |
| 60 |
- eerror |
| 61 |
- eerror "You can download the Oracle software from" |
| 62 |
- eerror "http://www.oracle.com/technetwork/database/features/instant-client/index.html" |
| 63 |
- die |
| 64 |
- fi |
| 65 |
-} |
| 66 |
+PATCHES=( "${FILESDIR}/${P}-missing-header.patch" ) |
| 67 |
|
| 68 |
src_prepare() { |
| 69 |
cmake-utils_src_prepare |
| 70 |
@@ -79,7 +69,7 @@ src_configure() { |
| 71 |
-DLOKI_INCLUDE_DIR="$(pkg-config --variable=includedir ferrisloki)/FerrisLoki" |
| 72 |
$(cmake-utils_use_find_package doc Doxygen) |
| 73 |
-DENABLE_ORACLE=$(usex oracle) |
| 74 |
- -DUSE_PCH=$(usex pch) |
| 75 |
+ -DUSE_PCH=OFF |
| 76 |
-DENABLE_PGSQL=$(usex postgres) |
| 77 |
) |
| 78 |
cmake-utils_src_configure |
| 79 |
|
| 80 |
diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-9999.ebuild |
| 81 |
index 41ee84ac7f5..2f79f2291a8 100644 |
| 82 |
--- a/dev-db/tora/tora-9999.ebuild |
| 83 |
+++ b/dev-db/tora/tora-9999.ebuild |
| 84 |
@@ -1,4 +1,4 @@ |
| 85 |
-# Copyright 1999-2017 Gentoo Foundation |
| 86 |
+# Copyright 1999-2018 Gentoo Foundation |
| 87 |
# Distributed under the terms of the GNU General Public License v2 |
| 88 |
|
| 89 |
EAPI=6 |
| 90 |
@@ -15,7 +15,8 @@ fi |
| 91 |
|
| 92 |
DESCRIPTION="SQL IDE for Oracle, MySQL and PostgreSQL dbs" |
| 93 |
HOMEPAGE="https://github.com/tora-tool/tora/wiki" |
| 94 |
-IUSE="doc mysql oracle pch postgres" |
| 95 |
+IUSE="doc mysql oracle pch +postgres" |
| 96 |
+REQUIRED_USE="|| ( mysql oracle postgres )" |
| 97 |
|
| 98 |
SLOT="0" |
| 99 |
LICENSE="GPL-2" |
| 100 |
@@ -29,7 +30,7 @@ RDEPEND=" |
| 101 |
dev-qt/qtsql:5[mysql?,postgres?] |
| 102 |
dev-qt/qtwidgets:5 |
| 103 |
>=x11-libs/qscintilla-2.10.1:=[qt5(+)] |
| 104 |
- oracle? ( =dev-db/oracle-instantclient-basic-11* ) |
| 105 |
+ oracle? ( || ( =dev-db/oracle-instantclient-basic-11* dev-db/oracle-instantclient ) ) |
| 106 |
postgres? ( dev-db/postgresql:* ) |
| 107 |
" |
| 108 |
DEPEND="${RDEPEND} |
| 109 |
@@ -38,19 +39,6 @@ DEPEND="${RDEPEND} |
| 110 |
doc? ( app-doc/doxygen ) |
| 111 |
" |
| 112 |
|
| 113 |
-pkg_setup() { |
| 114 |
- if use oracle && [[ -z "$ORACLE_HOME" ]]; then |
| 115 |
- eerror "ORACLE_HOME variable is not set." |
| 116 |
- eerror |
| 117 |
- eerror "You must install Oracle >= 8i client for Linux in" |
| 118 |
- eerror "order to compile TOra with Oracle support." |
| 119 |
- eerror |
| 120 |
- eerror "You can download the Oracle software from" |
| 121 |
- eerror "http://www.oracle.com/technetwork/database/features/instant-client/index.html" |
| 122 |
- die |
| 123 |
- fi |
| 124 |
-} |
| 125 |
- |
| 126 |
src_prepare() { |
| 127 |
cmake-utils_src_prepare |
Archives