Block with ircd-hybrid, both provide ircd executable

Package-Manager: portage-2.1.4_rc14

4 files changed, 26 insertions, 20 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/Manifest b/net-irc/charybdis/Manifest
index d5bad7deb662..11f57557115d 100644
--- a/net-irc/charybdis/Manifest
+++ b/net-irc/charybdis/Manifest
@@ -20,18 +20,18 @@ EBUILD charybdis-2.1.5.ebuild 1142 RMD160 04c5c0b780458010793c91571e4abc1287cd35
 MD5 d16763ac1738f48fb104dd45976162af charybdis-2.1.5.ebuild 1142
 RMD160 04c5c0b780458010793c91571e4abc1287cd3507 charybdis-2.1.5.ebuild 1142
 SHA256 4bf768b4f6b8707040b129bd71a0a02286c6bfaf2dc770eb4efe6fad53cad2fc charybdis-2.1.5.ebuild 1142
-EBUILD charybdis-2.2.0.ebuild 1142 RMD160 5ba28fd4690aab1a38378737910be93381afd443 SHA1 dfc2299a0273e774d5f5d6041b71032755155984 SHA256 66ce3c47a305e044e27df43d6ffdb7905bafeb7f8cdc99a05f80565ffe34d5d2
-MD5 002d6b8dd3a9cd62e3b22897853fcaa6 charybdis-2.2.0.ebuild 1142
-RMD160 5ba28fd4690aab1a38378737910be93381afd443 charybdis-2.2.0.ebuild 1142
-SHA256 66ce3c47a305e044e27df43d6ffdb7905bafeb7f8cdc99a05f80565ffe34d5d2 charybdis-2.2.0.ebuild 1142
-EBUILD charybdis-2.2.1_pre20080108.ebuild 1129 RMD160 3e134bf1176036d6635fe48fc94b6b55a075ea09 SHA1 9dd15d2368b0785a58c27d9285485049e814cc3c SHA256 1b57f4d34845ce2602df3843ee26df81b8ade8cee81b5bbeaba777549bda1d74
-MD5 b4da3b1e40458bc580aaad3225a6dc96 charybdis-2.2.1_pre20080108.ebuild 1129
-RMD160 3e134bf1176036d6635fe48fc94b6b55a075ea09 charybdis-2.2.1_pre20080108.ebuild 1129
-SHA256 1b57f4d34845ce2602df3843ee26df81b8ade8cee81b5bbeaba777549bda1d74 charybdis-2.2.1_pre20080108.ebuild 1129
-MISC ChangeLog 1395 RMD160 cdd4784453e74fb1ad901fb3764d27c17e20451f SHA1 8ba271e508b48952fece2e7a724b941894719d0e SHA256 a674cdb27f34756778b0a1705251a5cdcdfb13210f110683a5b23cf5ee758182
-MD5 317cbac22319565934c0b894cb2ab592 ChangeLog 1395
-RMD160 cdd4784453e74fb1ad901fb3764d27c17e20451f ChangeLog 1395
-SHA256 a674cdb27f34756778b0a1705251a5cdcdfb13210f110683a5b23cf5ee758182 ChangeLog 1395
+EBUILD charybdis-2.2.0.ebuild 1163 RMD160 cbf4f7e0fe4225f665720d7faee8109f999ffb68 SHA1 f75e4a22d878ae5b382dd035d9e879b3b79dbfcc SHA256 0241f73ec1354d01a5fe054ec6559cafe43251c0391ccd063f2e710f2987c20b
+MD5 7e5130807afccf4983665d5ba91cd545 charybdis-2.2.0.ebuild 1163
+RMD160 cbf4f7e0fe4225f665720d7faee8109f999ffb68 charybdis-2.2.0.ebuild 1163
+SHA256 0241f73ec1354d01a5fe054ec6559cafe43251c0391ccd063f2e710f2987c20b charybdis-2.2.0.ebuild 1163
+EBUILD charybdis-2.2.1_pre20080108.ebuild 1150 RMD160 705dc0234574053ce42cb53d284d3fa028c248ca SHA1 2dad1055460b9895e17c98481bfd4be7d059664b SHA256 6f1bba6461477a3695c436cdd4473ffa93b6df4b7caa7dd2aa2480aa5e3fec36
+MD5 7a4d6764c94954b253451315f1098120 charybdis-2.2.1_pre20080108.ebuild 1150
+RMD160 705dc0234574053ce42cb53d284d3fa028c248ca charybdis-2.2.1_pre20080108.ebuild 1150
+SHA256 6f1bba6461477a3695c436cdd4473ffa93b6df4b7caa7dd2aa2480aa5e3fec36 charybdis-2.2.1_pre20080108.ebuild 1150
+MISC ChangeLog 1562 RMD160 d875008dfa1e6f0dde1d549dde295f77cd5f0b2c SHA1 ad7ee5fce9f2db8e637feb5600855c3719cedea9 SHA256 b1d600adf27a778d821cc51fcbd6c390769aca5b2c204693382a0a039c0646ef
+MD5 7e258a1f8fce54df8b19b8be0cfe2e7b ChangeLog 1562
+RMD160 d875008dfa1e6f0dde1d549dde295f77cd5f0b2c ChangeLog 1562
+SHA256 b1d600adf27a778d821cc51fcbd6c390769aca5b2c204693382a0a039c0646ef ChangeLog 1562
 MISC metadata.xml 379 RMD160 5cb40074a3f8fc83d081a30f6dc448ad47a43cf9 SHA1 f49154ca029d1f3af5733afe0d9b992df2b59341 SHA256 4921fd19cc7a965e67dc9292d9cac6d72b8adb9804046c0a23f159419128b13c
 MD5 fb27b8bdafbfbe4f4136059ac7da5efe metadata.xml 379
 RMD160 5cb40074a3f8fc83d081a30f6dc448ad47a43cf9 metadata.xml 379
@@ -48,7 +48,7 @@ SHA256 d039be1ea22071d1de871ad9581f5dd78187f6fd612367c883b9c89fe0706e91 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHg4Y/z974XjDVpbkRAt+eAJ9tNCSR1q39vBwYQUvS5qrm3U7xuACfS50b
-dVAq72r5bQbyfKWqMw/c3yU=
-=HMj+
+iD8DBQFHg4ePz974XjDVpbkRAvNgAJkBJLmzNuFL7GxxZi8NCvVHZxN26ACg1RN/
+/+UQA3XfH5VbPmHmHFQiSsU=
+=aEG6
 -----END PGP SIGNATURE-----
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