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 B551F139085 for ; Thu, 22 Dec 2016 18:27:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F48BE0DAC; Thu, 22 Dec 2016 18:27:05 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 F277EE0DAC for ; Thu, 22 Dec 2016 18:26:59 +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 005F5340FC1 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 873E024E8 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: <1482431158.cb3d1cf8bc7e896c4a61418644c6748f2c4e7cd9.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqliteman/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild X-VCS-Directories: dev-db/sqliteman/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: cb3d1cf8bc7e896c4a61418644c6748f2c4e7cd9 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: 447c0374-4db6-403f-a609-b444f3716220 X-Archives-Hash: f47bf3407b93137265b3f3fbe88c2763 commit: cb3d1cf8bc7e896c4a61418644c6748f2c4e7cd9 Author: David Seifert gentoo org> AuthorDate: Thu Dec 22 17:46:37 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Thu Dec 22 18:25:58 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb3d1cf8 dev-db/sqliteman: Depend on x11-libs/qscintilla[qt4] Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3188 .../{sqliteman-1.2.2-r1.ebuild => sqliteman-1.2.2-r2.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild b/dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild similarity index 89% rename from dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild rename to dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild index e10a0ca..b91d182 100644 --- a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild +++ b/dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild @@ -19,7 +19,7 @@ RDEPEND=" dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsql:4[sqlite] - x11-libs/qscintilla" + x11-libs/qscintilla:=[qt4(-)]" DEPEND="${RDEPEND}" DOCS=( AUTHORS README ) @@ -27,7 +27,7 @@ PATCHES=( "${FILESDIR}/${P}-lpthread.patch" ) src_prepare() { # remove bundled lib - rm -rf "${S}"/${PN}/qscintilla2 + rm -rf "${S}"/${PN}/qscintilla2 || die cmake-utils_src_prepare }