summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Hood <squinky86@gentoo.org>2004-08-23 00:47:29 +0000
committerJon Hood <squinky86@gentoo.org>2004-08-23 00:47:29 +0000
commit6d240caf9e464e723df84d3b6a4d38f163bd2d0f (patch)
tree751fb2fc5df8bdf12006f1105ad5b3562059ce4e
parentmark pydance ~amd64 (Manifest recommit) (diff)
downloadgentoo-2-6d240caf9e464e723df84d3b6a4d38f163bd2d0f.tar.gz
gentoo-2-6d240caf9e464e723df84d3b6a4d38f163bd2d0f.tar.bz2
gentoo-2-6d240caf9e464e723df84d3b6a4d38f163bd2d0f.zip
version bump, closes #60954 and #61148
-rw-r--r--net-p2p/xmule/ChangeLog12
-rw-r--r--net-p2p/xmule/Manifest11
-rw-r--r--net-p2p/xmule/files/digest-xmule-1.8.2-r32
-rw-r--r--net-p2p/xmule/files/digest-xmule-1.8.4-r1 (renamed from net-p2p/xmule/files/digest-xmule-1.8.4)0
-rw-r--r--net-p2p/xmule/files/digest-xmule-1.9.01
-rw-r--r--net-p2p/xmule/files/xmule.sh16
-rw-r--r--net-p2p/xmule/xmule-1.8.4-r1.ebuild (renamed from net-p2p/xmule/xmule-1.8.4.ebuild)11
-rw-r--r--net-p2p/xmule/xmule-1.9.0.ebuild (renamed from net-p2p/xmule/xmule-1.8.2-r3.ebuild)24
8 files changed, 25 insertions, 52 deletions
diff --git a/net-p2p/xmule/ChangeLog b/net-p2p/xmule/ChangeLog
index 42cdda3ff72a..07e4f0543fdb 100644
--- a/net-p2p/xmule/ChangeLog
+++ b/net-p2p/xmule/ChangeLog
@@ -1,6 +1,16 @@
# 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.45 2004/08/16 16:57:18 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/ChangeLog,v 1.46 2004/08/23 00:47:29 squinky86 Exp $
+
+*xmule-1.9.0 (22 Aug 2004)
+
+*xmule-1.8.4-r1 (22 Aug 2004)
+
+ 22 Aug 2004; Jon Hood <squinky86@gentoo.org> -files/xmule.sh,
+ -xmule-1.8.2-r3.ebuild, +xmule-1.8.4-r1.ebuild, -xmule-1.8.4.ebuild,
+ +xmule-1.9.0.ebuild:
+ Fix bug #61148, thanks Antonio <netbix@tiscali.it> :). Version bump,
+ closes #60954.
16 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> xmule-1.8.2-r3.ebuild,
xmule-1.8.4.ebuild:
diff --git a/net-p2p/xmule/Manifest b/net-p2p/xmule/Manifest
index c4f81d4c57b9..fbbe9a06b188 100644
--- a/net-p2p/xmule/Manifest
+++ b/net-p2p/xmule/Manifest
@@ -1,7 +1,6 @@
-MD5 deca455e7175ceeefd29898d598757a9 ChangeLog 6220
+MD5 2c504e8e6df401989aaf527a513c3859 xmule-1.8.4-r1.ebuild 975
+MD5 2254079ba8368de60f68bf4a57233274 xmule-1.9.0.ebuild 976
+MD5 9dd48d7d17e04d975adf24045a169202 ChangeLog 6444
MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-MD5 0ee034371af2a4fa353ce32cfbefc749 xmule-1.8.4.ebuild 1241
-MD5 f45149d50428ff7ea569b311badbbceb xmule-1.8.2-r3.ebuild 1371
-MD5 7af93e9c27cecc95812aaf13b2579dc9 files/digest-xmule-1.8.4 65
-MD5 975033c3b074bc4843c273182226a745 files/digest-xmule-1.8.2-r3 132
-MD5 8b1e8db7ffe51b7a0cebee62f5c116ba files/xmule.sh 567
+MD5 83413c32a94e2597771601d45b4ac116 files/digest-xmule-1.9.0 65
+MD5 7af93e9c27cecc95812aaf13b2579dc9 files/digest-xmule-1.8.4-r1 65
diff --git a/net-p2p/xmule/files/digest-xmule-1.8.2-r3 b/net-p2p/xmule/files/digest-xmule-1.8.2-r3
deleted file mode 100644
index f4f8817e2066..000000000000
--- a/net-p2p/xmule/files/digest-xmule-1.8.2-r3
+++ /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-r1
index 256def60e973..256def60e973 100644
--- a/net-p2p/xmule/files/digest-xmule-1.8.4
+++ b/net-p2p/xmule/files/digest-xmule-1.8.4-r1
diff --git a/net-p2p/xmule/files/digest-xmule-1.9.0 b/net-p2p/xmule/files/digest-xmule-1.9.0
new file mode 100644
index 000000000000..f21c7787512a
--- /dev/null
+++ b/net-p2p/xmule/files/digest-xmule-1.9.0
@@ -0,0 +1 @@
+MD5 6610cb64b6e5832926eece3a08ae97e8 xmule-1.9.0.tar.bz2 1387580
diff --git a/net-p2p/xmule/files/xmule.sh b/net-p2p/xmule/files/xmule.sh
deleted file mode 100644
index 4bc0f19b6b86..000000000000
--- a/net-p2p/xmule/files/xmule.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/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.2 2004/06/29 16:34:12 squinky86 Exp $
-
-if [ ! -d ~/.xMule ]; then
- echo "Creating ~/.xMule..."
- mkdir ~/.xMule || exit 1
-fi
-if [ ! -d ~/.xMule/resource ]; then
- echo "Copying required files to ~/.xMule..."
- mkdir ~/.xMule/resource || exit 1
- cp /usr/share/xmule/*.pm ~/.xMule/resource/ || exit 1
- echo "Starting xMule..."
-fi
-exec xmule-bin
diff --git a/net-p2p/xmule/xmule-1.8.4.ebuild b/net-p2p/xmule/xmule-1.8.4-r1.ebuild
index 994aa089c668..755a50a8973f 100644
--- a/net-p2p/xmule/xmule-1.8.4.ebuild
+++ b/net-p2p/xmule/xmule-1.8.4-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.8.4.ebuild,v 1.3 2004/08/16 16:57:18 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/xmule-1.8.4-r1.ebuild,v 1.1 2004/08/23 00:47:29 squinky86 Exp $
inherit wxwidgets
@@ -44,12 +44,5 @@ src_compile () {
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
+ rm -rf ${D}/var || die
}
diff --git a/net-p2p/xmule/xmule-1.8.2-r3.ebuild b/net-p2p/xmule/xmule-1.9.0.ebuild
index 498f3fed6eef..ac21a27fcd18 100644
--- a/net-p2p/xmule/xmule-1.8.2-r3.ebuild
+++ b/net-p2p/xmule/xmule-1.9.0.ebuild
@@ -1,20 +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-r3.ebuild,v 1.7 2004/08/16 16:57:18 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/xmule-1.9.0.ebuild,v 1.1 2004/08/23 00:47:29 squinky86 Exp $
-inherit eutils wxwidgets
-
-MY_P=${P}c
-S=${WORKDIR}/${PN}
+inherit wxwidgets
DESCRIPTION="wxWidgets based client for the eDonkey/eMule/lMule network"
HOMEPAGE="http://xmule.ws/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
- http://dev.gentoo.org/~squinky86/files/${P}-gcc34.patch"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="x86 ~amd64 ~ppc"
+KEYWORDS="~x86 ~amd64 ~ppc"
IUSE="nls gtk2"
@@ -25,8 +21,7 @@ DEPEND=">=x11-libs/wxGTK-2.4.2-r2
src_unpack() {
unpack ${A}
cd ${S}
- sed -i 's/@datadir@/${DESTDIR}@datadir@/' Makefile.in
- epatch ${DISTDIR}/${P}-gcc34.patch
+ sed -i 's/@datadir@/${DESTDIR}@datadir@/' Makefile.in || die
}
src_compile () {
@@ -49,12 +44,5 @@ src_compile () {
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 -rf ${D}/var
- exeinto /usr/bin
- newexe ${FILESDIR}/xmule.sh xmule
+ rm -rf ${D}/var || die
}