diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-06-05 03:31:20 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-06-05 03:31:20 +0000 |
| commit | 07b0b74a7694db64f9599e22c238fa886732ad17 (patch) | |
| tree | c1c78b721e96c3f38d3255edb49696349e6f533c /sys-power | |
| parent | bump; add pypy support, tidy, closes Bug # 512152 by kensington (diff) | |
| download | gentoo-2-07b0b74a7694db64f9599e22c238fa886732ad17.tar.gz gentoo-2-07b0b74a7694db64f9599e22c238fa886732ad17.tar.bz2 gentoo-2-07b0b74a7694db64f9599e22c238fa886732ad17.zip | |
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)
Diffstat (limited to 'sys-power')
| -rw-r--r-- | sys-power/upower/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-power/upower/upower-0.99.0-r1.ebuild | 17 |
2 files changed, 15 insertions, 9 deletions
diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog index 82e1a1debe01..e4cee489747a 100644 --- a/sys-power/upower/ChangeLog +++ b/sys-power/upower/ChangeLog @@ -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 <ssuominen@gentoo.org> 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) diff --git a/sys-power/upower/upower-0.99.0-r1.ebuild b/sys-power/upower/upower-0.99.0-r1.ebuild index ac830d5a352d..56ac11d14b36 100644 --- a/sys-power/upower/upower-0.99.0-r1.ebuild +++ b/sys-power/upower/upower-0.99.0-r1.ebuild @@ -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 @@ SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz" 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 @@ DEPEND="${RDEPEND} 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 @@ src_configure() { --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_configure() { 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 } |