Version bump wrt bug #393197, rename gtk USE-flag to X wrt bug #258479, enable X USE-flag by default wrt bug #254758, some fixes to the ebuild wrt bug #362781 by Raphaël Droz <gibboris at gmail dot com>

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

3 files changed, 117 insertions, 6 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index faf6b0ad7237..58b41d0380a4 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/amule
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.157 2011/05/08 18:24:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.158 2011/12/06 18:27:43 armin76 Exp $
+
+*amule-2.3.1 (06 Dec 2011)
+
+  06 Dec 2011; Raúl Porcel <armin76@gentoo.org> +amule-2.3.1.ebuild:
+  Version bump wrt bug #393197, rename gtk USE-flag to X wrt bug #258479,
+  enable X USE-flag by default wrt bug #254758, some fixes to the ebuild wrt
+  bug #362781 by Raphaël Droz <gibboris at gmail dot com>
 
   08 May 2011; Raúl Porcel <armin76@gentoo.org> amule-2.2.6.ebuild,
   +files/amule-2.2.6-gcc45.patch:
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 2c63ef1418fd..7301b1a10ec6 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -8,13 +8,15 @@ AUX amuled.initd 1204 RMD160 d17d6b709f8b7eb91132804fa8a420b5f9499d14 SHA1 93656
 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 2606 RMD160 1c151b19842c203811e11d36e9a9d5a367dbc085 SHA1 2355572d863b985cc152bfc43c295ccc2e6078b9 SHA256 85bdd8372e5e0c2d0aaf81a9e1c9833bef19f4d25cbb320bf78d037fa8bd2cec
-MISC ChangeLog 22006 RMD160 ae673cc9e2d8538fee8d685aabc42702908f3ca7 SHA1 f02ccae1e45aec72a795f83f810db67aeafe188c SHA256 5ce7134c7c678d8e9565c743fb1f88431ce3a69627af2970c59921959c4eab9a
+EBUILD amule-2.3.1.ebuild 2349 RMD160 7b807265abc797917b50b2079db4a74410b95155 SHA1 b3b70767b18ed856be5419f5319cfae58c0856ed SHA256 6a6ca934fa33f6fff6dee337b1485b87f85a72428c6aab7cb02fa80b77e9993e
+MISC ChangeLog 22315 RMD160 c8d8810936d4523f9701e3a2d0cc7aae51ed8d11 SHA1 034ad3f4c51d68d6b13bd184dd38eaae3743c67b SHA256 2d90cfaf310daaf6e10b40598029b39b47cd3f276abbbb4a1b6ee657afad3f7d
 MISC metadata.xml 425 RMD160 87fe71e15546c8adff535542f5fb963fc2fb7048 SHA1 83864d1b7e26ea59062f6a19a9635eb95c2da916 SHA256 c22fa825da533c079b4c801274cbf3f675982501ba003e79632e164835e48942
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3G4AoACgkQuQc30/atMkDXSwCdFK6vBksgEK8Mk8e3pgi3aOpa
-QcEAoJoWGGsLn7Xs/lYSY60SZ+mjwEQq
-=5QcN
+iEYEARECAAYFAk7eXqUACgkQuQc30/atMkAGUwCfbwBRtW5t4s6vRkhXWSoTwg7l
+j8UAoJ409OL29Noms8YmkPMJ70bcHvDI
+=u6Kp
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/amule/amule-2.3.1.ebuild b/net-p2p/amule/amule-2.3.1.ebuild
new file mode 100644
index 000000000000..92b3f995b4df
--- /dev/null
+++ b/net-p2p/amule/amule-2.3.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2011 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.1 2011/12/06 18:27:43 armin76 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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="daemon debug geoip nls remote stats unicode upnp +X"
+
+DEPEND=">=x11-libs/wxGTK-2.8.12
+	>=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 stats && ! use X; then
+		einfo "Note: You would need both the X 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}"/${PN}-2.2.6-fallocate.diff
+}
+
+src_configure() {
+	local myconf
+
+	WX_GTK_VER="2.8"
+
+	if use X; then
+		einfo "wxGTK with X support will be used"
+		need-wxwidgets unicode
+	else
+		einfo "wxGTK without X support will be used"
+		need-wxwidgets base-unicode
+	fi
+
+	if use X ; 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} \
+		--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) \
+		$(use_enable upnp) \
+		${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
+}