--- /usr/portage/gentoo/dev-db/tora/tora-3.2.ebuild	2017-12-28 13:39:44.000000000 +0300
+++ /usr/portage/local/dev-db/tora/tora-9999-r2.ebuild	2018-01-21 15:50:35.360001892 +0300
@@ -11,11 +11,13 @@
 else
 	SRC_URI="https://github.com/tora-tool/tora/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+	#
+	PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
 fi
 
 DESCRIPTION="SQL IDE for Oracle, MySQL and PostgreSQL dbs"
 HOMEPAGE="https://github.com/tora-tool/tora/wiki"
-IUSE="doc mysql oracle postgres"
+IUSE="doc mysql oracle +postgres"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -29,7 +31,7 @@
 	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,20 +40,7 @@
 	doc? ( app-doc/doxygen )
 "
 
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
-
-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
-}
+REQUIRED_USE="|| ( mysql oracle postgres )"
 
 src_prepare() {
 	cmake-utils_src_prepare