commit: 35546a1c31531780dfbc5125b40a774307c31985 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Thu Dec 22 17:46:37 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Dec 22 18:26:01 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35546a1c
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 ...re20140929-r1.ebuild => tora-3.0.0_pre20140929-r2.ebuild} | 5 ++--- dev-db/tora/tora-9999.ebuild | 12 +++++++----- 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 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 3c19307..bee25ee 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 6970c22..8867f7b 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
