stable on x86, many cleanups

11 files changed, 8 insertions, 232 deletions

diff --git a/net-p2p/xmule/ChangeLog b/net-p2p/xmule/ChangeLog
index 2b24aad32678..2c26e711c8a0 100644
--- a/net-p2p/xmule/ChangeLog
+++ b/net-p2p/xmule/ChangeLog
@@ -1,6 +1,11 @@
 # 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.41 2004/07/17 03:06:26 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/ChangeLog,v 1.42 2004/07/22 04:23:26 squinky86 Exp $
+
+  21 Jul 2004; Jon Hood <squinky86@gentoo.org> -files/ini2.patch,
+  -xmule-1.6.0a.ebuild, -xmule-1.6.1.ebuild, -xmule-1.7.4c.ebuild,
+  -xmule-1.8.0.ebuild, xmule-1.8.2-r3.ebuild:
+  stable on x86, lots of cleanups
 
 *xmule-1.8.4 (16 Jul 2004)
 
diff --git a/net-p2p/xmule/files/digest-xmule-1.6.0a b/net-p2p/xmule/files/digest-xmule-1.6.0a
deleted file mode 100644
index 938b04b0f6f9..000000000000
--- a/net-p2p/xmule/files/digest-xmule-1.6.0a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 513aee4826007d2e9c5bade5ca48b144 xmule-1.6.0.tar.bz2 1250341
diff --git a/net-p2p/xmule/files/digest-xmule-1.6.1 b/net-p2p/xmule/files/digest-xmule-1.6.1
deleted file mode 100644
index d83f2c7adadc..000000000000
--- a/net-p2p/xmule/files/digest-xmule-1.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7db64383f0b2ed33f09f1cb5e34dd161 xmule-1.6.1.tar.bz2 1250111
diff --git a/net-p2p/xmule/files/digest-xmule-1.7.4c b/net-p2p/xmule/files/digest-xmule-1.7.4c
deleted file mode 100644
index 8100c2bbc32c..000000000000
--- a/net-p2p/xmule/files/digest-xmule-1.7.4c
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8a9c445ff0eb1d97c2ecf677e5225f36 xmule-1.7.4c.tar.bz2 1169516
diff --git a/net-p2p/xmule/files/digest-xmule-1.8.0 b/net-p2p/xmule/files/digest-xmule-1.8.0
deleted file mode 100644
index 6e05270d86eb..000000000000
--- a/net-p2p/xmule/files/digest-xmule-1.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6561ab9daae20fd17c7e6cec6ae53349 xmule-1.8.0.tar.bz2 1165529
diff --git a/net-p2p/xmule/files/ini2.patch b/net-p2p/xmule/files/ini2.patch
deleted file mode 100644
index d9fec5ac08f2..000000000000
--- a/net-p2p/xmule/files/ini2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/ini2.cpp.org	2004-02-01 12:25:19.000000000 +0100
-+++ src/ini2.cpp	2004-02-01 12:25:33.000000000 +0100
-@@ -5,8 +5,8 @@
- #ifdef PRECOMP
- #	include "xmule-headers.h"
- #else
--#include "ini2.h"
- #include "wintypes.h"
-+#include "ini2.h"
- #endif
- 
- #include <wx/string.h>
diff --git a/net-p2p/xmule/xmule-1.6.0a.ebuild b/net-p2p/xmule/xmule-1.6.0a.ebuild
deleted file mode 100644
index 0373ee471341..000000000000
--- a/net-p2p/xmule/xmule-1.6.0a.ebuild
+++ /dev/null
@@ -1,40 +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/xmule/xmule-1.6.0a.ebuild,v 1.9 2004/07/17 03:06:26 squinky86 Exp $
-
-MY_P=${P//a}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="wxWindows based client for the eDonkey/eMule/lMule network"
-HOMEPAGE="http://xmule.ws/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-IUSE=""
-
-DEPEND=">=x11-libs/wxGTK-2.4
-	>=sys-libs/zlib-1.1.4"
-
-pkg_setup() {
-	# FIXME: Is this really how we want to do this ?
-	GREP=`grep ' unicode' /var/db/pkg/x11-libs/wxGTK*/USE`
-	if [ "${GREP}" != "" ]; then
-		eerror "This package doesn't work with wxGTK"
-		eerror "compiled with gtk2 and unicode in USE"
-		eerror "Please re-compile wxGTK with -unicode"
-		die "aborting..."
-	fi
-}
-
-src_compile () {
-	econf || die
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die
-}
-
-src_install () {
-	einstall || die
-}
diff --git a/net-p2p/xmule/xmule-1.6.1.ebuild b/net-p2p/xmule/xmule-1.6.1.ebuild
deleted file mode 100644
index b6aeb0c8a4f7..000000000000
--- a/net-p2p/xmule/xmule-1.6.1.ebuild
+++ /dev/null
@@ -1,51 +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/xmule/xmule-1.6.1.ebuild,v 1.10 2004/07/17 03:06:26 squinky86 Exp $
-
-MY_P=${P//a}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="wxWindows based client for the eDonkey/eMule/lMule network"
-HOMEPAGE="http://xmule.ws/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE="nls"
-
-DEPEND=">=x11-libs/wxGTK-2.4.1
-	nls? ( sys-devel/gettext )
-	>=sys-libs/zlib-1.1.4"
-
-pkg_setup() {
-	# FIXME: Is this really how we want to do this ?
-	GREP=`grep ' unicode' /var/db/pkg/x11-libs/wxGTK*/USE`
-	if [ "${GREP}" != "" ]; then
-		eerror "This package doesn't work with wxGTK"
-		eerror "compiled with gtk2 and unicode in USE"
-		eerror "Please re-compile wxGTK with -unicode"
-		die "aborting..."
-	fi
-}
-
-src_compile () {
-	aclocal
-	autoconf
-	autoheader
-	automake
-
-	local myconf=
-
-	use nls \
-		|| myconf="${myconf} --disable-nls"
-
-	econf ${myconf} || die
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die
-}
-
-src_install () {
-	einstall || die
-}
diff --git a/net-p2p/xmule/xmule-1.7.4c.ebuild b/net-p2p/xmule/xmule-1.7.4c.ebuild
deleted file mode 100644
index 28e2a9a439ac..000000000000
--- a/net-p2p/xmule/xmule-1.7.4c.ebuild
+++ /dev/null
@@ -1,61 +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/xmule/xmule-1.7.4c.ebuild,v 1.4 2004/07/17 03:06:26 squinky86 Exp $
-
-MY_P=${P//a}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="wxWindows based client for the eDonkey/eMule/lMule network"
-HOMEPAGE="http://xmule.ws/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-IUSE="nls"
-
-DEPEND=">=x11-libs/wxGTK-2.4.1
-	nls? ( sys-devel/gettext )
-	>=sys-libs/zlib-1.2.1"
-
-pkg_setup() {
-	# FIXME: Is this really how we want to do this ?
-	GREP=`grep ' unicode' /var/db/pkg/x11-libs/wxGTK*/USE`
-	if [ "${GREP}" != "" ]; then
-		eerror "This package doesn't work with wxGTK"
-		eerror "compiled with gtk2 and unicode in USE"
-		eerror "Please re-compile wxGTK with -unicode"
-		die "aborting..."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i 's/@datadir@/${DESTDIR}@datadir@/' Makefile.in
-}
-
-src_compile () {
-	export WANT_AUTOCONF=2.5
-	WANT_AUTOMAKE=1.7
-	aclocal
-	autoconf
-	autoheader
-	automake
-
-	local myconf=
-
-	use nls \
-		|| myconf="${myconf} --disable-nls"
-
-	myconf="${myconf} --with-zlib=/tmp/zlib/"
-
-	econf ${myconf} || die
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die
-}
-
-src_install () {
-	einstall mkinstalldirs=${S}/mkinstalldirs DESTDIR=${D} || die
-}
diff --git a/net-p2p/xmule/xmule-1.8.0.ebuild b/net-p2p/xmule/xmule-1.8.0.ebuild
deleted file mode 100644
index 247b1a88c9c2..000000000000
--- a/net-p2p/xmule/xmule-1.8.0.ebuild
+++ /dev/null
@@ -1,61 +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/xmule/xmule-1.8.0.ebuild,v 1.4 2004/07/17 03:06:26 squinky86 Exp $
-
-MY_P=${P//a}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="wxWindows based client for the eDonkey/eMule/lMule network"
-HOMEPAGE="http://xmule.ws/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-IUSE="nls"
-
-DEPEND=">=x11-libs/wxGTK-2.4.1
-	nls? ( sys-devel/gettext )
-	>=sys-libs/zlib-1.2.1"
-
-pkg_setup() {
-	# FIXME: Is this really how we want to do this ?
-	GREP=`grep ' unicode' /var/db/pkg/x11-libs/wxGTK*/USE`
-	if [ "${GREP}" != "" ]; then
-		eerror "This package doesn't work with wxGTK"
-		eerror "compiled with gtk2 and unicode in USE"
-		eerror "Please re-compile wxGTK with -unicode"
-		die "aborting..."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i 's/@datadir@/${DESTDIR}@datadir@/' Makefile.in
-}
-
-src_compile () {
-	export WANT_AUTOCONF=2.5
-	WANT_AUTOMAKE=1.7
-	aclocal
-	autoconf
-	autoheader
-	automake
-
-	local myconf=
-
-	use nls \
-		|| myconf="${myconf} --disable-nls"
-
-	myconf="${myconf} --with-zlib=/tmp/zlib/"
-
-	econf ${myconf} || die
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die
-}
-
-src_install () {
-	einstall mkinstalldirs=${S}/mkinstalldirs DESTDIR=${D} || die
-}
diff --git a/net-p2p/xmule/xmule-1.8.2-r3.ebuild b/net-p2p/xmule/xmule-1.8.2-r3.ebuild
index 78111ef9bbce..b3fd5e81c5cc 100644
--- a/net-p2p/xmule/xmule-1.8.2-r3.ebuild
+++ b/net-p2p/xmule/xmule-1.8.2-r3.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.2-r3.ebuild,v 1.4 2004/07/17 03:06:26 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/xmule-1.8.2-r3.ebuild,v 1.5 2004/07/22 04:23:26 squinky86 Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 ~amd64 ~ppc"
 
 IUSE="nls"