Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/xfig: xfig-3.2.5b-r2.ebuild xfig-3.2.5b-r3.ebuild ChangeLog
Date: Fri, 07 Jun 2013 14:23:49
Message-Id: 20130607142346.9B62F2171D@flycatcher.gentoo.org
1 jer 13/06/07 14:23:46
2
3 Modified: xfig-3.2.5b-r2.ebuild xfig-3.2.5b-r3.ebuild
4 ChangeLog
5 Log:
6 Die more often. RDEPEND on x11-libs/libXt. Remove unneeded einfo.
7
8 (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key A792A613)
9
10 Revision Changes Path
11 1.2 media-gfx/xfig/xfig-3.2.5b-r2.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/xfig-3.2.5b-r2.ebuild?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/xfig-3.2.5b-r2.ebuild?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/xfig-3.2.5b-r2.ebuild?r1=1.1&r2=1.2
16
17 Index: xfig-3.2.5b-r2.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5b-r2.ebuild,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- xfig-3.2.5b-r2.ebuild 6 Nov 2011 06:39:07 -0000 1.1
24 +++ xfig-3.2.5b-r2.ebuild 7 Jun 2013 14:23:46 -0000 1.2
25 @@ -1,6 +1,6 @@
26 -# Copyright 1999-2011 Gentoo Foundation
27 +# Copyright 1999-2013 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5b-r2.ebuild,v 1.1 2011/11/06 06:39:07 pva Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5b-r2.ebuild,v 1.2 2013/06/07 14:23:46 jer Exp $
31
32 EAPI="2"
33 inherit eutils multilib
34 @@ -50,12 +50,18 @@
35 for variable in "${vars2subs[@]}" ; do
36 varname=${variable%%=*}
37 varval=${variable##*=}
38 - sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@"
39 + sed -i \
40 + -e "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" \
41 + "$@" || die
42 done
43 - sed -i "s:^\(XCOMM\)*[[:space:]]*\(#define I18N\).*$:\2:" "$@"
44 + sed -i \
45 + -e "s:^\(XCOMM\)*[[:space:]]*\(#define I18N\).*$:\2:" \
46 + "$@" || die
47 if has_version '>=x11-libs/libXaw3d-1.5e'; then
48 einfo "x11-libs/libXaw3d 1.5e and abover installed"
49 - sed -i "s:^\(XCOMM\)*[[:space:]]*\(#define XAW3D1_5E\).*$:\2:" "$@"
50 + sed -i \
51 + -e "s:^\(XCOMM\)*[[:space:]]*\(#define XAW3D1_5E\).*$:\2:" \
52 + "$@" || die
53 fi
54 }
55
56
57
58
59 1.5 media-gfx/xfig/xfig-3.2.5b-r3.ebuild
60
61 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/xfig-3.2.5b-r3.ebuild?rev=1.5&view=markup
62 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/xfig-3.2.5b-r3.ebuild?rev=1.5&content-type=text/plain
63 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/xfig-3.2.5b-r3.ebuild?r1=1.4&r2=1.5
64
65 Index: xfig-3.2.5b-r3.ebuild
66 ===================================================================
67 RCS file: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5b-r3.ebuild,v
68 retrieving revision 1.4
69 retrieving revision 1.5
70 diff -u -r1.4 -r1.5
71 --- xfig-3.2.5b-r3.ebuild 6 Jun 2013 21:50:51 -0000 1.4
72 +++ xfig-3.2.5b-r3.ebuild 7 Jun 2013 14:23:46 -0000 1.5
73 @@ -1,6 +1,6 @@
74 # Copyright 1999-2013 Gentoo Foundation
75 # Distributed under the terms of the GNU General Public License v2
76 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5b-r3.ebuild,v 1.4 2013/06/06 21:50:51 nimiux Exp $
77 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5b-r3.ebuild,v 1.5 2013/06/07 14:23:46 jer Exp $
78
79 EAPI=5
80
81 @@ -22,6 +22,7 @@
82 x11-libs/libXaw3d
83 nls? ( x11-libs/libXaw3d[unicode] )
84 x11-libs/libXi
85 + x11-libs/libXt
86 virtual/jpeg
87 media-libs/libpng
88 media-fonts/font-misc-misc
89 @@ -52,23 +53,30 @@
90 for variable in "${vars2subs[@]}" ; do
91 varname=${variable%%=*}
92 varval=${variable##*=}
93 - sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@"
94 + sed -i \
95 + -e "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" \
96 + "$@" || die
97 done
98 if use nls; then
99 - sed -i "s:^\(XCOMM\)*[[:space:]]*\(#define I18N\).*$:\2:" "$@"
100 + sed -i \
101 + -e "s:^\(XCOMM\)*[[:space:]]*\(#define I18N\).*$:\2:" \
102 + "$@" || die
103 # Fix #405475 and #426780 by Markus Peloquin #405475 comment 17
104 - sed -i 's:^I18N_DEFS[[:space:]]*=.*:& -DXAW_INTERNATIONALIZATION:' "$@"
105 + sed -i \
106 + -e 's:^I18N_DEFS[[:space:]]*=.*:& -DXAW_INTERNATIONALIZATION:' \
107 + "$@" || die
108 fi
109 if has_version '>=x11-libs/libXaw3d-1.5e'; then
110 - einfo "x11-libs/libXaw3d 1.5e and abover installed"
111 - sed -i "s:^\(XCOMM\)*[[:space:]]*\(#define XAW3D1_5E\).*$:\2:" "$@"
112 + sed -i \
113 + -e "s:^\(XCOMM\)*[[:space:]]*\(#define XAW3D1_5E\).*$:\2:" \
114 + "$@" || die
115 fi
116 }
117
118 src_prepare() {
119 # Permissions are really crazy here
120 - chmod -R go+rX .
121 - find . -type f -exec chmod a-x '{}' \;
122 + chmod -R go+rX . || die
123 + find . -type f -exec chmod a-x '{}' \; || die
124 epatch "${FILESDIR}/${P}-figparserstack.patch" #297379
125 epatch "${FILESDIR}/${P}-spelling.patch"
126 epatch "${FILESDIR}/${P}-papersize_b1.patch"
127
128
129
130 1.82 media-gfx/xfig/ChangeLog
131
132 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/ChangeLog?rev=1.82&view=markup
133 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/ChangeLog?rev=1.82&content-type=text/plain
134 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/ChangeLog?r1=1.81&r2=1.82
135
136 Index: ChangeLog
137 ===================================================================
138 RCS file: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v
139 retrieving revision 1.81
140 retrieving revision 1.82
141 diff -u -r1.81 -r1.82
142 --- ChangeLog 6 Jun 2013 21:50:51 -0000 1.81
143 +++ ChangeLog 7 Jun 2013 14:23:46 -0000 1.82
144 @@ -1,6 +1,10 @@
145 # ChangeLog for media-gfx/xfig
146 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
147 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.81 2013/06/06 21:50:51 nimiux Exp $
148 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.82 2013/06/07 14:23:46 jer Exp $
149 +
150 + 07 Jun 2013; Jeroen Roovers <jer@g.o> xfig-3.2.5b-r2.ebuild,
151 + xfig-3.2.5b-r3.ebuild:
152 + Die more often. RDEPEND on x11-libs/libXt. Remove unneeded einfo.
153
154 06 Jun 2013; Chema Alonso <nimiux@g.o> xfig-3.2.5b-r3.ebuild:
155 Stable for amd64 wrt bug #472340