commit: bb07d154b32c83f3e29fc6dee2d15602d639ce4f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jul 2 15:30:45 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Jul 2 15:56:41 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb07d154
dev-db/tora: Switch to +postgres default, drop obsolete warning Thanks-to: Sergey S. Starikoff <Ikonta <AT> yandex.ru> Closes: https://bugs.gentoo.org/645242 Package-Manager: Portage-2.3.41, Repoman-2.3.9 .../tora/{tora-9999.ebuild => tora-3.2-r1.ebuild} | 22 ++++++---------------- dev-db/tora/tora-9999.ebuild | 20 ++++---------------- 2 files changed, 10 insertions(+), 32 deletions(-) diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-3.2-r1.ebuild similarity index 79% copy from dev-db/tora/tora-9999.ebuild copy to dev-db/tora/tora-3.2-r1.ebuild index 41ee84ac7f5..dd82fa3785b 100644 --- a/dev-db/tora/tora-9999.ebuild +++ b/dev-db/tora/tora-3.2-r1.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 @@ -15,7 +15,8 @@ fi DESCRIPTION="SQL IDE for Oracle, MySQL and PostgreSQL dbs" HOMEPAGE="https://github.com/tora-tool/tora/wiki"; -IUSE="doc mysql oracle pch postgres" +IUSE="doc mysql oracle +postgres" +REQUIRED_USE="|| ( mysql oracle postgres )" SLOT="0" LICENSE="GPL-2" @@ -29,7 +30,7 @@ RDEPEND=" dev-qt/qtsql:5[mysql?,postgres?] dev-qt/qtwidgets:5 >=x11-libs/qscintilla-2.10.1:=[qt5(+)] - oracle? ( =dev-db/oracle-instantclient-basic-11* ) + oracle? ( || ( =dev-db/oracle-instantclient-basic-11* dev-db/oracle-instantclient ) ) postgres? ( dev-db/postgresql:* ) " DEPEND="${RDEPEND} @@ -38,18 +39,7 @@ DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) " -pkg_setup() { - if use oracle && [[ -z "$ORACLE_HOME" ]]; then - eerror "ORACLE_HOME variable is not set." - eerror - eerror "You must install Oracle >= 8i client for Linux in" - eerror "order to compile TOra with Oracle support." - eerror - eerror "You can download the Oracle software from" - eerror "http://www.oracle.com/technetwork/database/features/instant-client/index.html"; - die - fi -} +PATCHES=( "${FILESDIR}/${P}-missing-header.patch" ) src_prepare() { cmake-utils_src_prepare @@ -79,7 +69,7 @@ src_configure() { -DLOKI_INCLUDE_DIR="$(pkg-config --variable=includedir ferrisloki)/FerrisLoki" $(cmake-utils_use_find_package doc Doxygen) -DENABLE_ORACLE=$(usex oracle) - -DUSE_PCH=$(usex pch) + -DUSE_PCH=OFF -DENABLE_PGSQL=$(usex postgres) ) cmake-utils_src_configure diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-9999.ebuild index 41ee84ac7f5..2f79f2291a8 100644 --- a/dev-db/tora/tora-9999.ebuild +++ b/dev-db/tora/tora-9999.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 @@ -15,7 +15,8 @@ fi DESCRIPTION="SQL IDE for Oracle, MySQL and PostgreSQL dbs" HOMEPAGE="https://github.com/tora-tool/tora/wiki"; -IUSE="doc mysql oracle pch postgres" +IUSE="doc mysql oracle pch +postgres" +REQUIRED_USE="|| ( mysql oracle postgres )" SLOT="0" LICENSE="GPL-2" @@ -29,7 +30,7 @@ RDEPEND=" dev-qt/qtsql:5[mysql?,postgres?] dev-qt/qtwidgets:5 >=x11-libs/qscintilla-2.10.1:=[qt5(+)] - oracle? ( =dev-db/oracle-instantclient-basic-11* ) + oracle? ( || ( =dev-db/oracle-instantclient-basic-11* dev-db/oracle-instantclient ) ) postgres? ( dev-db/postgresql:* ) " DEPEND="${RDEPEND} @@ -38,19 +39,6 @@ DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) " -pkg_setup() { - if use oracle && [[ -z "$ORACLE_HOME" ]]; then - eerror "ORACLE_HOME variable is not set." - eerror - eerror "You must install Oracle >= 8i client for Linux in" - eerror "order to compile TOra with Oracle support." - eerror - eerror "You can download the Oracle software from" - eerror "http://www.oracle.com/technetwork/database/features/instant-client/index.html"; - die - fi -} - src_prepare() { cmake-utils_src_prepare
