version bump and gcc-3.4 patch, #53638

7 files changed, 103 insertions, 5 deletions

diff --git a/net-p2p/xmule/ChangeLog b/net-p2p/xmule/ChangeLog
index c542378d9940..d95933e9dde5 100644
--- a/net-p2p/xmule/ChangeLog
+++ b/net-p2p/xmule/ChangeLog
@@ -1,6 +1,13 @@
 # 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.37 2004/06/25 00:37:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/ChangeLog,v 1.38 2004/06/28 16:20:56 squinky86 Exp $
+
+*xmule-1.8.2-r3 (28 Jun 2004)
+
+  28 Jun 2004; Jon Hood <squinky86@gentoo.org> +files/xmule.sh,
+  xmule-1.8.2-r2.ebuild, +xmule-1.8.2-r3.ebuild:
+  version bump for new wrapper script and gcc-3.4 fixes from HopeSeekr
+  <theodore@xmule.ws> #53638
 
   03 Jun 2004; Jon Hood <squinky86@gentoo.org> xmule-1.8.2-r1.ebuild,
   xmule-1.8.2-r2.ebuild, xmule-1.8.2.ebuild:
diff --git a/net-p2p/xmule/Manifest b/net-p2p/xmule/Manifest
index f6a635f207aa..6bd7bcfa818b 100644
--- a/net-p2p/xmule/Manifest
+++ b/net-p2p/xmule/Manifest
@@ -1,12 +1,13 @@
 MD5 12b865a7299303650b46a684a04b10c6 xmule-1.8.1.ebuild 1379
 MD5 06daddc3b417f47b904d62b52434b7c0 xmule-1.8.2-r1.ebuild 1293
+MD5 0aae5910569110e3ab691c05b47011a8 xmule-1.8.2-r3.ebuild 1541
 MD5 44ff57a672951db68829afa0025e541f xmule-1.8.0.ebuild 1374
 MD5 b77ddff2f5a2e6b88ebc21303fbcd528 xmule-1.6.0a.ebuild 986
 MD5 ad09f9b125a467e41f6e3e051b95ccae xmule-1.6.1.ebuild 1137
 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 233884188223670331ee120454172b4e xmule-1.8.2-r2.ebuild 1270
+MD5 8a36a403d7683e77707937631ff3fd44 xmule-1.8.2-r2.ebuild 1380
 MD5 f84460b88fefb4ba25e97fc59cd3ecb5 ChangeLog 4666
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 MD5 1135d70abe10f56fe3b0590aa3cae9c9 files/ini2.patch 273
@@ -18,5 +19,7 @@ MD5 7adc6014458471c8eeaea9d9cbf18b2a files/digest-xmule-1.8.1 65
 MD5 4a160dd11195bb437e2c23345b3ded06 files/digest-xmule-1.8.2 65
 MD5 ae3ef316b6a6a3cc8b670289ed08ee79 files/digest-xmule-1.6.0a 65
 MD5 20de5f5c6c7ea1fcf2a8f66c6e5a20fc files/digest-xmule-1.7.4c 66
+MD5 71cf5709341b37f176ae90ae545b396b files/xmule.sh 341
 MD5 a315a0afb15453b08ffb71352b707136 files/digest-xmule-1.8.2-r1 66
-MD5 ce9469eeebc9b7444e3e8c371213098c files/digest-xmule-1.8.2-r2 65
+MD5 975033c3b074bc4843c273182226a745 files/digest-xmule-1.8.2-r2 132
+MD5 975033c3b074bc4843c273182226a745 files/digest-xmule-1.8.2-r3 132
diff --git a/net-p2p/xmule/files/digest-xmule-1.8.2-r2 b/net-p2p/xmule/files/digest-xmule-1.8.2-r2
index d36badee2832..f4f8817e2066 100644
--- a/net-p2p/xmule/files/digest-xmule-1.8.2-r2
+++ b/net-p2p/xmule/files/digest-xmule-1.8.2-r2
@@ -1 +1,2 @@
 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.2-r3 b/net-p2p/xmule/files/digest-xmule-1.8.2-r3
new file mode 100644
index 000000000000..f4f8817e2066
--- /dev/null
+++ b/net-p2p/xmule/files/digest-xmule-1.8.2-r3
@@ -0,0 +1,2 @@
+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/xmule.sh b/net-p2p/xmule/files/xmule.sh
new file mode 100644
index 000000000000..e749e2904658
--- /dev/null
+++ b/net-p2p/xmule/files/xmule.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/files/xmule.sh,v 1.1 2004/06/28 16:20:57 squinky86 Exp $
+
+if [ ! -e ~/.xMule ]; then
+	echo "Creating ~/.xMule..."
+	mkdir ~/.xMule
+	echo "Copying required files to ~/.xMule..."
+	mkdir ~/.xMule/resource
+	cp /usr/share/xmule/*.pm ~/.xMule/resource/
+	echo "Starting xMule..."
+	xmule-bin
+else
+	xmule-bin
+fi
diff --git a/net-p2p/xmule/xmule-1.8.2-r2.ebuild b/net-p2p/xmule/xmule-1.8.2-r2.ebuild
index 82c83748f5d3..4ff8c2762164 100644
--- a/net-p2p/xmule/xmule-1.8.2-r2.ebuild
+++ b/net-p2p/xmule/xmule-1.8.2-r2.ebuild
@@ -1,13 +1,16 @@
 # 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.3 2004/06/25 00:37:06 agriffis Exp $
+# $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"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+	http://dev.gentoo.org/~squinky86/files/${P}-gcc34.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -34,6 +37,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -i 's/@datadir@/${DESTDIR}@datadir@/' Makefile.in
+	epatch ${DISTDIR}/${P}-gcc34.patch
 }
 
 src_compile () {
diff --git a/net-p2p/xmule/xmule-1.8.2-r3.ebuild b/net-p2p/xmule/xmule-1.8.2-r3.ebuild
new file mode 100644
index 000000000000..15af4399a64d
--- /dev/null
+++ b/net-p2p/xmule/xmule-1.8.2-r3.ebuild
@@ -0,0 +1,65 @@
+# 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.1 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
+	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/xmule-1.8.2-r2/image/usr/share/locale/* ${D}/usr/share/locale/
+	rm -f ${D}/var
+	exeinto /usr/bin
+	newexe ${FILESDIR}/xmule.sh xmule
+}