From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8E4EA139085 for ; Thu, 22 Dec 2016 18:27:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4827FE0DC1; Thu, 22 Dec 2016 18:27:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 29328E0DBE for ; Thu, 22 Dec 2016 18:27:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0093E341117 for ; Thu, 22 Dec 2016 18:26:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98D7024E9 for ; Thu, 22 Dec 2016 18:26:55 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1482431161.35546a1c31531780dfbc5125b40a774307c31985.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/tora/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/tora/tora-3.0.0_pre20140929-r1.ebuild dev-db/tora/tora-3.0.0_pre20140929-r2.ebuild dev-db/tora/tora-9999.ebuild X-VCS-Directories: dev-db/tora/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 35546a1c31531780dfbc5125b40a774307c31985 X-VCS-Branch: master Date: Thu, 22 Dec 2016 18:26:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: de1e4801-b553-4c29-82bb-6050ab0e6c6d X-Archives-Hash: 8449ff97983e450ccf24ecfa01b7e271 commit: 35546a1c31531780dfbc5125b40a774307c31985 Author: David Seifert gentoo org> AuthorDate: Thu Dec 22 17:46:37 2016 +0000 Commit: David Seifert gentoo 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