default to console if use ! gtk && ! use console

(Portage version: 2.1.2_rc3-r9)
 (Unsigned Manifest commit)

3 files changed, 8 insertions, 258 deletions

diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 41ea45202b81..b6d4af90bef4 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -12,18 +12,14 @@ EBUILD gaim-1.5.0.ebuild 3993 RMD160 c590613b9c54e16c9aa6d427893d47924a86cf68 SH
 MD5 33700f7439472df3bb31923316010694 gaim-1.5.0.ebuild 3993
 RMD160 c590613b9c54e16c9aa6d427893d47924a86cf68 gaim-1.5.0.ebuild 3993
 SHA256 f644ac37595f2727fa58198a7d16409a4b3102fae684bfc7e8acc91a8ad0db63 gaim-1.5.0.ebuild 3993
-EBUILD gaim-2.0.0_beta5-r1.ebuild 6873 RMD160 b02e39e65e2bb22d158373355f28a5ae6696c32e SHA1 5950ad352a92a390634145adfba062b6fc4f68de SHA256 fa4d2a18f8a8c1f8edf2d85b6413e5b097f22ecacbb7cd38fd107d21dbc26563
-MD5 733f66213bce88f60210908b8faaecb2 gaim-2.0.0_beta5-r1.ebuild 6873
-RMD160 b02e39e65e2bb22d158373355f28a5ae6696c32e gaim-2.0.0_beta5-r1.ebuild 6873
-SHA256 fa4d2a18f8a8c1f8edf2d85b6413e5b097f22ecacbb7cd38fd107d21dbc26563 gaim-2.0.0_beta5-r1.ebuild 6873
-EBUILD gaim-2.0.0_beta5.ebuild 6633 RMD160 b4ef1feeb7e758e4da6c7d8db796a0d9d0ae0c92 SHA1 458ecd9a30437695f7456c509cdfde4cf128dbde SHA256 aa934161d3ba10715dba730fb2cde05952bcd9643bd4975c8dcf0534fcebf19c
-MD5 e5879ae6ca7137a352a5d6f5a8376bd9 gaim-2.0.0_beta5.ebuild 6633
-RMD160 b4ef1feeb7e758e4da6c7d8db796a0d9d0ae0c92 gaim-2.0.0_beta5.ebuild 6633
-SHA256 aa934161d3ba10715dba730fb2cde05952bcd9643bd4975c8dcf0534fcebf19c gaim-2.0.0_beta5.ebuild 6633
-MISC ChangeLog 62144 RMD160 e658bdad1d29b88765bfbb78edfdf4334e641612 SHA1 ae353a3d490a84021384d6bf6648eac7b1bd5dc7 SHA256 adeffe9cce26499f304bc652c4d04fcebb7555218cef086f2c22d2390a37f374
-MD5 f549e3b4447cdb2d7b75c6728103dce9 ChangeLog 62144
-RMD160 e658bdad1d29b88765bfbb78edfdf4334e641612 ChangeLog 62144
-SHA256 adeffe9cce26499f304bc652c4d04fcebb7555218cef086f2c22d2390a37f374 ChangeLog 62144
+EBUILD gaim-2.0.0_beta5-r1.ebuild 6903 RMD160 79f52e3956ecc22d724c08db27632e6d9ed09ef8 SHA1 decc2597a1246943e77da1ca118fbb855da8de90 SHA256 935edd55e99d298ba7cb482a9ba8fada3e4b05d4b144f6da044778d866ca9ebe
+MD5 bdfb44ad98ba4306ab02cfc47b2f0062 gaim-2.0.0_beta5-r1.ebuild 6903
+RMD160 79f52e3956ecc22d724c08db27632e6d9ed09ef8 gaim-2.0.0_beta5-r1.ebuild 6903
+SHA256 935edd55e99d298ba7cb482a9ba8fada3e4b05d4b144f6da044778d866ca9ebe gaim-2.0.0_beta5-r1.ebuild 6903
+MISC ChangeLog 62289 RMD160 6458c87ff5aa685ec6a9c7a49f99ac3806c2d409 SHA1 b5b8c473c3a19e9ad51ebd9ff1746b227bbf4dce SHA256 b8c51e1653485111ebdca16f6c3cd2558b4cc8bc30af65e611c80b7c0eabe16d
+MD5 83d18f65380258d34de428807ab4e00c ChangeLog 62289
+RMD160 6458c87ff5aa685ec6a9c7a49f99ac3806c2d409 ChangeLog 62289
+SHA256 b8c51e1653485111ebdca16f6c3cd2558b4cc8bc30af65e611c80b7c0eabe16d ChangeLog 62289
 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
