ssuominen    14/06/05 03:31:21

  Modified:             upower-0.99.0-r1.ebuild ChangeLog
  Log:
  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.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
4868F14D)

Revision  Changes    Path
1.2                  sys-power/upower/upower-0.99.0-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/upower/upower-0.99.0-r1.ebuild?rev=1.2&view=markup
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
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/upower/upower-0.99.0-r1.ebuild?r1=1.1&r2=1.2

Index: upower-0.99.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.99.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upower-0.99.0-r1.ebuild     4 Jun 2014 21:25:54 -0000       1.1
+++ upower-0.99.0-r1.ebuild     5 Jun 2014 03:31:20 -0000       1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 EAPI=5
 inherit eutils systemd
@@ -12,7 +12,7 @@
 LICENSE="GPL-2"
 SLOT="0/2" # based on SONAME of libupower-glib.so
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc +introspection ios kernel_FreeBSD kernel_linux"
+IUSE="+introspection ios kernel_FreeBSD kernel_linux"
 
 RDEPEND=">=dev-libs/dbus-glib-0.100
        >=dev-libs/glib-2.30
@@ -32,11 +32,7 @@
        dev-libs/libxslt
        app-text/docbook-xsl-stylesheets
        dev-util/intltool
-       virtual/pkgconfig
-       doc? (
-               dev-util/gtk-doc
-               app-text/docbook-xml-dtd:4.1.2
-               )"
+       virtual/pkgconfig"
 
 QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
 
@@ -70,7 +66,6 @@
                --disable-static \
                ${myconf} \
                --enable-man-pages \
-               $(use_enable doc gtk-doc) \
                --disable-tests \
                --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
                --with-backend=${backend} \
@@ -81,6 +76,12 @@
 
 src_install() {
        default
+
+       # http://bugs.gentoo.org/487400
+       insinto /usr/share/doc/${PF}/html/UPower
+       doins doc/html/*
+       dosym /usr/share/doc/${PF}/html/UPower /usr/share/gtk-doc/html/UPower
+
        keepdir /var/lib/upower #383091
        prune_libtool_files
 }



1.155                sys-power/upower/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/upower/ChangeLog?rev=1.155&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/upower/ChangeLog?rev=1.155&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/upower/ChangeLog?r1=1.154&r2=1.155

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- ChangeLog   4 Jun 2014 21:25:54 -0000       1.154
+++ ChangeLog   5 Jun 2014 03:31:20 -0000       1.155
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/upower
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.154 
2014/06/04 21:25:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.155 
2014/06/05 03:31:20 ssuominen Exp $
+
+  05 Jun 2014; Samuli Suominen <[email protected]> upower-0.99.0-r1.ebuild:
+  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.
 
 *upower-0.99.0-r1 (04 Jun 2014)
 




Reply via email to