this is 1.8.2b. Seems only this one if affected by 50895

6 files changed, 87 insertions, 19 deletions

diff --git a/net-p2p/xmule/ChangeLog b/net-p2p/xmule/ChangeLog
index 33f91fc28e40..0f75969f13fd 100644
--- a/net-p2p/xmule/ChangeLog
+++ b/net-p2p/xmule/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/xmule
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/ChangeLog,v 1.31 2004/05/15 06:29:27 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/ChangeLog,v 1.32 2004/05/15 18:07:21 mholzer Exp $
+
+*xmule-1.8.2-r1 (15 May 2004)
+
+  15 May 2004; Martin Holzer <mholzer@gentoo.org> xmule-1.8.2-r1.ebuild,
+  xmule-1.8.2.ebuild:
+  this is 1.8.2b. Seems only this one if affected by 50895
 
   15 May 2004; Jon Hood <squinky86@gentoo.org> xmule-1.8.2.ebuild:
   xmule 1.8.2 fails to compile for just about everyone. Blocking KEYWORDS until
diff --git a/net-p2p/xmule/Manifest b/net-p2p/xmule/Manifest
index 4de352a0acad..92e57b5e8403 100644
--- a/net-p2p/xmule/Manifest
+++ b/net-p2p/xmule/Manifest
@@ -1,18 +1,20 @@
-MD5 d8b393c04334d15288135d4a660653a7 xmule-1.8.1.ebuild 1389
-MD5 a502c2c626a3b5a5e5659cd0f173be20 xmule-1.8.0.ebuild 1384
+MD5 02d6e34d14e48a3b587b0df8f435ebad ChangeLog 4012
+MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
+MD5 6cc14df19a222952ea4e8021f9f8e800 xmule-1.6.0a-r1.ebuild 1140
 MD5 3caa3066eade95cb46d6c7b9d55e2d3a xmule-1.6.0a.ebuild 996
 MD5 ced063db879181b869d3166c1b5db9d9 xmule-1.6.1.ebuild 1147
-MD5 6cc14df19a222952ea4e8021f9f8e800 xmule-1.6.0a-r1.ebuild 1140
-MD5 38a76d2356966cf7cc238a2842463e71 xmule-1.8.2.ebuild 1402
+MD5 d8b393c04334d15288135d4a660653a7 xmule-1.8.1.ebuild 1389
+MD5 ac96069a1c1db0b947f5d38a3dd334f1 xmule-1.8.2.ebuild 1367
 MD5 49e456c5b7c360f2b19527ee2c284e61 xmule-1.7.4c.ebuild 1385
-MD5 02d6e34d14e48a3b587b0df8f435ebad ChangeLog 4012
-MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-MD5 1135d70abe10f56fe3b0590aa3cae9c9 files/ini2.patch 273
-MD5 d4e66918eaa0f6b42f988409ae3c218f files/rehash.patch 348
+MD5 a502c2c626a3b5a5e5659cd0f173be20 xmule-1.8.0.ebuild 1384
+MD5 38a76d2356966cf7cc238a2842463e71 xmule-1.8.2-r1.ebuild 1402
+MD5 ae3ef316b6a6a3cc8b670289ed08ee79 files/digest-xmule-1.6.0a 65
 MD5 ae3ef316b6a6a3cc8b670289ed08ee79 files/digest-xmule-1.6.0a-r1 65
 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 a315a0afb15453b08ffb71352b707136 files/digest-xmule-1.8.2 66
-MD5 ae3ef316b6a6a3cc8b670289ed08ee79 files/digest-xmule-1.6.0a 65
+MD5 4a160dd11195bb437e2c23345b3ded06 files/digest-xmule-1.8.2 65
+MD5 1135d70abe10f56fe3b0590aa3cae9c9 files/ini2.patch 273
+MD5 d4e66918eaa0f6b42f988409ae3c218f files/rehash.patch 348
 MD5 20de5f5c6c7ea1fcf2a8f66c6e5a20fc files/digest-xmule-1.7.4c 66
+MD5 fda50be6ca23916ab5227a58de0290d3 files/digest-xmule-1.8.0 65
+MD5 a315a0afb15453b08ffb71352b707136 files/digest-xmule-1.8.2-r1 66
diff --git a/net-p2p/xmule/files/digest-xmule-1.8.2 b/net-p2p/xmule/files/digest-xmule-1.8.2
index 73fdc4d994a3..1d80dce8f79b 100644
--- a/net-p2p/xmule/files/digest-xmule-1.8.2
+++ b/net-p2p/xmule/files/digest-xmule-1.8.2
@@ -1 +1 @@
-MD5 eb0638668ae74a5ec225d172e23832df xmule-1.8.2b.tar.bz2 1082397
+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
new file mode 100644
index 000000000000..73fdc4d994a3
--- /dev/null
+++ b/net-p2p/xmule/files/digest-xmule-1.8.2-r1
@@ -0,0 +1 @@
+MD5 eb0638668ae74a5ec225d172e23832df xmule-1.8.2b.tar.bz2 1082397
diff --git a/net-p2p/xmule/xmule-1.8.2-r1.ebuild b/net-p2p/xmule/xmule-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..97e341ae29ff
--- /dev/null
+++ b/net-p2p/xmule/xmule-1.8.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/05/15 18:07:22 mholzer 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="-*"
+#KEYWORDS="~x86 ~amd64 ~ppc"
+
+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.ebuild b/net-p2p/xmule/xmule-1.8.2.ebuild
index 881be94896fe..7f161b83bd2e 100644
--- a/net-p2p/xmule/xmule-1.8.2.ebuild
+++ b/net-p2p/xmule/xmule-1.8.2.ebuild
@@ -1,19 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.3 2004/05/15 06:29:27 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/xmule-1.8.2.ebuild,v 1.4 2004/05/15 18:07:22 mholzer 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"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-*"
-#KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~x86 ~amd64 ~ppc"
 
 IUSE="nls"