Updating dbus dependencies to fix dbus breakage

Package-Manager: portage-2.1.2_rc4-r3

3 files changed, 268 insertions, 10 deletions

diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 274eca4d7cbb..1d6f4c0ae684 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gaim-0.76-xinput.patch 644 RMD160 8003dcbad47c300845898cb42b7a96f12b149c5f SHA1 f74085f170b8d6171cf47094bde9601f2e6085d7 SHA256 3532e792388cc6023522871bc99fd9e84204a42dfa6801b507df7fe480c37cd0
 MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
 RMD160 8003dcbad47c300845898cb42b7a96f12b149c5f files/gaim-0.76-xinput.patch 644
@@ -27,6 +24,10 @@ EBUILD gaim-2.0.0_beta5-r2.ebuild 6983 RMD160 6f76e3cd5f027841a554b02988ab535699
 MD5 169980f172616deb74615d0aa593e553 gaim-2.0.0_beta5-r2.ebuild 6983
 RMD160 6f76e3cd5f027841a554b02988ab535699b4d65a gaim-2.0.0_beta5-r2.ebuild 6983
 SHA256 5c6aad5d449b7f6b05f74a516b485a9ddb948d0f34f928b7bb86851c893e14bc gaim-2.0.0_beta5-r2.ebuild 6983
+EBUILD gaim-2.0.0_beta5-r3.ebuild 6939 RMD160 1a87d609d4f6aa231101d8fb5ee15fe1407a49f5 SHA1 8162077bc8abc8d81a16fd721dc2754d2b01bcd5 SHA256 a1e16e6e9bb444c0780857ff5ca235935481fa85443b54be3a8b73551a3465b8
+MD5 8cfdd53188851b6870bdd4f060bc6df1 gaim-2.0.0_beta5-r3.ebuild 6939
+RMD160 1a87d609d4f6aa231101d8fb5ee15fe1407a49f5 gaim-2.0.0_beta5-r3.ebuild 6939
+SHA256 a1e16e6e9bb444c0780857ff5ca235935481fa85443b54be3a8b73551a3465b8 gaim-2.0.0_beta5-r3.ebuild 6939
 MISC ChangeLog 62871 RMD160 653b43071eafb692b6875ead52dfbf3f84f754b7 SHA1 3a7e50a48dbd82efad3778fb93001ab8c715fa2f SHA256 f6c974db05853fa028e52e7ed6c44fdabaa969090dfbaf9f626b095358b46909
 MD5 34c6e167703865b196d049bd0b7bb2e7 ChangeLog 62871
 RMD160 653b43071eafb692b6875ead52dfbf3f84f754b7 ChangeLog 62871
@@ -44,10 +45,6 @@ SHA256 609d8796cdf2888aae84b2d384a750f17ab9d48516c4e229d46a92c789bc668b files/di
 MD5 e72ee508b4ecfbfb4b6aa4a2d69e1a8b files/digest-gaim-2.0.0_beta5-r2 253
 RMD160 8e54b2eeefbc921ead529e878e49e0ed6ef763ea files/digest-gaim-2.0.0_beta5-r2 253
 SHA256 609d8796cdf2888aae84b2d384a750f17ab9d48516c4e229d46a92c789bc668b files/digest-gaim-2.0.0_beta5-r2 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFndR/AiZjviIA2XgRAkixAKCPWSAVEe8UmWtF/VrF4gxiE2fcigCgreNl
-Ape63VpSFANJzxIfFJzubmg=
-=7wTn
------END PGP SIGNATURE-----
+MD5 e72ee508b4ecfbfb4b6aa4a2d69e1a8b files/digest-gaim-2.0.0_beta5-r3 253
+RMD160 8e54b2eeefbc921ead529e878e49e0ed6ef763ea files/digest-gaim-2.0.0_beta5-r3 253
+SHA256 609d8796cdf2888aae84b2d384a750f17ab9d48516c4e229d46a92c789bc668b files/digest-gaim-2.0.0_beta5-r3 253
diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta5-r3 b/net-im/gaim/files/digest-gaim-2.0.0_beta5-r3
new file mode 100644
index 000000000000..f7813f30596c
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-2.0.0_beta5-r3
@@ -0,0 +1,3 @@
+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-r3.ebuild b/net-im/gaim/gaim-2.0.0_beta5-r3.ebuild
new file mode 100644
index 000000000000..7242fea01ba3
--- /dev/null
+++ b/net-im/gaim/gaim-2.0.0_beta5-r3.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2007 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-r3.ebuild,v 1.1 2007/01/06 04:15:29 gothgirl Exp $
+
+inherit flag-o-matic eutils toolchain-funcs multilib mono autotools perl-app gnome2
+
+MY_PV=${P/_beta/beta}
+
+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 nls perl silc startup-notification tcl tk xscreensaver custom-cflags spell ssl qq msn gadu"
+IUSE="${IUSE} gtk sasl console groupwise"
+
+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
+		>=dev-lang/python-2.4 )
+	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 )
+		eds? ( gnome-extra/evolution-data-server ) 	)
+	>=dev-libs/glib-2.0
+	gstreamer? ( media-libs/gstreamer
+		     media-libs/gst-plugins-good )
+	perl? ( >=dev-lang/perl-5.8.2-r1 )
+	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 )
+	tcl? ( dev-lang/tcl )
+	tk? ( dev-lang/tk )
+	mono? ( dev-lang/mono )
+	gstreamer? ( >=media-libs/gstreamer-0.10 )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	doc? ( app-doc/doxygen )
+	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,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-cflags; 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-cflags"
+		einfo
+	else
+		einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
+		einfo
+	fi
+}
+
+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
+
+	if use console &&  ! built_with_use sys-libs/ncurses unicode; then
+		eerror
+		eerror "You need to rebuild sys-libs/ncurses with USE=unicode in order"
+		eerror "to build the console client of gaim."
+		eerror
+		die "Configure failed"
+	fi
+
+	if ! use gtk && ! use console; then
+		einfo
+		elog "As you did not pick gtk or console use flag, building"
+		elog "console only."
+		einfo
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+}
+
+src_compile() {
+	# Stabilize things, for your own good
+	if ! use custom-cflags; 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 msn; then
+		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},msn"
+	fi
+
+	if use groupwise; then
+		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},novell"
+	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
+
+	if ! use console && ! use gtk; then
+		myconf="${myconf} --enable-consoleui"
+	else
+		myconf="${myconf} $(use_enable console consoleui) $(use_enable gtk gtkui)"
+	fi
+
+	econf \
+		$(use_enable nls) \
+		$(use_enable perl) \
+		$(use_enable startup-notification) \
+		$(use_enable tcl) \
+		$(use_enable gtk sm) \
+		$(use_enable spell gtkspell) \
+		$(use_enable tk) \
+		$(use_enable xscreensaver screensaver) \
+		$(use_enable mono) \
+		$(use_enable debug) \
+		$(use_enable dbus) \
+		$(use_enable meanwhile) \
+		$(use_enable eds gevolution) \
+		$(use_enable gstreamer) \
+		$(use_enable sasl cyrus-sasl ) \
+		$(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
+		emake -j1
+	else
+		emake
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+	use perl && fixlocalpod
+	dodoc AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	print_gaim_warning
+}