Version bump wrt #2206073, remove old

Package-Manager: portage-2.1.5.5

6 files changed, 18 insertions, 361 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 731d25ccf0b3..afa75bc8ac68 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,14 @@
 # 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.116 2008/06/03 09:30:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.117 2008/06/13 10:21:53 armin76 Exp $
+
+*amule-2.2.1 (13 Jun 2008)
+
+  13 Jun 2008; Raúl Porcel <armin76@gentoo.org>
+  -amule-2.2.0_pre20080324.ebuild, -amule-2.2.0_pre20080413.ebuild,
+  -amule-2.2.0_pre20080507.ebuild, -amule-2.2.0_pre20080531.ebuild,
+  +amule-2.2.1.ebuild:
+  Version bump wrt #2206073, remove old
 
 *amule-2.2.0_pre20080531 (03 Jun 2008)
 
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 296770d52ed7..c84ac16f40f7 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -4,17 +4,11 @@ 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.1.3.tar.bz2 3248530 RMD160 fcc345000e5ad0a221d1e96d0d514f3be36428c3 SHA1 dd47deb38e7a5b823550b85150f5a814c597b273 SHA256 6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244
+DIST aMule-2.2.1.tar.bz2 4569813 RMD160 061af71a3be980e6f430637c1814c2f96a581fcb SHA1 c4a98fd034ae9af9ace632c9bc9f51a75405c271 SHA256 c9f7a58dfcfc1b8104d9a0cebd0454a0c827dad41e54576f0b9a9eba8cf79a7d
 DIST aMule-CVS-20080304.tar.bz2 4027066 RMD160 b937956d6bc16a825e9a4c4533c3c7d3f0c2d163 SHA1 75a40c8fa0f6087477ac21113a5fbf93293c8a55 SHA256 a8db3a4a5969741056b2ba1fd04aec9b34b0da8f9934b27bfd46d9d74fe2b875
-DIST aMule-CVS-20080324.tar.bz2 4179421 RMD160 06a241e8d14c8c3750a13ce9ece3889bae40e7d5 SHA1 2883987de1a06e6a6a90900f1ce0fa8894bb6c69 SHA256 5f022820244e6e05bbd2600f4655f98d4a98f272ef05bc50731c996aff312dd5
-DIST aMule-CVS-20080413.tar.bz2 4478140 RMD160 e018a68fc0f9e8dbbca6a95ae7a838ace36ce41d SHA1 bcfd3f7867f469a17752600ecb531e06cdcfaebe SHA256 0ff01b50330ec9ba0f095c7d49f420adafd620745cf5a855d8971e8419a81238
-DIST aMule-CVS-20080507.tar.bz2 4490382 RMD160 54a7eda20055e97c246076150ac042442bfd9d0c SHA1 336397cc39f7e94d98212645a1a28cde9b677bb3 SHA256 5459bf2e5f418c6f7663b2b1277a76148b17a86da5b2254361ef9fbcd60cccbd
-DIST aMule-CVS-20080531.tar.bz2 4384697 RMD160 ff3afee65fddaa302794a47470d6cfaaa75a6ac1 SHA1 75250eba8ce61f7514cb97e3bac72d98a9d1f9f4 SHA256 8c590e5588b0a5471ffe0b148c4f012d84cc7b86a1fa964273e050a3da0fd735
 EBUILD amule-2.1.3-r1.ebuild 3055 RMD160 a8b3effdc140b8293219808f603d4166a165510d SHA1 ecf37cc6e80b0ea84de955b78c8053be1621e38c SHA256 0b160f0d2b3515a1b9b5021130d19c53b2a319fbe3837ac43e9182b56c925f5e
 EBUILD amule-2.1.3.ebuild 3013 RMD160 0435e512f6b69ae8e47cf697fa26e0101553ad9f SHA1 421e60db1e7e7041df32437b00ae8b1c4a84cc16 SHA256 e680653b5c7925ae07d8f3282927f9f97831db5a081b8eb1445a4efccd7158ef
 EBUILD amule-2.2.0_pre20080304.ebuild 3002 RMD160 e7ad2dbb43fbad6dab0c374cb1ea74769d944b46 SHA1 7468352f3bbd1e126c4e2ec3f813dfdaf1169e08 SHA256 0a0675ec8c14463cb95025c5cdf5f50257183f9aed18fc28667e2c751723a097
