Adjusted use flags wrt bug#124844

(Portage version: 2.1_pre7-r2)

4 files changed, 180 insertions, 11 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 9fb216a7d7c8..609adf200dc2 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.383 2006/02/17 12:16:08 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.384 2006/03/28 05:26:19 gothgirl Exp $
+
+*gaim-2.0.0_beta2-r2 (28 Mar 2006)
+
+  28 Mar 2006; kathryn <gothgirl@gentoo.org> +gaim-2.0.0_beta2-r2.ebuild:
+  Added ao use flag and fixed dbus use flag wrt bug#124844
 
   17 Feb 2006; kathryn <gothgirl@gentoo.org> -gaim-2.0.0_beta1.ebuild,
   -gaim-2.0.0_beta2.ebuild, gaim-2.0.0_beta2-r1.ebuild:
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index ae796f3bbde5..2cd2a9972cb8 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f51679f91a48f9bce39e7f782458ec9c ChangeLog 55586
 RMD160 9222796009bbb20b8838e0874c0e8dcb6e8d41ed ChangeLog 55586
 SHA256 2633f79507e1f0d8824bbb3955b302cf754123c731ea27c40c79740b34c3d2c6 ChangeLog 55586
@@ -10,6 +7,9 @@ SHA256 6d0d6a97397284c18dd881305d135a634f77b01c762cd8232f8b626d97841036 files/di
 MD5 5447214c866d2701435a0b84e7280d71 files/digest-gaim-2.0.0_beta2-r1 253
 RMD160 3c53d5682c6d05cfd6c0f48b162c5eb673c4b6cf files/digest-gaim-2.0.0_beta2-r1 253
 SHA256 ccf624a4c27f49a823a5e988cfe639813ddcddb99efcea971b6cf79f8d3f484c files/digest-gaim-2.0.0_beta2-r1 253
+MD5 5447214c866d2701435a0b84e7280d71 files/digest-gaim-2.0.0_beta2-r2 253
+RMD160 3c53d5682c6d05cfd6c0f48b162c5eb673c4b6cf files/digest-gaim-2.0.0_beta2-r2 253
+SHA256 ccf624a4c27f49a823a5e988cfe639813ddcddb99efcea971b6cf79f8d3f484c files/digest-gaim-2.0.0_beta2-r2 253
 MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
 RMD160 8003dcbad47c300845898cb42b7a96f12b149c5f files/gaim-0.76-xinput.patch 644
 SHA256 3532e792388cc6023522871bc99fd9e84204a42dfa6801b507df7fe480c37cd0 files/gaim-0.76-xinput.patch 644
@@ -19,13 +19,9 @@ SHA256 6f0426214a4670f03b4e3b305f31a4a9c0c354c42722b307fe5deb85c5345cf7 gaim-1.5
 MD5 291f88ed70209e4471f344505fa52416 gaim-2.0.0_beta2-r1.ebuild 5499
 RMD160 af2268447a27bde1326407033f6b7168253b07bb gaim-2.0.0_beta2-r1.ebuild 5499
 SHA256 6ee3cff128a3d60d44d860b1b665f8b0bdbfc03801801995736376553a7ddb10 gaim-2.0.0_beta2-r1.ebuild 5499
