Use pregenerated manpages wrt #320731 by Martin Väth.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-power/pm-utils/ChangeLog b/sys-power/pm-utils/ChangeLog
index aa076c86d4bd656bdb52763f9406adb6ea7602d8..4a20d7a2399df0a852da13c30c1413522bfc40a9 100644 (file)
--- a/sys-power/pm-utils/ChangeLog
+++ b/sys-power/pm-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/pm-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.41 2010/05/17 07:01:13 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.42 2010/05/20 17:50:11 ssuominen Exp $
+
+  20 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  pm-utils-1.3.0-r3.ebuild, +files/1.3.0-fix_autotools-2.patch:
+  Use pregenerated manpages wrt #320731 by Martin Väth.
 
   17 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   pm-utils-1.3.0-r2.ebuild:

diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest
index 9c666af03bf94f7c2843a3cf8b947a00b335ba33..c89ebd0f24ba06f41be3bab935b5e64ef23ba42c 100644 (file)
--- a/sys-power/pm-utils/Manifest
+++ b/sys-power/pm-utils/Manifest
@@ -1,9 +1,10 @@
+AUX 1.3.0-fix_autotools-2.patch 442 RMD160 12aa47374131bb76ab360c9c434c80e371c73721 SHA1 f439c5b5f6d9abfb331371f14c2da8c4e8572d07 SHA256 177210c01d3048e9641505ea8e4474a8535b4f5398d49345f361ee8cd07959de
 AUX 1.3.0-fix_autotools.patch 1858 RMD160 75f3cf306ce146f0fdeb21db1c73b9271c88b0b9 SHA1 8a94d9e6d096fed747cbb0a99bdea439e52ff1c8 SHA256 911e25a3565addb2cd8222e503ac9b98ca285e6ab83577b7f8032c8f1e32b32d
 AUX 1.3.0-on_ac_power-upower.patch 2948 RMD160 5ffeff42862ac80eef619bc10391b3d1047ec8cf SHA1 86c7d9dfc59c7ba75e1bcb68f9f1600b34faf656 SHA256 95c776aa43bba1f364e813691294726c9c4ff825454fe2d6c729380b17ab4392
 DIST pm-utils-1.2.5.tar.gz 174592 RMD160 987a795e0cada9aeabcab2053d1de33af2635e7a SHA1 1e413f65d947179a675ab5d1ee1ac4dd06314cb6 SHA256 84cf07c7771ffe91c1b6f3a60c43fc76a44ae8d6c90e47bfdd6b1a7482a0e4ce
 DIST pm-utils-1.3.0.tar.gz 197344 RMD160 52d257a5440bbdafd7d814351b9a59deb36536ba SHA1 30f6c0a7f470d2c2874d3b13046c1883363c06f3 SHA256 586cc4a6d40e5d659d9d634ba9d3cde6268a0543fd7f29026a3069bcd726806e
 EBUILD pm-utils-1.2.5.ebuild 1631 RMD160 5197fae7c6da3c3ecbf0ec5431d94c31d8874f1c SHA1 cf7d15cb07f376503b1a47771b5d467431620bf7 SHA256 6cd03cb334243d6dcaa75fc8e684176842ebabc0d633add68001b9d220b3fa67
 EBUILD pm-utils-1.3.0-r2.ebuild 1522 RMD160 c78f6c607bde8cb32d7904512b305e4ae71d32a6 SHA1 c8506baf7f03b93b660fe18e4d24a03cbf9baa36 SHA256 8b39e5034b9c3811822028d8199e7dfc1ae05d6c15107b48cebbfb2853c8da2f
