Fixed X idle time support.

Package-Manager: portage-2.1.1_pre1-r5

3 files changed, 51 insertions, 24 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index fee7a17e5ceb..bb2aa51d1423 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.397 2006/07/05 12:28:27 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.398 2006/07/05 19:46:10 gothgirl Exp $
+
+  05 Jul 2006; gothgirl <gothgirl@gentoo.org> gaim-2.0.0_beta3-r1.ebuild:
+  Fixed X idle time support.
 
   05 Jul 2006; gothgirl <gothgirl@gentoo.org> gaim-2.0.0_beta3-r1.ebuild:
   Fixed a typo in the beta3-r1 ebuild.
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index a8af127e2ce7..d53c01cb6834 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -16,14 +16,14 @@ EBUILD gaim-1.5.0.ebuild 4040 RMD160 a3dc2aa0459198bb80b3cb704e28875e35ed2386 SH
 MD5 62ebc38e159f6c72332f63edf42722c3 gaim-1.5.0.ebuild 4040
 RMD160 a3dc2aa0459198bb80b3cb704e28875e35ed2386 gaim-1.5.0.ebuild 4040
 SHA256 22d683106d6f1ff173ee26dbd711b40940488c0842464b21e62471f8da69c964 gaim-1.5.0.ebuild 4040
-EBUILD gaim-2.0.0_beta3-r1.ebuild 6128 RMD160 53aae6696d1a39210594a374b8bd089025230176 SHA1 0173c2aba5e35516192166211be1486aa795d3cb SHA256 05a83f8c6baa5df36a0e4b3b85d0683e53760b1afb0085adf34fd7001caff1b3
-MD5 aaba7bf814fd573f965d857097be7644 gaim-2.0.0_beta3-r1.ebuild 6128
-RMD160 53aae6696d1a39210594a374b8bd089025230176 gaim-2.0.0_beta3-r1.ebuild 6128
-SHA256 05a83f8c6baa5df36a0e4b3b85d0683e53760b1afb0085adf34fd7001caff1b3 gaim-2.0.0_beta3-r1.ebuild 6128
-MISC ChangeLog 57795 RMD160 2c1412a4ce361e0752f361e04a2110fd10bd4be3 SHA1 cc5d1f04f6bbee7329941e92be816804695c3293 SHA256 ebebe1ea4a40ee1517fd3974f093b4e157aa36ac7ced1611947d593922990fe7
-MD5 2739a77e1c434452f4de61846bbc0fa4 ChangeLog 57795
-RMD160 2c1412a4ce361e0752f361e04a2110fd10bd4be3 ChangeLog 57795
-SHA256 ebebe1ea4a40ee1517fd3974f093b4e157aa36ac7ced1611947d593922990fe7 ChangeLog 57795
+EBUILD gaim-2.0.0_beta3-r1.ebuild 6756 RMD160 891c14a54932c74695ba0c6bc60fb170167f495e SHA1 b7376433fd6e2edd957c27de3a8c0330bb5f6156 SHA256 870a8d733a93c4a7a2541654de669e31a492d8563407672fdfb2eab6ead2319f
+MD5 ebe7c5308ddaa61308ef7d91aaec3921 gaim-2.0.0_beta3-r1.ebuild 6756
+RMD160 891c14a54932c74695ba0c6bc60fb170167f495e gaim-2.0.0_beta3-r1.ebuild 6756
+SHA256 870a8d733a93c4a7a2541654de669e31a492d8563407672fdfb2eab6ead2319f gaim-2.0.0_beta3-r1.ebuild 6756
+MISC ChangeLog 57899 RMD160 c987d9e590ce05339c3975b13aed100f08ba0466 SHA1 21db1447b944efbfa55a6e7e48f927f7c0968bbc SHA256 7f845f6d3d1a6e4353f82e49dc603b0f322d8a01c343dfbba9285c5988a71821
+MD5 ddd87338dd03d35d260fdb5acb833750 ChangeLog 57899
+RMD160 c987d9e590ce05339c3975b13aed100f08ba0466 ChangeLog 57899
+SHA256 7f845f6d3d1a6e4353f82e49dc603b0f322d8a01c343dfbba9285c5988a71821 ChangeLog 57899
 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
