version bump, homepage fix, #57343

16 files changed, 39 insertions, 143 deletions

diff --git a/net-p2p/xmule/ChangeLog b/net-p2p/xmule/ChangeLog
index a6190f91c88a..2b24aad32678 100644
--- a/net-p2p/xmule/ChangeLog
+++ b/net-p2p/xmule/ChangeLog
@@ -1,6 +1,15 @@
 # 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.40 2004/07/09 03:02:37 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/ChangeLog,v 1.41 2004/07/17 03:06:26 squinky86 Exp $
+
+*xmule-1.8.4 (16 Jul 2004)
+
+  16 Jul 2004; Jon Hood <squinky86@gentoo.org> xmule-1.6.0a-r1.ebuild,
+  xmule-1.6.0a.ebuild, xmule-1.6.1.ebuild, xmule-1.7.4c.ebuild,
+  xmule-1.8.0.ebuild, xmule-1.8.1.ebuild, -xmule-1.8.2-r1.ebuild,
+  -xmule-1.8.2-r2.ebuild, xmule-1.8.2-r3.ebuild, -xmule-1.8.2.ebuild,
+  +xmule-1.8.4.ebuild:
+  version bump, change homepage irt #57343, cleanups
 
   08 Jul 2004; Jon Hood <squinky86@gentoo.org> xmule-1.8.2-r3.ebuild:
   remove MAKEOPTS definition
diff --git a/net-p2p/xmule/Manifest b/net-p2p/xmule/Manifest
index 333ba0861069..d3012675e3d1 100644
--- a/net-p2p/xmule/Manifest
+++ b/net-p2p/xmule/Manifest
@@ -8,6 +8,7 @@ MD5 b35448f0136134e43c9dc8bd10e97ff9 xmule-1.6.0a-r1.ebuild 1131
 MD5 5866d00d0eada5cce0db517f8290e149 xmule-1.8.2.ebuild 1342
 MD5 029adc5ac8a24ba75d7074c302fa3850 xmule-1.7.4c.ebuild 1375
 MD5 dcf56b1dc4d057fd8126f99bcddf249d xmule-1.8.2-r2.ebuild 1380
+MD5 fb298bc594a14e2f5d808ea2ded6bd42 xmule-1.8.4.ebuild 1484
 MD5 ab862be19b4f161d3bf6d96e625e4b32 ChangeLog 5148
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 MD5 1135d70abe10f56fe3b0590aa3cae9c9 files/ini2.patch 273
@@ -17,6 +18,7 @@ MD5 88c461e77cc500b6238785f3b86edcb5 files/digest-xmule-1.6.1 65
 MD5 fda50be6ca23916ab5227a58de0290d3 files/digest-xmule-1.8.0 65
 MD5 7adc6014458471c8eeaea9d9cbf18b2a files/digest-xmule-1.8.1 65
 MD5 4a160dd11195bb437e2c23345b3ded06 files/digest-xmule-1.8.2 65
+MD5 7af93e9c27cecc95812aaf13b2579dc9 files/digest-xmule-1.8.4 65
 MD5 ae3ef316b6a6a3cc8b670289ed08ee79 files/digest-xmule-1.6.0a 65
 MD5 20de5f5c6c7ea1fcf2a8f66c6e5a20fc files/digest-xmule-1.7.4c 66
 MD5 8b1e8db7ffe51b7a0cebee62f5c116ba files/xmule.sh 567
