Change patch from --enable-doc to --enable-manpages and always build them (no point...

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 16536c5511faa89a359439c9d41f5dce9794f389..e849b8213b5b0327a7535c7a01eba1852b793c89 100644 (file)
--- a/sys-power/pm-utils/ChangeLog
+++ b/sys-power/pm-utils/ChangeLog
@@ -1,6 +1,11 @@
 # 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.36 2010/04/20 20:20:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.37 2010/05/03 19:31:50 ssuominen Exp $
+
+  03 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  files/1.3.0-fix_autotools.patch, pm-utils-1.3.0-r2.ebuild:
+  Change patch from --enable-doc to --enable-manpages and always build them
+  (no point in avoiding small xmlto depend).
 
   20 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
   pm-utils-1.3.0-r2.ebuild:

diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest
index 250df348d938ee388ad8d764657b4a98f4e88eee..db8ec420e19d070acdbb2de02fab528b158987a9 100644 (file)
--- a/sys-power/pm-utils/Manifest
+++ b/sys-power/pm-utils/Manifest
@@ -1,8 +1,8 @@
-AUX 1.3.0-fix_autotools.patch 1965 RMD160 7a05f0c4774531d2cac75f42750eac7ca16774d0 SHA1 e4fa3a0d72f94126f898bef06c9193f8810df49c SHA256 2c6dc817cf72ff6ce5a5d4e56a7fc7ad4f5bc0d8bcaecf4d9a9e04628c2a9ece
+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 1596 RMD160 aedba23e40935d180c137c74abfadcd7ef00da27 SHA1 5a197b0d9707fa4459bf4876d970c37b31d10e31 SHA256 bde11157ca03284485d709692ea7eb531a38a08d4ec33c1a9675d09e5e6b1586
-MISC ChangeLog 5481 RMD160 22b0242027584b08949909721ff0d7be44e69cc3 SHA1 4331aa46e914124285079986ed232182f6fd1bda SHA256 190b4fa32a223d47f705f5408364f5b5bb3e8060f7dfc928b4b3804a964aba67
-MISC metadata.xml 250 RMD160 08588db6e1637c16aa4063e7cbb1f954e55a3445 SHA1 da190958f6305db16f8e39b0acacf4e0547bb7f4 SHA256 558a1eef7dd3a566d55bd1d69a9eb1b0fba9b30a77e181af3011afb99d040ceb
+EBUILD pm-utils-1.3.0-r2.ebuild 1494 RMD160 09f2d010b93a241ab6483f68ddbc3b49922c368f SHA1 b77f9b081c2be4fdfd50ad33f023457d3a535a3f SHA256 80464aa57595e1d126a7cb8ffdecc5afaa49f8d41164f42d794c3113cada61ad
+MISC ChangeLog 5718 RMD160 3f926414720feca64c1ed517f959e326c0524a3b SHA1 5b9df35ad2135cbd46082cc528d0e790b6272a86 SHA256 cb2d8d2379e865192a1789e87d71878a52594d336b92eae9677346bb52685144
+MISC metadata.xml 333 RMD160 28ff42d27d929095e83151b3a6bc06e9acdc1a10 SHA1 bd2334f7ff7c962f0d98678472e7feb673b942b6 SHA256 f06c34f767b411fcbc763a18bfd022d40fd4eb7fb38d3d14473a47064685bbda

diff --git a/sys-power/pm-utils/files/1.3.0-fix_autotools.patch b/sys-power/pm-utils/files/1.3.0-fix_autotools.patch
index e2c7a6401b941edb05ad2e174c0a03b442ab3f4c..8dda68cffb804862d03ade9193802635d5dea014 100644 (file)
--- a/sys-power/pm-utils/files/1.3.0-fix_autotools.patch
+++ b/sys-power/pm-utils/files/1.3.0-fix_autotools.patch
@@ -1,6 +1,7 @@
-diff -urN pm-utils-1.3.0.old//configure.ac pm-utils-1.3.0/configure.ac
---- pm-utils-1.3.0.old//configure.ac   2010-03-15 04:44:45.000000000 +0100
-+++ pm-utils-1.3.0/configure.ac        2010-04-04 17:00:13.000000000 +0200
+./configure --disable-manpages for controlling xmlto depend
+
+--- configure.ac
++++ configure.ac
 @@ -8,28 +8,28 @@
  AC_PROG_LN_S
  
@@ -27,8 +28,8 @@ diff -urN pm-utils-1.3.0.old//configure.ac pm-utils-1.3.0/configure.ac
 -AC_SUBST(DATADIR, $datadir)
 -AC_SUBST(BINDIR, $bindir)
 -AC_SUBST(SBINDIR, $sbindir)
-+AC_ARG_ENABLE([doc],
-+      AC_HELP_STRING([--disable-doc],
++AC_ARG_ENABLE([manpages],
++      AC_HELP_STRING([--disable-manpages],
 +              [Disable manpage generating via xmlto [[default=auto]]]),
 +      [MAN="$enableval"],
 +      [MAN=auto])

diff --git a/sys-power/pm-utils/metadata.xml b/sys-power/pm-utils/metadata.xml
index 4c187dcac9664812f5a67f5be6a2da9f7d6d8930..e1f7c983143514ad8f3091a8a978eb9533bb74e9 100644 (file)
--- a/sys-power/pm-utils/metadata.xml
+++ b/sys-power/pm-utils/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-       <herd>freedesktop</herd>
-       <use>
-               <flag name='ntp'>install support for <pkg>net-misc/ntp</pkg></flag>
-       </use>
+  <herd>freedesktop</herd>
+  <maintainer>
+    <email>freedesktop-bugs@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="ntp">Install support for <pkg>net-misc/ntp</pkg></flag>
+  </use>
 </pkgmetadata>

diff --git a/sys-power/pm-utils/pm-utils-1.3.0-r2.ebuild b/sys-power/pm-utils/pm-utils-1.3.0-r2.ebuild
index f6cda725fa028c7530574c1330c8128eb637b079..cefba347b0c42c86b337df92bc7ba9603bf12bd8 100644 (file)
--- a/sys-power/pm-utils/pm-utils-1.3.0-r2.ebuild
+++ b/sys-power/pm-utils/pm-utils-1.3.0-r2.ebuild
@@ -1,10 +1,9 @@
 # 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-r2.ebuild,v 1.2 2010/04/20 20:20:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.3.0-r2.ebuild,v 1.3 2010/05/03 19:31:50 ssuominen Exp $
 
-EAPI="2"
-
-inherit autotools base
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="Suspend and hibernation utilities"
 HOMEPAGE="http://pm-utils.freedesktop.org/"
@@ -13,7 +12,7 @@ SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="alsa debug doc networkmanager ntp video_cards_intel video_cards_radeon"
+IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon"
 
 vbetool="!video_cards_intel? ( sys-apps/vbetool )"
 RDEPEND="
@@ -26,14 +25,8 @@ RDEPEND="
        ntp? ( net-misc/ntp )
        amd64? ( ${vbetool} )
        x86? ( ${vbetool} )
-       video_cards_radeon? ( app-laptop/radeontool )
-"
-DEPEND="doc? ( app-text/xmlto )"
-
-PATCHES=(
-       "${FILESDIR}/${PV}-fix_autotools.patch"
-       "${FILESDIR}/${PV}-on_ac_power-upower.patch"
-)
+       video_cards_radeon? ( app-laptop/radeontool )"
+DEPEND="app-text/xmlto"
 
 src_prepare() {
        local ignore="01grub"
@@ -43,23 +36,21 @@ src_prepare() {
        use debug && echo 'PM_DEBUG="true"' > "${S}/gentoo"
        echo "HOOK_BLACKLIST=\"${ignore}\"" >> "${S}/gentoo"
 
-       # write makefile patch
-       base_src_prepare
+       epatch "${FILESDIR}"/${PV}-fix_autotools.patch \
+               "${FILESDIR}"/${PV}-on_ac_power-upower.patch
 
        eautoreconf
 }
 
 src_configure() {
        econf \
-               --docdir=/usr/share/doc/${PF} \
-               $(use_enable doc)
+               --docdir=/usr/share/doc/${PF}
 }
 
 src_install() {
-       base_src_install
-
-       dodoc AUTHORS ChangeLog NEWS pm/HOWTO* README* TODO || die "dodoc failed"
+       emake DESTDIR="${D}" install || die
+       dodoc AUTHORS ChangeLog NEWS pm/HOWTO* README* TODO || die
 
-       insinto /etc/pm/config.d/
-       doins "${S}/gentoo" || die "doins failed"
+       insinto /etc/pm/config.d
+       doins gentoo || die
 }