public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-irc/xchat: xchat-2.8.8-r2.ebuild ChangeLog xchat-2.8.8-r1.ebuild
@ 2011-01-30  9:51 Lars Wendler (polynomial-c)
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler (polynomial-c) @ 2011-01-30  9:51 UTC (permalink / raw
  To: gentoo-commits

polynomial-c    11/01/30 09:51:43

  Modified:             ChangeLog xchat-2.8.8-r1.ebuild
  Added:                xchat-2.8.8-r2.ebuild
  Log:
  Better patch for >=libnotify-0.7
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.294                net-irc/xchat/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?rev=1.294&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?rev=1.294&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?r1=1.293&r2=1.294

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- ChangeLog	30 Jan 2011 09:32:21 -0000	1.293
+++ ChangeLog	30 Jan 2011 09:51:43 -0000	1.294
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/xchat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.293 2011/01/30 09:32:21 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.294 2011/01/30 09:51:43 polynomial-c Exp $
+
+*xchat-2.8.8-r2 (30 Jan 2011)
+
+  30 Jan 2011; Lars Wendler <polynomial-c@gentoo.org> xchat-2.8.8-r1.ebuild,
+  +xchat-2.8.8-r2.ebuild, files/xchat-2.8.8-libnotify07.patch:
+  Better patch for >=libnotify-0.7. Don't impose this to stable users yet so
+  moving this to -r2.
 
   30 Jan 2011; Lars Wendler <polynomial-c@gentoo.org> xchat-2.8.8-r1.ebuild,
   +files/xchat-2.8.8-libnotify07.patch:



1.5                  net-irc/xchat/xchat-2.8.8-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild?r1=1.4&r2=1.5

Index: xchat-2.8.8-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xchat-2.8.8-r1.ebuild	30 Jan 2011 09:32:21 -0000	1.4
+++ xchat-2.8.8-r1.ebuild	30 Jan 2011 09:51:43 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v 1.4 2011/01/30 09:32:21 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v 1.5 2011/01/30 09:51:43 polynomial-c Exp $
 
 EAPI=2
 
@@ -43,7 +43,6 @@
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-input-box4.patch
-	epatch "${FILESDIR}"/${P}-libnotify07.patch
 
 	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
 



1.1                  net-irc/xchat/xchat-2.8.8-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?rev=1.1&content-type=text/plain

Index: xchat-2.8.8-r2.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.1 2011/01/30 09:51:43 polynomial-c Exp $

EAPI=2

inherit eutils versionator gnome2 autotools

DESCRIPTION="Graphical IRC client"
SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
	mirror://sourceforge/${PN}/${P}.tar.bz2
	xchatdccserver? ( mirror://gentoo/${PN}-dccserver-0.6.patch.bz2 )"
HOMEPAGE="http://www.xchat.org/"

LICENSE="GPL-2"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="dbus fastscroll +gtk ipv6 libnotify mmx nls ntlm perl python spell ssl tcl xchatdccserver"

RDEPEND=">=dev-libs/glib-2.6.0
	gtk? ( >=x11-libs/gtk+-2.10.0 )
	ssl? ( >=dev-libs/openssl-0.9.6d )
	perl? ( >=dev-lang/perl-5.8.0 )
	python? ( >=dev-lang/python-2.2 )
	tcl? ( dev-lang/tcl )
	dbus? ( >=dev-libs/dbus-glib-0.71 )
	spell? ( app-text/gtkspell )
	libnotify? ( x11-libs/libnotify )
	ntlm? ( net-libs/libntlm )
	x11-libs/pango
	!<net-irc/xchat-gnome-0.9"

DEPEND="${RDEPEND}
	>=dev-util/pkgconfig-0.16
	nls? ( sys-devel/gettext )"

pkg_setup() {
	# Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org>
	if [[ ${ARCH} = sparc ]] ; then
		replace-flags "-O[3-9]" "-O2"
	fi
}

src_prepare() {
	epatch "${FILESDIR}"/${PN}-input-box4.patch
	epatch "${FILESDIR}"/${P}-libnotify07.patch

	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2

	# use libdir/xchat/plugins as the plugin directory
	if [ $(get_libdir) != "lib" ] ; then
		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
			"${S}"/configure.in || die
	fi

	# xchat sourcecode ships with po/Makefile.in.in from gettext-0.17
	# which fails with >=gettext-0.18
	cp /usr/share/gettext/po/Makefile.in.in "${S}"/po/ || die

	eautoreconf
}

src_configure() {
	# xchat's configure script uses sys.path to find library path
	# instead of python-config (#25943)
	unset PYTHONPATH

	econf \
		--enable-shm \
		$(use_enable dbus) \
		$(use_enable ipv6) \
		$(use_enable mmx) \
		$(use_enable nls) \
		$(use_enable ntlm) \
		$(use_enable perl) \
		$(use_enable python) \
		$(use_enable spell spell gtkspell) \
		$(use_enable ssl openssl) \
		$(use_enable tcl) \
		$(use_enable gtk gtkfe) \
		$(use_enable fastscroll xft)
}

src_install() {
	USE_DESTDIR=1 gnome2_src_install || die "make install failed"

	# install plugin development header
	insinto /usr/include/xchat
	doins src/common/xchat-plugin.h || die "doins failed"

	dodoc ChangeLog README* || die "dodoc failed"
}

pkg_postinst() {
	elog
	elog "XChat binary has been renamed from xchat-2 to xchat."
	elog

	if has_version net-irc/xchat-systray
	then
		elog "XChat now includes it's own systray icon, you may want to remove net-irc/xchat-systray."
		elog
	fi
}






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-irc/xchat: xchat-2.8.8-r2.ebuild ChangeLog xchat-2.8.8-r1.ebuild
@ 2011-01-30 17:34 Lars Wendler (polynomial-c)
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler (polynomial-c) @ 2011-01-30 17:34 UTC (permalink / raw
  To: gentoo-commits

polynomial-c    11/01/30 17:34:10

  Modified:             xchat-2.8.8-r2.ebuild ChangeLog
                        xchat-2.8.8-r1.ebuild
  Log:
  bug #353106
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  net-irc/xchat/xchat-2.8.8-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?r1=1.1&r2=1.2

Index: xchat-2.8.8-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xchat-2.8.8-r2.ebuild	30 Jan 2011 09:51:43 -0000	1.1
+++ xchat-2.8.8-r2.ebuild	30 Jan 2011 17:34:09 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.1 2011/01/30 09:51:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.2 2011/01/30 17:34:09 polynomial-c Exp $
 
 EAPI=2
 
@@ -78,6 +78,7 @@
 		$(use_enable ssl openssl) \
 		$(use_enable tcl) \
 		$(use_enable gtk gtkfe) \
+		$(use_enable !gtk textfe) \
 		$(use_enable fastscroll xft)
 }
 



1.295                net-irc/xchat/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?rev=1.295&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?rev=1.295&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?r1=1.294&r2=1.295

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- ChangeLog	30 Jan 2011 09:51:43 -0000	1.294
+++ ChangeLog	30 Jan 2011 17:34:09 -0000	1.295
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.294 2011/01/30 09:51:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.295 2011/01/30 17:34:09 polynomial-c Exp $
+
+  30 Jan 2011; Lars Wendler <polynomial-c@gentoo.org> xchat-2.8.8-r1.ebuild,
+  xchat-2.8.8-r2.ebuild:
+  No binary gets installed with -gtk USE flag. Work around this by enabling the
+  text-only interface when -gtk is in USE (bug #353106).
 
 *xchat-2.8.8-r2 (30 Jan 2011)
 



1.6                  net-irc/xchat/xchat-2.8.8-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild?r1=1.5&r2=1.6

Index: xchat-2.8.8-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xchat-2.8.8-r1.ebuild	30 Jan 2011 09:51:43 -0000	1.5
+++ xchat-2.8.8-r1.ebuild	30 Jan 2011 17:34:09 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v 1.5 2011/01/30 09:51:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v 1.6 2011/01/30 17:34:09 polynomial-c Exp $
 
 EAPI=2
 
@@ -77,6 +77,7 @@
 		$(use_enable ssl openssl) \
 		$(use_enable tcl) \
 		$(use_enable gtk gtkfe) \
+		$(use_enable !gtk textfe) \
 		$(use_enable fastscroll xft)
 }
 






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-irc/xchat: xchat-2.8.8-r2.ebuild ChangeLog xchat-2.8.8-r1.ebuild
@ 2011-07-11 13:29 Lars Wendler (polynomial-c)
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler (polynomial-c) @ 2011-07-11 13:29 UTC (permalink / raw
  To: gentoo-commits

polynomial-c    11/07/11 13:29:09

  Modified:             xchat-2.8.8-r2.ebuild ChangeLog
                        xchat-2.8.8-r1.ebuild
  Log:
  Fixed segfault with "+dbus -gtk" USE flags being set (bug #373975)
  
  (Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  net-irc/xchat/xchat-2.8.8-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?r1=1.5&r2=1.6

Index: xchat-2.8.8-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xchat-2.8.8-r2.ebuild	11 Jul 2011 00:01:13 -0000	1.5
+++ xchat-2.8.8-r2.ebuild	11 Jul 2011 13:29:09 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.5 2011/07/11 00:01:13 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.6 2011/07/11 13:29:09 polynomial-c Exp $
 
 EAPI=3
 
@@ -44,9 +44,10 @@
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-input-box4.patch
-	epatch "${FILESDIR}"/${PN}-2.8.4-interix.patch
-	epatch "${FILESDIR}"/${P}-libnotify07.patch
+	epatch "${FILESDIR}"/${PN}-input-box4.patch \
+		"${FILESDIR}"/${PN}-2.8.4-interix.patch \
+		"${FILESDIR}"/${P}-libnotify07.patch \
+		"${FILESDIR}"/${P}-dbus.patch
 
 	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
 



1.301                net-irc/xchat/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?rev=1.301&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?rev=1.301&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?r1=1.300&r2=1.301

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- ChangeLog	11 Jul 2011 00:01:13 -0000	1.300
+++ ChangeLog	11 Jul 2011 13:29:09 -0000	1.301
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/xchat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.300 2011/07/11 00:01:13 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.301 2011/07/11 13:29:09 polynomial-c Exp $
+
+  11 Jul 2011; Lars Wendler <polynomial-c@gentoo.org> xchat-2.8.8-r1.ebuild,
+  xchat-2.8.8-r2.ebuild, +files/xchat-2.8.8-dbus.patch:
+  Fixed segfault with "+dbus -gtk" USE flags being set. Thanks to Claudio
+  Roberto França Pereira who reported this issue in bug #373975 and to Nathan
+  Phillip Brink for a working patch.
 
   11 Jul 2011; Matt Turner <mattst88@gentoo.org> xchat-2.8.8-r2.ebuild:
   Added ~mips, bug 313589



1.8                  net-irc/xchat/xchat-2.8.8-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild?r1=1.7&r2=1.8

Index: xchat-2.8.8-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xchat-2.8.8-r1.ebuild	22 Mar 2011 09:54:15 -0000	1.7
+++ xchat-2.8.8-r1.ebuild	11 Jul 2011 13:29:09 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v 1.7 2011/03/22 09:54:15 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v 1.8 2011/07/11 13:29:09 polynomial-c Exp $
 
 EAPI=2
 
@@ -42,7 +42,8 @@
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-input-box4.patch
+	epatch "${FILESDIR}"/${PN}-input-box4.patch \
+		"${FILESDIR}"/${P}-dbus.patch
 
 	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
 






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-irc/xchat: xchat-2.8.8-r2.ebuild ChangeLog xchat-2.8.8-r1.ebuild
@ 2011-07-12  7:39 Lars Wendler (polynomial-c)
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler (polynomial-c) @ 2011-07-12  7:39 UTC (permalink / raw
  To: gentoo-commits

polynomial-c    11/07/12 07:39:59

  Modified:             xchat-2.8.8-r2.ebuild ChangeLog
                        xchat-2.8.8-r1.ebuild
  Log:
  Don't install a desktop entry when gtk USE flag is disabled. Warn the user that there's not GUI available as well
  
  (Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  net-irc/xchat/xchat-2.8.8-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?r1=1.6&r2=1.7

Index: xchat-2.8.8-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xchat-2.8.8-r2.ebuild	11 Jul 2011 13:29:09 -0000	1.6
+++ xchat-2.8.8-r2.ebuild	12 Jul 2011 07:39:59 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.6 2011/07/11 13:29:09 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.7 2011/07/12 07:39:59 polynomial-c Exp $
 
 EAPI=3
 
@@ -111,17 +111,28 @@
 		# Replace default pixmap icon
 		cp "48x48/xchat.png" "${D}/usr/share/pixmaps" || die
 	fi
+
+	# remove useless desktop entry when gtk USE flag is unset
+	if ! use gtk ; then
+		rm "${ED}"/usr/share/applications -rf
+	fi
 }
 
 pkg_postinst() {
-	elog
-	elog "XChat binary has been renamed from xchat-2 to xchat."
-	elog
-
-	if has_version net-irc/xchat-systray
-	then
-		elog "XChat now includes it's own systray icon, you may want to remove net-irc/xchat-systray."
+	if use gtk ; then
+		elog
+		elog "XChat binary has been renamed from xchat-2 to xchat."
 		elog
+
+		if has_version net-irc/xchat-systray
+		then
+			elog "XChat now includes it's own systray icon, you may want to remove net-irc/xchat-systray."
+			elog
+		fi
+	else
+		elog "You have disabled the gtk USE flag. This means you don't have"
+		elog "the GTK-GUI for xchat but only a text interface called \"xchat-text\"."
 	fi
+
 	gnome2_icon_cache_update
 }



1.302                net-irc/xchat/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?rev=1.302&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?rev=1.302&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?r1=1.301&r2=1.302

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- ChangeLog	11 Jul 2011 13:29:09 -0000	1.301
+++ ChangeLog	12 Jul 2011 07:39:59 -0000	1.302
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.301 2011/07/11 13:29:09 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.302 2011/07/12 07:39:59 polynomial-c Exp $
+
+  12 Jul 2011; Lars Wendler <polynomial-c@gentoo.org> xchat-2.8.8-r1.ebuild,
+  xchat-2.8.8-r2.ebuild:
+  Don't install a desktop entry when gtk USE flag is disabled. Warn the user
+  that there's not GUI available as well.
 
   11 Jul 2011; Lars Wendler <polynomial-c@gentoo.org> xchat-2.8.8-r1.ebuild,
   xchat-2.8.8-r2.ebuild, +files/xchat-2.8.8-dbus.patch:



1.9                  net-irc/xchat/xchat-2.8.8-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild?r1=1.8&r2=1.9

Index: xchat-2.8.8-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xchat-2.8.8-r1.ebuild	11 Jul 2011 13:29:09 -0000	1.8
+++ xchat-2.8.8-r1.ebuild	12 Jul 2011 07:39:59 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v 1.8 2011/07/11 13:29:09 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v 1.9 2011/07/12 07:39:59 polynomial-c Exp $
 
 EAPI=2
 
@@ -90,16 +90,26 @@
 	doins src/common/xchat-plugin.h || die "doins failed"
 
 	dodoc ChangeLog README* || die "dodoc failed"
+
+	# remove useless desktop entry when gtk USE flag is unset
+	if ! use gtk ; then
+		rm "${D}"/usr/share/applications -rf
+	fi
 }
 
 pkg_postinst() {
-	elog
-	elog "XChat binary has been renamed from xchat-2 to xchat."
-	elog
-
-	if has_version net-irc/xchat-systray
-	then
-		elog "XChat now includes it's own systray icon, you may want to remove net-irc/xchat-systray."
+	if use gtk ; then
 		elog
+		elog "XChat binary has been renamed from xchat-2 to xchat."
+		elog
+
+		if has_version net-irc/xchat-systray
+		then
+			elog "XChat now includes it's own systray icon, you may want to remove net-irc/xchat-systray."
+			elog
+		fi
+	else
+		elog "You have disabled the gtk USE flag. This means you don't have"
+		elog "the GTK-GUI for xchat but only a text interface called \"xchat-text\"."
 	fi
 }






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-irc/xchat: xchat-2.8.8-r2.ebuild ChangeLog xchat-2.8.8-r1.ebuild
@ 2012-04-12 21:00 Lars Wendler (polynomial-c)
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler (polynomial-c) @ 2012-04-12 21:00 UTC (permalink / raw
  To: gentoo-commits

polynomial-c    12/04/12 21:00:43

  Modified:             xchat-2.8.8-r2.ebuild ChangeLog
  Removed:              xchat-2.8.8-r1.ebuild
  Log:
  Fixed compilation with >=dev-libs/glib-2.31 (bug #411195)
  
  (Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

Revision  Changes    Path
1.17                 net-irc/xchat/xchat-2.8.8-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?r1=1.16&r2=1.17

Index: xchat-2.8.8-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xchat-2.8.8-r2.ebuild	27 Oct 2011 06:42:00 -0000	1.16
+++ xchat-2.8.8-r2.ebuild	12 Apr 2012 21:00:43 -0000	1.17
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.16 2011/10/27 06:42:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.17 2012/04/12 21:00:43 polynomial-c Exp $
 
 EAPI=3
 
@@ -48,7 +48,8 @@
 		"${FILESDIR}"/${PN}-2.8.4-interix.patch \
 		"${FILESDIR}"/${P}-libnotify07.patch \
 		"${FILESDIR}"/${P}-dbus.patch \
-		"${FILESDIR}"/${PN}-2.8.8-cflags.patch
+		"${FILESDIR}"/${PN}-2.8.8-cflags.patch \
+		"${FILESDIR}"/${P}-glib-2.31.patch
 
 	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
 



1.312                net-irc/xchat/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?rev=1.312&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?rev=1.312&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?r1=1.311&r2=1.312

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- ChangeLog	27 Oct 2011 06:42:00 -0000	1.311
+++ ChangeLog	12 Apr 2012 21:00:43 -0000	1.312
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchat
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.311 2011/10/27 06:42:00 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.312 2012/04/12 21:00:43 polynomial-c Exp $
+
+  12 Apr 2012; Lars Wendler <polynomial-c@gentoo.org> -xchat-2.8.8-r1.ebuild,
+  xchat-2.8.8-r2.ebuild, +files/xchat-2.8.8-glib-2.31.patch:
+  Fixed compilation with >=dev-libs/glib-2.31. Thanks to Alexandre Rostovtsev
+  (tetromino) for filing bug #411195 and providing a working patch.
 
   27 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   xchat-2.8.6-r2.ebuild, xchat-2.8.8-r1.ebuild, xchat-2.8.8-r2.ebuild:






^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2012-04-12 21:01 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-11 13:29 [gentoo-commits] gentoo-x86 commit in net-irc/xchat: xchat-2.8.8-r2.ebuild ChangeLog xchat-2.8.8-r1.ebuild Lars Wendler (polynomial-c)
  -- strict thread matches above, loose matches on Subject: below --
2012-04-12 21:00 Lars Wendler (polynomial-c)
2011-07-12  7:39 Lars Wendler (polynomial-c)
2011-01-30 17:34 Lars Wendler (polynomial-c)
2011-01-30  9:51 Lars Wendler (polynomial-c)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox