summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2016-12-22 18:46:37 +0100
committerDavid Seifert <soap@gentoo.org>2016-12-22 20:26:01 +0200
commit35546a1c31531780dfbc5125b40a774307c31985 (patch)
treef2f3fe7da5a83fb79da46a74141a7139a8b5c740 /dev-db/tora
parentdev-db/sqliteman: Depend on x11-libs/qscintilla[qt4] (diff)
downloadgentoo-35546a1c31531780dfbc5125b40a774307c31985.tar.gz
gentoo-35546a1c31531780dfbc5125b40a774307c31985.tar.bz2
gentoo-35546a1c31531780dfbc5125b40a774307c31985.zip
dev-db/tora: Depend on x11-libs/qscintilla[qt4]
Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3188
Diffstat (limited to 'dev-db/tora')
-rw-r--r--dev-db/tora/tora-3.0.0_pre20140929-r2.ebuild (renamed from dev-db/tora/tora-3.0.0_pre20140929-r1.ebuild)5
-rw-r--r--dev-db/tora/tora-9999.ebuild12
2 files changed, 9 insertions, 8 deletions
diff --git a/dev-db/tora/tora-3.0.0_pre20140929-r1.ebuild b/dev-db/tora/tora-3.0.0_pre20140929-r2.ebuild
index 3c193077b772..bee25eeba66f 100644
--- a/dev-db/tora/tora-3.0.0_pre20140929-r1.ebuild
+++ b/dev-db/tora/tora-3.0.0_pre20140929-r2.ebuild
@@ -24,14 +24,13 @@ KEYWORDS="~amd64 ~x86"
RDEPEND="
dev-libs/ferrisloki
- x11-libs/qscintilla
+ x11-libs/qscintilla:=[qt4(-)]
dev-qt/qtgui:4
dev-qt/qtsql:4[mysql?,postgres?]
dev-qt/qtxmlpatterns:4
=dev-db/oracle-instantclient-basic-11*
- postgres? ( dev-db/postgresql )
+ postgres? ( dev-db/postgresql:* )
"
-
DEPEND="
virtual/pkgconfig
${RDEPEND}
diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-9999.ebuild
index 6970c22b8bac..8867f7b24313 100644
--- a/dev-db/tora/tora-9999.ebuild
+++ b/dev-db/tora/tora-9999.ebuild
@@ -22,17 +22,19 @@ SLOT="0"
LICENSE="GPL-2"
KEYWORDS=""
-DEPEND="
- virtual/pkgconfig
+RDEPEND="
dev-libs/ferrisloki
- x11-libs/qscintilla
+ x11-libs/qscintilla:=[qt4(-)]
dev-qt/qtgui:4
dev-qt/qtsql:4[mysql?,postgres?]
dev-qt/qtxmlpatterns:4
oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- postgres? ( dev-db/postgresql )
+ postgres? ( dev-db/postgresql:* )
+"
+DEPEND="
+ virtual/pkgconfig
+ ${RDEPEND}
"
-RDEPEND="${DEPEND}"
pkg_setup() {
if ( use oracle || use oci8-instant-client ) && [ -z "$ORACLE_HOME" ] ; then