Fix pcie-aspm issue, per bug#462900, thanks to Manuel Rüger

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

4 files changed, 142 insertions, 5 deletions

diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog
index 32d27f4e885f..2b180289fd55 100644
--- a/app-laptop/laptop-mode-tools/ChangeLog
+++ b/app-laptop/laptop-mode-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/laptop-mode-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.72 2013/03/23 17:41:47 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.73 2013/03/29 07:59:39 alonbl Exp $
+
+*laptop-mode-tools-1.63-r1 (29 Mar 2013)
+
+  29 Mar 2013; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch,
+  +laptop-mode-tools-1.63-r1.ebuild:
+  Fix pcie-aspm issue, per bug#462900, thanks to Manuel Rüger
 
 *laptop-mode-tools-1.63 (23 Mar 2013)
 
diff --git a/app-laptop/laptop-mode-tools/Manifest b/app-laptop/laptop-mode-tools/Manifest
index 3dde38bd291c..a94dda142ebc 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -12,6 +12,7 @@ AUX 1.62/0018-install-remove-unused-substitute-for-udev-rule.patch 802 SHA256 23
 AUX 1.62/0019-install-use-customizable-udev-directory.patch 1960 SHA256 13cec2f005adb58e58e305e00d590652f6dbfa9e81963d7ff408a35c6a909b19 SHA512 59d6cad9ab893aba574d3ec79dcdd981433c4b19d2e8e606b44fbe4c9f4b49d03ee8aef4731c0428b789ebf0ca09b8464a5d4095f2765f190376e26cb777625b WHIRLPOOL a125734051e2bee7a4ed9a26875016cd348748a85e8998188a555ba4f6adb1bc3e17ad21ba70c9d890ffbf54d727097763f4df002b491047f0fdc9158773913f
 AUX 1.62/0020-install-make-systemd-optional-and-configurable-locat.patch 2770 SHA256 2d65e9679abff293d817c7e1e4a566d16a47dbb85d5ed1fe3d1e47f0d52789f0 SHA512 a54ac3ad9352314033465042b2cd91e35ab7acdfaa5f44ef8cede45c4f641763e7cc64b7c0c0f7569e2e42679d417a2cae240b09123d01213f7f370f5d2c3a01 WHIRLPOOL b37457277265db20243391895be9bdaebca1f5a6c1452b7536b1b664856f2c223bf472758285b980f6a141d0afa7be0300f83ddd0acfd7892e029f9e5fca0395
 AUX laptop-mode-tools-1.62-remove-hal.patch 1336 SHA256 d3a7b4edd1fb9d7d3569dea7c531f8f2c06cda28b94d03aa5c1c853b7ae22fee SHA512 5a9937127544f041dccd32d30bd6c964cad68cdf6ca777a3538ba3940674c87490426180652d4b3ba87e41f43ad9fb3607f67b756b00023826a1594348a12d87 WHIRLPOOL 044c61af773bff61e10b6d9e4e5bfcd0d89a0962e9411a2e40667e802402fdb842ad9c837cf3ba08e2b830204eaf0ba18a242b85154f07a2ebfeb0309f344364
