Adding dbus patch to resolve bug#148128,#149402

Package-Manager: portage-2.1.2_pre2-r9

4 files changed, 248 insertions, 5 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 87f2e399c1f4..a89d2d56584c 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,11 @@
 # 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.411 2006/10/13 14:01:23 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.412 2006/10/14 04:46:20 gothgirl Exp $
+
+*gaim-2.0.0_beta3-r4 (14 Oct 2006)
+
+  14 Oct 2006; gothgirl <gothgirl@gentoo.org> +gaim-2.0.0_beta3-r4.ebuild:
+  Adding dbus patch to resolve bug#148128,#149402
 
   13 Oct 2006; gothgirl <gothgirl@gentoo.org> gaim-1.5.0.ebuild:
   Adjusted tcl/tk use flags in 1.5.0
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index fd704988ac58..e9472bfba671 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -15,6 +15,7 @@ MD5 f22b2bfd3cedd6e55a4db189c8e40446 files/gaim-2.0.0_beta3-gtkconv.diff 482
 RMD160 551bc5871a5a67c5163dc5c7b34160a0cd8e2f96 files/gaim-2.0.0_beta3-gtkconv.diff 482
 SHA256 b6a66176356011bdb62e419b03ec6b1e42498214dc3143f006cbeb25f48b87ce files/gaim-2.0.0_beta3-gtkconv.diff 482
 DIST gaim-1.5.0.tar.bz2 6123237 RMD160 13f74e2d2ed69a775a5884b807c365177455ae0e SHA1 a280d005f01be7fa89c9fa210efb86cc6a9eb9c7 SHA256 58e3b0340cfc9e54e46f8d8835e5a02e31201c9ed8820bbb4cea36c59b9682aa
+DIST gaim-2.0.0_beta3-dbus.patch.tar.bz2 164515 RMD160 f58826b3ee190a68e806d4bc141d9715693df9ad SHA1 a78576512e0630702f8844aa696fa6f6109b3cf1 SHA256 e23c7c1a6a06cf6b3dd13da58905030addb6f1f7f4e4c1a70e19ef159f0b417f
 DIST gaim-2.0.0beta3.1.tar.bz2 5445059 RMD160 5987586fee212a5c5e9287a9dce55a35c30ea7b7 SHA1 5897cc8b89e0937645be21a0655a6ebb4fb3e626 SHA256 a282c56f32a37f7838c5332f182bdd920d4e80099b96313e503c6acc020931f4
 DIST gaim-2.0.0beta3.tar.bz2 8056708 RMD160 f7c7273ebb5149b5eb3b3759f4a1d756f68392c5 SHA1 e23363cdcf928d503c6fa583239537b409d10b84 SHA256 5ce3a0054b26e96cacb5471d0d3456fde00223cadc267a3e010155b6a2ffe710
 EBUILD gaim-1.5.0.ebuild 3993 RMD160 c590613b9c54e16c9aa6d427893d47924a86cf68 SHA1 6168859d926d724e236b0906fd8ed41536cd0f1e SHA256 f644ac37595f2727fa58198a7d16409a4b3102fae684bfc7e8acc91a8ad0db63
@@ -33,10 +34,14 @@ EBUILD gaim-2.0.0_beta3-r3.ebuild 6236 RMD160 8396d0f363b563dd0421472d441c79707a
 MD5 3de349eeb6d47724546abf64a61ac958 gaim-2.0.0_beta3-r3.ebuild 6236
 RMD160 8396d0f363b563dd0421472d441c79707a342abb gaim-2.0.0_beta3-r3.ebuild 6236
 SHA256 bc9b7866401ab920a2622f0ae57e492c6826daf0375e8a54e46f51d9549ce2fe gaim-2.0.0_beta3-r3.ebuild 6236
-MISC ChangeLog 59876 RMD160 cd7b02d036e6d362fcc36269fa8c39277572c54a SHA1 2732d57f265f5c5e2ee6d76ddf2846ddc5128476 SHA256 85d596c66c5e1347fbfd1bdfcf71acaf25fa8dcc22ae8d95e307a17926eedf24
-MD5 efa586a48be033310770911dae68c399 ChangeLog 59876
-RMD160 cd7b02d036e6d362fcc36269fa8c39277572c54a ChangeLog 59876
-SHA256 85d596c66c5e1347fbfd1bdfcf71acaf25fa8dcc22ae8d95e307a17926eedf24 ChangeLog 59876
+EBUILD gaim-2.0.0_beta3-r4.ebuild 6325 RMD160 a0f963fe96e9ce51db2a7893a6192b00835cc131 SHA1 4f136727702491e4626b8de2c6cb8e6c4df4ea7d SHA256 357e13829762e7ec3a88ad484fd00ae14d44a7eaf3fc309cc9d33d7449707d88
+MD5 e0ba418f139d4c528ab164b05e4cfb82 gaim-2.0.0_beta3-r4.ebuild 6325
+RMD160 a0f963fe96e9ce51db2a7893a6192b00835cc131 gaim-2.0.0_beta3-r4.ebuild 6325
+SHA256 357e13829762e7ec3a88ad484fd00ae14d44a7eaf3fc309cc9d33d7449707d88 gaim-2.0.0_beta3-r4.ebuild 6325
+MISC ChangeLog 60038 RMD160 764dd41d22432b86830bef6854667aef5409a603 SHA1 17d2c72bc9276c5f7ea139751e37b998a5dcb0a6 SHA256 956c1cb35dbc019fb367352ce4f1bd37e6fb9e61dc374a02b85b6e7592ca8afc
+MD5 f592c5fcc2ec826c42de78ba247b0b35 ChangeLog 60038
+RMD160 764dd41d22432b86830bef6854667aef5409a603 ChangeLog 60038
+SHA256 956c1cb35dbc019fb367352ce4f1bd37e6fb9e61dc374a02b85b6e7592ca8afc ChangeLog 60038
 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
