adding patch re bug#152353 to fix use flags

Package-Manager: portage-2.1.2_pre3-r6

5 files changed, 342 insertions, 5 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 2c6b69880cd6..2149d387d0f4 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.418 2006/10/23 01:24:13 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.419 2006/10/23 22:55:55 gothgirl Exp $
+
+*gaim-2.0.0_beta4-r2 (23 Oct 2006)
+
+  23 Oct 2006; gothgirl <gothgirl@gentoo.org> +gaim-2.0.0_beta4-r2.ebuild:
+  adding patch re bug#152353 to fix use flags
 
 *gaim-2.0.0_beta4-r1 (23 Oct 2006)
 
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index ee1af5474930..1d4eb65101e5 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -14,6 +14,10 @@ AUX gaim-2.0.0_beta3-dbus-1.patch 2845 RMD160 8a16ba09713a28a93fce789c9daa98f12f
 MD5 fe24d2f46894db059e7f41e48a6789c3 files/gaim-2.0.0_beta3-dbus-1.patch 2845
 RMD160 8a16ba09713a28a93fce789c9daa98f12fdb533c files/gaim-2.0.0_beta3-dbus-1.patch 2845
 SHA256 886e5918f1cdddf172e9db52c049d7571dc1bb277faa75d154c78a0ef658e447 files/gaim-2.0.0_beta3-dbus-1.patch 2845
+AUX gaim-2.0.0_beta4-configure.patch 3324 RMD160 f634d925e82eb6bce95409c69d35ca1ee01d6d0e SHA1 7706fea880c0aef907b166c174a45f4649a15363 SHA256 4a4a0e821503736462c93748bc0af5ea58663fd36592d66ab663ca1b27985415
+MD5 844c0f8e20c7cd246335b326f4d2d80e files/gaim-2.0.0_beta4-configure.patch 3324
+RMD160 f634d925e82eb6bce95409c69d35ca1ee01d6d0e files/gaim-2.0.0_beta4-configure.patch 3324
+SHA256 4a4a0e821503736462c93748bc0af5ea58663fd36592d66ab663ca1b27985415 files/gaim-2.0.0_beta4-configure.patch 3324
 AUX gaim-2.0.0_beta4-dbus.patch 2347 RMD160 df8f4261289b1f1dd5dfb25d10c2750bb61cae3f SHA1 fbf4801f56008641e6de5c8a52c2710302cbb3a2 SHA256 ccdb151171d8df331f7192aeb3b04767627f608e5b0d9b06a9173be484f2b6bd
 MD5 3368d8d7c673a679625f0fd12b535602 files/gaim-2.0.0_beta4-dbus.patch 2347
 RMD160 df8f4261289b1f1dd5dfb25d10c2750bb61cae3f files/gaim-2.0.0_beta4-dbus.patch 2347
@@ -33,14 +37,18 @@ EBUILD gaim-2.0.0_beta4-r1.ebuild 6524 RMD160 bf86248469f8d3478f867e38a6f231e5a1
 MD5 fae3ce886ecf9cbdca0433d11ede4e02 gaim-2.0.0_beta4-r1.ebuild 6524
 RMD160 bf86248469f8d3478f867e38a6f231e5a14f1298 gaim-2.0.0_beta4-r1.ebuild 6524
 SHA256 a002bf9c858dbdb10a70561ca6b5ddb44c6e397246931fb256531b74946d6297 gaim-2.0.0_beta4-r1.ebuild 6524
+EBUILD gaim-2.0.0_beta4-r2.ebuild 6583 RMD160 0cd29ed89fd1b1d1f0395f6b6fac6c9af0e0fec5 SHA1 594ee074970865bf5416497f0a40749e01d587f8 SHA256 042baa901aa834aabbd34b5446a1718c7b5aa1263276057a04bb09878951699f
+MD5 c9f1ece49ad26dda8e8feb4631f8693b gaim-2.0.0_beta4-r2.ebuild 6583
+RMD160 0cd29ed89fd1b1d1f0395f6b6fac6c9af0e0fec5 gaim-2.0.0_beta4-r2.ebuild 6583
+SHA256 042baa901aa834aabbd34b5446a1718c7b5aa1263276057a04bb09878951699f gaim-2.0.0_beta4-r2.ebuild 6583
 EBUILD gaim-2.0.0_beta4.ebuild 6416 RMD160 c51357a21e0d6fb9ffed3c47b3f7f36decefd679 SHA1 ce4f93e73f1c05680cc3eef0e6cd70d2efa09724 SHA256 1dce90fae617eb3ca5ef7d0dbff0283b8e1c8cd5f8b149c1040efb1cfd9fab69
 MD5 f8decc9b9a6cdbab21f1b5f1e2799676 gaim-2.0.0_beta4.ebuild 6416
 RMD160 c51357a21e0d6fb9ffed3c47b3f7f36decefd679 gaim-2.0.0_beta4.ebuild 6416
 SHA256 1dce90fae617eb3ca5ef7d0dbff0283b8e1c8cd5f8b149c1040efb1cfd9fab69 gaim-2.0.0_beta4.ebuild 6416
