Version bump, and alpha/x86 stable

(Portage version: 2.1.4.4)

3 files changed, 124 insertions, 3 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index a1e1ff9994d2..d3d1420264fc 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.108 2008/03/22 15:17:55 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.109 2008/03/24 18:34:47 armin76 Exp $
+
+*amule-2.2.0_pre20080324 (24 Mar 2008)
+
+  24 Mar 2008; Raúl Porcel <armin76@gentoo.org>
+  amule-2.2.0_pre20080304.ebuild, +amule-2.2.0_pre20080324.ebuild:
+  Version bump, and alpha/x86 stable
 
   22 Mar 2008; nixnut <nixnut@gentoo.org> amule-2.2.0_pre20080304.ebuild:
   Stable on ppc wrt bug 213487
diff --git a/net-p2p/amule/amule-2.2.0_pre20080304.ebuild b/net-p2p/amule/amule-2.2.0_pre20080304.ebuild
index 8af214774df5..be69f5c45d31 100644
--- a/net-p2p/amule/amule-2.2.0_pre20080304.ebuild
+++ b/net-p2p/amule/amule-2.2.0_pre20080304.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20080304.ebuild,v 1.2 2008/03/22 15:17:55 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20080304.ebuild,v 1.3 2008/03/24 18:34:47 armin76 Exp $
 
 inherit eutils flag-o-matic wxwidgets autotools
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.hirnriss.net/files/cvs/${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="daemon debug geoip gtk nls remote stats unicode upnp"
 
 DEPEND="=x11-libs/wxGTK-2.8*
diff --git a/net-p2p/amule/amule-2.2.0_pre20080324.ebuild b/net-p2p/amule/amule-2.2.0_pre20080324.ebuild
new file mode 100644
index 000000000000..e8eb2390e20f
--- /dev/null
+++ b/net-p2p/amule/amule-2.2.0_pre20080324.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20080324.ebuild,v 1.1 2008/03/24 18:34:47 armin76 Exp $
+
+inherit eutils flag-o-matic wxwidgets autotools
+
+MY_P=${PN/m/M}-CVS-${PV/2.2.0_pre/}
+S="${WORKDIR}/${PN}-cvs"
+
+DESCRIPTION="aMule, the all-platform eMule p2p client"
+HOMEPAGE="http://www.amule.org/"
+SRC_URI="http://www.hirnriss.net/files/cvs/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="daemon debug geoip gtk nls remote stats unicode upnp"
+
+DEPEND="=x11-libs/wxGTK-2.8*
+		dev-libs/crypto++
+		>=sys-libs/zlib-1.2.1
+		stats? ( >=media-libs/gd-2.0.26 )
+		geoip? ( dev-libs/geoip )
+		upnp? ( net-libs/libupnp )
+		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
+
+		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 daemon || use remote; then
+		enewgroup p2p
+		enewuser p2p -1 -1 /home/p2p p2p
+	fi
+}
+
+src_compile() {
+		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
+
+		# we filter ssp until bug #74457 is closed to build on hardened
+		filter-flags -fstack-protector -fstack-protector-all
+
+		emake -j1 || 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
+				make_desktop_entry amulegui "aMule Remote" amule "Network;P2P"
+		fi
+}