@@ -53,3 +58,6 @@ SHA256 94f6c231a875fc84a7e98d49e9e32d31d19107375f600bbe357457d951fcc15d files/di
 MD5 ffd99b34dae16b5b118de79bff8a948c files/digest-gaim-2.0.0_beta3-r3 259
 RMD160 53b88544cfe6ea127784fcb43fc82a24097dcf94 files/digest-gaim-2.0.0_beta3-r3 259
 SHA256 94f6c231a875fc84a7e98d49e9e32d31d19107375f600bbe357457d951fcc15d files/digest-gaim-2.0.0_beta3-r3 259
+MD5 5b90f3c0ee45bea4b129b86571cd62bf files/digest-gaim-2.0.0_beta3-r4 545
+RMD160 a1d063b0d9d23fdb7795edee90ac4d03e76e8de0 files/digest-gaim-2.0.0_beta3-r4 545
+SHA256 eb4e0f3bb295675ef5e55673a2e8886c1a45f99a109440aea8ff3f79979b4d5c files/digest-gaim-2.0.0_beta3-r4 545
diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta3-r4 b/net-im/gaim/files/digest-gaim-2.0.0_beta3-r4
new file mode 100644
index 000000000000..d3d1046a0c2e
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-2.0.0_beta3-r4
@@ -0,0 +1,6 @@
+MD5 78ef09a607941f44821e9294a653eff3 gaim-2.0.0_beta3-dbus.patch.tar.bz2 164515
+RMD160 f58826b3ee190a68e806d4bc141d9715693df9ad gaim-2.0.0_beta3-dbus.patch.tar.bz2 164515
+SHA256 e23c7c1a6a06cf6b3dd13da58905030addb6f1f7f4e4c1a70e19ef159f0b417f gaim-2.0.0_beta3-dbus.patch.tar.bz2 164515
+MD5 202b9e6ee5171da90de14230b3037dc1 gaim-2.0.0beta3.1.tar.bz2 5445059
+RMD160 5987586fee212a5c5e9287a9dce55a35c30ea7b7 gaim-2.0.0beta3.1.tar.bz2 5445059
+SHA256 a282c56f32a37f7838c5332f182bdd920d4e80099b96313e503c6acc020931f4 gaim-2.0.0beta3.1.tar.bz2 5445059
diff --git a/net-im/gaim/gaim-2.0.0_beta3-r4.ebuild b/net-im/gaim/gaim-2.0.0_beta3-r4.ebuild
new file mode 100644
index 000000000000..2fc5ca461a7c
--- /dev/null
+++ b/net-im/gaim/gaim-2.0.0_beta3-r4.ebuild
@@ -0,0 +1,224 @@
+# 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-r4.ebuild,v 1.1 2006/10/14 04:46:20 gothgirl Exp $
+
+inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-app
+
+#MY_PV=${PV/_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_P}.tar.bz2
+	 mirror://gentoo/${P}-dbus.patch.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="avahi audiofile bonjour cjk dbus debug doc eds gadu gnutls meanwhile mono nas nls perl silc spell startup-notification tcl tk xscreensaver custom-flags ssl msn"
+
+RDEPEND="
+	audiofile? ( media-libs/libao
+		media-libs/audiofile )
+	bonjour? ( !avahi? ( net-misc/howl )
+		   avahi? ( net-dns/avahi ) )
+	dbus? ( >=sys-apps/dbus-0.35
+		>=dev-lang/python-2.4 )
+	>=x11-libs/gtk+-2.0
+	>=dev-libs/glib-2.0
+	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 )"
+
+DEPEND="$RDEPEND
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+
+S="${WORKDIR}/${MY_P}"
+
+# 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() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}"/"${P}"-as-needed.patch
+	epatch "${FILESDIR}"/"${P}"-avahi-compat.patch
+	epatch "${FILESDIR}"/"${P}"-gtkconv.diff
+	epatch "${DISTDIR}"/"${P}"-dbus.patch.tar.bz2
+	eautoreconf || die "Failed running eautoreconf"
+}
+
+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 bonjour ; then
+		myconf="${myconf} --with-howl-includes=."
+		myconf="${myconf} --with-howl-libs=."
+	fi
+
+	if ! use silc; then
+		einfo "Disabling SILC protocol"
+		myconf="${myconf} --with-silc-includes=."
+		myconf="${myconf} --with-silc-libs=."
+	fi
+
+	if ! use gadu ; then
+		myconf="${myconf} --with-gadu-includes=."
+		myconf="${myconf} --with-gadu-libs=."
+	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
+
+	econf \
+		$(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 audiofile audio) \
+		$(use_enable doc doxygen) \
+		${myconf} || die "Configuration failed"
+
+	emake -j1 || die "Make failed"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "Install failed"
+	use perl && fixlocalpod
+	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
+}
+
+pkg_postinst() {
+	print_gaim_warning
+}