Make laptopmode.sh always respect noatime option in fstab... did not revbump

  because most users probably won't want to rebuild just for this fix.
  Thanks to Eugene Surovegin who was observant to notice the bug (Bug #126001)

(Portage version: 2.1-r2)

7 files changed, 55 insertions, 6 deletions

diff --git a/app-laptop/pbbuttonsd/ChangeLog b/app-laptop/pbbuttonsd/ChangeLog
index e58ecc442ac2..9e46eba541ca 100644
--- a/app-laptop/pbbuttonsd/ChangeLog
+++ b/app-laptop/pbbuttonsd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-laptop/pbbuttonsd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.51 2006/07/31 20:33:26 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.52 2006/08/26 07:23:19 wormo Exp $
+
+  26 Aug 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  +files/pbbuttonsd-laptopmode-noatime.patch, pbbuttonsd-0.6.6.ebuild,
+  pbbuttonsd-0.7.4.ebuild, pbbuttonsd-0.7.5.ebuild, pbbuttonsd-0.7.6.ebuild,
+  pbbuttonsd-0.7.8.ebuild:
+  Make laptopmode.sh always respect noatime option in fstab... did not revbump 
+  because most users probably won't want to rebuild just for this fix.
+  Thanks to Eugene Surovegin who was observant to notice the bug (Bug #126001)
 
 *pbbuttonsd-0.7.8 (31 Jul 2006)
 
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-laptopmode-noatime.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-laptopmode-noatime.patch
new file mode 100644
index 000000000000..8e02c71a65a7
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/pbbuttonsd-laptopmode-noatime.patch
@@ -0,0 +1,12 @@
+diff -ur pbbuttonsd-0.7.8.orig/scripts/scripts.d/laptopmode.sh pbbuttonsd-0.7.8/scripts/scripts.d/laptopmode.sh
+--- pbbuttonsd-0.7.8.orig/scripts/scripts.d/laptopmode.sh	2006-07-31 04:51:40.000000000 -0700
++++ pbbuttonsd-0.7.8/scripts/scripts.d/laptopmode.sh	2006-08-25 18:48:40.000000000 -0700
+@@ -63,7 +63,7 @@
+ 	PARSEDOPTS1="$(parse_nonumber_mount_opts $OPT $L_OPTS)"
+ 	PARSEDOPTS1="$(parse_nonumber_mount_opts no$OPT $PARSEDOPTS1)"
+ 	# Watch for a default atime in fstab
+-	FSTAB_OPTS="$(cat /etc/fstab | sed 's/  / /g' | grep ^\ *"$L_DEV " | awk '{ print $4 }')"
++	FSTAB_OPTS="$(cat /etc/fstab | tr -s "[:blank:]" " " | grep ^\ *"$L_DEV " | awk '{ print $4 }')"
+ 	if [ -z "$(echo "$FSTAB_OPTS" | grep "$OPT")" ] ; then
+ 		# option not specified in fstab -- choose the default.
+ 		echo "$PARSEDOPTS1,$DEF_OPT"
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.6.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.6.6.ebuild
index 4fa54a73d802..2b1f543fda94 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.6.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.6.6.ebuild,v 1.6 2006/04/12 20:12:18 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.6.6.ebuild,v 1.7 2006/08/26 07:23:19 wormo Exp $
 
 inherit eutils
 
@@ -16,6 +16,11 @@ IUSE="debug"
 DEPEND="virtual/libc
 	>=sys-apps/baselayout-1.8.6.12-r1"
 RDEPEND=""
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-laptopmode-noatime.patch
+}
 
 src_compile() {
 	econf $(use_enable debug) || die "sorry, failed to configure pbbuttonsd"
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.7.4.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.7.4.ebuild
index b30e1ac4a84f..9c3c31e0dd7f 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.7.4.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.7.4.ebuild,v 1.5 2006/04/12 20:12:19 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.7.4.ebuild,v 1.6 2006/08/26 07:23:19 wormo Exp $
 
 inherit eutils flag-o-matic
 
@@ -18,6 +18,12 @@ DEPEND=">=sys-apps/baselayout-1.8.6.12-r1
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0 )
 		 >=dev-libs/glib-2.6"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-laptopmode-noatime.patch
+}
+
 src_compile() {
 	# Fix crash bug on some systems
 	replace-flags -O? -O1
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.7.5.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.7.5.ebuild
index c8311fe9c594..37250e408f3d 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.7.5.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.7.5.ebuild,v 1.3 2006/06/06 17:15:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.7.5.ebuild,v 1.4 2006/08/26 07:23:19 wormo Exp $
 
 inherit eutils flag-o-matic
 
@@ -18,6 +18,12 @@ DEPEND=">=sys-apps/baselayout-1.8.6.12-r1
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0 )
 		 >=dev-libs/glib-2.6"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-laptopmode-noatime.patch
+}
+
 src_compile() {
 	# Fix crash bug on some systems
 	replace-flags -O? -O1
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.7.6.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.7.6.ebuild
index 14ba4978ca4f..d01bdcfdf6d5 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.7.6.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.7.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.7.6.ebuild,v 1.1 2006/07/02 13:43:40 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.7.6.ebuild,v 1.2 2006/08/26 07:23:19 wormo Exp $
 
 inherit eutils flag-o-matic
 
@@ -18,6 +18,12 @@ DEPEND=">=sys-apps/baselayout-1.8.6.12-r1
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0 )
 		 >=dev-libs/glib-2.6"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-laptopmode-noatime.patch
+}
+
 src_compile() {
 	# Fix crash bug on some systems
 	replace-flags -O? -O1
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.7.8.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.7.8.ebuild
index 812487ba472b..46d779c8000d 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.7.8.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.7.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.7.8.ebuild,v 1.1 2006/07/31 20:33:26 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.7.8.ebuild,v 1.2 2006/08/26 07:23:19 wormo Exp $
 
 inherit eutils flag-o-matic
 
@@ -18,6 +18,12 @@ DEPEND=">=sys-apps/baselayout-1.8.6.12-r1
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0 )
 		 >=dev-libs/glib-2.6"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-laptopmode-noatime.patch
+}
+
 src_compile() {
 	# Fix crash bug on some systems
 	replace-flags -O? -O1