Remove USE="networkmanager" and 55NetworkManager because NetworkManager >= 0.8.2 is handling suspend/resume on it's own with UPower.

(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)

2 files changed, 64 insertions, 1 deletions

diff --git a/sys-power/pm-utils/ChangeLog b/sys-power/pm-utils/ChangeLog
index 52f4f40d5da6..c4feb57deafa 100644
--- a/sys-power/pm-utils/ChangeLog
+++ b/sys-power/pm-utils/ChangeLog
@@ -1,6 +1,13 @@
 # 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.54 2010/09/09 03:18:15 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.55 2010/11/10 19:40:47 ssuominen Exp $
+
+*pm-utils-1.4.1-r1 (10 Nov 2010)
+
+  10 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +pm-utils-1.4.1-r1.ebuild:
+  Remove USE="networkmanager" and 55NetworkManager because NetworkManager >=
+  0.8.2 is handling suspend/resume on it's own with UPower.
 
   09 Sep 2010; Joseph Jezak <josejx@gentoo.org> pm-utils-1.4.1.ebuild:
   Marked ppc/ppc64 stable for bug #329625.
diff --git a/sys-power/pm-utils/pm-utils-1.4.1-r1.ebuild b/sys-power/pm-utils/pm-utils-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..9d16a73c5339
--- /dev/null
+++ b/sys-power/pm-utils/pm-utils-1.4.1-r1.ebuild
@@ -0,0 +1,56 @@
+# 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.4.1-r1.ebuild,v 1.1 2010/11/10 19:40:47 ssuominen Exp $
+
+EAPI=2
+inherit 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 ntp video_cards_intel video_cards_radeon"
+
+vbetool="!video_cards_intel? ( sys-apps/vbetool )"
+DEPEND="!<app-laptop/laptop-mode-tools-1.55-r1
+	!<sys-power/powermgmt-base-1.31
+	!>=sys-power/powermgmt-base-1.31[-pm-utils]"
+RDEPEND="${DEPEND}
+	sys-apps/dbus
+	>=sys-apps/util-linux-2.13
+	sys-power/pm-quirks
+	alsa? ( media-sound/alsa-utils )
+	ntp? ( || ( net-misc/ntp net-misc/openntpd ) )
+	amd64? ( ${vbetool} )
+	x86? ( ${vbetool} )
+	video_cards_radeon? ( app-laptop/radeontool )"
+
+src_prepare() {
+	local ignore="01grub"
+	use ntp || ignore+=" 90clock"
+
+	use debug && echo 'PM_DEBUG="true"' > "${T}"/gentoo
+	echo "HOOK_BLACKLIST=\"${ignore}\"" >> "${T}"/gentoo
+}
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		--disable-doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS pm/HOWTO* README* TODO || die
+	doman man/*.{1,8} || die
+
+	insinto /etc/pm/config.d
+	doins "${T}"/gentoo || die
+
+	# NetworkManager 0.8.2 is handling suspend/resume on it's own with UPower
+	find "${D}" -type f -name 55NetworkManager -exec rm -f '{}' +
+}