@@ -31,9 +27,6 @@ SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f metadata
 MD5 390f6cb2111f1f54bb55da3cb074981e files/digest-gaim-1.5.0 238
 RMD160 565afdbee5ecd1f78913ee6d3d813ff9db8bb185 files/digest-gaim-1.5.0 238
 SHA256 0eeeff6fff0204e03a372c96611f8db0135f38286f7abade6be47aef06463f5b files/digest-gaim-1.5.0 238
-MD5 e72ee508b4ecfbfb4b6aa4a2d69e1a8b files/digest-gaim-2.0.0_beta5 253
-RMD160 8e54b2eeefbc921ead529e878e49e0ed6ef763ea files/digest-gaim-2.0.0_beta5 253
-SHA256 609d8796cdf2888aae84b2d384a750f17ab9d48516c4e229d46a92c789bc668b files/digest-gaim-2.0.0_beta5 253
 MD5 e72ee508b4ecfbfb4b6aa4a2d69e1a8b files/digest-gaim-2.0.0_beta5-r1 253
 RMD160 8e54b2eeefbc921ead529e878e49e0ed6ef763ea files/digest-gaim-2.0.0_beta5-r1 253
 SHA256 609d8796cdf2888aae84b2d384a750f17ab9d48516c4e229d46a92c789bc668b files/digest-gaim-2.0.0_beta5-r1 253
diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta5 b/net-im/gaim/files/digest-gaim-2.0.0_beta5
deleted file mode 100644
index f7813f30596c..000000000000
--- a/net-im/gaim/files/digest-gaim-2.0.0_beta5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 84099216123de25402fa7e904ceca437 gaim-2.0.0beta5.tar.bz2 6489271
-RMD160 5fdb0f16411745033a691c4991e0f36cd31655c5 gaim-2.0.0beta5.tar.bz2 6489271
-SHA256 d6fab2ff940eddbf8256b2d845332cbc25b10e1c44f1761a0a754c55849b01db gaim-2.0.0beta5.tar.bz2 6489271
diff --git a/net-im/gaim/gaim-2.0.0_beta5.ebuild b/net-im/gaim/gaim-2.0.0_beta5.ebuild
deleted file mode 100644
index 1da77363f894..000000000000
--- a/net-im/gaim/gaim-2.0.0_beta5.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# 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_beta5.ebuild,v 1.3 2006/11/18 07:42:50 cardoe Exp $
-
-inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-app gnome2
-
-MY_PV=${P/_beta/beta}
-#MY_PV="2.0.0beta3.1"
-#MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile mono nas nls perl silc spell startup-notification tcl tk xscreensaver custom-flags ssl qq msn gadu"
-
-RDEPEND="
-	bonjour? ( !avahi? ( net-misc/howl )
-		   avahi? ( net-dns/avahi ) )
-	dbus? ( || (
-				( >=dev-libs/dbus-glib-0.71 >=dev-python/dbus-python-0.71 )
-				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 )
-				)
-		>=dev-lang/python-2.4 )
-	>=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
-	gstreamer? ( media-libs/gstreamer
-		     media-libs/gst-plugins-good )
-	nas? ( >=media-libs/nas-1.4.1-r1 )
-	perl? ( >=dev-lang/perl-5.8.2-r1 )
-	spell? ( >=app-text/gtkspell-2.0.2 )
-	gadu?  ( net-libs/libgadu )
-	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 )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	startup-notification? ( >=x11-libs/startup-notification-0.5 )
-	mono? ( dev-lang/mono )
-	doc? ( app-doc/doxygen )
-	xscreensaver? (	x11-libs/libXScrnSaver )
-	dev-libs/libxml2"
-
-DEPEND="$RDEPEND
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-3.0_beta5 )"
-
-S="${WORKDIR}/${MY_PV}"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,msn,oscar,yahoo,zephyr,simple"
-
-# List of plugins
-#   app-accessibility/festival-gaim
-#   net-im/gaim-blogger
-#   net-im/gaim-bnet
-#   net-im/gaim-meanwhile
-#   net-im/gaim-snpp
-#   x11-plugins/autoprofile
-#   x11-plugins/gaim-assistant
-#   x11-plugins/gaim-encryption
-#   x11-plugins/gaim-extprefs
-#   x11-plugins/gaim-latex
-#   x11-plugins/gaim-otr
-#   x11-plugins/gaim-rhythmbox
-#   x11-plugins/gaim-xmms-remote
-#   x11-plugins/gaimosd
-#   x11-plugins/guifications
-
-
-print_gaim_warning() {
-	ewarn
-	ewarn "This is a beta release!  Please back up everything in your .gaim"
-	ewarn "directory. We're looking for lots of feedback on this release"
-	ewarn "especially what you love about it and what you hate about it."
-	ewarn
-	ewarn "If you are merging ${MY_P} from an earlier version, you may need"
-	ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp."
-	ewarn
-	ewarn "If you experience problems with gaim, file them as bugs with"
-	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
-	ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
-	ewarn "seek help in #gaim."
-	ewarn
-	ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
-	ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on"
-	ewarn "backtraces."
-	ewarn
-	ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php"
-	ewarn
-	einfo
-	if  use custom-flags; then
-		einfo "Note that you have chosen NOT TO FILTER UNSTABLE C[XX]FLAGS."
-		einfo "DO NOT file bugs with GENTOO or UPSTREAM while using custom-flags"
-		einfo
-	else
-		einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
-		einfo
-	fi
-
-	if use silc; then
-		einfo "To be able to connect to silc network, you need to run"
-		einfo "\`usermod -c \"comment\"\` as user as which you are running gaim,"
-		einfo "where \"comment\" is either your real name if you want show it"
-		einfo "on silc or any othe not empty string."
-		einfo
-	fi
-	ebeep 5
-	epause 3
-}
-
-pkg_setup() {
-	print_gaim_warning
-
-	if use bonjour && 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 to enable howl support for the bonjour protocol in gaim.
-	eerror
-	die "Configure failed"
-	fi
-
-	if use gadu && built_with_use net-libs/libgadu ssl ; then
-	eerror
-	eerror You need to rebuild net-libs/libgadu with USE=-ssl in order
-	eerror enable gadu gadu support in gaim.
-	eerror
-	die "Configure failed"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	epatch "${FILESDIR}"/"${P}"-dbus.patch
-	eautomake
-}
-
-src_compile() {
-	# Stabilize things, for your own good
-	if ! use custom-flags; then
-		strip-flags
-	fi
-	replace-flags -O? -O2
-
-	# -msse2 doesn't play nice on gcc 3.2
-	[ "`gcc-version`" == "3.2" ] && filter-flags -msse2
-
-	local myconf
-
-	if use gadu; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
-			myconf="${myconf} --with-gadu-includes=."
-			myconf="${myconf} --with-gadu-libs=."
-	fi
-
-	if use silc; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},silc"
-	fi
-
-	if use qq; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},qq"
-	fi
-
-	if use meanwhile; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},sametime"
-	fi
-
-	if use bonjour; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},bonjour"
-	fi
-
-
-	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 "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
-
-	G2CONF=" \
-		$(use_enable nls) \
-		$(use_enable perl) \
-		$(use_enable spell gtkspell) \
-		$(use_enable startup-notification) \
-		$(use_enable tcl) \
-		$(use_enable tk) \
-		$(use_enable mono) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable meanwhile) \
-		$(use_enable nas) \
-		$(use_enable eds gevolution) \
-		$(use_enable gstreamer) \
-		$(use_enable doc doxygen) \
-		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
-		${myconf} " || die "Configuration failed"
-
-	# This is a tempory fix until Makefile is fixed!!
-	if use mono; then
-	MAKEOPTS="-j1"	gnome2_src_compile || die "Make failed"
-	else
-		gnome2_src_compile || die "Make failed"
-	fi
-}
-
-src_install() {
-	gnome2_src_install || die "Install failed"
-	use perl && fixlocalpod
-	dodoc AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	print_gaim_warning
-}