Fix sysfs detection problems (by migrating to Debian patchset) wrt #359891 by Naohiro Aota

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

4 files changed, 126 insertions, 11 deletions

diff --git a/app-laptop/ibam/ChangeLog b/app-laptop/ibam/ChangeLog
index 8d93f8214280..830c31ca5de3 100644
--- a/app-laptop/ibam/ChangeLog
+++ b/app-laptop/ibam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/ibam
-# 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 $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibam/ChangeLog,v 1.9 2012/01/23 00:55:39 ssuominen Exp $
+
+*ibam-0.5.2-r3 (23 Jan 2012)
+
+  23 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> +ibam-0.5.2-r3.ebuild,
+  +files/ibam-0.5.2-build.patch:
+  Fix sysfs detection problems (by migrating to Debian patchset) wrt #359891 by
+  Naohiro Aota
 
 *ibam-0.5.2-r2 (20 Mar 2011)
 
diff --git a/app-laptop/ibam/Manifest b/app-laptop/ibam/Manifest
index a70cc252bca8..08a471796c71 100644
--- a/app-laptop/ibam/Manifest
+++ b/app-laptop/ibam/Manifest
@@ -2,23 +2,26 @@
 Hash: SHA1
 
 AUX ibam-0.5.2-acpi.patch 673 RMD160 12a6f512243439b5625a6319fb30a8368ed91f7f SHA1 a832c03f3769c3cfcbe3fb4cac57c46669044523 SHA256 1d69c7add0b7e655bb459c19c910cbf88d61a3528bbc0a508228ba4caa17ed14
+AUX ibam-0.5.2-build.patch 1317 RMD160 4eb85f79ebef850b530e5b40035702cfadb60e7e SHA1 b30c9168df63ad5a46bab7c68d7268e1d7eb56cf SHA256 595b70cd26b48a4bc0d6693b2d30e54153b5003ecd8f733cad5684b345d3cfdb
 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
+DIST ibam_0.5.2-2.diff.gz 5914 RMD160 c63047df2f410f173bf90c5a6e763550121a2e5a SHA1 284217ebe3042e9fdb2e2d0f769a0e808cd273cf SHA256 8986814e13e8014bac3daf15a10c446d045e11c0468fff442fab437956a16890
 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-r3.ebuild 1253 RMD160 2bf98ffd60e556eef635ff4c980478467fb9dc2b SHA1 03ce51e46127546f4302c42c796c4dafb62e0615 SHA256 c428f83062f3ebaa5fcb93804de7bace0df5bf8dbd3c24c2d97362fad5d04bd1
 EBUILD ibam-0.5.2.ebuild 1183 RMD160 91b07cc1b3f4b7e3047fbca482b92c05c9e50b9d SHA1 e41d3c4734cb8adc6fbc27b9d158bdbe7afdb1a0 SHA256 05108e2f1fc27feaf62cd034c1d0b94b2e40935dc6a3bf110ebbe3d17c95f288
-MISC ChangeLog 1477 RMD160 f520da4410108744cacc8cf379c3b18c25686a12 SHA1 effced4ad4fb5bb68bdcfd292e23aa26255241b0 SHA256 e92f195b17e4a8444b33a3aa42c262e2b24367a497c2dc68fce0d647f1c7d4d0
+MISC ChangeLog 1715 RMD160 ca64ffe1089265f197df879dd088e969ecd2950e SHA1 e363e884f5520eb817c0d875efeb38e1850ad783 SHA256 e93dbef5a0b6168d6a4c16b7f430888e207e6d0727868ebb1328cb4b5902f623
 MISC metadata.xml 249 RMD160 8e04b6b64876b3561df5a52d024986c36201916b SHA1 e947ac2259f4d344c91643adc614dbc39f707fa5 SHA256 197f0b2a7a62cad0ab840b016160b31b1665775cc5d6f1302c4823bc58f883ef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNhh6FAAoJEPATRTHh2/q1qJMH/36BdLY9ilu/xm1fGBY5sFRn