diff --git a/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild b/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild
index ed4acf18a6c4..40bd3324a902 100644
--- a/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild
+++ b/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild,v 1.6 2006/07/05 12:28:27 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild,v 1.7 2006/07/05 19:46:10 gothgirl Exp $
 
 inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-module
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/gaim/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="avahi audiofile bonjour cjk dbus debug eds gadu gnutls meanwhile mono nas nls perl silc spell startup-notification tcltk xscreensaver custom-flags"
+IUSE="avahi audiofile bonjour cjk dbus debug eds gadu gnutls krb4 meanwhile mono nas nls perl silc spell startup-notification tcltk xscreensaver custom-flags ssl msn"
 
 RDEPEND="
 	audiofile? ( media-libs/libao
@@ -29,17 +29,24 @@ RDEPEND="
 	perl? ( >=dev-lang/perl-5.8.2-r1 )
 	spell? ( >=app-text/gtkspell-2.0.2 )
 	gadu?  ( net-libs/libgadu )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( >=dev-libs/nss-3.11
-		>=dev-libs/nspr-4.6.1 )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( >=dev-libs/nss-3.11 )
+	)
+	msn? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( >=dev-libs/nss-3.11 )
+	)
 	meanwhile? ( net-libs/meanwhile )
 	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
 	eds? ( gnome-extra/evolution-data-server )
+	krb4? ( >=app-crypt/mit-krb5-1.3.6-r1 )
 	tcltk? ( dev-lang/tcl
 		dev-lang/tk )
 	startup-notification? ( >=x11-libs/startup-notification-0.5 )
 	mono? ( dev-lang/mono )
-	xscreensaver? ( x11-misc/xscreensaver )"
+	xscreensaver? ( x11-misc/xscreensaver
+			x11-libs/libXScrnSaver )"
 
 DEPEND="$RDEPEND
 	dev-util/pkgconfig
@@ -116,9 +123,17 @@ print_gaim_warning() {
 pkg_setup() {
 	print_gaim_warning
 
+	if use krb4 && ! built_with_use app-crypt/mit-krb5 krb4 ; then
+	eerror
+	eerror You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to
+	eerror enable krb4 support for the zephyr protocol in gaim.
+	eerror
+	die "Configure failed"
+	fi
+
 	if use avahi && ! built_with_use net-dns/avahi howl-compat ; then
 	eerror
-	eerror You need to rebuild net-dns/avahi with USE=howl-compat in order
+	eerror You need to rebuild net-dns/avavhi with USE=howl-compat in order
 	eerror to enable howl support for the bonjour protocol in gaim.
 	eerror
 	die "Configure failed"
@@ -171,14 +186,23 @@ src_compile() {
 		myconf="${myconf} --with-gadu-libs=."
 	fi
 
-	if use gnutls ; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf="${myconf} --enable-nss=no"
-		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
-		myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)"
+	if use ssl || use msn ; then
+		if use gnutls ; then
+			einfo "Disabling NSS, using GnuTLS"
+			myconf="${myconf} --enable-nss=no enable-gnutls=yes"
+			myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
+			myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)"
+		else
+			einfo "Disabling GnuTLS, using NSS"
+			myconf="${myconf} --enable-gnutls=no --enable-nss=yes"
+		fi
 	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf="${myconf} --enable-gnutls=no"
+		einfo "No SSL support selected"
+		myconf="${myconf} --enable-gnutls=no --enable-nss=no"
+	fi
+
+	if use xscreensaver ; then
+			myconf="${myconf} --x-includes=/usr/include/X11"
 	fi
 
 	econf \
@@ -188,8 +212,8 @@ src_compile() {
 		$(use_enable startup-notification) \
 		$(use_enable tcltk tcl) \
 		$(use_enable tcltk tk) \
-		$(use_enable xscreensaver screensaver) \
 		$(use_enable mono) \
+		$(use_enable krb4) \
 		$(use_enable debug) \
 		$(use_enable dbus) \
 		$(use_enable meanwhile) \