+AUX laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch 1604 SHA256 a9d14760c0ee0bde93f04fb369da00c35ac61e04393f1697a9fb7bf7030dc818 SHA512 c1d6fefb486d9ceb47f19f1b173d76c2a7244f4ed6da2c3752b3a4cbd4064964c34365aa62f114efd21d572986551cb4f74c7990cf78bbb70d845f8e0c59a94c WHIRLPOOL d739756d45cac564237a544df19491df2cce4cc121e50407f703a8dc3c3845c96abdd41cd080edf23b9f988fc148297e2afcee7eaa5e42967afbb17e97995617
 AUX laptop_mode.init-1.4 1190 SHA256 90a18e5c7e4d0b264bb51deb7b92ff25b508a3ddd75dd6c849fdc48c07ce4fda SHA512 47e67d54ed8005a864c017f4ef063c8a17286c6f8a260984fda96392e6461a3f0c5e4f17f8cf2272b072c1545b8f8e99fe45579a81b4d08a99e1eeb46f400fe5 WHIRLPOOL 7a87608d947be301400f2f1a0294a60f21e2cd1b6bed961788f7fc018bf4ac32d69a50e11e735db3cb6c000174ebd78e59f7ac0cd474bef3b803872b6a6665e5
 DIST laptop-mode-tools_1.60.tar.gz 104415 SHA256 39246db1bba2ea12c7ee6f1979f914a803a9f70836cde687ff9c3a39bc9c9519 SHA512 79596bb24b2af8bbeb3424eeff51022bb381609325a0eb5c009e0970dffe055d2493509d56a4e2c8f745c27f03bc176372d9b27e3a0a050f7bc1c58f86aae5c9 WHIRLPOOL 819cd4ad40c9e2a74bc07f70986c985b4128828ed508d808097472ee301ca788567b65d86717552a8191b378d595cb41b922a9e2f5a2fbcacf645acfe607d0ec
 DIST laptop-mode-tools_1.62.tar.gz 105941 SHA256 d40b3d2fb4dc120b4a427ef7dbddc9dd4d9ea0c475685538d36d3457b39158cd SHA512 3ba2a8db860349c5766f5282ca6f70f3bb780cb44e8674beb7e9c5783e96fc07a144245cc50414fef61b1cd6e08a2096667806792c2853cbcc9c83eb7d796b1a WHIRLPOOL 232115a3a6599241892abcc3f64db8bfa1c897bebbc22c198ce58bcb6bb3dd99aa3fb143c07f69fd6e6099b76da9c494423def0c86c8eeb3b610f9f3e51c0505
@@ -19,13 +20,14 @@ DIST laptop-mode-tools_1.63.tar.gz 107339 SHA256 04b9bf8cce4172a810ce4026e75e0e7
 EBUILD laptop-mode-tools-1.60-r1.ebuild 2325 SHA256 d1a017658837ca3815a01ce4e50e1fee2fb8880ccb56e43b0b9b48adea05a4fe SHA512 1b355b8c27749542c220426f9d32e383402ccf66d0479d30abd4e7ebe70109bd84ac4696fc5d98d693055183c4ea437a2a869fc9b4ebf2e326b4f47e2a2d1783 WHIRLPOOL 1cd185542cd6e6f55a8102dab3df447003b1b2566f54ec29a3062e264f8f63bf5c68da29b61a1b0940a38242b5c772088943ecc43ccaffd383e7545715a6f98e
 EBUILD laptop-mode-tools-1.62-r1.ebuild 2867 SHA256 e1f3c5de68fdee7d0362e8e0396a7ae732cda4f7a4ecb48f79c7726d3d7b2307 SHA512 3010b17b6c11f99d309941b3b059661c0efac131da08867dee9d937fa7a068773eb5ffb25781aa73c44663d4074038c78bddd9a397774e2fce6a88122553d5e1 WHIRLPOOL 08c0fe07581c92777049a1d3d325fd60567af3ce583dd414b08b1a91fcc6bb77cda1b4f1b3fa184c73623bbfd070bc13db182272ed9423c093583e43a574c329
 EBUILD laptop-mode-tools-1.62-r2.ebuild 2806 SHA256 a0ce435e33e4796bca6124d96de45d6bac1cb37692947044b087fe590b469011 SHA512 5f0f18eb50499fa0a22b4d34654677c1a86ae1b8840e6004a89d5171931a98763a6815594485e1b93b0e0ad60474f8a0d2a942f338440402784026d1e5ee5642 WHIRLPOOL 0151bd7d50e295d655940675f341d62324229a66476b5e8e4f83cd784272fe90da8de8db17c62e71b1b06649ed698100d817750199734fa458600c9eb5447733
