version bump, bug #126663

(Portage version: 2.1_pre6-r5)

4 files changed, 132 insertions, 11 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 53575ec599b1..f6cb417e2b44 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.64 2006/02/07 02:45:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.65 2006/03/24 12:35:37 reb Exp $
+
+*amule-2.1.1 (24 Mar 2006)
+
+  24 Mar 2006; <reb@gentoo.org> +amule-2.1.1.ebuild:
+  version bump, bug #126663
 
   07 Feb 2006; Aron Griffis <agriffis@gentoo.org> amule-2.0.3-r4.ebuild:
   Mark 2.0.3-r4 stable on alpha
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index bbb7b7591e58..353e2b019306 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b2224a6069edfa39fcf372fc47366b9f ChangeLog 9271
 RMD160 0aa9265b1536fd07e855477c498bbb1951f90276 ChangeLog 9271
 SHA256 4a63d9b7f82d303ba3df55478045c243b3128307f3e9c31b060d3e5ee4b419fa ChangeLog 9271
@@ -13,6 +10,9 @@ SHA256 201df6a97dc1e3fe0d301ec7e333efa6f86b1ccb6bda08092c4794a5fa844d94 amule-2.
 MD5 98f71604f7f7ccc8b63b3aaaba3c9b89 amule-2.1.0-r1.ebuild 3117
 RMD160 1a525779e966c18eada28ee50110cc34b2afd537 amule-2.1.0-r1.ebuild 3117
 SHA256 4373d0812ac394d1450b3ad5a452d3e4dbfcd7aa0a7530e2b8a75a202c3a6eae amule-2.1.0-r1.ebuild 3117
+MD5 236e7b10f5fffa3f648f9ab60efa3268 amule-2.1.1.ebuild 3022
+RMD160 2d06bff1141b39793e0721b0ee52d6ef4abe9717 amule-2.1.1.ebuild 3022
+SHA256 b63e9bd0838723852d1b4596fa456f99215b2f47743314d364b599e27adf643b amule-2.1.1.ebuild 3022
 MD5 6cfdc1b9b4a65d47e9047a8fed427889 files/amuled.confd 409
 RMD160 0e31c5aaa42c4ee2b6dfcd00afcde3b48b2d4299 files/amuled.confd 409
 SHA256 7af480fd6dd325ad66b37464417d4d89015a52722961d44da2e3f7990ac4959a files/amuled.confd 409
@@ -34,13 +34,9 @@ SHA256 bccdc46ad0b7c1648628a0e904d207f34127b7e5ff942dd2c75a9558406312f8 files/di
 MD5 17b1cd39e975bb37750852113ede26ed files/digest-amule-2.1.0-r1 65
 RMD160 b289e839342360434eb74639f98739a6327818ab files/digest-amule-2.1.0-r1 65
 SHA256 4377ded0f31f3d991aea042f995273cce00263971a3cddca308d6d49d89f3006 files/digest-amule-2.1.0-r1 65
+MD5 1ea8ccf47f2fe9c979377bd01737863c files/digest-amule-2.1.1 241
+RMD160 b842c6be824640bbc44896fcf0d2dad0e00bbc2a files/digest-amule-2.1.1 241
+SHA256 0efc188847beb4f73f5beac1f057e9372a049cdb392cad9cabc518302fabf9b6 files/digest-amule-2.1.1 241
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
 SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata.xml 160
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD6AnGJrHF4yAQTrARAvqjAJ0eC0lHRfDJouAOSIhDB9dI45+iVACeKq2U
-ynwLtlRG+f22eMEntsGrMHk=
-=b0H6
------END PGP SIGNATURE-----
diff --git a/net-p2p/amule/amule-2.1.1.ebuild b/net-p2p/amule/amule-2.1.1.ebuild
new file mode 100644
index 000000000000..627a6aa8d9aa
--- /dev/null
+++ b/net-p2p/amule/amule-2.1.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.1.ebuild,v 1.1 2006/03/24 12:35:37 reb 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="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="amuled debug gtk 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 remote && ! use amuled; then
+				eerror ""
+				eerror "You have to specify at least one of gtk, remote or amuled"
+				eerror "USE flag to build amule."
+				eerror ""
+				die "Invalid USE flag set"
+		fi
+
+		if use unicode && use gtk; then
+				einfo "wxGTK with gtk2 and unicode support will be used"
+				need-wxwidgets unicode
+		elif use gtk; then
+				einfo "wxGTK with gtk2 support will be used"
+				need-wxwidgets gtk2
+		elif use unicode; then
+				einfo "wxGTK with unicode and without X support will be used"
+				need-wxwidgets base-unicode
+		else
+				einfo "wxGTK without X support will be used"
+				need-wxwidgets base
+		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
+}
+
+src_compile() {
+		local myconf=""
+
+		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 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.1 b/net-p2p/amule/files/digest-amule-2.1.1
new file mode 100644
index 000000000000..4ea62f5a5e97
--- /dev/null
+++ b/net-p2p/amule/files/digest-amule-2.1.1
@@ -0,0 +1,3 @@
+MD5 a25521d358f65ae45744ee0099922069 aMule-2.1.1.tar.bz2 3263428
+RMD160 4a12afd91ecaaff75defa69796a7124abcd84dca aMule-2.1.1.tar.bz2 3263428
+SHA256 c675c7b1d97b14b410747af5d91185ec5f0cc55d8cfbd77b4525d47ef8756ea6 aMule-2.1.1.tar.bz2 3263428