Clean up old revisions. Add libcanberra gtk support check, bug #247457.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

7 files changed, 19 insertions, 230 deletions

diff --git a/net-irc/xchat-gnome/ChangeLog b/net-irc/xchat-gnome/ChangeLog
index acb182b304b0..e1d26f60c2e8 100644
--- a/net-irc/xchat-gnome/ChangeLog
+++ b/net-irc/xchat-gnome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/xchat-gnome
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.39 2008/10/22 21:10:42 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.40 2008/11/21 22:00:30 eva Exp $
+
+  21 Nov 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/0.17-segfault-fix.patch,
+  -files/0.11-libnotify-libsexy-configure.patch, -xchat-gnome-0.13.ebuild,
+  -xchat-gnome-0.24.0.ebuild, xchat-gnome-0.24.1.ebuild:
+  Clean up old revisions. Add libcanberra gtk support check, bug #247457.
 
 *xchat-gnome-0.24.1 (22 Oct 2008)
 
diff --git a/net-irc/xchat-gnome/Manifest b/net-irc/xchat-gnome/Manifest
index 9282adbac5bc..35de36a63ae8 100644
--- a/net-irc/xchat-gnome/Manifest
+++ b/net-irc/xchat-gnome/Manifest
@@ -1,23 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0.11-libnotify-libsexy-configure.patch 2400 RMD160 b928e0d6d20a5dabf80f67f2b714aef8b29678a8 SHA1 5ed478867e687b084fe34f281b37acabce712e58 SHA256 cb713b86de4418a3bed1c86d54fdea6bdb519cb90519867dda3ce269a8ab0f00
 AUX 0.17-libnotify-configure.patch 1143 RMD160 523268ba62d7de8a8ee74ca6b3526b52c0629ec7 SHA1 1e66406d588fd53554a2734605244d9d85fe5892 SHA256 8445e009069fd3df5865219b9110becd8733c6320c5eb5dcf1248cde3af2e198
-AUX 0.17-segfault-fix.patch 477 RMD160 f380ae596809652f1602f2617670258047e330cb SHA1 f99447e984ec04fe03a15832eb11c3afd03ae546 SHA256 2851ca5bdfa7eafd2c140b7a86a6fe5b2f2cd27430703d8d32d392862638aa52
-DIST xchat-gnome-0.13.tar.bz2 1495400 RMD160 8dd134e8a10cb58e66744282504022b7013208e8 SHA1 c2d027db941b9c1455569d55675ffcb5401f5f7a SHA256 00ac36202b1b13f1022a33ab5a28fc0c5a75475a3ea4d512e46dc9c1007de2f9
 DIST xchat-gnome-0.18.tar.bz2 1540748 RMD160 5f8aa69e04f8ab540abd83ebb71edf2835f0aba2 SHA1 0391bfeaac53697cc080478c74c5e0de0423c636 SHA256 86e5bb1b9a073c04be1a38ead51284f04268183cfc7cf711cb80543d055e1372
-DIST xchat-gnome-0.24.0.tar.bz2 1889076 RMD160 b5e04919830faf1d5fd89710d43e3f54bf96c672 SHA1 a4436ece28c5d9c0a895e1bcd6403536b1f7e8bd SHA256 d252e0f73cf145861fe7e37060b3d2f6b3dc8edf1078c83c46170bc98cee0cab
 DIST xchat-gnome-0.24.1.tar.bz2 1896078 RMD160 199e9dcba62dbfd8eb68c7f15d58ab46af73dbe5 SHA1 61739091400448e5e7666c6d7ae53d823ca6e8b4 SHA256 7166cb809278a05db24eed2765c4b52c4ebf54bb33bdec595ae7217509cd3fe5
-EBUILD xchat-gnome-0.13.ebuild 2099 RMD160 1c0cbd0d09ec2c4aacdeb7b528e555d4fdf1549b SHA1 1c0c973987720dff3e4603c65477860b90397ab2 SHA256 94b9643dd9a9a94107605354221c3705899467ea1506ac3370c889d35fc8a924
 EBUILD xchat-gnome-0.18.ebuild 1929 RMD160 dbbf18ee9bbde1ccf3092aeda3c56c0136092652 SHA1 3bd0d2551451d52761a9fdddac3f343423f0dd7a SHA256 d7b46955897cf0a012a2bb60b6f64d8abb46fc272cfce5a84c03b7320b480937
