1 |
eva 08/01/02 22:55:13 |
2 |
|
3 |
Modified: ChangeLog goffice-0.6.1.ebuild goffice-0.4.3.ebuild |
4 |
Log: |
5 |
fix USE flags tests and die only with a complete check of features |
6 |
(Portage version: 2.1.4_rc14) |
7 |
|
8 |
Revision Changes Path |
9 |
1.33 x11-libs/goffice/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/goffice/ChangeLog?rev=1.33&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/goffice/ChangeLog?rev=1.33&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/goffice/ChangeLog?r1=1.32&r2=1.33 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v |
18 |
retrieving revision 1.32 |
19 |
retrieving revision 1.33 |
20 |
diff -u -r1.32 -r1.33 |
21 |
--- ChangeLog 2 Jan 2008 17:10:07 -0000 1.32 |
22 |
+++ ChangeLog 2 Jan 2008 22:55:12 -0000 1.33 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for x11-libs/goffice |
25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.32 2008/01/02 17:10:07 ranger Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.33 2008/01/02 22:55:12 eva Exp $ |
28 |
+ |
29 |
+ 02 Jan 2008; Gilles Dartiguelongue <eva@g.o> goffice-0.4.3.ebuild, |
30 |
+ goffice-0.6.1.ebuild: |
31 |
+ fix USE flags tests and die only with a complete check of features |
32 |
|
33 |
02 Jan 2008; Brent Baude <ranger@g.o> goffice-0.6.1.ebuild: |
34 |
Marking goffice-0.6.1 ppc for bug 198385 |
35 |
|
36 |
|
37 |
|
38 |
1.8 x11-libs/goffice/goffice-0.6.1.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/goffice/goffice-0.6.1.ebuild?rev=1.8&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/goffice/goffice-0.6.1.ebuild?rev=1.8&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/goffice/goffice-0.6.1.ebuild?r1=1.7&r2=1.8 |
43 |
|
44 |
Index: goffice-0.6.1.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.6.1.ebuild,v |
47 |
retrieving revision 1.7 |
48 |
retrieving revision 1.8 |
49 |
diff -u -r1.7 -r1.8 |
50 |
--- goffice-0.6.1.ebuild 2 Jan 2008 17:10:07 -0000 1.7 |
51 |
+++ goffice-0.6.1.ebuild 2 Jan 2008 22:55:12 -0000 1.8 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2008 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.6.1.ebuild,v 1.7 2008/01/02 17:10:07 ranger Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.6.1.ebuild,v 1.8 2008/01/02 22:55:12 eva Exp $ |
57 |
|
58 |
inherit eutils gnome2 flag-o-matic |
59 |
|
60 |
@@ -38,21 +38,30 @@ |
61 |
pkg_setup() { |
62 |
G2CONF="${G2CONF} $(use_with gnome)" |
63 |
|
64 |
+ local diemessage="" |
65 |
+ |
66 |
if use gnome && ! built_with_use gnome-extra/libgsf gnome; then |
67 |
eerror "Please rebuild gnome-extra/libgsf with gnome support enabled" |
68 |
- eerror "USE=\"gnome\" emerge gnome-extra/libgsf" |
69 |
+ eerror "echo \"gnome-extra/libgsf gnome\" >> /etc/portage/package.use" |
70 |
eerror "or add \"gnome\" to your USE string in /etc/make.conf" |
71 |
- die "No Gnome support found in libgsf" |
72 |
+ diemessage="No Gnome support found in libgsf." |
73 |
fi |
74 |
|
75 |
if ! built_with_use x11-libs/cairo svg ; then |
76 |
- eerror |
77 |
eerror "Please rebuild x11-libs/cairo with svg support enabled" |
78 |
eerror "echo \"x11-libs/cairo svg\" >> /etc/portage/package.use" |
79 |
eerror "emerge -1 x11-libs/cairo" |
80 |
- eerror |
81 |
- die "cairo built with -svg" |
82 |
+ diemessage="${diemessage} No SVG support found in cairo." |
83 |
+ fi |
84 |
+ |
85 |
+ if ! built_with_use dev-libs/libpcre unicode; then |
86 |
+ eerror "Please rebuild dev-libs/libpcre with unicode support enabled" |
87 |
+ eerror "echo \"dev-libs/libpcre unicode\" >> /etc/portage/package.use" |
88 |
+ eerror "emerge -1 dev-libs/libpcre" |
89 |
+ diemessage="${diemessage} No unicode support found in libpcre." |
90 |
fi |
91 |
+ |
92 |
+ [ -n "${diemessage}" ] && die ${diemessage} |
93 |
} |
94 |
|
95 |
src_unpack() { |
96 |
|
97 |
|
98 |
|
99 |
1.8 x11-libs/goffice/goffice-0.4.3.ebuild |
100 |
|
101 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/goffice/goffice-0.4.3.ebuild?rev=1.8&view=markup |
102 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/goffice/goffice-0.4.3.ebuild?rev=1.8&content-type=text/plain |
103 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/goffice/goffice-0.4.3.ebuild?r1=1.7&r2=1.8 |
104 |
|
105 |
Index: goffice-0.4.3.ebuild |
106 |
=================================================================== |
107 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.4.3.ebuild,v |
108 |
retrieving revision 1.7 |
109 |
retrieving revision 1.8 |
110 |
diff -u -r1.7 -r1.8 |
111 |
--- goffice-0.4.3.ebuild 2 Jan 2008 14:28:46 -0000 1.7 |
112 |
+++ goffice-0.4.3.ebuild 2 Jan 2008 22:55:12 -0000 1.8 |
113 |
@@ -1,6 +1,6 @@ |
114 |
# Copyright 1999-2008 Gentoo Foundation |
115 |
# Distributed under the terms of the GNU General Public License v2 |
116 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.4.3.ebuild,v 1.7 2008/01/02 14:28:46 armin76 Exp $ |
117 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.4.3.ebuild,v 1.8 2008/01/02 22:55:12 eva Exp $ |
118 |
|
119 |
inherit eutils gnome2 flag-o-matic |
120 |
|
121 |
@@ -37,12 +37,30 @@ |
122 |
pkg_setup() { |
123 |
G2CONF="${G2CONF} $(use_with gnome)" |
124 |
|
125 |
+ local diemessage="" |
126 |
+ |
127 |
if use gnome && ! built_with_use gnome-extra/libgsf gnome; then |
128 |
eerror "Please rebuild gnome-extra/libgsf with gnome support enabled" |
129 |
- eerror "USE=\"gnome\" emerge gnome-extra/libgsf" |
130 |
+ eerror "echo \"gnome-extra/libgsf gnome\" >> /etc/portage/package.use" |
131 |
eerror "or add \"gnome\" to your USE string in /etc/make.conf" |
132 |
- die "No Gnome support found in libgsf" |
133 |
+ diemessage="No Gnome support found in libgsf." |
134 |
+ fi |
135 |
+ |
136 |
+ if ! built_with_use x11-libs/cairo svg; then |
137 |
+ eerror "Please rebuild x11-libs/cairo with svg support enabled" |
138 |
+ eerror "echo \"x11-libs/cairo svg\" >> /etc/portage/package.use" |
139 |
+ eerror "emerge -1 x11-libs/cairo" |
140 |
+ diemessage="${diemessage} No SVG support found in cairo." |
141 |
fi |
142 |
+ |
143 |
+ if ! built_with_use dev-libs/libpcre unicode; then |
144 |
+ eerror "Please rebuild dev-libs/libpcre with unicode support enabled" |
145 |
+ eerror "echo \"dev-libs/libpcre unicode\" >> /etc/portage/package.use" |
146 |
+ eerror "emerge -1 dev-libs/libpcre" |
147 |
+ diemessage="${diemessage} No unicode support found in libpcre." |
148 |
+ fi |
149 |
+ |
150 |
+ [ -n "${diemessage}" ] && die ${diemessage} |
151 |
} |
152 |
|
153 |
src_unpack() { |
154 |
|
155 |
|
156 |
|
157 |
-- |
158 |
gentoo-commits@g.o mailing list |