Disable gtk ui if neither gtk or ncurses use flags are present

Package-Manager: portage-2.1.2.7

3 files changed, 39 insertions, 21 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 739f61f888d5..712ea38d314b 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.16 2007/06/18 17:20:10 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.17 2007/06/30 16:37:51 tester Exp $
+
+  30 Jun 2007; Olivier Crête <tester@gentoo.org> pidgin-2.0.2.ebuild:
+  Disable gtk ui if neither gtk or ncurses use flags are present
 
 *pidgin-2.0.2 (18 Jun 2007)
 
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 73a89d4b67f4..63dd9c647dd5 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -21,14 +24,14 @@ EBUILD pidgin-2.0.1.ebuild 7657 RMD160 c0ccb8db6ffcd7f31c097a5efcd82024fccac3a7
 MD5 b6a52df6a861cf505817182b29bdfaa7 pidgin-2.0.1.ebuild 7657
 RMD160 c0ccb8db6ffcd7f31c097a5efcd82024fccac3a7 pidgin-2.0.1.ebuild 7657
 SHA256 54e717e9c52333e4d30df8451eaedc2058393a54440f7791a0d40ffb28ccc9b4 pidgin-2.0.1.ebuild 7657
-EBUILD pidgin-2.0.2.ebuild 7778 RMD160 12c84200d37b9addfff6953b2489dc137ca87988 SHA1 2f09543652cde50b27e7d378cabe4614948a3fe2 SHA256 ef8c2f529885c4f80e6c740dae81bb4ecca950ee8dafc05bfdf8c2619ae3f8ba
-MD5 35d03be89bb9ee393a9d61f6ff62d197 pidgin-2.0.2.ebuild 7778
-RMD160 12c84200d37b9addfff6953b2489dc137ca87988 pidgin-2.0.2.ebuild 7778
-SHA256 ef8c2f529885c4f80e6c740dae81bb4ecca950ee8dafc05bfdf8c2619ae3f8ba pidgin-2.0.2.ebuild 7778
-MISC ChangeLog 2369 RMD160 5581b1a0655e29a987c4dd00709597c9f2ff3305 SHA1 a9e9b93b21565e6df2dcffa002ac22a3d27b9115 SHA256 e7eb7021abfde4bf1bc29fa21f88daa64e4a6c0af2bf2dbd52e263c99983f098
-MD5 f854b7b8101d756721c7b62a57f09e55 ChangeLog 2369
-RMD160 5581b1a0655e29a987c4dd00709597c9f2ff3305 ChangeLog 2369
-SHA256 e7eb7021abfde4bf1bc29fa21f88daa64e4a6c0af2bf2dbd52e263c99983f098 ChangeLog 2369
+EBUILD pidgin-2.0.2.ebuild 7908 RMD160 6886792111d042ead7a515adc81d16f1901481d4 SHA1 303cd87d4d12c6554f13393e2b45aee1b6936d86 SHA256 d6b2c47dab21f165a2f3b49345a1b209459fea2e7b87d42bc0fe5dbae0b8b774
+MD5 67fdcd5d066d2482e72a4629fb040428 pidgin-2.0.2.ebuild 7908
+RMD160 6886792111d042ead7a515adc81d16f1901481d4 pidgin-2.0.2.ebuild 7908
+SHA256 d6b2c47dab21f165a2f3b49345a1b209459fea2e7b87d42bc0fe5dbae0b8b774 pidgin-2.0.2.ebuild 7908
+MISC ChangeLog 2506 RMD160 8fcdd9b730f4f5d9cdab41fecb291eb9419ca621 SHA1 4a5df314ebb7db3253f107509679eeb675916354 SHA256 c61f057597e2cdb8899b4cf7c3aae067c63d0150b3160c95b9e6ecdd01723264
+MD5 b965771ece2dd90bd2820f0c5d0cfa69 ChangeLog 2506
+RMD160 8fcdd9b730f4f5d9cdab41fecb291eb9419ca621 ChangeLog 2506
+SHA256 c61f057597e2cdb8899b4cf7c3aae067c63d0150b3160c95b9e6ecdd01723264 ChangeLog 2506
 MISC metadata.xml 458 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd SHA1 7dc17a356911852b3f5867e3629ef02a46adb675 SHA256 4457ab0d5db90f61e9d916879c32d1e0a7c6d15f2f7c955a17e5e31cb0777ba9
 MD5 bba7b9e682937ac5182b872b00b19d93 metadata.xml 458
 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd metadata.xml 458
