ppc64 stable wrt #318209

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

5 files changed, 14 insertions, 65 deletions

diff --git a/sys-power/pm-quirks/ChangeLog b/sys-power/pm-quirks/ChangeLog
index ef10db6be15f..a9f1868bec56 100644
--- a/sys-power/pm-quirks/ChangeLog
+++ b/sys-power/pm-quirks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/pm-quirks
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-quirks/ChangeLog,v 1.6 2010/06/23 09:19:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-quirks/ChangeLog,v 1.7 2010/07/03 21:27:54 ssuominen Exp $
+
+  03 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  pm-quirks-20100316.ebuild:
+  ppc64 stable wrt #318209
 
 *pm-quirks-20100619 (23 Jun 2010)
 
diff --git a/sys-power/pm-quirks/pm-quirks-20100316.ebuild b/sys-power/pm-quirks/pm-quirks-20100316.ebuild
index c6f6bb1917d8..1b21912defda 100644
--- a/sys-power/pm-quirks/pm-quirks-20100316.ebuild
+++ b/sys-power/pm-quirks/pm-quirks-20100316.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-quirks/pm-quirks-20100316.ebuild,v 1.4 2010/06/05 18:55:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-quirks/pm-quirks-20100316.ebuild,v 1.5 2010/07/03 21:27:54 ssuominen Exp $
 
 EAPI=3
 inherit multilib
@@ -11,7 +11,7 @@ SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-power/pm-utils/ChangeLog b/sys-power/pm-utils/ChangeLog
index edf3dc2f0ae3..a6bac9f2c2bb 100644
--- 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.45 2010/06/23 11:06:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.46 2010/07/03 21:32:49 ssuominen Exp $
+
+  03 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  pm-utils-1.3.0-r2.ebuild:
+  ppc64 stable wrt #318209
 
   23 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> pm-utils-1.4.0.ebuild:
   Make net-misc/openntpd option for USE="ntp" wrt #314891 by Thomas Kahle.
diff --git a/sys-power/pm-utils/pm-utils-1.2.5.ebuild b/sys-power/pm-utils/pm-utils-1.2.5.ebuild
deleted file mode 100644
index 8c58899aa6ca..000000000000
--- a/sys-power/pm-utils/pm-utils-1.2.5.ebuild
+++ /dev/null
@@ -1,59 +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.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"
-HOMEPAGE="http://pm-utils.freedesktop.org/"
-SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc64"
-IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon"
-
-RDEPEND=">=sys-apps/hal-0.5.10
-	>=sys-apps/dbus-1.0.0
-	!sys-power/powermgmt-base
-	>=sys-apps/util-linux-2.13
-	alsa? ( media-sound/alsa-utils )
-	networkmanager? ( net-misc/networkmanager )
-	ntp? ( net-misc/ntp )
-	!ppc? (
-		!ppc64? (
-			!video_cards_intel? ( sys-apps/vbetool )
-			video_cards_radeon? ( app-laptop/radeontool )
-		)
-	)"
-DEPEND="!sys-power/powermgmt-base"
-# XXX: app-text/xmlto usage is automagic
-
-src_prepare() {
-	local ignore="01grub"
-	use networkmanager || ignore="${ignore} 55NetworkManager"
-	use ntp            || ignore="${ignore} 90clock"
-
-	touch "${S}/gentoo"
-	use debug && echo 'PM_DEBUG="true"' >> "${S}/gentoo"
-	echo "HOOK_BLACKLIST=\"${ignore}\"" >> "${S}/gentoo"
-
-	# Be a bit more future proof, bug #260943
-	sed "s/-Werror//" -i configure.ac || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir=/usr/share/doc/${P}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README* TODO || die "dodoc failed"
-
-	insinto /etc/pm/config.d/
-	doins "${S}/gentoo" || die "doins failed"
-}
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 fa4804d4cf58..a8f4858a9116 100644
--- 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,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-r2.ebuild,v 1.8 2010/06/05 19:06:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.3.0-r2.ebuild,v 1.9 2010/07/03 21:32:49 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon"
 
 vbetool="!video_cards_intel? ( sys-apps/vbetool )"