-EBUILD pm-utils-1.3.0-r3.ebuild 1622 RMD160 338b3f4dad47714f4e2d97c00fe06df2de0c6801 SHA1 9ce0866ca8e323803d44fe151d0ae9143c3bc43e SHA256 7b0b082b98b4bc6058dc9f21eda945e890160df42198562f31c12cdc9db99157
-MISC ChangeLog 6243 RMD160 d777dfe442fc3e4a2677d92e7b32d8610d328cee SHA1 26facd4f91f1eb584d226b611e23bc6689cbe5e5 SHA256 24848d0468ad66bb5487dce308d583bcd1bcb43c027670cf83ecb0f32381f312
+EBUILD pm-utils-1.3.0-r3.ebuild 1647 RMD160 8e4e835fed8a5bf89323d8da9ab88eb5b2bb5302 SHA1 9ca590f5c70b15c5f90e7776fd171f2bfb21b1eb SHA256 f340a6755589810b767011c03582417211c2726761431d647eb3e77d35249ca8
+MISC ChangeLog 6418 RMD160 c74989691825b8cfbff7aba49294efdb9c1c738d SHA1 25c34adb654ffea6e4dbcf9411ee7bb4530d1371 SHA256 7066cb8238eff0373cabe34a3e2915e5604c459197a89407d2c047956ddbb1e8
 MISC metadata.xml 333 RMD160 28ff42d27d929095e83151b3a6bc06e9acdc1a10 SHA1 bd2334f7ff7c962f0d98678472e7feb673b942b6 SHA256 f06c34f767b411fcbc763a18bfd022d40fd4eb7fb38d3d14473a47064685bbda

diff --git a/sys-power/pm-utils/files/1.3.0-fix_autotools-2.patch b/sys-power/pm-utils/files/1.3.0-fix_autotools-2.patch
new file mode 100644 (file)
index 0000000..d40e731
--- /dev/null
+++ b/sys-power/pm-utils/files/1.3.0-fix_autotools-2.patch
@@ -0,0 +1,28 @@
+http://bugs.gentoo.org/320731
+
+--- man/Makefile.am
++++ man/Makefile.am
+@@ -5,9 +5,7 @@
+       pm-powersave.8          \
+       pm-action.8
+ 
+-if HAVE_XMLTO
+ man_MANS = $(pm_mans)
+-endif
+ 
+ EXTRA_DIST =                  \
+       on_ac_power.xml         \
+@@ -20,11 +18,13 @@
+ MAINTAINERCLEANFILES =                \
+       $(pm_mans)
+ 
++if HAVE_XMLTO
+ .xml.1:
+       $(XMLTO) man $<
+ 
+ .xml.8:
+       $(XMLTO) man $<
++endif
+ 
+ install-data-hook: install-man
+       @if test -f $(DESTDIR)$(mandir)/man8/pm-action.8; then \

diff --git a/sys-power/pm-utils/pm-utils-1.3.0-r3.ebuild b/sys-power/pm-utils/pm-utils-1.3.0-r3.ebuild
index c58ab1b07e8adefc4378cf7cf9d76da70a6dbaf4..1cccf806b040b208c8ec78f7176ff73f0eccedbb 100644 (file)
--- a/sys-power/pm-utils/pm-utils-1.3.0-r3.ebuild
+++ b/sys-power/pm-utils/pm-utils-1.3.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.3.0-r3.ebuild,v 1.1 2010/05/14 19:37:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.3.0-r3.ebuild,v 1.2 2010/05/20 17:50:11 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils multilib
@@ -26,8 +26,7 @@ RDEPEND="
        amd64? ( ${vbetool} )
        x86? ( ${vbetool} )
        video_cards_radeon? ( app-laptop/radeontool )"
-DEPEND="app-text/xmlto
-       app-text/docbook-xml-dtd:4.5"
+DEPEND=""
 
 src_prepare() {
        local ignore="01grub"
@@ -38,6 +37,7 @@ src_prepare() {
        echo "HOOK_BLACKLIST=\"${ignore}\"" >> "${S}/gentoo"
 
        epatch "${FILESDIR}"/${PV}-fix_autotools.patch \
+               "${FILESDIR}"/${PV}-fix_autotools-2.patch \
                "${FILESDIR}"/${PV}-on_ac_power-upower.patch
 
        sed -i \
@@ -49,7 +49,8 @@ src_prepare() {
 
 src_configure() {
        econf \
-               --docdir=/usr/share/doc/${PF}
+               --docdir=/usr/share/doc/${PF} \
+               --disable-manpages
 }
 
 src_install() {