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

diff --git a/dev-db/tora/tora-3.0.0_pre20140929-r1.ebuild b/dev-db/tora/tora-3.0.0_pre20140929-r2.ebuild
similarity index 96%
rename from dev-db/tora/tora-3.0.0_pre20140929-r1.ebuild
rename to dev-db/tora/tora-3.0.0_pre20140929-r2.ebuild
index 3c193077b7722b0e9ffc2b122b002fa7a0711b05..bee25eeba66f771a89b0309a47b17b4222f0faeb 100644 (file)
--- 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 6970c22b8bacc88a44d02c4741ccbba4540b7c7e..8867f7b24313152974a7256b5c8dbfc91e1f686e 100644 (file)
--- 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