Remove make_desktop_entry as its not needed, bug #241676, and fix upnp dependency, bug 247126

Package-Manager: portage-2.1.4.5

4 files changed, 10 insertions, 123 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index b9cfaab8c439..e9fe4f0788d9 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,11 @@
 # 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.120 2008/08/08 19:55:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.121 2008/11/27 20:45:24 armin76 Exp $
+
+  27 Nov 2008; Raúl Porcel <armin76@gentoo.org> -amule-2.2.1.ebuild,
+  amule-2.2.2.ebuild:
+  Remove make_desktop_entry as its not needed, bug #241676, and fix upnp
+  dependency, bug 247126
 
 *amule-2.2.2 (08 Aug 2008)
 
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 40efe5a7a86e..7cb8ff0692db 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -4,13 +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-2.2.2.tar.bz2 4669549 RMD160 544e36feeab9ee4c6b4e07502b716565cc6a44a3 SHA1 d8214597c370ef74f695962905d3034307961370 SHA256 1b969dd9c2c65bdd5dc5ec67cd623291d0d072b18a68d7e893cae117e61e377b
 DIST aMule-CVS-20080304.tar.bz2 4027066 RMD160 b937956d6bc16a825e9a4c4533c3c7d3f0c2d163 SHA1 75a40c8fa0f6087477ac21113a5fbf93293c8a55 SHA256 a8db3a4a5969741056b2ba1fd04aec9b34b0da8f9934b27bfd46d9d74fe2b875
 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 3009 RMD160 ef6948614d8cff4bb54688945ea7cbe397b68f63 SHA1 aad79a6430947dde41f1ef6a10d753c4f267fb0c SHA256 231d83718b865e149e5dfded6d9a95a70792d95c26166a6ebc8f4cda522c191e
-EBUILD amule-2.2.1.ebuild 2969 RMD160 a6dc5292dc6dc65641e638029c60bb6e7a78cd50 SHA1 5e73e5b5a3383d0f8689c0b5894432a41abe5d0f SHA256 024b2e79903e17ffc53515dd47c9b88dd4618717e11c7f794efa38dcaf9043ab
-EBUILD amule-2.2.2.ebuild 2969 RMD160 f7575e2b6bc30789a9420fe4e1c8763777785c3f SHA1 93501229e5cb61a2a4bef9c2d3effd7e79b964f6 SHA256 809a3a3038766a0104b16fbfe9cffdc34f3e79c47dab8498b5084ad1c29ca9ea
-MISC ChangeLog 17702 RMD160 df6ac21da0907e3fdc287624482a23132a383f42 SHA1 698d931549c32b2dd85e600a79185e3cf60117f8 SHA256 d1c67a2fe50eeaf4bf37caf5d65a08b8f244e53def32816a96513faf384db8e1
+EBUILD amule-2.2.2.ebuild 2910 RMD160 b79e3d1d5783f953f0e5128f61f7e51947f72c45 SHA1 a6b62a29f035ea15ced21061dbe997ed1ba50574 SHA256 9442be1c228d9322bc67ef0da53fb166607a9c8ae4053a7073c92984ce064e82
+MISC ChangeLog 17893 RMD160 9b800a311f41ef4c10733361ab11fc8a35590fe2 SHA1 73a93ae06ca6d60bda338de6b25d70546a2db1ef SHA256 5a21300c3a963b0937d8a55ea93b1ea1dfcbd5c066e3ad7e318538c9ae75aa61
 MISC metadata.xml 425 RMD160 87fe71e15546c8adff535542f5fb963fc2fb7048 SHA1 83864d1b7e26ea59062f6a19a9635eb95c2da916 SHA256 c22fa825da533c079b4c801274cbf3f675982501ba003e79632e164835e48942
diff --git a/net-p2p/amule/amule-2.2.1.ebuild b/net-p2p/amule/amule-2.2.1.ebuild
deleted file mode 100644
index e94893c61b93..000000000000
--- a/net-p2p/amule/amule-2.2.1.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.1.ebuild,v 1.1 2008/06/13 10:21:53 armin76 Exp $
-
-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 gtk nls remote stats unicode upnp"
-
-DEPEND="=x11-libs/wxGTK-2.8*
-		>=dev-libs/crypto++-5.5.2
-		>=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.2.ebuild b/net-p2p/amule/amule-2.2.2.ebuild
index 449619ee7ea8..578014849587 100644
--- a/net-p2p/amule/amule-2.2.2.ebuild
+++ b/net-p2p/amule/amule-2.2.2.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.2.ebuild,v 1.1 2008/08/08 19:55:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.2.ebuild,v 1.2 2008/11/27 20:45:24 armin76 Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -21,7 +21,7 @@ DEPEND="=x11-libs/wxGTK-2.8*
 		>=sys-libs/zlib-1.2.1
 		stats? ( >=media-libs/gd-2.0.26 )
 		geoip? ( dev-libs/geoip )
-		upnp? ( net-libs/libupnp )
+		upnp? ( >=net-libs/libupnp-1.6.6 )
 		remote? ( >=media-libs/libpng-1.2.0
 		unicode? ( >=media-libs/gd-2.0.26 ) )"
 
@@ -110,6 +110,5 @@ src_install() {
 		if use remote; then
 				newconfd "${FILESDIR}"/amuleweb.confd amuleweb
 				newinitd "${FILESDIR}"/amuleweb.initd amuleweb
-				make_desktop_entry amulegui "aMule Remote" amule "Network;P2P"
 		fi
 }