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

(Portage version: 2.2_rc14/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

6 files changed, 14 insertions, 219 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/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