Add networkmanager local use flag, bug #179525

Package-Manager: portage-2.1.2.2

3 files changed, 29 insertions, 16 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 39a389615d06..0235650e194f 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.9 2007/05/22 14:56:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.10 2007/05/24 04:21:13 tester Exp $
+
+  24 May 2007; Olivier Crête <tester@gentoo.org> pidgin-2.0.0.ebuild:
+  Add networkmanager local use flag, bug #179525
 
   22 May 2007; Jeroen Roovers <jer@gentoo.org> pidgin-2.0.0.ebuild:
   Marked ~hppa (again, in a way).
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index fe1a728b4449..e10529e4e7e7 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pidgin-2.0.0-cchar_t-undeclared.patch 278 RMD160 f126c8410896bb7933cc81e05ebae9f5b83af0c7 SHA1 ce923b83bb27faeaf272a3eb7a740008c50f2742 SHA256 a0c33e57f509bc87a84903689ef7ce4a33b615e79658e5bbf83bf9cc7077efea
 MD5 64f45de10775a81453340b4f9aae2b5d files/pidgin-2.0.0-cchar_t-undeclared.patch 278
 RMD160 f126c8410896bb7933cc81e05ebae9f5b83af0c7 files/pidgin-2.0.0-cchar_t-undeclared.patch 278
 SHA256 a0c33e57f509bc87a84903689ef7ce4a33b615e79658e5bbf83bf9cc7077efea files/pidgin-2.0.0-cchar_t-undeclared.patch 278
 DIST pidgin-2.0.0.tar.bz2 7521328 RMD160 1e387bb098bb985c5aa46deedc5eb4450579ae4e SHA1 7bfe348abc25307845e8de1d0fe2b761293ab071 SHA256 d700a95fbce796b4a9e5c2fb07aad8c24402f38a795c8eb51a44e000a8400cff
-EBUILD pidgin-2.0.0.ebuild 7371 RMD160 c74de51668b239e307b114262a26fbce517b65ca SHA1 13d427ae09b0fcb9ca183b7c7ee604884c28084b SHA256 764c9aeb9842f532b3cd2d5f5c872403a21fefb2724b707d30167d09da9f6a35
-MD5 a6bdd2b4c8c9404c9a1ee941fd8987fc pidgin-2.0.0.ebuild 7371
-RMD160 c74de51668b239e307b114262a26fbce517b65ca pidgin-2.0.0.ebuild 7371
-SHA256 764c9aeb9842f532b3cd2d5f5c872403a21fefb2724b707d30167d09da9f6a35 pidgin-2.0.0.ebuild 7371
-MISC ChangeLog 1340 RMD160 fe0b88c00223c1441debc6a21017a50b43e45c1a SHA1 e6e20d864244e1cd32eb00e86fac8dc800821adc SHA256 21aa24bc7b6d4c7951443ede170bde52231309fb44e969f1e0b0463d46772218
-MD5 a50ec8dda44717d1ed50f238d973bb30 ChangeLog 1340
-RMD160 fe0b88c00223c1441debc6a21017a50b43e45c1a ChangeLog 1340
-SHA256 21aa24bc7b6d4c7951443ede170bde52231309fb44e969f1e0b0463d46772218 ChangeLog 1340
+EBUILD pidgin-2.0.0.ebuild 7441 RMD160 febc898b4259203170ecabeba090b0e6581ffe16 SHA1 068cbdf8c12835f6fd86096ece1796fb9f5ec13b SHA256 69aa0cdad66d0c9744fbe2295e78e594725253212837474946ac7ecb8d2227e0
+MD5 8b658a77b2b151825cd592c57c6bf3ce pidgin-2.0.0.ebuild 7441
+RMD160 febc898b4259203170ecabeba090b0e6581ffe16 pidgin-2.0.0.ebuild 7441
+SHA256 69aa0cdad66d0c9744fbe2295e78e594725253212837474946ac7ecb8d2227e0 pidgin-2.0.0.ebuild 7441
+MISC ChangeLog 1465 RMD160 cfcd2279b7fdb145af746a8ff1117040b73d3fde SHA1 c131d586198ea7195daba67f9d0955e2cdb41036 SHA256 a74e4745d830598e22f4e1f2200384a9260d09ea8c49d8d48d03e3a8dbcfd4a2
+MD5 3ad0fda7951231537da6a5f02b487191 ChangeLog 1465
+RMD160 cfcd2279b7fdb145af746a8ff1117040b73d3fde ChangeLog 1465
+SHA256 a74e4745d830598e22f4e1f2200384a9260d09ea8c49d8d48d03e3a8dbcfd4a2 ChangeLog 1465
 MISC metadata.xml 458 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd SHA1 7dc17a356911852b3f5867e3629ef02a46adb675 SHA256 4457ab0d5db90f61e9d916879c32d1e0a7c6d15f2f7c955a17e5e31cb0777ba9
 MD5 bba7b9e682937ac5182b872b00b19d93 metadata.xml 458
 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd metadata.xml 458
