public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mikle Kolyada" <zlogene@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/irssi-otr/
Date: Sat,  9 Mar 2019 11:48:40 +0000 (UTC)	[thread overview]
Message-ID: <1552132115.424b14c84dcbbaff7f364df9863a34bf15750638.zlogene@gentoo> (raw)

commit:     424b14c84dcbbaff7f364df9863a34bf15750638
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  9 11:48:10 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Mar  9 11:48:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=424b14c8

net-irc/irssi-otr: block irssi-1.2* as it has built-in otr

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild | 3 ++-
 net-irc/irssi-otr/irssi-otr-1.0.2.ebuild    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild b/net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild
index acbe377b4c6..adc29addfcb 100644
--- a/net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild
+++ b/net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,6 +17,7 @@ IUSE=""
 # please note >=libotr-4.1.0 is required due to critical bugfix
 # d748757e581b74e7298df155ad49174cb914102b, see README.md
 RDEPEND="
+	!=net-irc/irssi-1.2*
 	>=dev-libs/glib-2.22.0:2
 	>=dev-libs/libgcrypt-1.2.0:0
 	>=net-libs/libotr-4.1.0

diff --git a/net-irc/irssi-otr/irssi-otr-1.0.2.ebuild b/net-irc/irssi-otr/irssi-otr-1.0.2.ebuild
index f9338b3ea99..5a4cc0eb98d 100644
--- a/net-irc/irssi-otr/irssi-otr-1.0.2.ebuild
+++ b/net-irc/irssi-otr/irssi-otr-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 hppa sparc x86"
 
 RDEPEND="
+	!=net-irc/irssi-1.2*
 	dev-libs/glib:2
 	>=dev-libs/libgcrypt-1.7.3
 	>=net-libs/libotr-4.1.0


             reply	other threads:[~2019-03-09 11:48 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-09 11:48 Mikle Kolyada [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-05-02 16:33 [gentoo-commits] repo/gentoo:master commit in: net-irc/irssi-otr/ Thomas Deutschmann
2018-04-27 21:08 Sergei Trofimovich
2018-04-26 22:00 Patrice Clement
2016-01-17 23:10 Patrice Clement
2015-10-16 13:56 Michael Palimaka
2015-10-16 11:02 Mikle Kolyada
2015-10-15 11:52 Michael Palimaka

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=1552132115.424b14c84dcbbaff7f364df9863a34bf15750638.zlogene@gentoo \
    --to=zlogene@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