removed audiofile use/deps, adding gstreamer

Package-Manager: portage-2.1.2_pre3-r6

4 files changed, 256 insertions, 5 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index c86b1662d671..2c6b69880cd6 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.417 2006/10/21 01:42:12 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.418 2006/10/23 01:24:13 gothgirl Exp $
+
+*gaim-2.0.0_beta4-r1 (23 Oct 2006)
+
+  23 Oct 2006; gothgirl <gothgirl@gentoo.org> +gaim-2.0.0_beta4-r1.ebuild:
+  removed audiofile use/deps and added gstreamer re:bug#152179
 
   21 Oct 2006; gothgirl <gothgirl@gentoo.org> gaim-2.0.0_beta4.ebuild:
   Gadu iuse fix, and temporary fix for mono use flag
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 3a45c88a0fe7..0365b8a1a74c 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -29,14 +29,18 @@ EBUILD gaim-2.0.0_beta3-r4.ebuild 6303 RMD160 2e298efa3f36ef9e7b3b8749f8e8992ff8
 MD5 94c9d7a2d063bd8aabb2189f003632aa gaim-2.0.0_beta3-r4.ebuild 6303
 RMD160 2e298efa3f36ef9e7b3b8749f8e8992ff80ec82b gaim-2.0.0_beta3-r4.ebuild 6303
 SHA256 c7257a4f82967c4a69b1d381927a8266258392b44246f855dff591fcea8ffff6 gaim-2.0.0_beta3-r4.ebuild 6303
+EBUILD gaim-2.0.0_beta4-r1.ebuild 6514 RMD160 74ae24464cc5f09585b3de28fc4d2a8d91b2438b SHA1 f87c058c9fff58141700b395a39a308889872d62 SHA256 71bebf91bfdf7336f52679b86dc51030740e2c6fb25451a3a65dbd450e39be13
+MD5 5144db31e98c4abbcf4120b14ecdbce9 gaim-2.0.0_beta4-r1.ebuild 6514
+RMD160 74ae24464cc5f09585b3de28fc4d2a8d91b2438b gaim-2.0.0_beta4-r1.ebuild 6514
+SHA256 71bebf91bfdf7336f52679b86dc51030740e2c6fb25451a3a65dbd450e39be13 gaim-2.0.0_beta4-r1.ebuild 6514
 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 60827 RMD160 c8393f0bbb8377615c0a1e54c61d632f96d78dce SHA1 57e53561b76a2aeefba2a7c00d9381621eadef8d SHA256 a2e8a66d8e4cc4cae46fcb5b73f6e0db4bf14dc4c4ce08369cd7784afd1dc267
-MD5 a87f3e6e3da9319c1f18f7cf3a6bc078 ChangeLog 60827
-RMD160 c8393f0bbb8377615c0a1e54c61d632f96d78dce ChangeLog 60827
-SHA256 a2e8a66d8e4cc4cae46fcb5b73f6e0db4bf14dc4c4ce08369cd7784afd1dc267 ChangeLog 60827
+MISC ChangeLog 61002 RMD160 d485e7848f6fbad5ee125e708b3d7f6103667152 SHA1 a9a4a6ffa5c1f6ab54df9817afcaab285cbac71d SHA256 8235355123f8a424d47769d0cae13e2a24ca5354aaae7302e98d76fd09497dc2
+MD5 4757798f65d60c6008dbffc4b3f93a75 ChangeLog 61002
+RMD160 d485e7848f6fbad5ee125e708b3d7f6103667152 ChangeLog 61002
+SHA256 8235355123f8a424d47769d0cae13e2a24ca5354aaae7302e98d76fd09497dc2 ChangeLog 61002
 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
@@ -50,3 +54,6 @@ SHA256 94f6c231a875fc84a7e98d49e9e32d31d19107375f600bbe357457d951fcc15d files/di
 MD5 f5bc0e4144699e3db21103823912768c files/digest-gaim-2.0.0_beta4 253
 RMD160 46a8c79ada5eedb43c7cda139c06ae55ad7b852f files/digest-gaim-2.0.0_beta4 253
 SHA256 bdfad7a8a04a595682982df7046e8f00b8ce106beb865ed4239b7bd361a5b76a files/digest-gaim-2.0.0_beta4 253
+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
diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta4-r1 b/net-im/gaim/files/digest-gaim-2.0.0_beta4-r1
new file mode 100644
index 000000000000..db30a0a3dd8a
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-2.0.0_beta4-r1
@@ -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/gaim-2.0.0_beta4-r1.ebuild b/net-im/gaim/gaim-2.0.0_beta4-r1.ebuild
new file mode 100644
index 000000000000..63703ad2db11
--- /dev/null
+++ b/net-im/gaim/gaim-2.0.0_beta4-r1.ebuild
@@ -0,0 +1,236 @@
+# 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-r1.ebuild,v 1.1 2006/10/23 01:24:14 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
+}
+
+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
+		gnome2_src_compile -j1 || 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
+}