Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-irc/xchat: xchat-2.8.8-r2.ebuild ChangeLog xchat-2.8.8-r1.ebuild
Date: Sun, 30 Jan 2011 09:51:53
Message-Id: 20110130095143.2ED0120054@flycatcher.gentoo.org
1 polynomial-c 11/01/30 09:51:43
2
3 Modified: ChangeLog xchat-2.8.8-r1.ebuild
4 Added: xchat-2.8.8-r2.ebuild
5 Log:
6 Better patch for >=libnotify-0.7
7
8 (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.294 net-irc/xchat/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?rev=1.294&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?rev=1.294&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?r1=1.293&r2=1.294
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v
20 retrieving revision 1.293
21 retrieving revision 1.294
22 diff -u -r1.293 -r1.294
23 --- ChangeLog 30 Jan 2011 09:32:21 -0000 1.293
24 +++ ChangeLog 30 Jan 2011 09:51:43 -0000 1.294
25 @@ -1,6 +1,13 @@
26 # ChangeLog for net-irc/xchat
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.293 2011/01/30 09:32:21 polynomial-c Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.294 2011/01/30 09:51:43 polynomial-c Exp $
30 +
31 +*xchat-2.8.8-r2 (30 Jan 2011)
32 +
33 + 30 Jan 2011; Lars Wendler <polynomial-c@g.o> xchat-2.8.8-r1.ebuild,
34 + +xchat-2.8.8-r2.ebuild, files/xchat-2.8.8-libnotify07.patch:
35 + Better patch for >=libnotify-0.7. Don't impose this to stable users yet so
36 + moving this to -r2.
37
38 30 Jan 2011; Lars Wendler <polynomial-c@g.o> xchat-2.8.8-r1.ebuild,
39 +files/xchat-2.8.8-libnotify07.patch:
40
41
42
43 1.5 net-irc/xchat/xchat-2.8.8-r1.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild?rev=1.5&view=markup
46 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
47 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild?r1=1.4&r2=1.5
48
49 Index: xchat-2.8.8-r1.ebuild
50 ===================================================================
51 RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v
52 retrieving revision 1.4
53 retrieving revision 1.5
54 diff -u -r1.4 -r1.5
55 --- xchat-2.8.8-r1.ebuild 30 Jan 2011 09:32:21 -0000 1.4
56 +++ xchat-2.8.8-r1.ebuild 30 Jan 2011 09:51:43 -0000 1.5
57 @@ -1,6 +1,6 @@
58 # Copyright 1999-2011 Gentoo Foundation
59 # Distributed under the terms of the GNU General Public License v2
60 -# $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 $
61 +# $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 $
62
63 EAPI=2
64
65 @@ -43,7 +43,6 @@
66
67 src_prepare() {
68 epatch "${FILESDIR}"/${PN}-input-box4.patch
69 - epatch "${FILESDIR}"/${P}-libnotify07.patch
70
71 use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
72
73
74
75
76 1.1 net-irc/xchat/xchat-2.8.8-r2.ebuild
77
78 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?rev=1.1&view=markup
79 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
80
81 Index: xchat-2.8.8-r2.ebuild
82 ===================================================================
83 # Copyright 1999-2011 Gentoo Foundation
84 # Distributed under the terms of the GNU General Public License v2
85 # $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 $
86
87 EAPI=2
88
89 inherit eutils versionator gnome2 autotools
90
91 DESCRIPTION="Graphical IRC client"
92 SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
93 mirror://sourceforge/${PN}/${P}.tar.bz2
94 xchatdccserver? ( mirror://gentoo/${PN}-dccserver-0.6.patch.bz2 )"
95 HOMEPAGE="http://www.xchat.org/"
96
97 LICENSE="GPL-2"
98 SLOT="2"
99 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
100 IUSE="dbus fastscroll +gtk ipv6 libnotify mmx nls ntlm perl python spell ssl tcl xchatdccserver"
101
102 RDEPEND=">=dev-libs/glib-2.6.0
103 gtk? ( >=x11-libs/gtk+-2.10.0 )
104 ssl? ( >=dev-libs/openssl-0.9.6d )
105 perl? ( >=dev-lang/perl-5.8.0 )
106 python? ( >=dev-lang/python-2.2 )
107 tcl? ( dev-lang/tcl )
108 dbus? ( >=dev-libs/dbus-glib-0.71 )
109 spell? ( app-text/gtkspell )
110 libnotify? ( x11-libs/libnotify )
111 ntlm? ( net-libs/libntlm )
112 x11-libs/pango
113 !<net-irc/xchat-gnome-0.9"
114
115 DEPEND="${RDEPEND}
116 >=dev-util/pkgconfig-0.16
117 nls? ( sys-devel/gettext )"
118
119 pkg_setup() {
120 # Added for to fix a sparc seg fault issue by Jason Wever <weeve@g.o>
121 if [[ ${ARCH} = sparc ]] ; then
122 replace-flags "-O[3-9]" "-O2"
123 fi
124 }
125
126 src_prepare() {
127 epatch "${FILESDIR}"/${PN}-input-box4.patch
128 epatch "${FILESDIR}"/${P}-libnotify07.patch
129
130 use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
131
132 # use libdir/xchat/plugins as the plugin directory
133 if [ $(get_libdir) != "lib" ] ; then
134 sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
135 "${S}"/configure.in || die
136 fi
137
138 # xchat sourcecode ships with po/Makefile.in.in from gettext-0.17
139 # which fails with >=gettext-0.18
140 cp /usr/share/gettext/po/Makefile.in.in "${S}"/po/ || die
141
142 eautoreconf
143 }
144
145 src_configure() {
146 # xchat's configure script uses sys.path to find library path
147 # instead of python-config (#25943)
148 unset PYTHONPATH
149
150 econf \
151 --enable-shm \
152 $(use_enable dbus) \
153 $(use_enable ipv6) \
154 $(use_enable mmx) \
155 $(use_enable nls) \
156 $(use_enable ntlm) \
157 $(use_enable perl) \
158 $(use_enable python) \
159 $(use_enable spell spell gtkspell) \
160 $(use_enable ssl openssl) \
161 $(use_enable tcl) \
162 $(use_enable gtk gtkfe) \
163 $(use_enable fastscroll xft)
164 }
165
166 src_install() {
167 USE_DESTDIR=1 gnome2_src_install || die "make install failed"
168
169 # install plugin development header
170 insinto /usr/include/xchat
171 doins src/common/xchat-plugin.h || die "doins failed"
172
173 dodoc ChangeLog README* || die "dodoc failed"
174 }
175
176 pkg_postinst() {
177 elog
178 elog "XChat binary has been renamed from xchat-2 to xchat."
179 elog
180
181 if has_version net-irc/xchat-systray
182 then
183 elog "XChat now includes it's own systray icon, you may want to remove net-irc/xchat-systray."
184 elog
185 fi
186 }