version bump, clean out, bug #32942

9 files changed, 9 insertions, 86 deletions

diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 6945c87847c5..ac3249bb40bd 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,5 +1,5 @@
-MD5 0a8a000a2d980472451f52350420e28b ChangeLog 1180
-MD5 2a2a83c6d495a3b15c659bb72b7c341c amule-1.1.0.ebuild 960
+MD5 306d2cc7dcff337ebb4fe0eb3278f899 ChangeLog 1181
+MD5 defa4147467691f44e172a882e475b1d amule-1.1.0.ebuild 961
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 MD5 170c28b3f0b77bed3aee7cb5815edf40 amule-1.1.2.ebuild 934
 MD5 1f788e567786e2aefb362559593e827a files/digest-amule-1.1.0 65
diff --git a/net-p2p/amule/amule-1.0.7.ebuild b/net-p2p/amule/amule-1.0.7.ebuild
deleted file mode 100644
index 863d28c5e83e..000000000000
--- a/net-p2p/amule/amule-1.0.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.0.7.ebuild,v 1.4 2003/10/18 23:18:13 scandium Exp $
-
-MY_P=${P/m/M}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="aNOTHER wxWindows based eMule P2P Client"
-HOMEPAGE="http://sourceforge.net/projects/amule"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-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/amule/amule-1.0.9.ebuild b/net-p2p/amule/amule-1.0.9.ebuild
deleted file mode 100644
index 5fd0faf36826..000000000000
--- a/net-p2p/amule/amule-1.0.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.0.9.ebuild,v 1.4 2003/10/18 23:18:13 scandium Exp $
-
-MY_P=${P/m/M}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="aNOTHER wxWindows based eMule P2P Client"
-HOMEPAGE="http://sourceforge.net/projects/amule"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-
-DEPEND=">=x11-libs/wxGTK-2.4.1
-	>=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/amule/amule-1.1.0.ebuild b/net-p2p/amule/amule-1.1.0.ebuild
index 1e4e714a80da..a548312ea61e 100644
--- a/net-p2p/amule/amule-1.1.0.ebuild
+++ b/net-p2p/amule/amule-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.1.0.ebuild,v 1.1 2003/10/22 16:47:36 scandium Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.1.0.ebuild,v 1.2 2003/11/10 14:13:51 malverian Exp $
 
 MY_P=${P/m/M}
 S=${WORKDIR}/${MY_P}
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 IUSE=""
 
diff --git a/net-p2p/amule/amule-1.0.8.ebuild b/net-p2p/amule/amule-1.1.2.ebuild
index 71f17609c89d..ee4a172b8638 100644
--- a/net-p2p/amule/amule-1.0.8.ebuild
+++ b/net-p2p/amule/amule-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.0.8.ebuild,v 1.4 2003/10/18 23:18:13 scandium Exp $
+# $Header:
 
 MY_P=${P/m/M}
 S=${WORKDIR}/${MY_P}
@@ -30,6 +30,9 @@ pkg_setup() {
 }
 
 src_compile () {
+	export WANT_AUTOCONF_2_5='1'
+	export WANT_AUTOMAKE='1.7'
+	./autogen.sh
 	econf || die
 	MAKEOPTS="${MAKEOPTS} -j1" emake || die
 }
diff --git a/net-p2p/amule/files/digest-amule-1.0.7 b/net-p2p/amule/files/digest-amule-1.0.7
deleted file mode 100644
index 1d77b2039062..000000000000
--- a/net-p2p/amule/files/digest-amule-1.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4e5fca960bffac8d35203fa73e9d8c69 aMule-1.0.7.tar.bz2 1933923
diff --git a/net-p2p/amule/files/digest-amule-1.0.8 b/net-p2p/amule/files/digest-amule-1.0.8
deleted file mode 100644
index 9149e111c234..000000000000
--- a/net-p2p/amule/files/digest-amule-1.0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 774549ccca0f0aa48fa079206a40778f aMule-1.0.8.tar.bz2 1929961
diff --git a/net-p2p/amule/files/digest-amule-1.0.9 b/net-p2p/amule/files/digest-amule-1.0.9
deleted file mode 100644
index edbe7f9a8f56..000000000000
--- a/net-p2p/amule/files/digest-amule-1.0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 149be58f28c18f91926ab405a2f6efec aMule-1.0.9.tar.bz2 2110493
diff --git a/net-p2p/amule/files/digest-amule-1.1.2 b/net-p2p/amule/files/digest-amule-1.1.2
new file mode 100644
index 000000000000..52b9aeca077b
--- /dev/null
+++ b/net-p2p/amule/files/digest-amule-1.1.2
@@ -0,0 +1 @@
+MD5 67ed6489eb405ad475d4cca769310b23 aMule-1.1.2.tar.bz2 1425177