1 |
eva 09/09/28 19:37:53 |
2 |
|
3 |
Modified: ChangeLog gnome-power-manager-2.24.4-r2.ebuild |
4 |
gnome-power-manager-2.26.4.ebuild |
5 |
Log: |
6 |
Fix build with USE=-doc, bug #286728. |
7 |
(Portage version: 2.2_rc42/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.109 gnome-extra/gnome-power-manager/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog?rev=1.109&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog?rev=1.109&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog?r1=1.108&r2=1.109 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v |
19 |
retrieving revision 1.108 |
20 |
retrieving revision 1.109 |
21 |
diff -u -r1.108 -r1.109 |
22 |
--- ChangeLog 9 Aug 2009 18:31:49 -0000 1.108 |
23 |
+++ ChangeLog 28 Sep 2009 19:37:52 -0000 1.109 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for gnome-extra/gnome-power-manager |
26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.108 2009/08/09 18:31:49 eva Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.109 2009/09/28 19:37:52 eva Exp $ |
29 |
+ |
30 |
+ 28 Sep 2009; Gilles Dartiguelongue <eva@g.o> |
31 |
+ gnome-power-manager-2.24.4-r2.ebuild, gnome-power-manager-2.26.4.ebuild: |
32 |
+ Fix build with USE=-doc, bug #286728. |
33 |
|
34 |
*gnome-power-manager-2.26.4 (09 Aug 2009) |
35 |
|
36 |
|
37 |
|
38 |
|
39 |
1.2 gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r2.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r2.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r2.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r2.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: gnome-power-manager-2.24.4-r2.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r2.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -u -r1.1 -r1.2 |
51 |
--- gnome-power-manager-2.24.4-r2.ebuild 2 May 2009 18:26:31 -0000 1.1 |
52 |
+++ gnome-power-manager-2.24.4-r2.ebuild 28 Sep 2009 19:37:52 -0000 1.2 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2009 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r2.ebuild,v 1.1 2009/05/02 18:26:31 dang Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r2.ebuild,v 1.2 2009/09/28 19:37:52 eva Exp $ |
58 |
|
59 |
inherit autotools eutils gnome2 virtualx |
60 |
|
61 |
@@ -72,12 +72,6 @@ |
62 |
src_unpack() { |
63 |
gnome2_src_unpack |
64 |
|
65 |
- if ! use doc; then |
66 |
- # Remove the docbook2man rules here since it's not handled by a proper |
67 |
- # parameter in configure.in. |
68 |
- sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i "${S}/man/Makefile.in" || die "sed 1 failed" |
69 |
- fi |
70 |
- |
71 |
# Fix cpufreq-regression bug #247614 |
72 |
epatch "${WORKDIR}/${P}-cpufreq-libhal-glib.patch" |
73 |
epatch "${WORKDIR}/${P}-cpufreq-support.patch" |
74 |
@@ -90,6 +84,13 @@ |
75 |
rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed" |
76 |
eautoreconf |
77 |
|
78 |
+ if ! use doc; then |
79 |
+ # Remove the docbook2man rules here since it's not handled by a proper |
80 |
+ # parameter in configure.in. |
81 |
+ sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' \ |
82 |
+ -i "${S}/man/Makefile.in" || die "sed 1 failed" |
83 |
+ fi |
84 |
+ |
85 |
# glibc splits this out, whereas other libc's do not tend to |
86 |
use elibc_glibc || sed -e 's/-lresolv//' -i configure || die "sed 2 failed" |
87 |
} |
88 |
|
89 |
|
90 |
|
91 |
1.2 gnome-extra/gnome-power-manager/gnome-power-manager-2.26.4.ebuild |
92 |
|
93 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.26.4.ebuild?rev=1.2&view=markup |
94 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.26.4.ebuild?rev=1.2&content-type=text/plain |
95 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.26.4.ebuild?r1=1.1&r2=1.2 |
96 |
|
97 |
Index: gnome-power-manager-2.26.4.ebuild |
98 |
=================================================================== |
99 |
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.26.4.ebuild,v |
100 |
retrieving revision 1.1 |
101 |
retrieving revision 1.2 |
102 |
diff -u -r1.1 -r1.2 |
103 |
--- gnome-power-manager-2.26.4.ebuild 9 Aug 2009 18:31:49 -0000 1.1 |
104 |
+++ gnome-power-manager-2.26.4.ebuild 28 Sep 2009 19:37:52 -0000 1.2 |
105 |
@@ -1,6 +1,6 @@ |
106 |
# Copyright 1999-2009 Gentoo Foundation |
107 |
# Distributed under the terms of the GNU General Public License v2 |
108 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.26.4.ebuild,v 1.1 2009/08/09 18:31:49 eva Exp $ |
109 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.26.4.ebuild,v 1.2 2009/09/28 19:37:52 eva Exp $ |
110 |
|
111 |
EAPI="2" |
112 |
|
113 |
@@ -78,12 +78,6 @@ |
114 |
src_prepare() { |
115 |
gnome2_src_prepare |
116 |
|
117 |
- if ! use doc; then |
118 |
- # Remove the docbook2man rules here since it's not handled by a proper |
119 |
- # parameter in configure.in. |
120 |
- sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i "${S}/man/Makefile.in" || die "sed 1 failed" |
121 |
- fi |
122 |
- |
123 |
# Drop debugger CFLAGS |
124 |
sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' -i configure.ac \ |
125 |
|| die "sed 2 failed" |
126 |
@@ -110,6 +104,13 @@ |
127 |
rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed" |
128 |
eautoreconf |
129 |
|
130 |
+ if ! use doc; then |
131 |
+ # Remove the docbook2man rules here since it's not handled by a proper |
132 |
+ # parameter in configure.in. |
133 |
+ sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' \ |
134 |
+ -i "${S}/man/Makefile.in" || die "sed 1 failed" |
135 |
+ fi |
136 |
+ |
137 |
# glibc splits this out, whereas other libc's do not tend to |
138 |
use elibc_glibc || sed -e 's/-lresolv//' -i configure || die "sed 4 failed" |
139 |
} |