[gentoo-commits] repo/gentoo:master commit in: dev-db/sqliteman/

[David Seifert]

commit:     cb3d1cf8bc7e896c4a61418644c6748f2c4e7cd9
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: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
 }