Removed separate xscreensaver and startup-notification use flags, they are now enabled by the gtk use flag

Package-Manager: portage-2.1.2.11

3 files changed, 31 insertions, 20 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 71cad286bd7f..a8b26cba29d2 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.23 2007/08/23 03:48:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.24 2007/08/23 03:52:18 tester Exp $
+
+  23 Aug 2007; Olivier Crête <tester@gentoo.org> pidgin-2.1.1.ebuild:
+  Removed separate xscreensaver and startup-notification use flags, they are
+  now enabled by the gtk use flag
 
   23 Aug 2007; Jeroen Roovers <jer@gentoo.org> pidgin-2.1.0.ebuild:
   Stable for HPPA (bug #189781).
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 070558d173cb..200f75160004 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,17 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST pidgin-2.1.0.tar.bz2 7772942 RMD160 d04437251fbea8a1902621ebdf98f6fdc826a6d4 SHA1 33f78d07c3c7797a710bb7d2032a8d0bd89a6ab3 SHA256 79be69cccca6cb25d6c1ba0360864da8a0c043f5ded55babcd99dc5b8e15a5f8
 DIST pidgin-2.1.1.tar.bz2 7829592 RMD160 77a9f06446c1056c3ad54018e78e450cda3ac66e SHA1 da6b7dda67b14aa1837ca48895eedcee215f0818 SHA256 cfeb66d224acc574d9545eb52af685c43e0627db5abc2df04089245d181440de
 EBUILD pidgin-2.1.0.ebuild 7473 RMD160 4c3f4e5351020d828f5f6eccd309d2aab462c690 SHA1 f41ea857d08ab8a873e7473c157173de5e7dc707 SHA256 63431eddf54e107be30c5f4036fbd5ddc7ef2e5380ed22ca5777ffe083f6e454
 MD5 c3e0205f55098380f55f987c36e68887 pidgin-2.1.0.ebuild 7473
 RMD160 4c3f4e5351020d828f5f6eccd309d2aab462c690 pidgin-2.1.0.ebuild 7473
 SHA256 63431eddf54e107be30c5f4036fbd5ddc7ef2e5380ed22ca5777ffe083f6e454 pidgin-2.1.0.ebuild 7473
-EBUILD pidgin-2.1.1.ebuild 7104 RMD160 19906ec908f907c99e7b2dda9d425c2966df9c78 SHA1 9195bfcee21b97457c587859b17d5f74786410a2 SHA256 5f869d0fca5f634d3088bc91b41fb46334b0a72a74c45676ae21d29e3cd4e4ec
-MD5 c5fafab498bbbc44a2158c9aab21c92e pidgin-2.1.1.ebuild 7104
-RMD160 19906ec908f907c99e7b2dda9d425c2966df9c78 pidgin-2.1.1.ebuild 7104
-SHA256 5f869d0fca5f634d3088bc91b41fb46334b0a72a74c45676ae21d29e3cd4e4ec pidgin-2.1.1.ebuild 7104
-MISC ChangeLog 3496 RMD160 466fc7abd332f07590da17d006f711b7c5560412 SHA1 feefce626f7e0a141f8d8c8472e710edd7cbc79d SHA256 cf286422e51356c0ec4e7ee4c7ee58e4d835820a8f04cb39bd0b3ea8baf9437d
-MD5 8d51f0db9bc2a1098f8f407dce3e8a2b ChangeLog 3496
-RMD160 466fc7abd332f07590da17d006f711b7c5560412 ChangeLog 3496
-SHA256 cf286422e51356c0ec4e7ee4c7ee58e4d835820a8f04cb39bd0b3ea8baf9437d ChangeLog 3496
+EBUILD pidgin-2.1.1.ebuild 6970 RMD160 6383a60020d51cf3121b5febeecb054c81065665 SHA1 8c9740f3f2734017b44846e913d2aca1d66b6ec9 SHA256 6b190ec26c542476528fcf5319355fd054c0c3cb6cd293aa02b5e3727c93d2d7
+MD5 a22e90cb6ff27c707d68fb351aad241b pidgin-2.1.1.ebuild 6970
+RMD160 6383a60020d51cf3121b5febeecb054c81065665 pidgin-2.1.1.ebuild 6970
+SHA256 6b190ec26c542476528fcf5319355fd054c0c3cb6cd293aa02b5e3727c93d2d7 pidgin-2.1.1.ebuild 6970
+MISC ChangeLog 3682 RMD160 c79aae3f801a794b0399a334a4c3d7263f846516 SHA1 7e9747cfb0280ec331205f947a6e245f3cb1afd1 SHA256 199166622d8a61811a0ad41870576ac9daefa6b7a20b4a154a61557f063131eb
+MD5 f60480e24906bfb427102485eedf646d ChangeLog 3682
+RMD160 c79aae3f801a794b0399a334a4c3d7263f846516 ChangeLog 3682
+SHA256 199166622d8a61811a0ad41870576ac9daefa6b7a20b4a154a61557f063131eb ChangeLog 3682
 MISC metadata.xml 458 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd SHA1 7dc17a356911852b3f5867e3629ef02a46adb675 SHA256 4457ab0d5db90f61e9d916879c32d1e0a7c6d15f2f7c955a17e5e31cb0777ba9
 MD5 bba7b9e682937ac5182b872b00b19d93 metadata.xml 458
 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd metadata.xml 458
@@ -22,3 +25,10 @@ SHA256 5dee037d90f0e13e1a9c2995d0a8ea52774390806556bac19bfe9c954797b098 files/di
 MD5 5dcf5b507a82d0cc88669a0dac91904e files/digest-pidgin-2.1.1 244
 RMD160 c0984ecbdaec90bcf0d0c6c52dcd392c7750bbe3 files/digest-pidgin-2.1.1 244
 SHA256 0a3d5ab03c4a5242d59126e3a25a885b6a2477c0441aac396afc77ea52bcfa24 files/digest-pidgin-2.1.1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGzQSa+IXOQtHLm/gRAu6SAJ9wRD9vi/o5nox/tj4EWRBMIW/6yACdH6J+
+viFhIS6V8pvYeUyN9wPikD0=
+=6QrC
+-----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/pidgin-2.1.1.ebuild b/net-im/pidgin/pidgin-2.1.1.ebuild
index 36c080190264..716db64fac18 100644
--- a/net-im/pidgin/pidgin-2.1.1.ebuild
+++ b/net-im/pidgin/pidgin-2.1.1.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.1.1.ebuild,v 1.1 2007/08/22 02:50:21 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.1.1.ebuild,v 1.2 2007/08/23 03:52:18 tester Exp $
 
 WANT_AUTOMAKE=1.9
 
@@ -15,7 +15,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="bonjour dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc startup-notification tcl tk xscreensaver spell qq gadu"
+IUSE="bonjour dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc tcl tk spell qq gadu"
 IUSE="${IUSE} gtk sasl ncurses groupwise prediction zephyr" # mono"
 
 RDEPEND="
@@ -27,8 +27,8 @@ RDEPEND="
 	gtk? (
 		spell? ( >=app-text/gtkspell-2.0.2 )
 		>=x11-libs/gtk+-2.0
-		startup-notification? ( >=x11-libs/startup-notification-0.5 )
-		xscreensaver? (	x11-libs/libXScrnSaver )
+		>=x11-libs/startup-notification-0.5
+		x11-libs/libXScrnSaver
 		eds? ( gnome-extra/evolution-data-server ) 	)
 	>=dev-libs/glib-2.0
 	gstreamer? ( =media-libs/gstreamer-0.10*
@@ -203,10 +203,6 @@ src_compile() {
 		myconf="${myconf} --enable-gnutls=no --enable-nss=yes"
 	fi
 
-	if use xscreensaver ; then
-			myconf="${myconf} --x-includes=/usr/include/X11"
-	fi
-
 	if ! use ncurses && ! use gtk; then
 		myconf="${myconf} --enable-consoleui --disable-gtkui"
 	else
@@ -216,12 +212,12 @@ src_compile() {
 	econf \
 		$(use_enable nls) \
 		$(use_enable perl) \
-		$(use_enable startup-notification) \
-		$(use_enable tcl) \
+		$(use_enable gtk startup-notification) \
+		$(use_enable gtk screensaver) \
 		$(use_enable gtk sm) \
+		$(use_enable tcl) \
 		$(use_enable spell gtkspell) \
 		$(use_enable tk) \
-		$(use_enable xscreensaver screensaver) \
 		$(use_enable debug) \
 		$(use_enable dbus) \
 		$(use_enable meanwhile) \
@@ -234,6 +230,7 @@ src_compile() {
 		$(use_with zephyr krb4) \
 		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
 		--disable-mono \
+		--x-includes=/usr/include/X11 \
 		${myconf} || die "Configuration failed"
 		#$(use_enable mono) \