alpha stable wrt #161796 and remove old, vulnerable

(Portage version: 2.1.2.7)

4 files changed, 7 insertions, 118 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index b7a81d24c189..1fcc2e86c7e4 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.90 2007/04/22 11:48:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.91 2007/05/14 18:52:15 armin76 Exp $
+
+  14 May 2007; Raúl Porcel <armin76@gentoo.org> -amule-2.0.3-r4.ebuild,
+  amule-2.1.3.ebuild:
+  alpha stable wrt #161796 and remove old, vulnerable
 
 *amule-2.2.0_pre20070422 (22 Apr 2007)
 
diff --git a/net-p2p/amule/amule-2.0.3-r4.ebuild b/net-p2p/amule/amule-2.0.3-r4.ebuild
deleted file mode 100644
index d5eba4547a5f..000000000000
--- a/net-p2p/amule/amule-2.0.3-r4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.3-r4.ebuild,v 1.12 2007/04/22 11:48:32 armin76 Exp $
-
-inherit eutils flag-o-matic wxwidgets
-
-MY_P=${P/m/M}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org/"
-SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
-IUSE="amuled debug nls remote stats unicode gtk"
-
-
-DEPEND=">=x11-libs/wxGTK-2.6.0
-	>=sys-libs/zlib-1.2.2
-	nls? ( sys-devel/gettext )
-	remote? ( >=media-libs/libpng-1.2.8 )
-	stats? ( >=media-libs/gd-2.0.32 )
-	!net-p2p/xmule
-	sys-apps/sed"
-
-pkg_setup() {
-	export WX_GTK_VER="2.6"
-	if use unicode && use gtk; then
-		need-wxwidgets unicode
-	elif use gtk; then
-		need-wxwidgets gtk2
-	elif use unicode; then
-		need-wxwidgets base-unicode
-	else
-		need-wxwidgets base
-	fi
-
-	if ! use gtk && ! use remote && ! use amuled; then
-		eerror "You have to specify at least on of gtk, remote and amuled"
-		eerror "USE flag to build amule"
-		die "Invalid USE flag set"
-	fi
-
-	if use stats && ! built_with_use media-libs/gd jpeg; then
-		die "media-libs/gd should be compiled with the jpeg use flag when you have the stats use flag set"
-	fi
-}
-
-pkg_preinst() {
-	if use amuled || use remote; then
-		enewgroup p2p
-		enewuser p2p -1 -1 /home/p2p p2p
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -r "s:\\$\\(LN_S\\) (.*):\$\(LN_S\) ${D}/\1:g" docs/man/Makefile.in
-}
-
-src_compile() {
-	local myconf
-
-	if use gtk; then
-		myconf="--enable-amule-gui"
-		use stats && myconf="${myconf}
-			--enable-wxcas
-			--enable-alc"
-		use remote && myconf="${myconf}
-			--enable-amulecmdgui
-			--enable-webservergui"
-	else
-		myconf="--disable-monolithic"
-	fi
-
-	econf \
-		--disable-optimize \
-		--with-wx-config=${WX_CONFIG} \
-		--with-wxbase-config=${WX_CONFIG} \
-		`use_with gtk x` \
-		`use_enable amuled amule-daemon` \
-		`use_enable debug` \
-		`use_enable nls` \
-		`use_enable remote amulecmd` \
-		`use_enable remote webserver` \
-		`use_enable stats cas` \
-		`use_enable stats alcc` \
-		${myconf} \
-		|| die
-	# we filter ssp until bug #74457 is closed to build on hardened
-	if has_hardened; then
-	filter-flags -fstack-protector -fstack-protector-all
-	fi
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	if use amuled; then
-	        newconfd ${FILESDIR}/amuled.confd amuled
-	        newinitd ${FILESDIR}/amuled.initd amuled
-	fi
-
-	if use remote; then
-	        newconfd ${FILESDIR}/amuleweb.confd amuleweb
-	        newinitd ${FILESDIR}/amuleweb.initd amuleweb
-	fi
-}
diff --git a/net-p2p/amule/amule-2.1.3.ebuild b/net-p2p/amule/amule-2.1.3.ebuild
index 530fff62322e..f4af985a6fb8 100644
--- a/net-p2p/amule/amule-2.1.3.ebuild
+++ b/net-p2p/amule/amule-2.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.3.ebuild,v 1.12 2007/04/22 11:48:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.3.ebuild,v 1.13 2007/05/14 18:52:15 armin76 Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="amuled debug gtk nls remote stats unicode"
 
 DEPEND=">=x11-libs/wxGTK-2.6.0
diff --git a/net-p2p/amule/files/digest-amule-2.0.3-r4 b/net-p2p/amule/files/digest-amule-2.0.3-r4
deleted file mode 100644
index 3085a6ea1908..000000000000
--- a/net-p2p/amule/files/digest-amule-2.0.3-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 204ca3472a773d8fa484d0a0787bf0d7 aMule-2.0.3.tar.bz2 2154288
-RMD160 22d5c25fccd2346a7299c71ba8ad4c175a36db2d aMule-2.0.3.tar.bz2 2154288
-SHA256 b85d7a2bf10c8659c9287c4b1f653cd6ba22dfcb1bdd5251448988e8d57c10aa aMule-2.0.3.tar.bz2 2154288