-MISC ChangeLog 61002 RMD160 d485e7848f6fbad5ee125e708b3d7f6103667152 SHA1 a9a4a6ffa5c1f6ab54df9817afcaab285cbac71d SHA256 8235355123f8a424d47769d0cae13e2a24ca5354aaae7302e98d76fd09497dc2
-MD5 4757798f65d60c6008dbffc4b3f93a75 ChangeLog 61002
-RMD160 d485e7848f6fbad5ee125e708b3d7f6103667152 ChangeLog 61002
-SHA256 8235355123f8a424d47769d0cae13e2a24ca5354aaae7302e98d76fd09497dc2 ChangeLog 61002
+MISC ChangeLog 61160 RMD160 313c90fa4df4d4597272b44a97eb30ecdab35d04 SHA1 e05228cbb90e50ed89b5ead94a45768960096d74 SHA256 a03cde234da3bc22990c87e251e453763316d919a272876c491b5be309842c28
+MD5 62716c62b14c633f8b45adec1bc9245c ChangeLog 61160
+RMD160 313c90fa4df4d4597272b44a97eb30ecdab35d04 ChangeLog 61160
+SHA256 a03cde234da3bc22990c87e251e453763316d919a272876c491b5be309842c28 ChangeLog 61160
 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
@@ -57,3 +65,6 @@ SHA256 bdfad7a8a04a595682982df7046e8f00b8ce106beb865ed4239b7bd361a5b76a files/di
 MD5 f5bc0e4144699e3db21103823912768c files/digest-gaim-2.0.0_beta4-r1 253
 RMD160 46a8c79ada5eedb43c7cda139c06ae55ad7b852f files/digest-gaim-2.0.0_beta4-r1 253
 SHA256 bdfad7a8a04a595682982df7046e8f00b8ce106beb865ed4239b7bd361a5b76a files/digest-gaim-2.0.0_beta4-r1 253