+EBUILD laptop-mode-tools-1.63-r1.ebuild 2830 SHA256 895eafaf4e9bb4a1a78388d8f4c9eb5fa7e2b4b8e105e580078d425b6a898df0 SHA512 2bb7b18bb26f5403b963aaaa4b2be3efa06cce9f363ef3836d23446f3bddb0ea67cb91d4e2902bb742618e7ffcbcabcb1a96b741a67e173d3ef9fbb25472c4d4 WHIRLPOOL d2f459ca896cfd9421e9cef41713d0f1ac78fa96eefd9a4a9f9135bc18527c305523bc5ae817d513b259a765d3635e6f0d7d37604b96cb7d925fae00c2445cbb
 EBUILD laptop-mode-tools-1.63.ebuild 2766 SHA256 1e78a3dac11e3d4add216fe2e4ac97af1a652863a32bf6e36e895dfe9fabb3cd SHA512 08a3552d86f77d3587e1c85bbb2e0f2039f7dddba3ec2041d3d20fe147c412d7d3062c9367a5c64b2b9a850ada8851940ff2d9b679b415c350de6c7d596930fb WHIRLPOOL 48a75024e12ff495ebe55417ac8c1b0b1f7f052e0c522b8d4f26554981c0489df826d60304ab008ff813d9022d5a4b71dbc09835d5a9352e2cfa38a839c13e5c
-MISC ChangeLog 14091 SHA256 67e7b96adf376257b23457348024664f7a91ffff04fb8fed4f0abf6bd7055b20 SHA512 886c8cff8c12f3e6a656168f0a84fa9e097536fa530abd27a6b99b473c57db0ab12337591299064ea4a22ffadf902e35e0eb30865ca5d58e1017c1701ba1b6e6 WHIRLPOOL fa7c39b62612645662704f71ae8bff3e4b058c957eaefc8135430388bf2554c30b3380ffb4a5617c88dc1e39dd2d9eb21584b434b9e0f1e06fe2cc067cbfd5e7
+MISC ChangeLog 14348 SHA256 a31cde7dc287bc98255eb2ad7c8cbd8ce2e604864fe11e76bfe384f758e5c251 SHA512 dd724cfad0e76236d92b5ab37ae8228c731ea31f537587c1948e587e86b12b330885396485425fcf32266c1050e6628e7bc7728e3411ee41a764253deee88871 WHIRLPOOL e113aea38e2fd9b4b84909dc5b3eb0a6970e7e603e8358e401fc098e5e2e9b473c67979354c46544be8dc8c05aaa3fc4076661b93a8e2a2ad60b4581974b3b3d
 MISC metadata.xml 420 SHA256 2008caffae78c8d0c6a04f0b4b4768d2a9d2b9f62d96409141cd2e579f622749 SHA512 5bd05a4b5ce71343b10a46b57cd73b071c399062bb9813bcb9d9e329e1a4804a6b1f5489e6004626a9daa84e9b0ca399b0209d844dd0adb0c185a18adc535946 WHIRLPOOL ea091eb7cc936602de9e1179231f9fd8bb78ab447abd72b505be870b79acf50056a4610a56c4ab7c1585957ee44d2f85d47248eeee47f10cf860b8ac6b8535b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFN6V8ACgkQXYk9GL8g3FFppwD/Tj5ua90afMEfb8hXOXxKNpnA
-evJXoRrO9w3/9acjPQAA/jk7P/9m5WjSgwt2T2UrqvbffGcwpvhJeuuCMx87gR4j
-=0/r6
+iF4EAREIAAYFAlFVSe8ACgkQXYk9GL8g3FEJ1wD/ZzVrSem7blQUfhOBmQBoqX+1
+xcSR5CsqXsZkIT1aYfIA/1VQcPbjqtw5mqut4mA7+DMD0GSWyr9s99CWyZyAi9DA
+=P/7l
 -----END PGP SIGNATURE-----
diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch
new file mode 100644
index 000000000000..6d741738f1a1
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch
@@ -0,0 +1,34 @@
+From f52e9afc8966d3804e6a432b0a98bfa2a758c416 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Manuel=20R=C3=BCger?= <mrueg@rueg.eu>
+Date: Thu, 28 Mar 2013 01:24:39 +0100
+Subject: [PATCH] pcie-aspm: Silencing stderr.
+
+---
+ usr/share/laptop-mode-tools/modules/pcie-aspm | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/usr/share/laptop-mode-tools/modules/pcie-aspm b/usr/share/laptop-mode-tools/modules/pcie-aspm
+index 1f6eec9..57fe31e 100755
+--- a/usr/share/laptop-mode-tools/modules/pcie-aspm
++++ b/usr/share/laptop-mode-tools/modules/pcie-aspm
+@@ -7,7 +7,7 @@ if [ x$CONTROL_PCIE_ASPM = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_PCI
+     if [ $ON_AC -eq 1 ]; then
+         log "VERBOSE" "On AC power: setting pcie_aspm to default"
+         if [ -f /sys/module/pcie_aspm/parameters/policy ]; then
+-            echo default > /sys/module/pcie_aspm/parameters/policy
++            echo default > /sys/module/pcie_aspm/parameters/policy 2>/dev/null
+             if [ $? -eq 0 ]; then
+                 log "VERBOSE" "PCIe ASPM set to 'default'"
+             else
+@@ -19,7 +19,7 @@ if [ x$CONTROL_PCIE_ASPM = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_PCI
+     else
+         log "VERBOSE" "On battery: setting pcie_aspm to powersave"
+         if [ -f /sys/module/pcie_aspm/parameters/policy ]; then
+-            echo powersave > /sys/module/pcie_aspm/parameters/policy
++            echo powersave > /sys/module/pcie_aspm/parameters/policy 2>/dev/null
+             if [ $? -eq 0 ]; then
+                 log "VERBOSE" "PCIe ASPM set to 'powersave'"
+             else
+-- 
+1.8.1.5
+
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r1.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r1.ebuild
new file mode 100644
index 000000000000..7b020c6d7dc5
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r1.ebuild,v 1.1 2013/03/29 07:59:39 alonbl Exp $
+
+EAPI=5
+inherit eutils multilib systemd udev
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Linux kernel laptop_mode user-space utilities"
+HOMEPAGE="http://www.samwel.tk/laptop_mode/"
+SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+acpi apm bluetooth scsi systemd"
+
+RDEPEND="net-wireless/wireless-tools
+	sys-apps/ethtool
+	sys-apps/hdparm
+	acpi? ( sys-power/acpid )
+	apm? ( sys-apps/apmd )
+	bluetooth? ( net-wireless/bluez:= )
+	scsi? ( sys-apps/sdparm )
+	systemd? ( sys-apps/systemd )"
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-pcie-aspm-silencing-stderr.patch"
+
+	# This should avoid conflict with pm-powersave wrt #327443 and #396703
+	cat <<-EOF > "${T}"/${PN}
+	HOOK_BLACKLIST="00powersave"
+	EOF
+}
+
+src_compile() { :; }
+
+src_install() {
+	DESTDIR="${D}" \
+		INIT_D="none" \
+		MAN_D="/usr/share/man" \
+		LIB_D="/usr/$(get_libdir)" \
+		UDEV_D="$(udev_get_udevdir)" \
+		SYSTEMD_UNIT_D="$(systemd_get_unitdir)" \
+		TMPFILES_D="/usr/$(get_libdir)/tmpfiles.d" \
+		ACPI="$(use acpi && echo force || echo disabled)" \
+		PMU="$(false && echo force || echo disabled)" \
+		APM="$(use apm && echo force || echo disabled)" \
+		SYSTEMD="$(use systemd && echo yes || echo no)" \
+		sh ./install.sh || die
+
+	dodoc Documentation/*.txt README
+	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
+
+	# See src_prepare()
+	insinto /etc/pm/config.d
+	doins "${T}"/${PN}
+}
+
+pkg_postinst() {
+	if use acpi || use apm; then
+		if use acpi; then
+			daemon_name="acpid"
+		elif use apm; then
+			deamon_name="apmd"
+		fi
+		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+			ewarn "To enable automatic power state event handling,"
+			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
+			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
+			ewarn "added to default runlevel:"
+			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
+				ewarn "# rc-update add laptop_mode default"
+			fi
+			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+				ewarn "# rc-update add ${daemon_name} default"
+			fi
+		fi
+	else
+		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
+		ewarn "automatically disable laptop_mode on low battery."
+		ewarn
+		ewarn "This means you can lose up to 10 minutes of work if running"
+		ewarn "out of battery while laptop_mode is enabled."
+		ewarn
+		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
+		ewarn "information."
+		ewarn
+	fi
+}