Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/xrmap: xrmap-2.33-r1.ebuild ChangeLog
Date: Sat, 28 Dec 2013 00:10:01
Message-Id: 20131228000958.362982004C@flycatcher.gentoo.org
1 robbat2 13/12/28 00:09:58
2
3 Modified: xrmap-2.33-r1.ebuild ChangeLog
4 Log:
5 Bug #426206: compile-fix for newer zlib & GCC.
6
7 (Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
8
9 Revision Changes Path
10 1.4 x11-misc/xrmap/xrmap-2.33-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xrmap/xrmap-2.33-r1.ebuild?rev=1.4&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xrmap/xrmap-2.33-r1.ebuild?rev=1.4&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xrmap/xrmap-2.33-r1.ebuild?r1=1.3&r2=1.4
15
16 Index: xrmap-2.33-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33-r1.ebuild,v
19 retrieving revision 1.3
20 retrieving revision 1.4
21 diff -p -w -b -B -u -u -r1.3 -r1.4
22 --- xrmap-2.33-r1.ebuild 8 Oct 2011 16:45:18 -0000 1.3
23 +++ xrmap-2.33-r1.ebuild 28 Dec 2013 00:09:57 -0000 1.4
24 @@ -1,6 +1,6 @@
25 -# Copyright 1999-2011 Gentoo Foundation
26 +# Copyright 1999-2013 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33-r1.ebuild,v 1.3 2011/10/08 16:45:18 phajdan.jr Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33-r1.ebuild,v 1.4 2013/12/28 00:09:57 robbat2 Exp $
30
31 EAPI=2
32 inherit eutils toolchain-funcs
33 @@ -47,7 +47,8 @@ src_prepare() {
34 epatch "${FILESDIR}"/${P}-Makefile.kit.patch \
35 "${FILESDIR}"/${P}-as-needed.patch \
36 "${FILESDIR}"/${P}-parallel-make.patch \
37 - "${FILESDIR}"/${P}-libpng15.patch
38 + "${FILESDIR}"/${P}-libpng15.patch \
39 + "${FILESDIR}"/${P}-zlib.patch
40
41 sed -e 's,^\(X11DIR=\).*,\1/usr/,g' \
42 -e 's,^\(EDITOR=\).*,\1less,g' \
43
44
45
46 1.24 x11-misc/xrmap/ChangeLog
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xrmap/ChangeLog?rev=1.24&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xrmap/ChangeLog?rev=1.24&content-type=text/plain
50 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xrmap/ChangeLog?r1=1.23&r2=1.24
51
52 Index: ChangeLog
53 ===================================================================
54 RCS file: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v
55 retrieving revision 1.23
56 retrieving revision 1.24
57 diff -p -w -b -B -u -u -r1.23 -r1.24
58 --- ChangeLog 8 Oct 2011 16:45:18 -0000 1.23
59 +++ ChangeLog 28 Dec 2013 00:09:57 -0000 1.24
60 @@ -1,6 +1,10 @@
61 # ChangeLog for x11-misc/xrmap
62 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
63 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.23 2011/10/08 16:45:18 phajdan.jr Exp $
64 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
65 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.24 2013/12/28 00:09:57 robbat2 Exp $
66 +
67 + 28 Dec 2013; Robin H. Johnson <robbat2@g.o>
68 + +files/xrmap-2.33-zlib.patch, xrmap-2.33-r1.ebuild:
69 + Bug #426206: compile-fix for newer zlib & GCC.
70
71 08 Oct 2011; Pawel Hajdan jr <phajdan.jr@g.o> xrmap-2.33-r1.ebuild:
72 x86 stable wrt bug #385981