+MD5 f5bc0e4144699e3db21103823912768c files/digest-gaim-2.0.0_beta4-r2 253
+RMD160 46a8c79ada5eedb43c7cda139c06ae55ad7b852f files/digest-gaim-2.0.0_beta4-r2 253
+SHA256 bdfad7a8a04a595682982df7046e8f00b8ce106beb865ed4239b7bd361a5b76a files/digest-gaim-2.0.0_beta4-r2 253
diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta4-r2 b/net-im/gaim/files/digest-gaim-2.0.0_beta4-r2
new file mode 100644
index 000000000000..db30a0a3dd8a
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-2.0.0_beta4-r2
@@ -0,0 +1,3 @@
+MD5 ddf49cb3f95febdd26bf2214875446e6 gaim-2.0.0beta4.tar.bz2 6298151
+RMD160 c9c5931fc2b2bf1c5bc524e6dc2b68c28a6570f1 gaim-2.0.0beta4.tar.bz2 6298151
+SHA256 08436e3fcb4caa61b92551e5e2c092ea94caae6520d50c479a164b93caedb820 gaim-2.0.0beta4.tar.bz2 6298151
diff --git a/net-im/gaim/files/gaim-2.0.0_beta4-configure.patch b/net-im/gaim/files/gaim-2.0.0_beta4-configure.patch
new file mode 100644
index 000000000000..37b345ecbf03
--- /dev/null
+++ b/net-im/gaim/files/gaim-2.0.0_beta4-configure.patch
@@ -0,0 +1,79 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 17552)
++++ configure.ac	(working copy)
+@@ -186,27 +186,27 @@
+ AC_ARG_ENABLE(screensaver,
+ 	[AC_HELP_STRING([--disable-screensaver],
+ 		[compile without X screensaver extension (used to detect idleness)])],
+-	enable_screensaver="no", enable_screensaver="yes")
++	enable_screensaver="$enableval", enable_screensaver="yes")
+ AC_ARG_ENABLE(sm,
+ 	[AC_HELP_STRING([--disable-sm],
+ 		[compile without X session management support])],
+-	enable_sm="no", enable_sm="yes")
++	enable_sm="$enableval", enable_sm="yes")
+ AC_ARG_ENABLE(startup-notification,
+ 	[AC_HELP_STRING([--disable-startup-notification],
+ 		[compile without startup notification support])],
+-	enable_startup_notification="no", enable_startup_notification="yes")
++	enable_startup_notification="$enableval", enable_startup_notification="yes")
+ AC_ARG_ENABLE(gtkspell,
+ 	[AC_HELP_STRING([--disable-gtkspell],
+ 		[compile without GtkSpell automatic spell checking])],
+-	enable_gtkspell="no", enable_gtkspell="yes")
++	enable_gtkspell="$enableval", enable_gtkspell="yes")
+ AC_ARG_ENABLE(gevolution,
+ 	[AC_HELP_STRING([--disable-gevolution],
+ 		[compile without the Gaim Evolution plugin])],
+-	enable_gevolution="no", enable_gevolution="yes")
++	enable_gevolution="$enableval", enable_gevolution="yes")
+ AC_ARG_ENABLE(cap,
+ 	[AC_HELP_STRING([--disable-cap],
+ 		[compile without Contact Availability Prediction plugin])],
+-	enable_cap="no", enable_cap="yes")
++	enable_cap="$enableval", enable_cap="yes")
+ 
+ 
+ AC_PATH_XTRA
+@@ -455,7 +455,7 @@
+ dnl #######################################################################
+ AC_ARG_ENABLE(gstreamer,
+ 	[AC_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])],
+-	enable_gst="no", enable_gst="yes")
++	enable_gst="$enableval", enable_gst="yes")
+ PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], , [
+ 	AC_MSG_RESULT(no)
+ 	enable_gst="no"
+@@ -1564,7 +1564,7 @@
+ dnl # Check for Tcl
+ dnl #######################################################################
+ AC_ARG_ENABLE(tcl, [AC_HELP_STRING([--disable-tcl],
+-	[compile without Tcl scripting])], enable_tcl="no", enable_tcl="yes")
++	[compile without Tcl scripting])], enable_tcl="$enableval", enable_tcl="yes")
+ AC_ARG_WITH(tclconfig, [AC_HELP_STRING([--with-tclconfig=DIR],
+ 	[directory containing tclConfig.sh])])
+ 
+@@ -1633,7 +1633,7 @@
+ dnl # Check for Tk
+ dnl #######################################################################
+ AC_ARG_ENABLE(tk, [AC_HELP_STRING([--disable-tk],
+-	[compile without Tcl support for Tk])], enable_tk="no", enable_tk="yes")
++	[compile without Tcl support for Tk])], enable_tk="$enableval", enable_tk="yes")
+ AC_ARG_WITH(tkconfig, [AC_HELP_STRING([--with-tkconfig=DIR],
+ 	[directory containing tkConfig.sh])])
+ 
+@@ -1812,11 +1812,11 @@
+ AC_ARG_ENABLE(doxygen,
+ 	[AC_HELP_STRING([--disable-doxygen],
+ 		[enable documentation with doxygen])],
+-	enable_doxygen="no", enable_doxygen="yes")
++	enable_doxygen="$enableval", enable_doxygen="yes")
+ AC_ARG_ENABLE(dot,
+ 	[AC_HELP_STRING([--enable-dot],
+ 		[enable graphs in doxygen via 'dot'])],
+-	enable_dot="no", enable_dot="yes")
++	enable_dot="$enableval", enable_dot="yes")
+ 
+ if test "x$enable_doxygen" = xyes; then
+ 	AC_CHECK_PROG(DOXYGEN, doxygen, true, false)
diff --git a/net-im/gaim/gaim-2.0.0_beta4-r2.ebuild b/net-im/gaim/gaim-2.0.0_beta4-r2.ebuild
new file mode 100644
index 000000000000..a795cfc91e57
--- /dev/null
+++ b/net-im/gaim/gaim-2.0.0_beta4-r2.ebuild
@@ -0,0 +1,239 @@
+# 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_beta4-r2.ebuild,v 1.1 2006/10/23 22:55:55 gothgirl 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? ( >=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
+	epatch "${FILESDIR}"/"${P}"-configure.patch
+
+	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 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
+}