alpha stable wrt #413129, remove old

Package-Manager: portage-2.1.10.53/cvs/Linux ia64

5 files changed, 13 insertions, 145 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 71a934f0ad93..142b205e19ce 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/amule
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.166 2012/05/21 12:25:39 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.167 2012/06/03 16:57:23 armin76 Exp $
+
+  03 Jun 2012; Raúl Porcel <armin76@gentoo.org> -amule-2.2.6.ebuild,
+  -files/amule-2.2.6-gcc45.patch, amule-2.3.1.ebuild:
+  alpha stable wrt #413129, remove old
 
   21 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> amule-2.3.1.ebuild:
   x86 stable wrt bug #413129
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 40c132fd060f..0f333537f3b8 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,23 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX amule-2.2.6-fallocate.diff 687 RMD160 f2dba9f74d356a4cfde95dfa7f33c7b818eabde9 SHA1 9f633a83027e9b9bf8e35389c4dafe568f954065 SHA256 a6d6755f1ecd6af4527df4826a363ed2518155021df395f08074ce0c4998ad41
-AUX amule-2.2.6-gcc45.patch 893 RMD160 31f6055550c3eca052250346ddd32a5f7d234364 SHA1 78546fe5393f56b181c29dbdc1918aab3212fc33 SHA256 6aa83a2f1533eadb75b7089cde8a51408cada9389c74e3880d3135cfddb483a1
 AUX amule-2.3.1-gcc47.patch 777 RMD160 d0f6a5e3c19f84a68393551445e634b7019c2e77 SHA1 a18ffcaa5cd7d1b9196d4c230f43e644dce4c7ed SHA256 fcd1372ffefd6af9ee9ac96391d7549a2f77f62debd47bf3fc8da82a378f926e
 AUX amuled.confd 409 RMD160 0e31c5aaa42c4ee2b6dfcd00afcde3b48b2d4299 SHA1 b5872943f5ec0ac41a7c054239a754f1f9669e09 SHA256 7af480fd6dd325ad66b37464417d4d89015a52722961d44da2e3f7990ac4959a
 AUX amuled.initd 1204 RMD160 d17d6b709f8b7eb91132804fa8a420b5f9499d14 SHA1 936566e113bb91cbc7cfe6803bf7b1d76b8cbadb SHA256 af51a7d148368b2ed3b9cc289e0831c95348dbda9b331360a5635af31b81ed7a
 AUX amuleweb.confd 830 RMD160 1921152543c6f327caf55087269cf0f277545764 SHA1 7800ad36f88a116ca4dcc7b68944b7acaf5877e1 SHA256 e0c4ad636011797618c31ce3d4d5d20ea689ecf6f3ad350fff5b1716c6009c4f
 AUX amuleweb.initd 1236 RMD160 d9f417c3145a26d0e2e0879ab8fe4cc6b569dd35 SHA1 c4f7830950db758c1d961e1edb51e8b067cfb50c SHA256 64a2d1c7770b6d975a68a900b6b15f7bc8ff686b249da3ca96c7bc62cfee57d1
-DIST aMule-2.2.6.tar.bz2 4722143 RMD160 9483eb1907803d3a6ac375c4d85a7b0cbd895daa SHA1 369bb950897c3f1f59fc1190ac7034113ac253d0 SHA256 6ce32b5f1d8113a224a8e850639d957656623a04a73fb83d52313c06c3488122
 DIST aMule-2.3.1.tar.bz2 4565232 RMD160 7bc5ceea196f9ba0aa0687a694cc82354a0210fc SHA1 25bcef92b06cb34849afaf052e2cd66b4a8454c2 SHA256 d2eda19c34ec574fa123efb95726c7cc241b093c95d074a5161ee7330dece69d