@@ -18,3 +21,10 @@ SHA256 4457ab0d5db90f61e9d916879c32d1e0a7c6d15f2f7c955a17e5e31cb0777ba9 metadata
 MD5 c9fa3630408c75bc8eaebdccdcee270f files/digest-pidgin-2.0.0 244
 RMD160 f10e884c9488999e94f2230bb11f9b1575c43630 files/digest-pidgin-2.0.0 244
 SHA256 e2615579a04819aeb25329e428463a42e3b8a1a0a2702e83113261ddaf4071bb files/digest-pidgin-2.0.0 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFGVRSR+IXOQtHLm/gRArbCAKCHZBKLrom6eCSelFh8KFKgObdbeQCbB4/M
+SCiwri7wsoMqjN/6Z6L1Ssw=
+=VUdi
+-----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/pidgin-2.0.0.ebuild b/net-im/pidgin/pidgin-2.0.0.ebuild
index 0feec9276f68..2fdc074ad194 100644
--- a/net-im/pidgin/pidgin-2.0.0.ebuild
+++ b/net-im/pidgin/pidgin-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.0.0.ebuild,v 1.4 2007/05/22 14:56:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.0.0.ebuild,v 1.5 2007/05/24 04:21:13 tester Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib autotools perl-app gnome2
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile nls perl silc startup-notification tcl tk xscreensaver custom-cflags spell ssl qq msn gadu"
+IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc startup-notification tcl tk xscreensaver custom-cflags spell ssl qq msn gadu"
 IUSE="${IUSE} gtk sasl console groupwise prediction" # mono"
 
 RDEPEND="
@@ -30,8 +30,8 @@ RDEPEND="
 		xscreensaver? (	x11-libs/libXScrnSaver )
 		eds? ( gnome-extra/evolution-data-server ) 	)
 	>=dev-libs/glib-2.0
-	gstreamer? ( media-libs/gstreamer
-		     media-libs/gst-plugins-good )
+	gstreamer? ( =media-libs/gstreamer-0.10*
+		     =media-libs/gst-plugins-good-0.10* )
 	perl? ( >=dev-lang/perl-5.8.2-r1 )
 	gadu?  ( net-libs/libgadu )
 	ssl? (
@@ -46,10 +46,10 @@ RDEPEND="
 	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
 	tcl? ( dev-lang/tcl )
 	tk? ( dev-lang/tk )
-	gstreamer? ( >=media-libs/gstreamer-0.10 )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
 	doc? ( app-doc/doxygen )
 	dev-libs/libxml2
+	networkmanager? ( net-misc/networkmanager )
 	prediction? ( =dev-db/sqlite-3.3* )"
 	#mono? ( dev-lang/mono )"
 
@@ -74,7 +74,6 @@ DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple"
 #   net-im/gaim-snpp (will soon be net-im/pidgin-snpp)
 #   x11-plugins/autoprofile
 #   x11-plugins/gaim-assistant
-#   x11-plugins/gaim-encryption
 #   x11-plugins/gaim-latex
 #   x11-plugins/gaim-otr
 #   x11-plugins/gaimosd
@@ -84,7 +83,7 @@ DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple"
 #   x11-plugins/pidgin-extprefs
 #   x11-plugins/gaim-rhythmbox
 #   x11-plugins/guifications
-
+#   x11-plugins/pidgin-encryption
 
 print_pidgin_warning() {
 	ewarn
@@ -246,6 +245,7 @@ src_compile() {
 		$(use_enable sasl cyrus-sasl ) \
 		$(use_enable doc doxygen) \
 		$(use_enable prediction cap) \
+		$(use_enable networkmanager nm) \
 		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
 		--disable-mono \
 		${myconf} || die "Configuration failed"