old

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

4 files changed, 4 insertions, 97 deletions

diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest
index 1227de82c351..57e3e0e9f129 100644
--- a/sys-power/pm-utils/Manifest
+++ b/sys-power/pm-utils/Manifest
@@ -1,12 +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
 DIST pm-utils-1.4.0.tar.gz 210724 RMD160 67d8e5478c7fcc946396969a11a6f4cf765777c8 SHA1 28e338c84d73b38e233f5f0b2efc1056f040359a SHA256 317d1e47a7c8530687442cb8b77e7f6d0380d4f0aeb37b851dbba54c2654927e
-EBUILD pm-utils-1.2.5.ebuild 1632 RMD160 daa196066e6e2f256d094ca86b6444811febf112 SHA1 6e62adb33818d22c27f9fd8e5c835b72dba13951 SHA256 73a21fd58ed975c85c3ab486ce049834e1e807711687284cc12ffaf87d6f795e
+EBUILD pm-utils-1.2.5.ebuild 1618 RMD160 f855cbb698ffd307c6f763d9677f7e1976dee575 SHA1 d68369667f64a5ff2bdd995ecee78ba5be00c1a7 SHA256 3107090f4ba4a7e46a03c5d055812ef9b05772ff2bca49f25b7795a63f726121
 EBUILD pm-utils-1.3.0-r2.ebuild 1524 RMD160 cb102a88a1777ce3fa001327de4d87cea9b8a81d SHA1 879c8770fef27bdc6598786034b17a2d4339346c SHA256 c7dc79e0a59f0ca6d471248012a9b5a0b1730fde757052a12482339045536602
-EBUILD pm-utils-1.3.0-r3.ebuild 1650 RMD160 4e810d59d87f752282718ef15247a290dad52078 SHA1 052242d8a45e9e0c57d9dd43ab99127606182727 SHA256 4f12d9a40d0ff1733653bd502ac4fdeaf29006d6a639e59c4be10ba1604195bb
 EBUILD pm-utils-1.4.0.ebuild 1574 RMD160 2ddba7c53062a506571312ec46a627c6d27b335d SHA1 5b8ce968f78226ab697af81f6d45fe20e3371957 SHA256 2cd3d48a71a7b675dcae706768d8b49010b607784e600738d229f516f454ce52
 MISC ChangeLog 6952 RMD160 479fd8411209a60205546a18965242ea8b12de4e SHA1 d8f71c0f9abba928d9b9444f3c9201ae72e883bd SHA256 1f9fbe860f281e20f48a0135f51f7e761e0fabd02fbd7c800892c6d517259ce3
 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
deleted file mode 100644
index d40e731c1a67..000000000000
--- a/sys-power/pm-utils/files/1.3.0-fix_autotools-2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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.2.5.ebuild b/sys-power/pm-utils/pm-utils-1.2.5.ebuild
index cb5002c81061..8c58899aa6ca 100644
--- a/sys-power/pm-utils/pm-utils-1.2.5.ebuild
+++ b/sys-power/pm-utils/pm-utils-1.2.5.ebuild
@@ -1,9 +1,8 @@
 # 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.2.5.ebuild,v 1.9 2010/06/05 19:06:35 armin76 Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.2.5.ebuild,v 1.10 2010/06/23 11:55:02 ssuominen Exp $
 
+EAPI=2
 inherit autotools eutils
 
 DESCRIPTION="Suspend and hibernation utilities for HAL"
@@ -12,7 +11,7 @@ SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="ppc64"
 IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon"
 
 RDEPEND=">=sys-apps/hal-0.5.10
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
deleted file mode 100644
index 981fd41af0b3..000000000000
--- a/sys-power/pm-utils/pm-utils-1.3.0-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.3 2010/06/05 19:06:35 armin76 Exp $
-
-EAPI=2
-inherit autotools eutils multilib
-
-DESCRIPTION="Suspend and hibernation utilities"
-HOMEPAGE="http://pm-utils.freedesktop.org/"
-SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon"
-
-vbetool="!video_cards_intel? ( sys-apps/vbetool )"
-RDEPEND="
-	!sys-power/powermgmt-base
-	sys-apps/dbus
-	>=sys-apps/util-linux-2.13
-	sys-power/pm-quirks
-	alsa? ( media-sound/alsa-utils )
-	networkmanager? ( net-misc/networkmanager )
-	ntp? ( net-misc/ntp )
-	amd64? ( ${vbetool} )
-	x86? ( ${vbetool} )
-	video_cards_radeon? ( app-laptop/radeontool )"
-DEPEND=""
-
-src_prepare() {
-	local ignore="01grub"
-	use networkmanager || ignore+=" 55NetworkManager"
-	use ntp || ignore+=" 90clock"
-
-	use debug && echo 'PM_DEBUG="true"' > "${S}/gentoo"
-	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 \
-		-e "s:/usr/local/lib:/usr/$(get_libdir):" \
-		src/import-fdi-quirkdb || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-manpages
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS pm/HOWTO* README* TODO || die
-
-	insinto /etc/pm/config.d
-	doins gentoo || die
-}