-EBUILD amule-2.2.6.ebuild 2597 RMD160 a0bf122674496f8f7b3b2943a5cf11b5f9ed9c32 SHA1 e3c1c0fb15cf40c7d44e344c57f8875ff1f46e45 SHA256 08be9938317cead4f9979be9cd6337bf0edf2c216a20ba4014a82b9cc46bf98e
-EBUILD amule-2.3.1.ebuild 2465 RMD160 2bd9d02602e6c3383de5f21816a71280b3a99c17 SHA1 c55dd4d6abaf7298afc3def74d5a06f32047dc3a SHA256 57a824f04fa40f75cf1f8c955431e19d617d1b8b88b06dc4d3856e6049a0b34c
-MISC ChangeLog 23343 RMD160 e2e15929e671639dd3901c91a4e78f2ad1d52e04 SHA1 15d3570169013e08c2d79a7e0123b23ce468c9be SHA256 0d5c90e74a0e8ae31d93f4fd5642da82525deb067623e4485f914baecf4aa09f
+EBUILD amule-2.3.1.ebuild 2461 RMD160 103edac0cac21e11cc719bb1167f40002c1c7e39 SHA1 0db713c22f1b9bf85c660aa70a999ad21adb27c1 SHA256 645cb66a480095744da846836cb49ad68a617bd194e624b7022aaf33c3ef4056
+MISC ChangeLog 23504 RMD160 d01de382b1a3eb2b33a4e1a0b1dd067be8795611 SHA1 e7445c1a6bca82f1e105803e6542caca8de3fb1d SHA256 16d0d760565c7a5e4288e985b3833d6e7cd024b77e629633ff4336888e87b60a
 MISC metadata.xml 425 RMD160 87fe71e15546c8adff535542f5fb963fc2fb7048 SHA1 83864d1b7e26ea59062f6a19a9635eb95c2da916 SHA256 c22fa825da533c079b4c801274cbf3f675982501ba003e79632e164835e48942
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk+6NEIACgkQuUQtlDBCeQK19wCeI7XcZCAhQPOylGgypd/B5/Bo
-9SAAn3neHFOG3+H0lvAZggExizW7bi5R
-=fyJG
+iEYEARECAAYFAk/Ll3oACgkQuQc30/atMkDRHgCeJxlZcVqq1DXDs28LhuM7f3FR
+mB0An0izWu04EBWxad5lXmV66VaFoTJ4
+=CpsK
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/amule/amule-2.2.6.ebuild b/net-p2p/amule/amule-2.2.6.ebuild
deleted file mode 100644
index 3104033f47ce..000000000000
--- a/net-p2p/amule/amule-2.2.6.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.6.ebuild,v 1.14 2012/02/16 17:17:32 jer Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic wxwidgets
-
-MY_P=${PN/m/M}-${PV}
-S="${WORKDIR}"/${MY_P}
-
-DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
-IUSE="daemon debug geoip gtk nls remote stats unicode upnp"
-
-DEPEND="=x11-libs/wxGTK-2.8*
-	>=dev-libs/crypto++-5
-	>=sys-libs/zlib-1.2.1
-	stats? ( >=media-libs/gd-2.0.26[jpeg] )
-	geoip? ( dev-libs/geoip )
-	upnp? ( >=net-libs/libupnp-1.6.6 )
-	remote? ( >=media-libs/libpng-1.2.0
-	unicode? ( >=media-libs/gd-2.0.26 ) )"
-
-pkg_setup() {
-	if ! use gtk && ! use remote && ! use daemon; then
-		eerror ""
-		eerror "You have to specify at least one of gtk, remote or daemon"
-		eerror "USE flag to build amule."
-		eerror ""
-		die "Invalid USE flag set"
-	fi
-
-	if use stats && ! use gtk; then
-		einfo "Note: You would need both the gtk and stats USE flags"
-		einfo "to compile aMule Statistics GUI."
-		einfo "I will now compile console versions only."
-	fi
-}
-
-pkg_preinst() {
-	if use daemon || use remote; then
-		enewgroup p2p
-		enewuser p2p -1 -1 /home/p2p p2p
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fallocate.diff
-	epatch "${FILESDIR}"/${P}-gcc45.patch
-}
-
-src_configure() {
-	local myconf
-
-	WX_GTK_VER="2.8"
-
-	if use gtk; then
-		einfo "wxGTK with gtk support will be used"
-		need-wxwidgets unicode
-	else
-		einfo "wxGTK without X support will be used"
-		need-wxwidgets base
-	fi
-
-	if use gtk ; then
-		use stats && myconf="${myconf}
-			--enable-wxcas
-			--enable-alc"
-		use remote && myconf="${myconf}
-			--enable-amule-gui"
-	else
-		myconf="
-			--disable-monolithic
-			--disable-amule-gui
-			--disable-wxcas
-			--disable-alc"
-	fi
-
-	econf \
-		--with-wx-config=${WX_CONFIG} \
-		--with-wxbase-config=${WX_CONFIG} \
-		--enable-amulecmd \
-		$(use_enable debug) \
-		$(use_enable !debug optimize) \
-		$(use_enable daemon amule-daemon) \
-		$(use_enable geoip) \
-		$(use_enable nls) \
-		$(use_enable remote webserver) \
-		$(use_enable stats cas) \
-		$(use_enable stats alcc) \
-		${myconf} || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	if use daemon; 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.3.1.ebuild b/net-p2p/amule/amule-2.3.1.ebuild
index f2a6daa2e2d2..b37a0289cbe9 100644
--- a/net-p2p/amule/amule-2.3.1.ebuild
+++ b/net-p2p/amule/amule-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.3.1.ebuild,v 1.8 2012/05/21 12:25:39 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.3.1.ebuild,v 1.9 2012/06/03 16:57:23 armin76 Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
 IUSE="daemon debug geoip nls remote stats unicode upnp +X"
 
 DEPEND=">=dev-libs/crypto++-5
diff --git a/net-p2p/amule/files/amule-2.2.6-gcc45.patch b/net-p2p/amule/files/amule-2.2.6-gcc45.patch
deleted file mode 100644
index e120ef23b76f..000000000000
--- a/net-p2p/amule/files/amule-2.2.6-gcc45.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# Subject: Fix FTBFS on gcc 4.5 (new in ubuntu natty)
-# Origin: other, http://bugs.amule.org/view.php?id=1624
-# Bug-ubuntu: https://bugs.launchpad.net/ubuntu/+source/amule/+bug/685584
-# Forwarded: upstream claims it's in their current svn code
-Index: amule-2.2.6+debian0/src/utils/wxCas/src/wxcasframe.cpp
-===================================================================
---- amule-2.2.6+debian0.orig/src/utils/wxCas/src/wxcasframe.cpp	2010-12-15 16:46:18.435693002 +0000
-+++ amule-2.2.6+debian0/src/utils/wxCas/src/wxcasframe.cpp	2010-12-15 16:47:07.151693001 +0000
-@@ -285,11 +285,11 @@
- #ifdef __WXMSW__
- 
- 	memdc.
--	SetFont ( wxFont::wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
-+	SetFont ( wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
- #else
- 
- 	memdc.
--	SetFont ( wxFont::wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
-+	SetFont ( wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
- #endif
- 
- 	memdc.