Version bump. Added patch to check for /proc/acpi instead of /proc/acpi/info. Partially fixes bug #348124.

Package-Manager: portage-2.1.9.42/cvs/Linux i686

6 files changed, 92 insertions, 8 deletions

diff --git a/x11-plugins/wmlaptop/ChangeLog b/x11-plugins/wmlaptop/ChangeLog
index 2f2cae7e7502..0f41c1413651 100644
--- a/x11-plugins/wmlaptop/ChangeLog
+++ b/x11-plugins/wmlaptop/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-plugins/wmlaptop
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/ChangeLog,v 1.9 2010/09/09 09:54:32 s4t4n Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/ChangeLog,v 1.10 2011/05/26 14:52:47 s4t4n Exp $
+
+  26 May 2011; Michele Noberasco <s4t4n@gentoo.org> wmlaptop-1.4.ebuild,
+  wmlaptop-1.3.ebuild:
+  Added patch to check for /proc/acpi instead of /proc/acpi/info. Partially fixes bug #348124.
+
+*wmlaptop-1.4 (26 May 2011)
+
+  26 May 2011; Michele Noberasco <s4t4n@gentoo.org> wmlaptop-1.4.ebuild:
+  Version bump.
 
   09 Sep 2010; Michele Noberasco <s4t4n@gentoo.org>; wmlaptop-1.3.ebuild,
   +files/wmlaptop-1.3-Makefile.patch:
diff --git a/x11-plugins/wmlaptop/Manifest b/x11-plugins/wmlaptop/Manifest
index 7274fdc1e25d..a0b4eea38770 100644
--- a/x11-plugins/wmlaptop/Manifest
+++ b/x11-plugins/wmlaptop/Manifest
@@ -1,6 +1,9 @@
-AUX wmlaptop-1.3-Makefile.patch 738 RMD160 fde1950424ed143a21d50731079f9fba43ec41d8 SHA1 89e7958421ae60a4942aad0dddbe28b9df504a66 SHA256 dead8f9796030e67002d45c55ed8b2f9fba57871e6f01c2cbd81cb0d97451460
+AUX wmlaptop-ACPI-detection.patch 983 RMD160 441cb5050e47a0dab1afb13ca4c55864a61754d3 SHA1 b7b9d835939b99c55255f8b031c3bff3ff15ab9c SHA256 0c9649eed33a41927678e8571f7d2e8a86dd1d55c8a2a2c6ec2bd3785f3d579f
+AUX wmlaptop-Makefile.patch 738 RMD160 fde1950424ed143a21d50731079f9fba43ec41d8 SHA1 89e7958421ae60a4942aad0dddbe28b9df504a66 SHA256 dead8f9796030e67002d45c55ed8b2f9fba57871e6f01c2cbd81cb0d97451460
 AUX wmlaptop.desktop 174 RMD160 0637e06c1769afa153761b05598227938f8b4b35 SHA1 27064295cc712a33924cb94a1626e64dd53ac1ad SHA256 854b3490e71c715439a3f05bf38ca8538391e944748c94e7e0b15cc3542bc726
 DIST wmlaptop-1.3.tar.bz2 54575 RMD160 6c08a2dc4f2bb722028fad7ae8be24e4fb5409fd SHA1 01911e8e9b817e4595758cd83b229d1e04370627 SHA256 5ce0ad86ebbf1e8167d0e7eb020389393cf08bd3c849dba9fce383d95a55281f
