app-laptop/ibam: Revbump to 0.5.2-r2. Fixes bug #346811.

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

4 files changed, 91 insertions, 7 deletions

diff --git a/app-laptop/ibam/ChangeLog b/app-laptop/ibam/ChangeLog
index 15b6a3a800b9..8d93f8214280 100644
--- a/app-laptop/ibam/ChangeLog
+++ b/app-laptop/ibam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/ibam
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibam/ChangeLog,v 1.7 2010/10/19 21:16:33 chainsaw Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibam/ChangeLog,v 1.8 2011/03/20 15:34:24 aidecoe Exp $
+
+*ibam-0.5.2-r2 (20 Mar 2011)
+
+  20 Mar 2011; Amadeusz Żołnowski <aidecoe@gentoo.org> +ibam-0.5.2-r2.ebuild,
+  +files/ibam-0.5.2-acpi.patch:
+  Make ibam working with newer kernels. Fixes bug #346811. Thanks to Simeon
+  Maryasin <marsoft@ya.ru> for providing the patch.
 
 *ibam-0.5.2-r1 (19 Oct 2010)
 
diff --git a/app-laptop/ibam/Manifest b/app-laptop/ibam/Manifest
index f39a0cbcbf08..a70cc252bca8 100644
--- a/app-laptop/ibam/Manifest
+++ b/app-laptop/ibam/Manifest
@@ -1,18 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ibam-0.5.2-acpi.patch 673 RMD160 12a6f512243439b5625a6319fb30a8368ed91f7f SHA1 a832c03f3769c3cfcbe3fb4cac57c46669044523 SHA256 1d69c7add0b7e655bb459c19c910cbf88d61a3528bbc0a508228ba4caa17ed14
 AUX ibam-0.5.2-ldflags.patch 1038 RMD160 5aabe36583a1961a3399dcee9e3c593c2c3fdd8f SHA1 7d2c290f74841f92bdbe9209d7c412f4a86f676e SHA256 56947fe53710a8dc7cbd03b98442f0ed5d8f2f4bc6447bf78959956cb95c2432
 DIST ibam-0.4.tar.gz 18913 RMD160 b834e1deae6989a23d2130810f8dcb9e9cb71616 SHA1 cab718518acb0b945078479d3c8540bb09892ccc SHA256 962b55ef610ffd5f954938188f3275e4c2c673e79015361718b83a3469be155b
 DIST ibam-0.5.2.tar.gz 22149 RMD160 c9a662abad521b4604c875ff3403d52f6aafc1d7 SHA1 79321ff80f4cf3a2b8b92522b5b652aaaefd09c1 SHA256 d668f23088e48be537dbf3ab63f1a8f6f9acb32031b1f6ba6fb185e9e6079d91
 EBUILD ibam-0.4.ebuild 864 RMD160 51ca02bc97f71f464634a331af895bd26d427a24 SHA1 292f2b5252625f6f290dc95c1af69a9ec5f97d8b SHA256 9efd59d8cd1191fbb3ad8478d47a7d1c027b0293ec3d0ba8a07221cac7369cc3
 EBUILD ibam-0.5.2-r1.ebuild 1252 RMD160 9571806d092d2f040cc0e2f6998a814a17b51110 SHA1 0dc60bb994751e5aa0afa12c29e13335b28dfa6b SHA256 36d73f6c38a52639aab19611b90b06f48cec06b69e9947ce0004c8a4ef769b60
+EBUILD ibam-0.5.2-r2.ebuild 1283 RMD160 4b66243a19d1aa2b5339c7851a56380a12e1bb32 SHA1 3c71a5f68382e4d174faa68e9ac18e0b1cab7038 SHA256 73b87383a28da5ffd6235284096816229f1e687bdaa0c59ceed749ffec726540
 EBUILD ibam-0.5.2.ebuild 1183 RMD160 91b07cc1b3f4b7e3047fbca482b92c05c9e50b9d SHA1 e41d3c4734cb8adc6fbc27b9d158bdbe7afdb1a0 SHA256 05108e2f1fc27feaf62cd034c1d0b94b2e40935dc6a3bf110ebbe3d17c95f288
