block xmule, #61438

8 files changed, 24 insertions, 94 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index ac117fd3fd78..bf8d8a0beadf 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.30 2004/08/14 00:44:00 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.31 2004/08/24 17:37:32 squinky86 Exp $
+
+  24 Aug 2004; Jon Hood <squinky86@gentoo.org> -amule-1.2.6.ebuild,
+  -amule-1.2.7.ebuild, amule-1.2.8.ebuild, amule-2.0.0_rc5.ebuild:
+  Block install of xmule, fixes #61438.
 
   13 Aug 2004; Jon Hood <squinky86@gentoo.org> amule-1.2.8.ebuild,
   -amule-2.0.0_rc3.ebuild:
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index d915fbe47253..6efce11c8381 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,10 +1,16 @@
-MD5 44203597f71957b61d479e8dff75af9d amule-1.2.7.ebuild 1087
-MD5 c0dd2419f9b4895012011f52a72c6a5a amule-2.0.0_rc5.ebuild 2337
-MD5 83a5322edb2d852d6bb032f9ee59ff7d amule-1.2.6.ebuild 1028
-MD5 cb71911b9348b676453ba28081a6923c ChangeLog 4238
-MD5 281033f8828df36c9669e9e0374a2a2f amule-1.2.8.ebuild 1085
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 584cfd736f3c184a3dd4479c80c429d8 amule-2.0.0_rc5.ebuild 2353
+MD5 9aaae6dee9fa854b6bddc61f40304095 ChangeLog 4414
+MD5 db6de540cb4d1cc82c65ec0474c45901 amule-1.2.8.ebuild 1101
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 MD5 25f3451bd4e421754b720ec5f10605b4 files/digest-amule-2.0.0_rc5 68
-MD5 a301972585e39355d61f9dcc8daaab86 files/digest-amule-1.2.6 65
-MD5 7a18b938fdc0d7255544a5e112db30b9 files/digest-amule-1.2.7 65
 MD5 6222124296125a6909963944434e0291 files/digest-amule-1.2.8 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBK3zfcAgAdbxYsnERAkUbAJ0RNHGTfLyOtAvGwZN0gUJyDOoUVACeOYSk
+U+6pCjSl2yy+fKmcduSabxQ=
+=9+ZT
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/amule/amule-1.2.6.ebuild b/net-p2p/amule/amule-1.2.6.ebuild
deleted file mode 100644
index fb18d8efd916..000000000000
--- a/net-p2p/amule/amule-1.2.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.2.6.ebuild,v 1.8 2004/06/29 00:41:44 squinky86 Exp $
-
-MY_P=${P/m/M}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="aNOTHER wxWindows based eMule P2P Client"
-HOMEPAGE="http://sourceforge.net/projects/amule"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE="nls"
-
-DEPEND=">=x11-libs/wxGTK-2.4.2
-	>=net-misc/curl-7.11.0
-	>=sys-libs/zlib-1.2.1"
-
-pkg_setup() {
-	if wx-config --cppflags | grep gtk2u >& /dev/null; then
-		einfo "${PN} will not build if wxGTK was compiled"
-		einfo "with unicode support.  If you are using a version of"
-		einfo "wxGTK <= 2.4.2, you must set USE=-gtk2.  In newer versions,"
-		einfo "you must set USE=-unicode."
-		die "wxGTK must be re-emerged without unicode suport"
-	fi
-}
-
-src_compile() {
-	econf `use_enable nls` || die
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/net-p2p/amule/amule-1.2.7.ebuild b/net-p2p/amule/amule-1.2.7.ebuild
deleted file mode 100644
index d31e86386bdb..000000000000
--- a/net-p2p/amule/amule-1.2.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.2.7.ebuild,v 1.1 2004/07/02 20:26:25 squinky86 Exp $
-
-MY_P=${P/m/M}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org"
-SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2"
-
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug nls remote"
-
-DEPEND=">=x11-libs/wxGTK-2.4.2
-	>=net-misc/curl-7.11.0
-	>=sys-libs/zlib-1.2.1"
-
-pkg_setup() {
-	if wx-config --cppflags | grep gtk2u >& /dev/null; then
-		einfo "${PN} will not build if wxGTK was compiled"
-		einfo "with unicode support.  If you are using a version of"
-		einfo "wxGTK <= 2.4.2, you must set USE=-gtk2.  In newer versions,"
-		einfo "you must set USE=-unicode."
-		die "wxGTK must be re-emerged without unicode suport"
-	fi
-}
-
-src_compile() {
-	econf `use_enable nls` \
-	`use_enable remote amulecmd` \
-	`use_enable debug` || die
-
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/net-p2p/amule/amule-1.2.8.ebuild b/net-p2p/amule/amule-1.2.8.ebuild
index 327b80db54b3..68b313ba4a53 100644
--- a/net-p2p/amule/amule-1.2.8.ebuild
+++ b/net-p2p/amule/amule-1.2.8.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/amule/amule-1.2.8.ebuild,v 1.2 2004/08/14 00:44:00 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.2.8.ebuild,v 1.3 2004/08/24 17:37:32 squinky86 Exp $
 
 MY_P=${P/m/M}
 S=${WORKDIR}/${MY_P}
@@ -16,7 +16,8 @@ IUSE="debug nls remote"
 
 DEPEND=">=x11-libs/wxGTK-2.4.2
 	>=net-misc/curl-7.11.0
-	>=sys-libs/zlib-1.2.1"
+	>=sys-libs/zlib-1.2.1
+	!net-p2p/xmule"
 
 pkg_setup() {
 	if wx-config --cppflags | grep gtk2u >& /dev/null; then
diff --git a/net-p2p/amule/amule-2.0.0_rc5.ebuild b/net-p2p/amule/amule-2.0.0_rc5.ebuild
index 63ed1931617e..a418f05878e7 100644
--- a/net-p2p/amule/amule-2.0.0_rc5.ebuild
+++ b/net-p2p/amule/amule-2.0.0_rc5.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/amule/amule-2.0.0_rc5.ebuild,v 1.4 2004/08/08 03:02:01 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.0_rc5.ebuild,v 1.5 2004/08/24 17:37:32 squinky86 Exp $
 
 inherit wxwidgets
 
@@ -28,7 +28,8 @@ DEPEND="remote? ( =x11-libs/wxGTK-2.4* )
 	>=dev-libs/crypto++-5.1-r1
 	>=sys-libs/zlib-1.2.1
 	stats? ( >=media-libs/gd-2.0.26 )
-	gd? ( >=media-libs/gd-2.0.26 )"
+	gd? ( >=media-libs/gd-2.0.26 )
+	!net-p2p/xmule"
 
 pkg_setup() {
 
diff --git a/net-p2p/amule/files/digest-amule-1.2.6 b/net-p2p/amule/files/digest-amule-1.2.6
deleted file mode 100644
index 540dd6a41528..000000000000
--- a/net-p2p/amule/files/digest-amule-1.2.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bcd30926d68f4f54dc9c3799f8cde070 aMule-1.2.6.tar.bz2 1398755
diff --git a/net-p2p/amule/files/digest-amule-1.2.7 b/net-p2p/amule/files/digest-amule-1.2.7
deleted file mode 100644
index 57558132d243..000000000000
--- a/net-p2p/amule/files/digest-amule-1.2.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5236a8d553b5a9759b1650136ffc5941 aMule-1.2.7.tar.bz2 1847182