summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-im/bitlbee/ChangeLog6
-rw-r--r--net-im/bitlbee/bitlbee-3.0.5-r1.ebuild4
-rw-r--r--net-im/bitlbee/bitlbee-3.0.6.ebuild4
-rw-r--r--net-im/bitlbee/bitlbee-3.2.1.ebuild4
-rw-r--r--net-im/bitlbee/bitlbee-3.2.ebuild4
5 files changed, 13 insertions, 9 deletions
diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index b8493d6b77ee..85df39612f82 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/bitlbee
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.168 2014/05/26 09:10:12 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.169 2014/06/05 10:04:32 mrueg Exp $
+
+ 05 Jun 2014; Manuel Rüger <mrueg@gentoo.org> bitlbee-3.0.5-r1.ebuild,
+ bitlbee-3.0.6.ebuild, bitlbee-3.2.1.ebuild, bitlbee-3.2.ebuild:
+ Restrict dependency to <net-libs/libotr-4
26 May 2014; Sven Vermeulen <swift@gentoo.org> bitlbee-3.0.5-r1.ebuild,
bitlbee-3.0.6.ebuild, bitlbee-3.2.1.ebuild, bitlbee-3.2.ebuild:
diff --git a/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild b/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild
index 3b68df4f602d..df6c511419af 100644
--- a/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild,v 1.9 2014/05/26 09:10:12 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild,v 1.10 2014/06/05 10:04:32 mrueg Exp $
EAPI="4"
PYTHON_DEPEND="skype? 2:2.5"
@@ -20,7 +20,7 @@ skype ssl test twitter +yahoo xinetd" # ldap - Bug 195758
COMMON_DEPEND="purple? ( net-im/pidgin )
libevent? ( dev-libs/libevent )
!libevent? ( >=dev-libs/glib-2.4 )
- otr? ( net-libs/libotr )
+ otr? ( <net-libs/libotr-4 )
gnutls? ( net-libs/gnutls )
!gnutls? (
nss? ( dev-libs/nss )
diff --git a/net-im/bitlbee/bitlbee-3.0.6.ebuild b/net-im/bitlbee/bitlbee-3.0.6.ebuild
index 8179b935e2f1..def1fb38d20a 100644
--- a/net-im/bitlbee/bitlbee-3.0.6.ebuild
+++ b/net-im/bitlbee/bitlbee-3.0.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.6.ebuild,v 1.3 2014/05/26 09:10:12 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.6.ebuild,v 1.4 2014/06/05 10:04:32 mrueg Exp $
EAPI="4"
PYTHON_DEPEND="skype? 2:2.5"
@@ -20,7 +20,7 @@ skype ssl test twitter +yahoo xinetd" # ldap - Bug 195758
COMMON_DEPEND="purple? ( net-im/pidgin )
libevent? ( dev-libs/libevent )
!libevent? ( >=dev-libs/glib-2.4 )
- otr? ( net-libs/libotr )
+ otr? ( <net-libs/libotr-4 )
gnutls? ( net-libs/gnutls )
!gnutls? (
nss? ( dev-libs/nss )
diff --git a/net-im/bitlbee/bitlbee-3.2.1.ebuild b/net-im/bitlbee/bitlbee-3.2.1.ebuild
index 40d3ae74e30f..bf4fa8acd1af 100644
--- a/net-im/bitlbee/bitlbee-3.2.1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.2.1.ebuild,v 1.3 2014/05/26 09:10:12 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.2.1.ebuild,v 1.4 2014/06/05 10:04:32 mrueg Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -20,7 +20,7 @@ skype ssl test twitter +yahoo xinetd" # ldap - Bug 195758
COMMON_DEPEND="purple? ( net-im/pidgin )
libevent? ( dev-libs/libevent )
!libevent? ( >=dev-libs/glib-2.4 )
- otr? ( net-libs/libotr )
+ otr? ( <net-libs/libotr-4 )
gnutls? ( net-libs/gnutls )
!gnutls? (
nss? ( dev-libs/nss )
diff --git a/net-im/bitlbee/bitlbee-3.2.ebuild b/net-im/bitlbee/bitlbee-3.2.ebuild
index caf7dc58ece4..0a16528ad6f6 100644
--- a/net-im/bitlbee/bitlbee-3.2.ebuild
+++ b/net-im/bitlbee/bitlbee-3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.2.ebuild,v 1.4 2014/05/26 09:10:12 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.2.ebuild,v 1.5 2014/06/05 10:04:32 mrueg Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -20,7 +20,7 @@ skype ssl test twitter +yahoo xinetd" # ldap - Bug 195758
COMMON_DEPEND="purple? ( net-im/pidgin )
libevent? ( dev-libs/libevent )
!libevent? ( >=dev-libs/glib-2.4 )
- otr? ( net-libs/libotr )
+ otr? ( <net-libs/libotr-4 )
gnutls? ( net-libs/gnutls )
!gnutls? (
nss? ( dev-libs/nss )