Version bump, bug #173140.

(Portage version: 2.1.2.3)

5 files changed, 129 insertions, 1 deletions

diff --git a/net-irc/xchat-gnome/ChangeLog b/net-irc/xchat-gnome/ChangeLog
index d958d5f9ee6f..fde222a7fe76 100644
--- a/net-irc/xchat-gnome/ChangeLog
+++ b/net-irc/xchat-gnome/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/xchat-gnome
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.29 2007/02/18 21:05:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.30 2007/04/04 19:25:52 swegener Exp $
+
+*xchat-gnome-0.17 (04 Apr 2007)
+
+  04 Apr 2007; Sven Wegener <swegener@gentoo.org>
+  +files/0.17-libnotify-configure.patch, +files/0.17-segfault-fix.patch,
+  +xchat-gnome-0.17.ebuild:
+  Version bump, bug #173140.
 
 *xchat-gnome-0.16 (18 Feb 2007)
 
diff --git a/net-irc/xchat-gnome/files/0.17-libnotify-configure.patch b/net-irc/xchat-gnome/files/0.17-libnotify-configure.patch
new file mode 100644
index 000000000000..56d3f02bdc42
--- /dev/null
+++ b/net-irc/xchat-gnome/files/0.17-libnotify-configure.patch
@@ -0,0 +1,23 @@
+diff -Nur xchat-gnome-0.17.orig/configure.ac xchat-gnome-0.17/configure.ac
+--- xchat-gnome-0.17.orig/configure.ac	2007-04-01 23:27:46.000000000 +0000
++++ xchat-gnome-0.17/configure.ac	2007-04-02 19:38:11.563221660 +0000
+@@ -111,12 +111,14 @@
+ AM_CONDITIONAL([ENABLE_DBUS],[test "x$dbus" = "xyes"])
+ 
+ # 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
new file mode 100644
index 000000000000..5f47f00a1422
--- /dev/null
+++ b/net-irc/xchat-gnome/files/0.17-segfault-fix.patch
@@ -0,0 +1,13 @@
+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/files/digest-xchat-gnome-0.17 b/net-irc/xchat-gnome/files/digest-xchat-gnome-0.17
new file mode 100644
index 000000000000..4966992a8bdf
--- /dev/null
+++ b/net-irc/xchat-gnome/files/digest-xchat-gnome-0.17
@@ -0,0 +1,3 @@
+MD5 bcb8e97a63c0fda6fcba0f88309ea645 xchat-gnome-0.17.tar.bz2 1512721
+RMD160 4ef75097d3e41ca4a3a75febca278633839c5968 xchat-gnome-0.17.tar.bz2 1512721
+SHA256 72c84c55fae956a8076eefc04c23d374c0df6b4e5b7b04e6815a6f32c5e931a3 xchat-gnome-0.17.tar.bz2 1512721
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.17.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.17.ebuild
new file mode 100644
index 000000000000..561a45b257a2
--- /dev/null
+++ b/net-irc/xchat-gnome/xchat-gnome-0.17.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2007 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.17.ebuild,v 1.1 2007/04/04 19:25:52 swegener 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 ~ppc64"
+IUSE="perl tcl python ssl mmx ipv6 nls dbus libnotify spell"
+
+RDEPEND=">=dev-libs/glib-2.12.0
+	>=gnome-base/libgnome-2.16.0
+	>=gnome-base/gconf-2.8.0
+	>=gnome-base/libgnomeui-2.16.0
+	>=gnome-base/libglade-2.3.0
+	>=gnome-base/gnome-vfs-2.9.2
+	>=x11-libs/gtk+-2.10.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.60 )
+	>=x11-libs/libsexy-0.1.11
+	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.17-libnotify-configure.patch
+	epatch ${FILESDIR}/0.17-segfault-fix.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 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
+}