Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/evince: evince-3.2.1-r1.ebuild ChangeLog evince-3.2.1.ebuild
Date: Sat, 26 Nov 2011 02:45:56
Message-Id: 20111126024545.CC2252004C@flycatcher.gentoo.org
1 tetromino 11/11/26 02:45:45
2
3 Modified: evince-3.2.1-r1.ebuild ChangeLog
4 evince-3.2.1.ebuild
5 Log:
6 Fix the gnome-icon-theme configure sed (bug #391859, thanks to Florian Faber <faber@××××××××.de> for reporting).
7
8 (Portage version: 2.2.0_alpha77/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.2 app-text/evince/evince-3.2.1-r1.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild?r1=1.1&r2=1.2
16
17 Index: evince-3.2.1-r1.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- evince-3.2.1-r1.ebuild 23 Nov 2011 20:35:27 -0000 1.1
24 +++ evince-3.2.1-r1.ebuild 26 Nov 2011 02:45:45 -0000 1.2
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2011 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild,v 1.1 2011/11/23 20:35:27 tetromino Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild,v 1.2 2011/11/26 02:45:45 tetromino Exp $
30
31 EAPI="4"
32 GCONF_DEBUG="yes"
33 @@ -95,9 +95,6 @@
34 }
35
36 src_prepare() {
37 - # Do not depend on gnome-icon-theme, bug #326855
38 - sed 's/gnome-icon-theme//' -i configure.ac || die "sed failed"
39 -
40 # Fix .desktop file so menu item shows up
41 epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
42
43 @@ -108,4 +105,8 @@
44 epatch "${FILESDIR}/${PN}-3.2.1-libgxps-0.2.patch"
45
46 gnome2_src_prepare
47 +
48 + # Do not depend on gnome-icon-theme, bug #326855, #391859
49 + sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \
50 + -i configure || die "sed failed"
51 }
52
53
54
55 1.234 app-text/evince/ChangeLog
56
57 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/ChangeLog?rev=1.234&view=markup
58 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/ChangeLog?rev=1.234&content-type=text/plain
59 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/ChangeLog?r1=1.233&r2=1.234
60
61 Index: ChangeLog
62 ===================================================================
63 RCS file: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v
64 retrieving revision 1.233
65 retrieving revision 1.234
66 diff -u -r1.233 -r1.234
67 --- ChangeLog 23 Nov 2011 20:35:27 -0000 1.233
68 +++ ChangeLog 26 Nov 2011 02:45:45 -0000 1.234
69 @@ -1,6 +1,11 @@
70 # ChangeLog for app-text/evince
71 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
72 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.233 2011/11/23 20:35:27 tetromino Exp $
73 +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.234 2011/11/26 02:45:45 tetromino Exp $
74 +
75 + 26 Nov 2011; Alexandre Rostovtsev <tetromino@g.o> evince-3.2.1.ebuild,
76 + evince-3.2.1-r1.ebuild:
77 + Fix the gnome-icon-theme configure sed (bug #391859, thanks to Florian Faber
78 + <faber@××××××××.de> for reporting).
79
80 *evince-3.2.1-r1 (23 Nov 2011)
81
82
83
84
85 1.3 app-text/evince/evince-3.2.1.ebuild
86
87 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1.ebuild?rev=1.3&view=markup
88 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1.ebuild?rev=1.3&content-type=text/plain
89 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1.ebuild?r1=1.2&r2=1.3
90
91 Index: evince-3.2.1.ebuild
92 ===================================================================
93 RCS file: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1.ebuild,v
94 retrieving revision 1.2
95 retrieving revision 1.3
96 diff -u -r1.2 -r1.3
97 --- evince-3.2.1.ebuild 16 Nov 2011 10:56:15 -0000 1.2
98 +++ evince-3.2.1.ebuild 26 Nov 2011 02:45:45 -0000 1.3
99 @@ -1,6 +1,6 @@
100 # Copyright 1999-2011 Gentoo Foundation
101 # Distributed under the terms of the GNU General Public License v2
102 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1.ebuild,v 1.2 2011/11/16 10:56:15 jlec Exp $
103 +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1.ebuild,v 1.3 2011/11/26 02:45:45 tetromino Exp $
104
105 EAPI="4"
106 GCONF_DEBUG="yes"
107 @@ -92,11 +92,12 @@
108 }
109
110 src_prepare() {
111 - # Do not depend on gnome-icon-theme, bug #326855
112 - sed 's/gnome-icon-theme//' -i configure.ac || die "sed failed"
113 -
114 # Fix .desktop file so menu item shows up
115 epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
116
117 gnome2_src_prepare
118 +
119 + # Do not depend on gnome-icon-theme, bug #326855, #391859
120 + sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \
121 + -i configure || die "sed failed"
122 }