-MISC ChangeLog 1207 RMD160 7fe57691e8409e9be1045fdd4b02a5284a12de59 SHA1 44159510308eeef7084ce7f3dfbf21ab8f8b5037 SHA256 0bbb71463b75d33b894e8d5986887a1bef664bbd2adb7c004d0369b5df3f9d72
+MISC ChangeLog 1477 RMD160 f520da4410108744cacc8cf379c3b18c25686a12 SHA1 effced4ad4fb5bb68bdcfd292e23aa26255241b0 SHA256 e92f195b17e4a8444b33a3aa42c262e2b24367a497c2dc68fce0d647f1c7d4d0
 MISC metadata.xml 249 RMD160 8e04b6b64876b3561df5a52d024986c36201916b SHA1 e947ac2259f4d344c91643adc614dbc39f707fa5 SHA256 197f0b2a7a62cad0ab840b016160b31b1665775cc5d6f1302c4823bc58f883ef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAky+Cr0ACgkQp5vW4rUFj5ojvgCeLmPOG0ArNyxYd8DgK2jcmps9
-ww8AoI1bj+HKy9ucgWrJGONqtqcV28vr
-=Gz25
+iQEcBAEBAgAGBQJNhh6FAAoJEPATRTHh2/q1qJMH/36BdLY9ilu/xm1fGBY5sFRn
+EsPE+Teb0tdpvSU8xntUQ0rCr6iQxLyUEV0liUvqo7xgCTroF0U96+cK5qfSsTak
+S4nr++IDuV5j7MxT8EfBbSyh7y76KyR9EWtGxouand3MpPYbQYGQyeBBh/6jXmWJ
+O7qUBhY9AmsboittiGzGHq6yp05XLY2DFolLN2/VCPrDFncZmkIQXYesmsvn1YPZ
+IGfTZiASWLli7D5/nyPXuuo1sQOy7f3jXZGJUBf4i5/rN/1yKR3LBQSkq0H5Fjq2
+nWUllg+5SnNlImZIWf83ZEDe77jCmoh06pDWt4AGV5Yf86xKgwx5TA+XpHMrQIk=
+=gPEV
 -----END PGP SIGNATURE-----
diff --git a/app-laptop/ibam/files/ibam-0.5.2-acpi.patch b/app-laptop/ibam/files/ibam-0.5.2-acpi.patch
new file mode 100644
index 000000000000..321f5b3c8dfb
--- /dev/null
+++ b/app-laptop/ibam/files/ibam-0.5.2-acpi.patch
@@ -0,0 +1,15 @@
+--- ibam-0.5.2/ibam.inl	2009-03-09 19:53:20.000000000 +0300
++++ ibam-0.5.2/ibam.inl	2010-11-26 04:52:29.590364097 +0300
+@@ -942,10 +942,11 @@ 
+ {
+    string pmu_path = "/proc/pmu";    // These strings are already in ibam.hpp,
+    string acpi_path = "/proc/acpi";  // maybe a static function should check this
++   string acpi_ver_path = "/sys/module/acpi/parameters/acpica_version";
+    string sysfs_path = "/sys/class/power_supply"; // ...
+    ifstream pmu,acpi,sysfs;
+    pmu.open((pmu_path+"/info").c_str());
+-   acpi.open((acpi_path+"/info").c_str());
++   acpi.open(acpi_ver_path.c_str());
+    if (pmu.is_open()) {
+ #ifdef IBAM_DEBUG
+       cout << "using pmu" << endl;
diff --git a/app-laptop/ibam/ibam-0.5.2-r2.ebuild b/app-laptop/ibam/ibam-0.5.2-r2.ebuild
new file mode 100644
index 000000000000..f20fffc9e5e9
--- /dev/null
+++ b/app-laptop/ibam/ibam-0.5.2-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibam/ibam-0.5.2-r2.ebuild,v 1.1 2011/03/20 15:34:24 aidecoe Exp $
+
+EAPI=2
+
+inherit base toolchain-funcs
+
+DESCRIPTION="Intelligent Battery Monitor"
+HOMEPAGE="http://ibam.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gkrellm"
+
+DEPEND="gkrellm? ( app-admin/gkrellm )"
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${P}-acpi.patch"
+	)
+
+src_prepare() {
+	base_src_prepare
+	sed -i \
+		-e "s:^CFLAGS=-O3:CFLAGS=${CFLAGS}:" \
+		-e "s:^CC=g++:CC=$(tc-getCXX):" \
+		"${S}"/Makefile \
+		|| die "Failed to set CFLAGS/compiler"
+}
+
+src_compile() {
+	emake || die "Making ibam failed"
+	if use gkrellm; then
+		emake krell || die "Making krell failed"
+	fi
+}
+
+src_install() {
+	dobin ibam || die "dobin failed"
+	dodoc CHANGES README REPORT || die "dodoc failed"
+
+	if use gkrellm; then
+		insinto /usr/$(get_libdir)/gkrellm2/plugins
+		doins ibam-krell.so || die "doins gkrellm plugin failed"
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "You will need to install sci-visualization/gnuplot if you wish to use"
+	elog "the --plot argument to ibam."
+	elog
+}