Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-power/upower: upower-0.99.0-r1.ebuild ChangeLog
Date: Thu, 05 Jun 2014 03:31:26
Message-Id: 20140605033121.2682520036@flycatcher.gentoo.org
1 ssuominen 14/06/05 03:31:21
2
3 Modified: upower-0.99.0-r1.ebuild ChangeLog
4 Log:
5 Remove USE="doc" and dev-util/gtk-doc dependency and install prebuilt copies wrt #487400 to avoid parallel build failure. Create a compability symlink for dev-util/devhelp.
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
8
9 Revision Changes Path
10 1.2 sys-power/upower/upower-0.99.0-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/upower/upower-0.99.0-r1.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/upower/upower-0.99.0-r1.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/upower/upower-0.99.0-r1.ebuild?r1=1.1&r2=1.2
15
16 Index: upower-0.99.0-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.99.0-r1.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- upower-0.99.0-r1.ebuild 4 Jun 2014 21:25:54 -0000 1.1
23 +++ upower-0.99.0-r1.ebuild 5 Jun 2014 03:31:20 -0000 1.2
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.99.0-r1.ebuild,v 1.1 2014/06/04 21:25:54 ssuominen Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.99.0-r1.ebuild,v 1.2 2014/06/05 03:31:20 ssuominen Exp $
29
30 EAPI=5
31 inherit eutils systemd
32 @@ -12,7 +12,7 @@
33 LICENSE="GPL-2"
34 SLOT="0/2" # based on SONAME of libupower-glib.so
35 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
36 -IUSE="doc +introspection ios kernel_FreeBSD kernel_linux"
37 +IUSE="+introspection ios kernel_FreeBSD kernel_linux"
38
39 RDEPEND=">=dev-libs/dbus-glib-0.100
40 >=dev-libs/glib-2.30
41 @@ -32,11 +32,7 @@
42 dev-libs/libxslt
43 app-text/docbook-xsl-stylesheets
44 dev-util/intltool
45 - virtual/pkgconfig
46 - doc? (
47 - dev-util/gtk-doc
48 - app-text/docbook-xml-dtd:4.1.2
49 - )"
50 + virtual/pkgconfig"
51
52 QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
53
54 @@ -70,7 +66,6 @@
55 --disable-static \
56 ${myconf} \
57 --enable-man-pages \
58 - $(use_enable doc gtk-doc) \
59 --disable-tests \
60 --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
61 --with-backend=${backend} \
62 @@ -81,6 +76,12 @@
63
64 src_install() {
65 default
66 +
67 + # http://bugs.gentoo.org/487400
68 + insinto /usr/share/doc/${PF}/html/UPower
69 + doins doc/html/*
70 + dosym /usr/share/doc/${PF}/html/UPower /usr/share/gtk-doc/html/UPower
71 +
72 keepdir /var/lib/upower #383091
73 prune_libtool_files
74 }
75
76
77
78 1.155 sys-power/upower/ChangeLog
79
80 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/upower/ChangeLog?rev=1.155&view=markup
81 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/upower/ChangeLog?rev=1.155&content-type=text/plain
82 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/upower/ChangeLog?r1=1.154&r2=1.155
83
84 Index: ChangeLog
85 ===================================================================
86 RCS file: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v
87 retrieving revision 1.154
88 retrieving revision 1.155
89 diff -u -r1.154 -r1.155
90 --- ChangeLog 4 Jun 2014 21:25:54 -0000 1.154
91 +++ ChangeLog 5 Jun 2014 03:31:20 -0000 1.155
92 @@ -1,6 +1,11 @@
93 # ChangeLog for sys-power/upower
94 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
95 -# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.154 2014/06/04 21:25:54 ssuominen Exp $
96 +# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.155 2014/06/05 03:31:20 ssuominen Exp $
97 +
98 + 05 Jun 2014; Samuli Suominen <ssuominen@g.o> upower-0.99.0-r1.ebuild:
99 + Remove USE="doc" and dev-util/gtk-doc dependency and install prebuilt copies
100 + wrt #487400 to avoid parallel build failure. Create a compability symlink for
101 + dev-util/devhelp.
102
103 *upower-0.99.0-r1 (04 Jun 2014)