New beta, disabled mono for now because it doesn't build, fixes bug #162930

Package-Manager: portage-2.1.1-r2

4 files changed, 291 insertions, 5 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 52781d1c7838..00e2f1f7f77f 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.430 2007/01/05 04:30:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.431 2007/01/21 23:32:32 tester Exp $
+
+*gaim-2.0.0_beta6 (21 Jan 2007)
+
+  21 Jan 2007; Olivier Crête <tester@gentoo.org> +gaim-2.0.0_beta6.ebuild:
+  New beta, disabled mono for now because it doesn't build, fixes bug #162930
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> gaim-1.5.0.ebuild,
   gaim-2.0.0_beta5-r1.ebuild, gaim-2.0.0_beta5-r2.ebuild:
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 1d6f4c0ae684..07e82a550cd8 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -12,6 +15,7 @@ RMD160 df8f4261289b1f1dd5dfb25d10c2750bb61cae3f files/gaim-2.0.0_beta5-dbus.patc
 SHA256 ccdb151171d8df331f7192aeb3b04767627f608e5b0d9b06a9173be484f2b6bd files/gaim-2.0.0_beta5-dbus.patch 2347
 DIST gaim-1.5.0.tar.bz2 6123237 RMD160 13f74e2d2ed69a775a5884b807c365177455ae0e SHA1 a280d005f01be7fa89c9fa210efb86cc6a9eb9c7 SHA256 58e3b0340cfc9e54e46f8d8835e5a02e31201c9ed8820bbb4cea36c59b9682aa
 DIST gaim-2.0.0beta5.tar.bz2 6489271 RMD160 5fdb0f16411745033a691c4991e0f36cd31655c5 SHA1 cc897b656b933c60d9557df7f6dfdffc913fb6b6 SHA256 d6fab2ff940eddbf8256b2d845332cbc25b10e1c44f1761a0a754c55849b01db
+DIST gaim-2.0.0beta6.tar.bz2 6667700 RMD160 b741288aeba621fbfeea3fd3ed16a2b4deff3dc9 SHA1 39345fe6e0519f2e126f7f60f7d9905e3460517b SHA256 fea8d9adbb2886ea7accde1d11b6da5fb77e1847fb4054ac55bca30b5b10ce82
 EBUILD gaim-1.5.0.ebuild 4033 RMD160 4ba8b9acf9dd79500d2aed40e3f11184c68134f3 SHA1 35da3f781e22185f77ef49c80df1faf560905b3c SHA256 1895bb1677e92635f563048a2aec47c7d908139a190c1d1da471ee10d2f64405
 MD5 36264b82fbdcd894d7df20df658d48b5 gaim-1.5.0.ebuild 4033
 RMD160 4ba8b9acf9dd79500d2aed40e3f11184c68134f3 gaim-1.5.0.ebuild 4033
@@ -28,10 +32,14 @@ EBUILD gaim-2.0.0_beta5-r3.ebuild 6939 RMD160 1a87d609d4f6aa231101d8fb5ee15fe140
 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
-SHA256 f6c974db05853fa028e52e7ed6c44fdabaa969090dfbaf9f626b095358b46909 ChangeLog 62871
+EBUILD gaim-2.0.0_beta6.ebuild 6995 RMD160 c19d547da17f1bbb353128c05f05c081164127d0 SHA1 87d777308765c7e727a631093d233856094f3cea SHA256 934202a2303b03ee6d384dab4e2bdcc7ee99f250ab8d55667d35a452dcaddda3
+MD5 19d2db87664d731380d86bbfd80a5bc9 gaim-2.0.0_beta6.ebuild 6995
+RMD160 c19d547da17f1bbb353128c05f05c081164127d0 gaim-2.0.0_beta6.ebuild 6995
+SHA256 934202a2303b03ee6d384dab4e2bdcc7ee99f250ab8d55667d35a452dcaddda3 gaim-2.0.0_beta6.ebuild 6995
+MISC ChangeLog 63056 RMD160 c710626c2603f714d367bc454cf4a8ec74fe5477 SHA1 f5b316dc120d0dbf04741cd96f3dbb920b54df5a SHA256 8a22b8263abed700736dd55c354eddb9b2e2515e89c7cacfc1b4ef0b8463cad2
+MD5 b2c414d434183de0a51a8dee35323094 ChangeLog 63056
+RMD160 c710626c2603f714d367bc454cf4a8ec74fe5477 ChangeLog 63056
+SHA256 8a22b8263abed700736dd55c354eddb9b2e2515e89c7cacfc1b4ef0b8463cad2 ChangeLog 63056
 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
@@ -48,3 +56,13 @@ SHA256 609d8796cdf2888aae84b2d384a750f17ab9d48516c4e229d46a92c789bc668b files/di
 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
+MD5 47b0636df1d92a1958b72b3755a8e64a files/digest-gaim-2.0.0_beta6 253
+RMD160 d55c9a3995a800b409ac253abad54f4d30c10261 files/digest-gaim-2.0.0_beta6 253
+SHA256 6648647e61579dfac661f3decdc8c8924ce23f284dcfa336afed9d3379cabff5 files/digest-gaim-2.0.0_beta6 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFs/gw+IXOQtHLm/gRAl3qAJ0QUE57ui33rVZsM/ND0YyA5AAsJACdGCdr
+nDDJQ2l9hIAvCCYULLkO/E8=
+=iR5m
+-----END PGP SIGNATURE-----
diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta6 b/net-im/gaim/files/digest-gaim-2.0.0_beta6
new file mode 100644
index 000000000000..d4ce2ed76f18
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-2.0.0_beta6
@@ -0,0 +1,3 @@
+MD5 404dcec261f911bcb56f69e5ea192583 gaim-2.0.0beta6.tar.bz2 6667700
+RMD160 b741288aeba621fbfeea3fd3ed16a2b4deff3dc9 gaim-2.0.0beta6.tar.bz2 6667700
+SHA256 fea8d9adbb2886ea7accde1d11b6da5fb77e1847fb4054ac55bca30b5b10ce82 gaim-2.0.0beta6.tar.bz2 6667700
diff --git a/net-im/gaim/gaim-2.0.0_beta6.ebuild b/net-im/gaim/gaim-2.0.0_beta6.ebuild
new file mode 100644
index 000000000000..eb02839bf4e6
--- /dev/null
+++ b/net-im/gaim/gaim-2.0.0_beta6.ebuild
@@ -0,0 +1,260 @@
+# 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_beta6.ebuild,v 1.1 2007/01/21 23:32:32 tester 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 nls perl silc startup-notification tcl tk xscreensaver custom-cflags spell ssl qq msn gadu"
+IUSE="${IUSE} gtk sasl console groupwise"
+# removed  IUSE mono because it doesnt build
+
+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 )
+	gstreamer? ( >=media-libs/gstreamer-0.10 )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	doc? ( app-doc/doxygen )
+	dev-libs/libxml2"
+#	mono? ( dev-lang/mono )
+
+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 debug) \
+		$(use_enable dbus) \
+		$(use_enable meanwhile) \
+		$(use_enable eds gevolution) \
+		$(use_enable gstreamer) \
+		$(use_enable sasl cyrus-sasl ) \
+		$(use_enable doc doxygen) \
+		--disable-mono \
+		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
+		${myconf} || die "Configuration failed"
+#		$(use_enable mono) \
+
+	# 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
+}