-EBUILD xchat-gnome-0.24.0.ebuild 1728 RMD160 fdffa919ddb9201c41e062eede243dd097b2b877 SHA1 c06ac60b07a9bcbd8fb9c3aba03c442c78d8d101 SHA256 928a98e257f96c07818801f9940076cfb1e369bc412f5dcee4b2b1bd8129d357
-EBUILD xchat-gnome-0.24.1.ebuild 1728 RMD160 4662b406e33a41e2418b4d7a876ea5118e4cbedb SHA1 0c67ed6f6c5e8fd52a0ebcf838f04510ae7d78bc SHA256 5f3baa454c903bec92fcd3ab9232fb6822c3306d2d69b273685cc142a72a64e4
-MISC ChangeLog 6768 RMD160 f5b722920dbda71562b9732384f5cd780228227f SHA1 d871639f78b752058b44bb85c1a82d060f5b8e08 SHA256 65397088f3a75847de8ca395de1c615558f4ca783a58e796772f196327f4354d
+EBUILD xchat-gnome-0.24.1.ebuild 1914 RMD160 8098382cdd306be178521df6bf065a55b655960b SHA1 90f79d42d371529b4c8715f66aba8e7a5a26a6c4 SHA256 eed2eb4b76ab04a57957fe9bb3276f2b3f16719f17a4abef2ff81252d9549dd5
+MISC ChangeLog 7063 RMD160 d25260f1d9b4e4d79b1b1e1699f35813a5aaa60b SHA1 8865ec11958f3595c7490c895c0be261ba385e01 SHA256 cebbb14ce254dc2054476fbe3135e4a0802898210200c7d85cb48586d0d60cf4
 MISC metadata.xml 357 RMD160 0ed7ef137be6ef1727ba1cda4b23364eadf21682 SHA1 32d82b458567df0f74422efb61c1378b748ae648 SHA256 048cd19e7b415e6c26ef453e9e566d3d251aabd325d89afb99718fc5dafa97ea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj/ltwACgkQ1fmVwcYIWAbl0gCgshp7lC7LLA8ivPCwAnweRvLh
-AAwAn3dfsePq3MfajHstHwsGPk2/uSPh
-=9JAN
+iEYEARECAAYFAkknPZcACgkQ1fmVwcYIWAYYgACeJY5bYekSwYsoyFQpt9VSYnJn
+keUAmwWlAHT20WEkKojhkIz6uL6+ELvh
+=Gf+G
 -----END PGP SIGNATURE-----