-EBUILD wmlaptop-1.3.ebuild 985 RMD160 e9f29bfc3d9f5644a11856af25758d22e6708dc0 SHA1 af0d9fcd5ffb139399b0b5796fde7a75a45bf4d7 SHA256 a970fdcb72c4c9743ed600d9c326048fd4ca8c2bdff58a8e0a3553f27e10aa65
-MISC ChangeLog 1297 RMD160 9a87f9cadaa6098968eb1d0f222fa4f58aebdb4e SHA1 c452dcc12a9eb35ca4bfb77fd0fe19b1d1e241fb SHA256 148b873e637694e3628d1db93d903fe5ffbc3c67adccde1c7732bade2d30da7b
+DIST wmlaptop-1.4.tar.gz 77023 RMD160 87826bc6f27e57d1956c305745a18e1490d6ef3d SHA1 6d72d56e00e5f578d62d70549d662bff6099f311 SHA256 3a6a2900489555606e2dd411963c659edb43613877de85c67dab14f0c8a47c2c
+EBUILD wmlaptop-1.3.ebuild 1035 RMD160 a815cc64b319e0e31d703ab689e4221aa729206f SHA1 030db42980176e4d20a89bd87239f2b4178b70d9 SHA256 6469603938fbd95639fdcc145ab4399297724fbdc73fea2c8680dbfc9e14c86e
+EBUILD wmlaptop-1.4.ebuild 1035 RMD160 ad07aac34a41482a2aa27714d661166ccf2396a5 SHA1 9e22ee9e573bf4d878cd059b2c9fdda22d2ef30e SHA256 d54917991a97482ce790ddf46df134b2e62e3f249388dd184aa507d461a155c7
+MISC ChangeLog 1609 RMD160 148e166cb0d5bfda66928d0c2667f724ccd5192d SHA1 c612a810bab90a5b2e3eaa99b78f96e6721c4080 SHA256 47bc45a0669dcea076beddb2741fc4d5e9fd4d2747dba448fc7e2210a5a01762
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
diff --git a/x11-plugins/wmlaptop/files/wmlaptop-ACPI-detection.patch b/x11-plugins/wmlaptop/files/wmlaptop-ACPI-detection.patch
new file mode 100644
index 000000000000..802e6f09a755
--- /dev/null
+++ b/x11-plugins/wmlaptop/files/wmlaptop-ACPI-detection.patch
@@ -0,0 +1,24 @@
+diff -ru wmlaptop-1.4.orig/src/battery.c wmlaptop-1.4/src/battery.c
+--- wmlaptop-1.4.orig/src/battery.c	2010-11-26 14:26:27.594108155 -0600
++++ wmlaptop-1.4/src/battery.c	2010-11-26 14:26:51.324108155 -0600
+@@ -74,7 +74,7 @@
+ 
+ bool ACPI_canSupport( )
+ {
+-	if( access( ACPI_ACCESS_TEST, R_OK ) == SUCCESS )
++	if( access( ACPI_ACCESS_TEST, R_OK | X_OK ) == SUCCESS )
+ 		return true;
+ 	return false;
+ }
+diff -ru wmlaptop-1.4.orig/src/battery.h wmlaptop-1.4/src/battery.h
+--- wmlaptop-1.4.orig/src/battery.h	2010-11-26 14:26:27.594108155 -0600
++++ wmlaptop-1.4/src/battery.h	2010-11-26 14:26:56.100774821 -0600
+@@ -24,7 +24,7 @@
+ /*******************
+  * ACPI FEATURES   *
+  *********************************************************************************/
+-#define    ACPI_ACCESS_TEST      "/proc/acpi/info"
++#define    ACPI_ACCESS_TEST      "/proc/acpi"
+ #define    ACPI_BATTERY_DIR      "/proc/acpi/battery"
+ //TODO #define    ACPI_BATTERY_DIR      "/home/mtc/hisBattery/battery"
+ 
diff --git a/x11-plugins/wmlaptop/files/wmlaptop-1.3-Makefile.patch b/x11-plugins/wmlaptop/files/wmlaptop-Makefile.patch
index ab1148ce117e..ab1148ce117e 100644
--- a/x11-plugins/wmlaptop/files/wmlaptop-1.3-Makefile.patch
+++ b/x11-plugins/wmlaptop/files/wmlaptop-Makefile.patch
diff --git a/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild b/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild
index 977590a065e7..e17e9cfab70f 100644
--- a/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild
+++ b/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild,v 1.8 2010/09/09 09:54:32 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild,v 1.9 2011/05/26 14:52:47 s4t4n Exp $
 
 inherit eutils
 
@@ -28,7 +28,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${PN}-Makefile.patch
+	epatch "${FILESDIR}"/${PN}-ACPI-detection.patch
 }
 
 src_compile() {
diff --git a/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild b/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild
new file mode 100644
index 000000000000..5e080ee8525c
--- /dev/null
+++ b/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild,v 1.1 2011/05/26 14:52:47 s4t4n Exp $
+
+inherit eutils
+
+IUSE=""
+
+MY_P="${P}"
+S="${WORKDIR}/${MY_P}/src"
+
+DESCRIPTION="Dockapp for laptop users"
+SRC_URI="http://www.dockapps.org/download.php/id/509/${P}.tar.gz"
+HOMEPAGE="http://www.dockapps.org/file.php/id/227"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	>=sys-apps/sed-4.1.5-r1"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-Makefile.patch
+	epatch "${FILESDIR}"/${PN}-ACPI-detection.patch
+}
+
+src_compile() {
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	einstall INSTALLDIR="${D}/usr/bin" || die "Installation failed"
+
+	dodoc ../AUTHORS ../README ../README.IT ../THANKS
+
+	insinto /usr/share/applications
+	doins "${FILESDIR}/${PN}.desktop"
+}