Make libcanberra support not optional per herd policy.

(Portage version: 2.2.0_alpha23/cvs/Linux x86_64, RepoMan options: --force)

3 files changed, 16 insertions, 15 deletions

diff --git a/net-irc/xchat-gnome/ChangeLog b/net-irc/xchat-gnome/ChangeLog
index a111c999e1c5..9efe11b8c512 100644
--- a/net-irc/xchat-gnome/ChangeLog
+++ b/net-irc/xchat-gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/xchat-gnome
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.60 2010/12/27 12:44:37 eva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.61 2011/02/15 08:19:25 eva Exp $
+
+  15 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  xchat-gnome-0.26.1-r1.ebuild, metadata.xml:
+  Make libcanberra support not optional per herd policy.
 
   27 Dec 2010; Gilles Dartiguelongue <eva@gentoo.org>
   xchat-gnome-0.26.1-r1.ebuild, +files/xchat-gnome-0.26.1-fix-it-help.patch:
diff --git a/net-irc/xchat-gnome/metadata.xml b/net-irc/xchat-gnome/metadata.xml
index db288ff2d4c9..e68d3371f6ea 100644
--- a/net-irc/xchat-gnome/metadata.xml
+++ b/net-irc/xchat-gnome/metadata.xml
@@ -3,7 +3,4 @@
 <pkgmetadata>
 <herd>net-irc</herd>
 <herd>gnome</herd>
-<use>
-	<flag name='sound'>Enable sound event support with <pkg>media-libs/libcanberra</pkg></flag>
-</use>
 </pkgmetadata>
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild
index 9d5dae5da876..7874f9e0cb0e 100644
--- a/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild
+++ b/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild,v 1.6 2010/12/27 14:33:18 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild,v 1.7 2011/02/15 08:19:25 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="yes"
@@ -14,24 +14,24 @@ HOMEPAGE="http://xchat-gnome.navi.cx/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="dbus ipv6 libnotify mmx nls perl python sound spell ssl tcl"
+IUSE="dbus ipv6 libnotify mmx nls perl python spell ssl tcl"
 
 RDEPEND=">=dev-libs/glib-2.18:2
 	>=gnome-base/libgnome-2.16.0
 	>=gnome-base/gconf-2.8.0
 	>=gnome-base/libgnomeui-2.16.0
 	>=gnome-base/libglade-2.3.2
+	>=media-libs/libcanberra-0.3[gtk]
 	>=x11-libs/gtk+-2.14:2
+	>=x11-libs/libsexy-0.1.11
+	x11-libs/libX11
 	spell? ( app-text/enchant )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	perl? ( >=dev-lang/perl-5.6.1 )
 	tcl? ( dev-lang/tcl )
 	dbus? ( >=sys-apps/dbus-0.60 )
-	>=x11-libs/libsexy-0.1.11
 	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	sound? ( >=media-libs/libcanberra-0.3[gtk] )
-	x11-libs/libX11"
-
+"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.7
 	>=app-text/gnome-doc-utils-0.3.2
@@ -51,6 +51,7 @@ pkg_setup() {
 	# --enable-shm
 	G2CONF="${G2CONF}
 		--enable-gnomefe
+		--enable-canberra
 		--disable-schemas-install
 		--disable-scrollkeeper
 		--disable-static
@@ -63,9 +64,10 @@ pkg_setup() {
 		$(use_enable ipv6)
 		$(use_enable dbus)
 		$(use_enable nls)
-		$(use_enable sound canberra)
 		$(use_enable libnotify notification)"
 
+	DOCS="AUTHORS ChangeLog NEWS"
+
 	use python && python_set_active_version 2
 }
 
@@ -83,8 +85,6 @@ src_install() {
 	insinto /usr/include/xchat-gnome
 	doins src/common/xchat-plugin.h || die "doins failed"
 
-	dodoc AUTHORS ChangeLog NEWS || die "dodoc failed"
-
 	# Not needed for plugins
 	find "${D}" -type f -name "*.la" -delete || die "la files removal failed"
 }