diff --git a/net-irc/xchat-gnome/files/0.11-libnotify-libsexy-configure.patch b/net-irc/xchat-gnome/files/0.11-libnotify-libsexy-configure.patch
deleted file mode 100644
index 84304983ccc2..000000000000
--- a/net-irc/xchat-gnome/files/0.11-libnotify-libsexy-configure.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Nur xchat-gnome-0.11.orig/configure.ac xchat-gnome-0.11/configure.ac
---- xchat-gnome-0.11.orig/configure.ac	2006-04-05 18:16:47.000000000 +0000
-+++ xchat-gnome-0.11/configure.ac	2006-04-17 19:28:12.502578000 +0000
-@@ -110,24 +110,40 @@
- 
- AM_CONDITIONAL([ENABLE_DBUS],[test "x$dbus" = "xyes"])
- 
-+AC_ARG_ENABLE([libsexy],
-+	AS_HELP_STRING([--enable-libsexy],[Enable libsexy support]),
-+	[enable_libsexy=$enableval libsexy=$enableval],
-+	[enable_libsexy=no libsexy=no])
-+
- # libsexy soft dependency
--PKG_CHECK_MODULES([LIBSEXY], [libsexy >= $LIBSEXY_REQUIRED], libsexy=yes, libsexy=no)
--AC_SUBST([LIBSEXY_CFLAGS])
--AC_SUBST([LIBSEXY_LIBS])
-+if test "x$enable_libsexy" = "xyes"; then
-+	PKG_CHECK_MODULES([LIBSEXY], [libsexy >= $LIBSEXY_REQUIRED], libsexy=yes, libsexy=no)
-+	AC_DEFINE(HAVE_LIBSEXY, 1, [Enable libsexy])
-+	AC_SUBST([LIBSEXY_CFLAGS])
-+	AC_SUBST([LIBSEXY_LIBS])
-+fi
-+
- AM_CONDITIONAL([ENABLE_LIBSEXY],[test "x$libsexy" = "xyes"])
--if test "x$libsexy" = "xyes"; then
--	AC_DEFINE(HAVE_LIBSEXY, 1, [Enable libsexy])
--else
--	AC_MSG_WARN([Library requirements (libsexy >= $LIBSEXY_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.])
-+
-+if test "x$enable_libsexy" = "xyes" && test "x$libsexy" != "xyes"; then
-+	AC_MSG_ERROR([libsexy not found])
- fi
- 
-+AC_ARG_ENABLE([libnotify],
-+	AS_HELP_STRING([--enable-libnotify],[Enable libnotify support]),
-+	[enable_libnotify=$enableval libnotify=$enableval],
-+	[enable_libnotify=no libnotify=no])
-+
- # libnotify soft dependency
--PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= $LIBNOTIFY_REQUIRED], libnotify=yes, libnotify=no)
--AC_SUBST([LIBNOTIFY_CFLAGS])
--AC_SUBST([LIBNOTIFY_LIBS])
-+if test "x$enable_libnotify" = "xyes"; then
-+	PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= $LIBNOTIFY_REQUIRED], libnotify=yes, libnotify=no)
-+	AC_SUBST([LIBNOTIFY_CFLAGS])
-+	AC_SUBST([LIBNOTIFY_LIBS])
-+fi
-+
- AM_CONDITIONAL([ENABLE_LIBNOTIFY],[test "x$libnotify" = "xyes"])
--if test "x$libnotify" != "xyes"; then
--	AC_MSG_WARN([Library requirements (libnotify >= $LIBNOTIFY_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.])
-+if test "x$enable_libnotify" = "xyes" && test "x$libnotify" != "xyes"; then
-+	AC_MSG_ERROR([libnotify not found])
- fi
- 
- # GConf
diff --git a/net-irc/xchat-gnome/files/0.17-segfault-fix.patch b/net-irc/xchat-gnome/files/0.17-segfault-fix.patch
deleted file mode 100644
index 5f47f00a1422..000000000000
--- a/net-irc/xchat-gnome/files/0.17-segfault-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xchat-gnome/src/fe-gnome/setup-dialog.c
-===================================================================
---- xchat-gnome/src/fe-gnome/setup-dialog.c	(revision 2504)
-+++ xchat-gnome/src/fe-gnome/setup-dialog.c	(working copy)
-@@ -46,7 +46,7 @@
- 	gchar *path = locate_data_file ("setup-dialog.glade");
- 	g_assert (path != NULL);
- 
--	GladeXML *xml = glade_xml_new (path, NULL, NULL);
-+	xml = glade_xml_new (path, NULL, NULL);
- 	g_assert (xml != NULL);
- 
- 	g_free (path);
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.13.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.13.ebuild
deleted file mode 100644
index 0b4ec2f2614b..000000000000
--- a/net-irc/xchat-gnome/xchat-gnome-0.13.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2008 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.13.ebuild,v 1.4 2008/06/29 21:47:16 eva Exp $
-
-inherit gnome2 eutils autotools
-
-DESCRIPTION="GNOME frontend for the popular X-Chat IRC client"
-HOMEPAGE="http://xchat-gnome.navi.cx/"
-SRC_URI="http://releases.navi.cx/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
-IUSE="perl tcl python ssl mmx ipv6 nls dbus libsexy libnotify spell"
-
-RDEPEND=">=dev-libs/glib-2.8.0
-	>=gnome-base/libgnome-2.13
-	>=gnome-base/gconf-2.8.0
-	>=gnome-base/libgnomeui-2.6.0
-	>=gnome-base/libglade-2.3.0
-	>=gnome-base/gnome-vfs-2.9.2
-	>=x11-libs/gtk+-2.8.0
-	spell? ( app-text/gtkspell )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( >=dev-lang/perl-5.6.1 )
-	python? ( dev-lang/python )
-	tcl? ( dev-lang/tcl )
-	dbus? ( >=sys-apps/dbus-0.35 )
-	libsexy? ( >=x11-libs/libsexy-0.1.7 )
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )"
-
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	>=dev-util/pkgconfig-0.7
-	>=app-text/gnome-doc-utils-0.3.2
-	nls? ( sys-devel/gettext )"
-
-# gnome-base/gnome-common is temporarily needed for re-creating configure
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/0.11-libnotify-libsexy-configure.patch"
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	econf \
-		--enable-gnomefe \
-		--enable-shm \
-		--disable-schemas-install \
-		--disable-scrollkeeper \
-		$(use_enable ssl openssl) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable tcl) \
-		$(use_enable mmx) \
-		$(use_enable ipv6) \
-		$(use_enable dbus) \
-		$(use_enable nls) \
-		$(use_enable libsexy) \
-		$(use_enable libnotify) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	USE_DESTDIR="1" gnome2_src_install || die "gnome2_src_install failed"
-
-	# install plugin development header
-	insinto /usr/include/xchat-gnome
-	doins src/common/xchat-plugin.h || die "doins failed"
-
-	dodoc AUTHORS ChangeLog NEWS || die "dodoc failed"
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_scrollkeeper_update
-}
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.24.0.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.24.0.ebuild
deleted file mode 100644
index 16b688872431..000000000000
--- a/net-irc/xchat-gnome/xchat-gnome-0.24.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 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.24.0.ebuild,v 1.1 2008/10/15 21:17:52 eva Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="GNOME frontend for the popular X-Chat IRC client"
-HOMEPAGE="http://xchat-gnome.navi.cx/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="dbus ipv6 libnotify mmx nls perl python sound spell ssl tcl"
-
-RDEPEND=">=dev-libs/glib-2.18.0
-	>=gnome-base/libgnome-2.16.0
-	>=gnome-base/gconf-2.8.0
-	>=gnome-base/libgnomeui-2.16.0
-	>=gnome-base/libglade-2.3.2
-	>=x11-libs/gtk+-2.14.0
-	spell? ( app-text/enchant )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( >=dev-lang/perl-5.6.1 )
-	python? ( dev-lang/python )
-	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 )
-	x11-libs/libX11"
-
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	>=dev-util/pkgconfig-0.7
-	>=app-text/gnome-doc-utils-0.3.2
-	nls? ( sys-devel/gettext )"
-
-# gnome-base/gnome-common is temporarily needed for re-creating configure
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-gnomefe
-		--enable-shm
-		--disable-schemas-install
-		--disable-scrollkeeper
-		$(use_enable ssl openssl)
-		$(use_enable perl)
-		$(use_enable python)
-		$(use_enable tcl)
-		$(use_enable mmx)
-		$(use_enable ipv6)
-		$(use_enable dbus)
-		$(use_enable nls)
-		$(use_enable libnotify notification)"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# install plugin development header
-	insinto /usr/include/xchat-gnome
-	doins src/common/xchat-plugin.h || die "doins failed"
-
-	dodoc AUTHORS ChangeLog NEWS || die "dodoc failed"
-}
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.24.1.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.24.1.ebuild
index a25a9d1801d1..c1382615cc97 100644
--- a/net-irc/xchat-gnome/xchat-gnome-0.24.1.ebuild
+++ b/net-irc/xchat-gnome/xchat-gnome-0.24.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.24.1.ebuild,v 1.1 2008/10/22 21:10:42 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.24.1.ebuild,v 1.2 2008/11/21 22:00:30 eva Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://xchat-gnome.navi.cx/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dbus ipv6 libnotify mmx nls perl python sound spell ssl tcl"
 
 RDEPEND=">=dev-libs/glib-2.18.0
@@ -38,6 +38,11 @@ DEPEND="${RDEPEND}
 # gnome-base/gnome-common is temporarily needed for re-creating configure
 
 pkg_setup() {
+	if use sound && ! built_with_use media-libs/libcanberra gtk; then
+		eerror "You need to rebuild media-libs/libcanberra with gtk support."
+		die "Rebuild media-libs/libcanberra with USE='gtk'"
+	fi
+
 	G2CONF="${G2CONF}
 		--enable-gnomefe
 		--enable-shm