public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqliteman/
Date: Thu, 22 Dec 2016 18:26:55 +0000 (UTC)	[thread overview]
Message-ID: <1482431158.cb3d1cf8bc7e896c4a61418644c6748f2c4e7cd9.soap@gentoo> (raw)

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
 }


             reply	other threads:[~2016-12-22 18:27 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-22 18:26 David Seifert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-04-16 16:30 [gentoo-commits] repo/gentoo:master commit in: dev-db/sqliteman/ Jimi Huotari
2022-04-05  7:49 Andreas Sturmlechner
2022-04-04 12:27 Jakov Smolić
2022-04-04 12:27 Jakov Smolić
2017-11-20 15:46 Manuel Rüger
2017-11-02 21:16 Thomas Deutschmann
2017-06-18  9:06 Michael Palimaka
2016-02-26 17:19 Markus Meier
2015-12-03 13:34 Michael Palimaka
2015-12-03 13:28 Agostino Sarubbo
2015-11-20 11:05 Agostino Sarubbo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1482431158.cb3d1cf8bc7e896c4a61418644c6748f2c4e7cd9.soap@gentoo \
    --to=soap@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox