Make libcanberra support not optional per herd policy.

Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 29 insertions, 18 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/Manifest b/net-irc/xchat-gnome/Manifest
index 37b5dd7b4320..237c1acbd556 100644
--- a/net-irc/xchat-gnome/Manifest
+++ b/net-irc/xchat-gnome/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xchat-gnome-0.26.1-fix-it-help.patch 1721 RMD160 58bf6c92e578e370b7e56d7fbcbbc361d11b4c3a SHA1 3cb78244cfe21ad7136833f4faf791ae8d4d0b5f SHA256 227be5542be8539df66eb6b7bcbe7237d40e43c8f793f8baf35c1cc35da1ff56
 DIST xchat-gnome-0.26.1.tar.bz2 1938676 RMD160 ff2228aa5258a2c5a3bd7c391e83a15b2f030aff SHA1 85d205baeca5f10be9245c582ae53fbb40a4ef17 SHA256 6234f14ddc7323faaa4f10f890786a0f69da00774855412a4382b11a6158cf4b
-EBUILD xchat-gnome-0.26.1-r1.ebuild 2501 RMD160 25f03cfe1e75b13d4126e09b0cb61cc681cd2982 SHA1 e3bb5b9d9daffbf5c0b63baa9716cc6f9a3a0db2 SHA256 9b55c5d42cb5286145b80da910b86271c7b22a13369c5c66c77a53df888e4194
-MISC ChangeLog 9853 RMD160 e6ecfa78f1db069a8f7d51af44cdb1427ac913e9 SHA1 bec91c95d90794e9b40c8635f877386f742fefc9 SHA256 911ff4b6e148a9ba12081a3447e0ea90cd18d732892b0333717b7d82da43bf8f
-MISC metadata.xml 285 RMD160 516ad5bb6783a56fe4d0c072f6d301be98f88b70 SHA1 ed317ba5b99e87d0247681a52dde25625600f368 SHA256 888b4792a75445dae1150b437e1fef8dfaae4c78e21fe5810d7b89359e6309d8
+EBUILD xchat-gnome-0.26.1-r1.ebuild 2447 RMD160 8cb34ffa8d4dc4390d7d5e78778a9b7ce7725f81 SHA1 904a31570e5df1a80e1bd2a64b9aa378653e5abe SHA256 7e1df881ef920ae8a8ce72e0e52e3eebbad5fbd88dea4706d2e9f867c5321865
+MISC ChangeLog 10011 RMD160 cc0a075680fb8e75468b073383dc6aec18c97ce2 SHA1 1f6934be1fa821ef962a0f073e40ddfbcc23ac97 SHA256 22e04d30fe850cb5954b6e536486137e4d11422feffd5a688439104f37f37f99
+MISC metadata.xml 179 RMD160 9d422d778271bb38d696f7d9045a4445d730b2a2 SHA1 ed52b66c15b2dd699d1e0518c5418b4906db06cc SHA256 bf1c049e4bdfc84d9c5f5cfdcc493b4cdeeda9b13e9d279a705c09fd457963c5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1aNxIACgkQ1fmVwcYIWAaXnwCg50Y0EWRcWn8lzU+Q71ggZuLV
+B30An2oklS9FQ9St00g/rHENQM4ZPNPk
+=jWsy
+-----END PGP SIGNATURE-----
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"
 }