@@ -42,3 +45,10 @@ SHA256 4497649139e101148737beee7286ec99251c0f212d04d0870ff7b4b467b7e34a files/di
 MD5 20d2e5c31a250ab41decc02c3ca57fe2 files/digest-pidgin-2.0.2 244
 RMD160 1ea26f933a03474796cd0606dbaa89fadcc9fbdc files/digest-pidgin-2.0.2 244
 SHA256 27d66066811cc55863a0fa30b3fdb0d94ab65f7a3dae2c1b1062a4893b6f91bb files/digest-pidgin-2.0.2 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGhobn+IXOQtHLm/gRAqZVAJ4nAC4u8P9sh9LlDB/DrjqbJCQ2pQCffTII
+Gw7eMJUBb4Jm1OY+JkY20IQ=
+=SalQ
+-----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/pidgin-2.0.2.ebuild b/net-im/pidgin/pidgin-2.0.2.ebuild
index 49d80acb4bf9..469e0c7aeded 100644
--- a/net-im/pidgin/pidgin-2.0.2.ebuild
+++ b/net-im/pidgin/pidgin-2.0.2.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.2.ebuild,v 1.1 2007/06/18 17:20:10 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.0.2.ebuild,v 1.2 2007/06/30 16:37:51 tester Exp $
 
 WANT_AUTOMAKE=1.9
 
@@ -68,32 +68,37 @@ S="${WORKDIR}/${MY_PV}"
 DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple"
 
 # List of plugins yet to be ported (will be removed at some point)
-#   app-accessibility/festival-gaim
-#   net-im/gaim-blogger
 #   net-im/gaim-bnet
-#   net-im/gaim-meanwhile (integrated in gaim)
 #   net-im/gaim-snpp (will soon be net-im/pidgin-snpp)
 #   x11-plugins/autoprofile
-#   x11-plugins/gaim-assistant
 #   x11-plugins/gaim-otr
-#   x11-plugins/gaimosd
 #   x11-plugins/gaim-xfire
-#   net-im/librvp
+#   x11-plugins/gaim-galago
+#   x11-themes/gaim-smileys (get liquidx to fix it)
+
+# Abandonned 
 #   x11-plugins/ignorance
 #   x11-plugins/bangexec
-#   x11-plugins/gaim-galago
+#   x11-plugins/gaim-assistant
+# Last release in 2004
+#   net-im/gaim-blogger
+#   x11-plugins/gaimosd
+# Last release in 2005
+#   app-accessibility/festival-gaim
+# Merged into something else
+#   net-im/gaim-meanwhile (integrated in gaim)
 #   x11-plugins/gaim-libnotify (integrated into pidgin)
 #   x11-plugins/gaim-slashexec (integrated into plugin pack)
-#   x11-themes/gaim-smileys
 
 # List of plugins
-#   x11-plugins/pidgin-extprefs
+#   net-im/librvp
 #   x11-plugins/gaim-rhythmbox
 #   x11-plugins/guifications
 #   x11-plugins/pidgin-encryption
+#   x11-plugins/pidgin-extprefs
+#   x11-plugins/pidgin-hotkeys
 #   x11-plugins/pidgin-latex
 #   x11-plugins/purple-plugin_pack
-#   x11-plugins/pidgin-hotkeys
 
 print_pidgin_warning() {
 	ewarn
@@ -235,7 +240,7 @@ src_compile() {
 	fi
 
 	if ! use ncurses && ! use gtk; then
-		myconf="${myconf} --enable-consoleui"
+		myconf="${myconf} --enable-consoleui --disable-gtkui"
 	else
 		myconf="${myconf} $(use_enable ncurses consoleui) $(use_enable gtk gtkui)"
 	fi