+MD5 70e678b69f54b7fdbac629a568cdfb62 gaim-2.0.0_beta2-r2.ebuild 5462
+RMD160 53f88fdda7226f93c1ea1dc980449b5c6f6b8504 gaim-2.0.0_beta2-r2.ebuild 5462
+SHA256 6f9c1a1e94e14ab9a805616416d8f8dfb1b99663e7fb67e1e7567525454bc503 gaim-2.0.0_beta2-r2.ebuild 5462
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f metadata.xml 414
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD9kdCI1lqEGTUzyQRAjBDAKCeJhO2opAozQJpC3Z0P2rwVRfA0wCgwts8
-xaMh5mbj4AynHrjhA9zjIOM=
-=RHxG
------END PGP SIGNATURE-----
diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta2-r2 b/net-im/gaim/files/digest-gaim-2.0.0_beta2-r2
new file mode 100644
index 000000000000..19c789d61863
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-2.0.0_beta2-r2
@@ -0,0 +1,3 @@
+MD5 f01c99b4556bde703a81d8ac16ebe6ab gaim-2.0.0beta2.tar.bz2 7353162
+RMD160 0d3b4018148b882269822944da26a07c9ab25cff gaim-2.0.0beta2.tar.bz2 7353162
+SHA256 72c1af01c46c305c4d37ea1fa18e27a33bede6efc19eab7c0b2c80122c73b758 gaim-2.0.0beta2.tar.bz2 7353162
diff --git a/net-im/gaim/gaim-2.0.0_beta2-r2.ebuild b/net-im/gaim/gaim-2.0.0_beta2-r2.ebuild
new file mode 100644
index 000000000000..6f72734e28a9
--- /dev/null
+++ b/net-im/gaim/gaim-2.0.0_beta2-r2.ebuild
@@ -0,0 +1,165 @@
+# 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_beta2-r2.ebuild,v 1.1 2006/03/28 05:26:20 gothgirl Exp $
+
+inherit flag-o-matic eutils toolchain-funcs debug multilib mono
+
+MY_PV=${PV/_beta/beta}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://gaim.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gaim/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="ao bonjour cjk dbus debug eds gnutls krb4 mono nas nls perl silc spell startup-notification tcltk xscreensaver"
+
+RDEPEND="
+	ao? ( media-libs/libao
+		media-libs/audiofile )
+	bonjour? ( net-misc/howl )
+	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
+		!<perl-core/ExtUtils-MakeMaker-6.17 )
+	spell? ( >=app-text/gtkspell-2.0.2 )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( >=dev-libs/nss-3.9.2-r2 )
+	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
+	eds? ( gnome-extra/evolution-data-server )
+	krb4? ( >=app-crypt/mit-krb5-1.3.6-r1 )
+	tcltk? ( dev-lang/tcl
+		dev-lang/tk )
+	startup-notification? ( >=x11-libs/startup-notification-0.5 )
+	mono? ( dev-lang/mono )
+	xscreensaver? ( x11-misc/xscreensaver )"
+
+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 "Again, this is a beta release and should not be used by those"
+	ewarn "with a heart condition, if you are pregnant, or if you are under"
+	ewarn "the age of 8. Side-effects include awesomeness, dumbfoundedness,"
+	ewarn "dry mouth and lava. Consult your doctor to find out if"
+	ewarn "${MY_P} is right for you."
+	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
+	einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
+	einfo
+	ebeep 5
+	epause 3
+}
+
+pkg_setup() {
+	print_gaim_warning
+	if use krb4 && ! built_with_use app-crypt/mit-krb5 krb4 ; then
+	eerror
+	eerror You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to
+	eerror enable krb4 support for the zephyr protocol in gaim.
+	eerror
+	die "Configure failed"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+}
+
+src_compile() {
+	# Stabilize things, for your own good
+	strip-flags
+	replace-flags -O? -O2
+
+	# -msse2 doesn't play nice on gcc 3.2
+	[ "`gcc-version`" == "3.2" ] && filter-flags -msse2
+
+	local myconf
+	use ao || use audiofile || myconf="${myconf} --disable-audio"
+	use dbus && myconf="${myconf} --enable-dbus" || myconf="${myconf} --disable-dbus"
+	use debug && myconf="${myconf} --enable-debug"
+	use eds || myconf="${myconf} --disable-gevolution"
+	use krb4 && myconf="${myconf} --with-krb4"
+	use mono && myconf="${myconf} --enable-mono"
+	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
+	use nls  || myconf="${myconf} --disable-nls"
+	use perl || myconf="${myconf} --disable-perl"
+	use silc && myconf="${myconf} --with-silc-includes=$(get_includedir)/silc-toolkit --with-silc-libs=$(get_libdir)/silc-toolkit"
+	use spell || myconf="${myconf} --disable-gtkspell"
+	use startup-notification || myconf="${myconf} --disable-startup-notification"
+	use tcltk || myconf="${myconf} --disable-tcl --disable-tk"
+	use xscreensaver || myconf="${myconf} --disable-screensaver"
+
+	if use gnutls ; then
+		einfo "Disabling NSS, using GnuTLS"
+		myconf="${myconf} --enable-nss=no"
+		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"
+		myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
+		myconf="${myconf} --with-nss-includes=/usr/include/nss"
+		myconf="${myconf} --with-nspr-libs=/usr/$(get_libdir)/nspr"
+		myconf="${myconf} --with-nss-libs=/usr/$(get_libdir)/nss"
+	fi
+
+	econf ${myconf} || die "Configuration failed"
+
+	emake -j1 || die "Make failed"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "Install failed"
+	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
+}
+
+pkg_postinst() {
+	print_gaim_warning
+}