diff --git a/net-p2p/xmule/files/digest-xmule-1.8.2 b/net-p2p/xmule/files/digest-xmule-1.8.2
deleted file mode 100644
index 1d80dce8f79b..000000000000
--- a/net-p2p/xmule/files/digest-xmule-1.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4d87272ba1a224e78a9368986bb4510e xmule-1.8.2.tar.bz2 1177837
diff --git a/net-p2p/xmule/files/digest-xmule-1.8.2-r1 b/net-p2p/xmule/files/digest-xmule-1.8.2-r1
deleted file mode 100644
index 73fdc4d994a3..000000000000
--- a/net-p2p/xmule/files/digest-xmule-1.8.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eb0638668ae74a5ec225d172e23832df xmule-1.8.2b.tar.bz2 1082397
diff --git a/net-p2p/xmule/files/digest-xmule-1.8.2-r2 b/net-p2p/xmule/files/digest-xmule-1.8.2-r2
deleted file mode 100644
index f4f8817e2066..000000000000
--- a/net-p2p/xmule/files/digest-xmule-1.8.2-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 429b02d782dd7f5a0277b87591cf5019 xmule-1.8.2c.tar.gz 1568022
-MD5 6d098b3d08cfee28a93bef742d02c8df xmule-1.8.2-gcc34.patch 44871
diff --git a/net-p2p/xmule/files/digest-xmule-1.8.4 b/net-p2p/xmule/files/digest-xmule-1.8.4
new file mode 100644
index 000000000000..256def60e973
--- /dev/null
+++ b/net-p2p/xmule/files/digest-xmule-1.8.4
@@ -0,0 +1 @@
+MD5 cc89ff7c717a0aeeddb0cebcddf1b91f xmule-1.8.4.tar.bz2 1324397
diff --git a/net-p2p/xmule/xmule-1.6.0a-r1.ebuild b/net-p2p/xmule/xmule-1.6.0a-r1.ebuild
index 0f1e86403f9c..80533ede0cba 100644
--- a/net-p2p/xmule/xmule-1.6.0a-r1.ebuild
+++ b/net-p2p/xmule/xmule-1.6.0a-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.6.0a-r1.ebuild,v 1.10 2004/06/25 00:37:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/xmule-1.6.0a-r1.ebuild,v 1.11 2004/07/17 03:06:26 squinky86 Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ MY_P=${P//a}
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="wxWindows based client for the eDonkey/eMule/lMule network"
-HOMEPAGE="http://home.gna.org/xmule/start.html"
+HOMEPAGE="http://xmule.ws/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 RESTRICT="nomirror"
 
diff --git a/net-p2p/xmule/xmule-1.6.0a.ebuild b/net-p2p/xmule/xmule-1.6.0a.ebuild
index 8c0840b10993..0373ee471341 100644
--- a/net-p2p/xmule/xmule-1.6.0a.ebuild
+++ b/net-p2p/xmule/xmule-1.6.0a.ebuild
@@ -1,12 +1,12 @@
 # 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.8 2004/06/25 00:37:06 agriffis Exp $
+# $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://home.gna.org/xmule/start.html"
+HOMEPAGE="http://xmule.ws/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 RESTRICT="nomirror"
 
diff --git a/net-p2p/xmule/xmule-1.6.1.ebuild b/net-p2p/xmule/xmule-1.6.1.ebuild
index bc85a0e421ec..b6aeb0c8a4f7 100644
--- a/net-p2p/xmule/xmule-1.6.1.ebuild
+++ b/net-p2p/xmule/xmule-1.6.1.ebuild
@@ -1,12 +1,12 @@
 # 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.9 2004/06/25 00:37:06 agriffis Exp $
+# $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://home.gna.org/xmule/start.html"
+HOMEPAGE="http://xmule.ws/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 RESTRICT="nomirror"
 
diff --git a/net-p2p/xmule/xmule-1.7.4c.ebuild b/net-p2p/xmule/xmule-1.7.4c.ebuild
index f13bb9535b57..28e2a9a439ac 100644
--- a/net-p2p/xmule/xmule-1.7.4c.ebuild
+++ b/net-p2p/xmule/xmule-1.7.4c.ebuild
@@ -1,12 +1,12 @@
 # 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.3 2004/06/25 00:37:06 agriffis Exp $
+# $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://home.gna.org/xmule/start.html"
+HOMEPAGE="http://xmule.ws/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 RESTRICT="nomirror"
 
diff --git a/net-p2p/xmule/xmule-1.8.0.ebuild b/net-p2p/xmule/xmule-1.8.0.ebuild
index c1c04957fd84..247b1a88c9c2 100644
--- a/net-p2p/xmule/xmule-1.8.0.ebuild
+++ b/net-p2p/xmule/xmule-1.8.0.ebuild
@@ -1,12 +1,12 @@
 # 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.3 2004/06/25 00:37:06 agriffis Exp $
+# $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://home.gna.org/xmule/start.html"
+HOMEPAGE="http://xmule.ws/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 RESTRICT="nomirror"
 
diff --git a/net-p2p/xmule/xmule-1.8.1.ebuild b/net-p2p/xmule/xmule-1.8.1.ebuild
index 1a6ae28a5d7d..e7c10adf4296 100644
--- a/net-p2p/xmule/xmule-1.8.1.ebuild
+++ b/net-p2p/xmule/xmule-1.8.1.ebuild
@@ -1,12 +1,12 @@
 # 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.1.ebuild,v 1.4 2004/06/25 00:37:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/xmule-1.8.1.ebuild,v 1.5 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://home.gna.org/xmule/start.html"
+HOMEPAGE="http://xmule.ws/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 RESTRICT="nomirror"
 
diff --git a/net-p2p/xmule/xmule-1.8.2-r1.ebuild b/net-p2p/xmule/xmule-1.8.2-r1.ebuild
deleted file mode 100644
index 15339f427fba..000000000000
--- a/net-p2p/xmule/xmule-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,54 +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.2-r1.ebuild,v 1.5 2004/06/25 00:37:06 agriffis Exp $
-
-MY_P=${P}b
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="wxWindows based client for the eDonkey/eMule/lMule network"
-HOMEPAGE="http://home.gna.org/xmule/start.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-
-IUSE="nls"
-
-DEPEND=">=x11-libs/wxGTK-2.4.2
-	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 () {
-	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-r2.ebuild b/net-p2p/xmule/xmule-1.8.2-r2.ebuild
deleted file mode 100644
index 4ff8c2762164..000000000000
--- a/net-p2p/xmule/xmule-1.8.2-r2.ebuild
+++ /dev/null
@@ -1,57 +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.2-r2.ebuild,v 1.4 2004/06/28 16:20:56 squinky86 Exp $
-
-inherit eutils
-
-MY_P=${P}c
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="wxWindows based client for the eDonkey/eMule/lMule network"
-HOMEPAGE="http://home.gna.org/xmule/start.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	http://dev.gentoo.org/~squinky86/files/${P}-gcc34.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-
-IUSE="nls"
-
-DEPEND=">=x11-libs/wxGTK-2.4.2
-	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
-	epatch ${DISTDIR}/${P}-gcc34.patch
-}
-
-src_compile () {
-	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 8f74c4f8787c..78111ef9bbce 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.3 2004/07/09 03:02:37 squinky86 Exp $
+# $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 $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ MY_P=${P}c
 S=${WORKDIR}/${PN}
 
 DESCRIPTION="wxWindows based client for the eDonkey/eMule/lMule network"
-HOMEPAGE="http://home.gna.org/xmule/start.html"
+HOMEPAGE="http://xmule.ws/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
 	http://dev.gentoo.org/~squinky86/files/${P}-gcc34.patch"
 
diff --git a/net-p2p/xmule/xmule-1.8.2.ebuild b/net-p2p/xmule/xmule-1.8.4.ebuild
index e05fb97e780e..8f9df1ab318d 100644
--- a/net-p2p/xmule/xmule-1.8.2.ebuild
+++ b/net-p2p/xmule/xmule-1.8.4.ebuild
@@ -1,12 +1,10 @@
 # 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.ebuild,v 1.6 2004/06/25 00:37:06 agriffis Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/xmule-1.8.4.ebuild,v 1.1 2004/07/17 03:06:26 squinky86 Exp $
 
 DESCRIPTION="wxWindows based client for the eDonkey/eMule/lMule network"
-HOMEPAGE="http://home.gna.org/xmule/start.html"
+HOMEPAGE="http://xmule.ws/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -32,17 +30,10 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i 's/@datadir@/${DESTDIR}@datadir@/' Makefile.in
+	sed -i 's/@datadir@/${DESTDIR}@datadir@/' Makefile.in || die
 }
 
 src_compile () {
-	export WANT_AUTOCONF=2.5
-	WANT_AUTOMAKE=1.7
-	aclocal
-	autoconf
-	autoheader
-	automake
-
 	local myconf=
 
 	use nls \
@@ -51,9 +42,17 @@ src_compile () {
 	myconf="${myconf} --with-zlib=/tmp/zlib/"
 
 	econf ${myconf} || die
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die
+	emake || die
 }
 
 src_install () {
 	einstall mkinstalldirs=${S}/mkinstalldirs DESTDIR=${D} || die
+	dodir /usr/share/xmule
+	insinto /usr/share/xmule
+	doins src/resource/*
+	mv ${D}/usr/bin/xmule ${D}/usr/bin/xmule-bin
+	mv ${D}/var/tmp/portage/${PF}/image/usr/share/locale/* ${D}/usr/share/locale/
+	rm -f ${D}/var
+	exeinto /usr/bin
+	newexe ${FILESDIR}/xmule.sh xmule
 }