stable on x86; cleanups

6 files changed, 11 insertions, 47 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index f4babd1a039d..9bb7a42163b5 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.22 2004/06/25 00:27:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.23 2004/06/29 00:41:44 squinky86 Exp $
+
+  28 Jun 2004; Jon Hood <squinky86@gentoo.org> -amule-1.1.0.ebuild,
+  amule-1.2.6.ebuild:
+  stable on x86 (#55182); cleanup
 
   15 Jun 2004; Jon Hood <squinky86@gentoo.org> amule-2.0.0_rc3.ebuild:
   testing ~amd64, closes #53981
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index de746bcbff17..5908f49b10ea 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,8 +1,6 @@
-MD5 98d38fde0dc9bc2f90a335c37d372733 amule-2.0.0_rc3.ebuild 2032
-MD5 77b597dc90254959bf09aa90de57f017 amule-1.2.6.ebuild 1028
-MD5 58355ef0c076cb1925f8a4ec6d663bf3 amule-1.1.0.ebuild 985
-MD5 518371d59d74f3649d2f60b0e1a38acd ChangeLog 3004
+MD5 0e4b2d0b95d2a7b98ff3eccaebc539c1 amule-2.0.0_rc3.ebuild 2146
+MD5 83a5322edb2d852d6bb032f9ee59ff7d amule-1.2.6.ebuild 1028
+MD5 8779564b38edc51c0b1f328846d668dc ChangeLog 3130
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 MD5 2fb2652f4ff91f2244ff07cccd31d5d2 files/digest-amule-2.0.0_rc3 68
-MD5 1f788e567786e2aefb362559593e827a files/digest-amule-1.1.0 65
 MD5 a301972585e39355d61f9dcc8daaab86 files/digest-amule-1.2.6 65
diff --git a/net-p2p/amule/amule-1.1.0.ebuild b/net-p2p/amule/amule-1.1.0.ebuild
deleted file mode 100644
index 7aaa0ce6c6ad..000000000000
--- a/net-p2p/amule/amule-1.1.0.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.1.0.ebuild,v 1.7 2004/06/25 00:27:57 agriffis Exp $
-
-IUSE=""
-
-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"
-
-DEPEND=">=x11-libs/wxGTK-2.4.1
-	>=sys-libs/zlib-1.1.4"
-
-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 || die
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die
-}
-
-src_install () {
-	einstall || die
-}
diff --git a/net-p2p/amule/amule-1.2.6.ebuild b/net-p2p/amule/amule-1.2.6.ebuild
index 05ebb0a6a971..fb18d8efd916 100644
--- a/net-p2p/amule/amule-1.2.6.ebuild
+++ b/net-p2p/amule/amule-1.2.6.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.6.ebuild,v 1.7 2004/06/25 00:27:57 agriffis Exp $
+# $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}
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 IUSE="nls"
 
 DEPEND=">=x11-libs/wxGTK-2.4.2
diff --git a/net-p2p/amule/amule-2.0.0_rc3.ebuild b/net-p2p/amule/amule-2.0.0_rc3.ebuild
index cac02f1b99ad..3739d4b78518 100644
--- a/net-p2p/amule/amule-2.0.0_rc3.ebuild
+++ b/net-p2p/amule/amule-2.0.0_rc3.ebuild
@@ -1,5 +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_rc3.ebuild,v 1.4 2004/06/29 00:41:44 squinky86 Exp $
 
 MY_P=${P/m/M}
 MY_P=${MY_P/_/}
diff --git a/net-p2p/amule/files/digest-amule-1.1.0 b/net-p2p/amule/files/digest-amule-1.1.0
deleted file mode 100644
index b4f939890cf7..000000000000
--- a/net-p2p/amule/files/digest-amule-1.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 648a1f1cbe57602dd9e546c046a4a229 aMule-1.1.0.tar.bz2 2086601