old

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 3 insertions, 94 deletions

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
-}