Version bump, bug #117397

(Portage version: 2.1_pre3-r1)

4 files changed, 135 insertions, 3 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 8d6b4352a61a..e4ef2e157aee 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/amule
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.59 2005/12/18 18:57:18 mkay Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.60 2006/01/07 20:02:06 sekretarz Exp $
+
+*amule-2.1.0 (07 Jan 2006)
+
+  07 Jan 2006; Karol Wojtaszek <sekretarz@gentoo.org> +amule-2.1.0.ebuild:
+  Version bump, bug #117397
 
   18 Dec 2005; Marcin Kryczek <mkay@gentoo.org> amule-2.0.3-r4.ebuild:
   Ebuild was broken. see bug #115592
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 29aeef63c41e..bf86e0dbe89a 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,4 +1,4 @@
-MD5 4f8f9288c39f44929ccb759597d87405 ChangeLog 8377
+MD5 e4ea84f5af953a41fdbde9cf4da0011c ChangeLog 8509
 MD5 b3c15e104e1b64f5499fad3b01f9b27d amule-1.2.8-r1.ebuild 829
 MD5 52781eab799d0ab31cdcd3847805789e amule-1.2.8-r2.ebuild 826
 MD5 8089773038f60bec63f9fc87c15aa26e amule-1.2.8.ebuild 922
@@ -9,6 +9,7 @@ MD5 9842bde0d727d0714cf5ae1f01c14f19 amule-2.0.3-r2.ebuild 2167
 MD5 28a843108dc2a81ececee701965cb3da amule-2.0.3-r3.ebuild 2183
 MD5 eb091bbab1311a771145c644cc437b84 amule-2.0.3-r4.ebuild 2763
 MD5 1abaced287e5f9e1594893fb667a96df amule-2.0.3.ebuild 2258
+MD5 0ca2c4d7c0e75448cb2a0c21d6b0ad8c amule-2.1.0.ebuild 3366
 MD5 8cde6982e4b5300f4521da90ab8733d6 files/amule-2.0.0_rc7-wxgtk.patch 1293
 MD5 6cfdc1b9b4a65d47e9047a8fed427889 files/amuled.confd 409
 MD5 37c7ee8278a02051a68d062beba82fbc files/amuled.initd 1138
@@ -24,4 +25,5 @@ MD5 393ff0bdafbbb32d292387e1ca196737 files/digest-amule-2.0.3 65
 MD5 393ff0bdafbbb32d292387e1ca196737 files/digest-amule-2.0.3-r2 65
 MD5 393ff0bdafbbb32d292387e1ca196737 files/digest-amule-2.0.3-r3 65
 MD5 393ff0bdafbbb32d292387e1ca196737 files/digest-amule-2.0.3-r4 65
+MD5 17b1cd39e975bb37750852113ede26ed files/digest-amule-2.1.0 65
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
diff --git a/net-p2p/amule/amule-2.1.0.ebuild b/net-p2p/amule/amule-2.1.0.ebuild
new file mode 100644
index 000000000000..83bf60f7853a
--- /dev/null
+++ b/net-p2p/amule/amule-2.1.0.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="amuled debug gtk gtk2 nls remote stats unicode"
+
+DEPEND=">=x11-libs/wxGTK-2.6.0
+		>=sys-libs/zlib-1.2.1
+		stats? ( >=media-libs/gd-2.0.26 )
+		remote? ( >=media-libs/libpng-1.2.0 )
+		!net-p2p/xmule"
+
+pkg_setup() {
+		export WX_GTK_VER="2.6"
+
+		if ( ! use gtk || ! use gtk2 )  && ! use remote && ! use amuled; then
+				eerror ""
+				eerror "You have to specify at least one of X, remote or amuled"
+				eerror "USE flag to build amule."
+				eerror ""
+				die "Invalid USE flag set"
+		fi
+
+		if use unicode && use gtk2; then
+				einfo "wxGTK with gtk2 and unicode support will be used"
+				need-wxwidgets unicode
+		elif use gtk2; then
+				einfo "wxGTK with gtk2 support will be used"
+				need-wxwidgets gtk2
+		elif use unicode && use gtk; then
+				einfo "wxGTK with gtk2 support will be used"
+				need-wxwidgets gtk
+		elif use gtk; then
+				einfo "wxGTK with gtk1 support will be used"
+				need-wxwidgets gtk
+		elif use unicode && built_with_use x11-libs/wxGTK -X unicode; then
+				einfo "wxGTK with unicode and without X support will be used"
+				einfo "(wxbase unicode)"
+				need-wxwidgets base-unicode
+		else
+				einfo "wxGTK without X support will be used"
+				einfo "(wxbase)"
+				need-wxwidgets base
+		fi
+
+		if use stats && ( ! use gtk || ! use gtk2 ); 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
+}
+
+src_compile() {
+		local myconf=""
+
+		if use gtk || use gtk2; 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 amuled amule-daemon` \
+				`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
+		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 || use remote; then
+			if ! id p2p >/dev/null; then
+					enewgroup p2p
+					enewuser p2p -1 -1 /home/p2p p2p
+			fi
+		fi
+
+		if use amuled; then
+				insinto /etc/conf.d; newins ${FILESDIR}/amuled.confd amuled
+				exeinto /etc/init.d; newexe ${FILESDIR}/amuled.initd amuled
+		fi
+
+		if use remote; then
+				insinto /etc/conf.d; newins ${FILESDIR}/amuleweb.confd amuleweb
+				exeinto /etc/init.d; newexe ${FILESDIR}/amuleweb.initd amuleweb
+		fi
+}
diff --git a/net-p2p/amule/files/digest-amule-2.1.0 b/net-p2p/amule/files/digest-amule-2.1.0
new file mode 100644
index 000000000000..751ecf0a175d
--- /dev/null
+++ b/net-p2p/amule/files/digest-amule-2.1.0
@@ -0,0 +1 @@
+MD5 238199195f2590d38e608ca5dbe06c16 aMule-2.1.0.tar.bz2 3244316