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

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

3 files changed, 66 insertions, 2 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/Manifest b/sys-power/pm-utils/Manifest
index 0c15b402c2e6..1b6061af5bc3 100644
--- a/sys-power/pm-utils/Manifest
+++ b/sys-power/pm-utils/Manifest
@@ -1,4 +1,5 @@
 DIST pm-utils-1.4.1.tar.gz 208687 RMD160 04798d6d3aa3bbbfbca6dc48037916b425714108 SHA1 9aacb9b4a5f11f751d94f5257c6c54460f106197 SHA256 8ed899032866d88b2933a1d34cc75e8ae42dcde20e1cc21836baaae3d4370c0b
+EBUILD pm-utils-1.4.1-r1.ebuild 1601 RMD160 59d304490b677c88ad304f4c6022095429c95ea9 SHA1 bf30be1c59dffe8f5efba1f23353bd8dc42aedce SHA256 f732744f55fd069fa8f3b6ef78fa463bdbabde06ca0135bbd5fb1e400a4acb7c
 EBUILD pm-utils-1.4.1.ebuild 1562 RMD160 1a9fef6015fa7d7e5e367abff772e49f941a87ed SHA1 bf500123b7a7aac45008f4ae5a140942b3eabb7c SHA256 a8513586697895257fcc5ac9004f2b884f757377880007e8743e2945bee3dc60
-MISC ChangeLog 8245 RMD160 59c7da3f5cd785eeb2fc834e8ab821841c0d16e0 SHA1 908bbe1cc9df601b8297cfedc71dcda67d70fb82 SHA256 71413c85ebd6024816ec83ca17c316570678e311fec5bcd8a956f2f48b2357e3
+MISC ChangeLog 8503 RMD160 4db8674b38c7fa81661c5caae2b939ed4d3466cb SHA1 370c832d75b633c5dfc0697ecfc8f14a82f41f6c SHA256 0a7af083431fb007e8b7143a54d7321428ecdbc4d8dc977fb091c108504dc63f
 MISC metadata.xml 333 RMD160 28ff42d27d929095e83151b3a6bc06e9acdc1a10 SHA1 bd2334f7ff7c962f0d98678472e7feb673b942b6 SHA256 f06c34f767b411fcbc763a18bfd022d40fd4eb7fb38d3d14473a47064685bbda
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 '{}' +
+}