-EsPE+Teb0tdpvSU8xntUQ0rCr6iQxLyUEV0liUvqo7xgCTroF0U96+cK5qfSsTak
-S4nr++IDuV5j7MxT8EfBbSyh7y76KyR9EWtGxouand3MpPYbQYGQyeBBh/6jXmWJ
-O7qUBhY9AmsboittiGzGHq6yp05XLY2DFolLN2/VCPrDFncZmkIQXYesmsvn1YPZ
-IGfTZiASWLli7D5/nyPXuuo1sQOy7f3jXZGJUBf4i5/rN/1yKR3LBQSkq0H5Fjq2
-nWUllg+5SnNlImZIWf83ZEDe77jCmoh06pDWt4AGV5Yf86xKgwx5TA+XpHMrQIk=
-=gPEV
+iQEcBAEBAgAGBQJPHK+CAAoJEEdUh39IaPFNGBIH/08OZuoKGNUZzkP0uybq4zXb
+/zciQhpR64xT5T+QC/rvstrzlmRlAiA70JTlPn7TWQclC3qVpr3f8Dn3A0MBWFGq
+mAFLwtmr6gYG1BsNXc4Exiy3vNh/Vsh0844SuWWXRuqt75IYYr+EEKB+gBNg8uM2
+ZXRy+lfOxF1GDlcdBTwlJIBd5msQXfb6dX1ASkJG122XA1Ut5LUseyErhTc2oW03
+P49MlClfVNyy8H54aYnVOsGIR2dVAvBCV85gfNXBkKrGPjXnoDj7oP6YZAoJ/kfC
+BDIaGUabs/ROUTQlO+Z7uYjiLPt2z4f+bIlvAt5OkxxF6ZL1s8R0KcwjtunkpoM=
+=xxpl
 -----END PGP SIGNATURE-----
diff --git a/app-laptop/ibam/files/ibam-0.5.2-build.patch b/app-laptop/ibam/files/ibam-0.5.2-build.patch
new file mode 100644
index 000000000000..77854b5f3d5a
--- /dev/null
+++ b/app-laptop/ibam/files/ibam-0.5.2-build.patch
@@ -0,0 +1,42 @@
+--- Makefile
++++ Makefile
+@@ -17,8 +17,8 @@
+ #
+ IBAM_VERSION=0.5.2
+ 
+-CC=g++
+-CFLAGS=-O3 -DIBAM_VERSION=\"$(IBAM_VERSION)\" -Wall
++CXX?=g++
++CXXFLAGS+=-DIBAM_VERSION=\"$(IBAM_VERSION)\" -Wall
+ 
+ PREFIX=/usr
+ 
+@@ -30,23 +30,23 @@
+ all:    ibam
+ 
+ ibam:	ibam.cpp ibam.inl ibam.hpp
+-	$(CC) $(CFLAGS) ibam.cpp -o ibam
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) ibam.cpp -o ibam
+ 
+ krell:	ibam-krell.so
+ 
+ ibam-krell.so: ibam-krell.o
+-	$(CC) $(CFLAGS) -fPIC -shared -Wl -o ibam-krell.so ibam-krell.o
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) -fPIC -shared -Wl -o ibam-krell.so ibam-krell.o
+ 
+ ibam-krell.o: ibam-krell.cpp ibam.hpp ibam.inl
+-	$(CC) $(CFLAGS) -fPIC `pkg-config gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp
++	$(CXX) $(CXXFLAGS) -fPIC `pkg-config gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp
+ 
+ krell1:	ibam-krell1.so
+ 
+ ibam-krell1.so: ibam-krell1.o
+-	$(CC) $(CFLAGS) -shared -Wl -o ibam-krell1.so ibam-krell1.o
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) -shared -Wl -o ibam-krell1.so ibam-krell1.o
+ 
+ ibam-krell1.o: ibam-krell1.cpp ibam.hpp ibam.inl
+-	$(CC) $(CFLAGS) -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk` -c ibam-krell1.cpp
++	$(CXX) $(CXXFLAGS) -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk` -c ibam-krell1.cpp
+ 
+ install: ibam
+ 	$(INSTALL) ./ibam $(PREFIX)/local/bin/
diff --git a/app-laptop/ibam/ibam-0.5.2-r3.ebuild b/app-laptop/ibam/ibam-0.5.2-r3.ebuild
new file mode 100644
index 000000000000..eba631af0a3b
--- /dev/null
+++ b/app-laptop/ibam/ibam-0.5.2-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 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-r3.ebuild,v 1.1 2012/01/23 00:55:39 ssuominen Exp $
+
+EAPI=4
+
+PATCH_LEVEL=2
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Intelligent Battery Monitor"
+HOMEPAGE="http://ibam.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${PATCH_LEVEL}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gkrellm"
+
+RDEPEND="
+	gkrellm? (
+		app-admin/gkrellm
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+	)"
+DEPEND="
+	${RDEPEND}
+	gkrellm? ( dev-util/pkgconfig )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
+
+	local f
+	for f in `find . -name '*.dpatch'`; do
+		epatch ${f}
+	done
+}
+
+src_compile() {
+	tc-export CXX
+	emake
+	use gkrellm && emake krell
+}
+
+src_install() {
+	dobin ibam
+	dodoc CHANGES README REPORT
+
+	if use gkrellm; then
+		insinto /usr/$(get_libdir)/gkrellm2/plugins
+		doins ibam-krell.so
+	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
+}