summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Hood <squinky86@gentoo.org>2004-08-24 17:37:58 +0000
committerJon Hood <squinky86@gentoo.org>2004-08-24 17:37:58 +0000
commit15f7e3d1a51ebd9d62da17ac98aaabbdcdaafab0 (patch)
treeee309d9022e6026010ce1755d4e4b0b8c5908eec /net-p2p
parentblock xmule, #61438 (Manifest recommit) (diff)
downloadgentoo-2-15f7e3d1a51ebd9d62da17ac98aaabbdcdaafab0.tar.gz
gentoo-2-15f7e3d1a51ebd9d62da17ac98aaabbdcdaafab0.tar.bz2
gentoo-2-15f7e3d1a51ebd9d62da17ac98aaabbdcdaafab0.zip
block amule, #61438
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/xmule/ChangeLog6
-rw-r--r--net-p2p/xmule/xmule-1.8.4-r1.ebuild5
-rw-r--r--net-p2p/xmule/xmule-1.9.0.ebuild5
3 files changed, 11 insertions, 5 deletions
diff --git a/net-p2p/xmule/ChangeLog b/net-p2p/xmule/ChangeLog
index 59cfa3c16b56..ed202699316d 100644
--- a/net-p2p/xmule/ChangeLog
+++ b/net-p2p/xmule/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-p2p/xmule
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/ChangeLog,v 1.47 2004/08/23 17:51:15 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/ChangeLog,v 1.48 2004/08/24 17:37:58 squinky86 Exp $
+
+ 24 Aug 2004; Jon Hood <squinky86@gentoo.org> xmule-1.8.4-r1.ebuild,
+ xmule-1.9.0.ebuild:
+ Block install of amule, fixes #61438.
23 Aug 2004; Jon Hood <squinky86@gentoo.org> xmule-1.8.4-r1.ebuild,
xmule-1.9.0.ebuild:
diff --git a/net-p2p/xmule/xmule-1.8.4-r1.ebuild b/net-p2p/xmule/xmule-1.8.4-r1.ebuild
index b67330e36b9f..5a8240212390 100644
--- a/net-p2p/xmule/xmule-1.8.4-r1.ebuild
+++ b/net-p2p/xmule/xmule-1.8.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/xmule-1.8.4-r1.ebuild,v 1.2 2004/08/23 17:51:15 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/xmule-1.8.4-r1.ebuild,v 1.3 2004/08/24 17:37:58 squinky86 Exp $
inherit wxwidgets
@@ -16,7 +16,8 @@ IUSE="nls gtk2 debug"
DEPEND=">=x11-libs/wxGTK-2.4.2-r2
nls? ( sys-devel/gettext )
- >=sys-libs/zlib-1.2.1"
+ >=sys-libs/zlib-1.2.1
+ !net-p2p/amule"
src_unpack() {
unpack ${A}
diff --git a/net-p2p/xmule/xmule-1.9.0.ebuild b/net-p2p/xmule/xmule-1.9.0.ebuild
index a3a6bb83b582..6bf2f45fe9ad 100644
--- a/net-p2p/xmule/xmule-1.9.0.ebuild
+++ b/net-p2p/xmule/xmule-1.9.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/xmule-1.9.0.ebuild,v 1.3 2004/08/23 22:55:46 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/xmule-1.9.0.ebuild,v 1.4 2004/08/24 17:37:58 squinky86 Exp $
inherit wxwidgets
@@ -16,7 +16,8 @@ IUSE="nls gtk2 debug"
DEPEND=">=x11-libs/wxGTK-2.4.2-r2
nls? ( sys-devel/gettext )
- >=sys-libs/zlib-1.2.1"
+ >=sys-libs/zlib-1.2.1
+ !net-p2p/amule"
src_unpack() {
unpack ${A}