1 |
pacho 11/02/25 08:38:04 |
2 |
|
3 |
Modified: ChangeLog gnome-power-manager-2.32.0.ebuild |
4 |
Log: |
5 |
Run docbook2man sed in proper place (like in 2.30) to prevent HAVE_DOCBOOK2MAN_TRUE to be regenerated (bug #356277 by Robin Johnson). |
6 |
|
7 |
(Portage version: 2.1.9.41/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.150 gnome-extra/gnome-power-manager/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog?rev=1.150&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog?rev=1.150&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog?r1=1.149&r2=1.150 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v |
19 |
retrieving revision 1.149 |
20 |
retrieving revision 1.150 |
21 |
diff -u -r1.149 -r1.150 |
22 |
--- ChangeLog 24 Feb 2011 19:32:13 -0000 1.149 |
23 |
+++ ChangeLog 25 Feb 2011 08:38:04 -0000 1.150 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for gnome-extra/gnome-power-manager |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.149 2011/02/24 19:32:13 tomka Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.150 2011/02/25 08:38:04 pacho Exp $ |
29 |
+ |
30 |
+ 25 Feb 2011; Pacho Ramos <pacho@g.o> |
31 |
+ gnome-power-manager-2.32.0.ebuild: |
32 |
+ Run docbook2man sed in proper place (like in 2.30) to prevent |
33 |
+ HAVE_DOCBOOK2MAN_TRUE to be regenerated (bug #356277 by Robin Johnson). |
34 |
|
35 |
24 Feb 2011; Thomas Kahle <tomka@g.o> |
36 |
gnome-power-manager-2.32.0.ebuild: |
37 |
|
38 |
|
39 |
|
40 |
1.11 gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild?rev=1.11&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild?rev=1.11&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild?r1=1.10&r2=1.11 |
45 |
|
46 |
Index: gnome-power-manager-2.32.0.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild,v |
49 |
retrieving revision 1.10 |
50 |
retrieving revision 1.11 |
51 |
diff -u -r1.10 -r1.11 |
52 |
--- gnome-power-manager-2.32.0.ebuild 24 Feb 2011 19:32:13 -0000 1.10 |
53 |
+++ gnome-power-manager-2.32.0.ebuild 25 Feb 2011 08:38:04 -0000 1.11 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2011 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild,v 1.10 2011/02/24 19:32:13 tomka Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild,v 1.11 2011/02/25 08:38:04 pacho Exp $ |
59 |
|
60 |
EAPI="3" |
61 |
GCONF_DEBUG="no" |
62 |
@@ -80,14 +80,6 @@ |
63 |
sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \ |
64 |
-i configure.ac configure || die "debugger sed failed" |
65 |
|
66 |
- if ! use doc; then |
67 |
- # Remove the docbook2man rules here since it's not handled by a proper |
68 |
- # parameter in configure.in. |
69 |
- sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' \ |
70 |
- -i man/Makefile.am man/Makefile.in \ |
71 |
- || die "docbook sed failed" |
72 |
- fi |
73 |
- |
74 |
# glibc splits this out, whereas other libc's do not tend to |
75 |
if use elibc_glibc; then |
76 |
sed -e 's/-lresolv//' \ |
77 |
@@ -97,6 +89,14 @@ |
78 |
# FIXME: This is required to prevent maintainer mode after "debugger sed" |
79 |
intltoolize --force --copy --automake || die "intltoolize failed" |
80 |
eautoreconf |
81 |
+ |
82 |
+ # This needs to be after eautoreconf to prevent problems like bug #356277 |
83 |
+ if ! use doc; then |
84 |
+ # Remove the docbook2man rules here since it's not handled by a proper |
85 |
+ # parameter in configure.in. |
86 |
+ sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \ |
87 |
+ || die "docbook sed failed" |
88 |
+ fi |
89 |
} |
90 |
|
91 |
src_test() { |