-EBUILD amule-2.2.0_pre20080324.ebuild 3007 RMD160 6184702b53d0c198740fa0e0f80e7a6796bd8494 SHA1 6a21e495871d0e4b6c9e1e1083cc698719d91ae1 SHA256 f8b73f6ed05818c0c66760c7a3eb7c99bf346c4262658ce8b78d5825340c5783
-EBUILD amule-2.2.0_pre20080413.ebuild 3007 RMD160 a2ac3a8ff1a1bb53f6c6b6bd32decc9ae8b07dc8 SHA1 7a68085ded636eaca0ec08a1d41094b6254b5e3a SHA256 36a380d631c1d12d93c0ca7097b021d6ced99f7eafd586cb3f76500b211a6fc4
-EBUILD amule-2.2.0_pre20080507.ebuild 3007 RMD160 b674dfae200e9a0108bb2278455281517d33bf56 SHA1 a46393bf1e9958e70391f02856f3ae57907cce5a SHA256 aafba948208fa1b427d76d9c2a1faa75c3a16603f30e99d49fef4f987a1b9568
-EBUILD amule-2.2.0_pre20080531.ebuild 3007 RMD160 2d638f2ee3ebd52f969454962ca5046793430988 SHA1 bfdb9ad1872402de152ad018aed8e8cca5564964 SHA256 0840e2e2fa436f76e3559bee5b353fd84dc192fff209a03bce756bd571afc2a7
-MISC ChangeLog 16991 RMD160 d7ab2df94c05ab2b86f90e5e6ed733b233700209 SHA1 6d1e2371b35e6e1b8c1b7b73a80bb50c0dea3237 SHA256 0551da41acfd9f52095a0e7bf99afb83f3c11f04ca6006fc03ac0a18499e4aa1
+EBUILD amule-2.2.1.ebuild 2969 RMD160 a6dc5292dc6dc65641e638029c60bb6e7a78cd50 SHA1 5e73e5b5a3383d0f8689c0b5894432a41abe5d0f SHA256 024b2e79903e17ffc53515dd47c9b88dd4618717e11c7f794efa38dcaf9043ab
+MISC ChangeLog 17268 RMD160 f11dd30bee31f9efeeb9c208a549774fe433d383 SHA1 2df195203c1792f7f36234ee582591c7fbaf06b2 SHA256 863b459bf45f25266e4291a3c2ea40a0dc09dbdf2edf117ab7ef2f63ec37291b
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
diff --git a/net-p2p/amule/amule-2.2.0_pre20080413.ebuild b/net-p2p/amule/amule-2.2.0_pre20080413.ebuild
deleted file mode 100644
index e9046e2663df..000000000000
--- a/net-p2p/amule/amule-2.2.0_pre20080413.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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_pre20080413.ebuild,v 1.1 2008/04/14 13:00:41 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
-}
diff --git a/net-p2p/amule/amule-2.2.0_pre20080507.ebuild b/net-p2p/amule/amule-2.2.0_pre20080507.ebuild
deleted file mode 100644
index 6d4e9acb2efb..000000000000
--- a/net-p2p/amule/amule-2.2.0_pre20080507.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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_pre20080507.ebuild,v 1.1 2008/05/07 16:02:22 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
-}
diff --git a/net-p2p/amule/amule-2.2.0_pre20080531.ebuild b/net-p2p/amule/amule-2.2.0_pre20080531.ebuild
deleted file mode 100644
index 3a10c6870b10..000000000000
--- a/net-p2p/amule/amule-2.2.0_pre20080531.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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_pre20080531.ebuild,v 1.1 2008/06/03 09:30:51 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
-}
diff --git a/net-p2p/amule/amule-2.2.0_pre20080324.ebuild b/net-p2p/amule/amule-2.2.1.ebuild
index e8eb2390e20f..e94893c61b93 100644
--- a/net-p2p/amule/amule-2.2.0_pre20080324.ebuild
+++ b/net-p2p/amule/amule-2.2.1.ebuild
@@ -1,15 +1,15 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.1.ebuild,v 1.1 2008/06/13 10:21:53 armin76 Exp $
 
-inherit eutils flag-o-matic wxwidgets autotools
+inherit eutils flag-o-matic wxwidgets
 
-MY_P=${PN/m/M}-CVS-${PV/2.2.0_pre/}
-S="${WORKDIR}/${PN}-cvs"
+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="http://www.hirnriss.net/files/cvs/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,7 +17,7 @@ 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++
+		>=dev-libs/crypto++-5.5.2
 		>=sys-libs/zlib-1.2.1
 		stats? ( >=media-libs/gd-2.0.26 )
 		geoip? ( dev-libs/geoip )