summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Ullmann <jokey@gentoo.org>2008-01-08 14:24:09 +0000
committerMarkus Ullmann <jokey@gentoo.org>2008-01-08 14:24:09 +0000
commitec03a280f8db921239aab9db6bab6f13f043da20 (patch)
tree1393876c8b0258710ef227e4029364cb4af88192 /net-irc
parentAdd strip-flags to compile, custom-cflags use flag (diff)
downloadgentoo-2-ec03a280f8db921239aab9db6bab6f13f043da20.tar.gz
gentoo-2-ec03a280f8db921239aab9db6bab6f13f043da20.tar.bz2
gentoo-2-ec03a280f8db921239aab9db6bab6f13f043da20.zip
Block with ircd-hybrid, both provide ircd executable
(Portage version: 2.1.4_rc14)
Diffstat (limited to 'net-irc')
-rw-r--r--net-irc/charybdis/ChangeLog6
-rw-r--r--net-irc/charybdis/charybdis-2.2.0.ebuild5
-rw-r--r--net-irc/charybdis/charybdis-2.2.1_pre20080108.ebuild5
3 files changed, 11 insertions, 5 deletions
diff --git a/net-irc/charybdis/ChangeLog b/net-irc/charybdis/ChangeLog
index 55e2d6a6396e..27c71c8faddc 100644
--- a/net-irc/charybdis/ChangeLog
+++ b/net-irc/charybdis/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-irc/charybdis
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/ChangeLog,v 1.7 2008/01/08 14:18:30 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/ChangeLog,v 1.8 2008/01/08 14:24:09 jokey Exp $
+
+ 08 Jan 2008; Markus Ullmann <jokey@gentoo.org> charybdis-2.2.0.ebuild,
+ charybdis-2.2.1_pre20080108.ebuild:
+ Block with ircd-hybrid, both provide ircd executable
*charybdis-2.2.1_pre20080108 (08 Jan 2008)
diff --git a/net-irc/charybdis/charybdis-2.2.0.ebuild b/net-irc/charybdis/charybdis-2.2.0.ebuild
index 526ce1379f55..4f99ef3ed8b6 100644
--- a/net-irc/charybdis/charybdis-2.2.0.ebuild
+++ b/net-irc/charybdis/charybdis-2.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/charybdis-2.2.0.ebuild,v 1.2 2008/01/08 13:33:28 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/charybdis-2.2.0.ebuild,v 1.3 2008/01/08 14:24:09 jokey Exp $
inherit eutils
@@ -14,7 +14,8 @@ KEYWORDS="~x86"
IUSE="ipv6 ssl debug smallnet zlib static"
DEPEND="zlib? ( sys-libs/zlib )
- ssl? ( dev-libs/openssl )"
+ ssl? ( dev-libs/openssl )
+ !net-irc/ircd-hybrid"
pkg_setup() {
enewuser ircd
diff --git a/net-irc/charybdis/charybdis-2.2.1_pre20080108.ebuild b/net-irc/charybdis/charybdis-2.2.1_pre20080108.ebuild
index 3b6ad46ed27b..ae30bbd599fc 100644
--- a/net-irc/charybdis/charybdis-2.2.1_pre20080108.ebuild
+++ b/net-irc/charybdis/charybdis-2.2.1_pre20080108.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/charybdis-2.2.1_pre20080108.ebuild,v 1.1 2008/01/08 14:18:30 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/charybdis-2.2.1_pre20080108.ebuild,v 1.2 2008/01/08 14:24:09 jokey Exp $
inherit eutils
@@ -14,7 +14,8 @@ KEYWORDS=""
IUSE="ipv6 ssl debug smallnet zlib static"
DEPEND="zlib? ( sys-libs/zlib )
- ssl? ( dev-libs/openssl )"
+ ssl? ( dev-libs/openssl )
+ !net-irc/ircd-hybrid"
pkg_setup() {
enewuser ircd