Fix gcc 4.1 build error. Thanks to William Keaney in bug #141032.

Package-Manager: portage-2.1.2_rc1-r3

4 files changed, 46 insertions, 21 deletions

diff --git a/x11-misc/bbacpi/ChangeLog b/x11-misc/bbacpi/ChangeLog
index 5b24d674b20c..82c4798900d2 100644
--- a/x11-misc/bbacpi/ChangeLog
+++ b/x11-misc/bbacpi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/bbacpi
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbacpi/ChangeLog,v 1.6 2006/04/10 19:23:19 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbacpi/ChangeLog,v 1.7 2006/11/05 21:54:11 dirtyepic Exp $
+
+  05 Nov 2006; <dirtyepic@gentoo.org> +files/bbacpi-0.1.5-noextraquals.diff,
+  bbacpi-0.1.5.ebuild:
+  Fix gcc 4.1 build error.  Thanks to William Keaney in bug #141032.
 
   10 Apr 2006; <smithj@gentoo.org> -bbacpi-0.1.3.ebuild,
   bbacpi-0.1.5.ebuild:
diff --git a/x11-misc/bbacpi/Manifest b/x11-misc/bbacpi/Manifest
index 9b2d03fd454c..ebe0dc6250f6 100644
--- a/x11-misc/bbacpi/Manifest
+++ b/x11-misc/bbacpi/Manifest
@@ -1,22 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c004841dc2e7bf98ba3c7ec23b5752ba ChangeLog 930
-RMD160 8793cfb0391a799cad896521b879ff08c35146bf ChangeLog 930
-SHA256 78c6cfd0ddb104ca1706d3ee18dbf5715d6f55e8ccf12170a6f3d84f050c2d17 ChangeLog 930
-MD5 95584514b403661697255d735479ce2b bbacpi-0.1.5.ebuild 629
-RMD160 4a500992f3cf1d8c034ffc4fe0fd47902bfccb92 bbacpi-0.1.5.ebuild 629
-SHA256 545ff2eaaab976ddba9c12ca443838f83ea975823133f539b1f6e755ef7c9843 bbacpi-0.1.5.ebuild 629
-MD5 30f6b8267a94c94fc0ca25faa86d5742 files/digest-bbacpi-0.1.5 238
-RMD160 c9dd7739dfa5a58b78b4c49126f36489ea4edbd0 files/digest-bbacpi-0.1.5 238
-SHA256 c6070a2330ac8a65441ef22ae66d35bdf232a8e9f63ecbc6caa3a8b2eae2d5cb files/digest-bbacpi-0.1.5 238
+AUX bbacpi-0.1.5-noextraquals.diff 468 RMD160 df1cc2e62df538c7b2300a64050ef1aa0ebafae6 SHA1 1009088a190514c776185a7433d6b609dd7276b9 SHA256 81959935f97c54244efa62dc3fea54a7e7a02abb0df3f21117986a1a60c5475a
+MD5 d304fd9c1bf2dd8e2c243bc70aa9da66 files/bbacpi-0.1.5-noextraquals.diff 468
+RMD160 df1cc2e62df538c7b2300a64050ef1aa0ebafae6 files/bbacpi-0.1.5-noextraquals.diff 468
+SHA256 81959935f97c54244efa62dc3fea54a7e7a02abb0df3f21117986a1a60c5475a files/bbacpi-0.1.5-noextraquals.diff 468
+DIST bbacpi-0.1.5.tar.gz 241565 RMD160 f0fd1d85ea891ca0cdbfaba29398ebc6a7649525 SHA1 10b86f6c27c9c5891656fa20e728c36c096d3742 SHA256 e3845b961f424461cd956b24b22613171b65f8fa1e302ad1ef713d22c9273e51
+EBUILD bbacpi-0.1.5.ebuild 736 RMD160 33fbaea82c470b7c6b55dd232361babc874936ea SHA1 2970b73a08e76b100fa36bc58bb9f7135abb7ccf SHA256 b5e34f109d53110a90591fc830948fed77a88e3688b6a1fd64c9c1f4ef0a57c2
+MD5 3394cb67649253fe1925f8da636ff2fa bbacpi-0.1.5.ebuild 736
+RMD160 33fbaea82c470b7c6b55dd232361babc874936ea bbacpi-0.1.5.ebuild 736
+SHA256 b5e34f109d53110a90591fc830948fed77a88e3688b6a1fd64c9c1f4ef0a57c2 bbacpi-0.1.5.ebuild 736
+MISC ChangeLog 1103 RMD160 c3ecf388ea112c63efda60b1499222c9f7891f57 SHA1 8efe34b0b7969897c5071f83955b6ac44d512bdd SHA256 aa68563b1f5ed676ef71bf1e0b80c63d71b87b8af67db54b0312ed59114a890e
+MD5 dfa32dec40e8e4548abe9e98df2527dd ChangeLog 1103
+RMD160 c3ecf388ea112c63efda60b1499222c9f7891f57 ChangeLog 1103
+SHA256 aa68563b1f5ed676ef71bf1e0b80c63d71b87b8af67db54b0312ed59114a890e ChangeLog 1103
+MISC metadata.xml 339 RMD160 f4f4be76eed193d6c00f478d380c387f4fa02cd4 SHA1 4185499e2b0323a1e7c2ce3ccd09166b26aa69d6 SHA256 97fd47adf43acead7f54ce7e3d16764110c685215fedc93ee7eeef24f62314f5
 MD5 63386012f26a419e69ec9f0cb6e188e3 metadata.xml 339
 RMD160 f4f4be76eed193d6c00f478d380c387f4fa02cd4 metadata.xml 339
 SHA256 97fd47adf43acead7f54ce7e3d16764110c685215fedc93ee7eeef24f62314f5 metadata.xml 339
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEO966I1lqEGTUzyQRAuTIAKDVFpNPUnK2Z7mDqUDEx/rNhSz9bwCgjOQs
-WdVRNGoRbchjZqpdXbxgxgk=
-=qiCf
------END PGP SIGNATURE-----
+MD5 30f6b8267a94c94fc0ca25faa86d5742 files/digest-bbacpi-0.1.5 238
+RMD160 c9dd7739dfa5a58b78b4c49126f36489ea4edbd0 files/digest-bbacpi-0.1.5 238
+SHA256 c6070a2330ac8a65441ef22ae66d35bdf232a8e9f63ecbc6caa3a8b2eae2d5cb files/digest-bbacpi-0.1.5 238
diff --git a/x11-misc/bbacpi/bbacpi-0.1.5.ebuild b/x11-misc/bbacpi/bbacpi-0.1.5.ebuild
index 30d0cf7e05f5..8bccec28d622 100644
--- a/x11-misc/bbacpi/bbacpi-0.1.5.ebuild
+++ b/x11-misc/bbacpi/bbacpi-0.1.5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbacpi/bbacpi-0.1.5.ebuild,v 1.2 2006/04/10 19:23:19 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbacpi/bbacpi-0.1.5.ebuild,v 1.3 2006/11/05 21:54:11 dirtyepic Exp $
+
+inherit eutils
 
 DESCRIPTION="ACPI monitor for X11"
 SRC_URI="mirror://sourceforge/bbacpi/${P}.tar.gz"
@@ -16,6 +18,13 @@ DEPEND="virtual/blackbox
 	sys-power/acpi
 	sys-power/acpid"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-noextraquals.diff
+}
+
 src_install () {
 	einstall || die "install failed"
 	dodoc README AUTHORS BUGS ChangeLog TODO
diff --git a/x11-misc/bbacpi/files/bbacpi-0.1.5-noextraquals.diff b/x11-misc/bbacpi/files/bbacpi-0.1.5-noextraquals.diff
new file mode 100644
index 000000000000..abf409b33c00
--- /dev/null
+++ b/x11-misc/bbacpi/files/bbacpi-0.1.5-noextraquals.diff
@@ -0,0 +1,14 @@
+diff -urN bbacpi-0.1.5/work/bbacpi-0.1.5/resource.hh bbacpi-0.1.5-r1/work/bbacpi-0.1.5/resource.hh
+--- bbacpi-0.1.5/work/bbacpi-0.1.5/resource.hh	2004-05-15 08:10:52.000000000 -0400
++++ bbacpi-0.1.5-r1/work/bbacpi-0.1.5/resource.hh	2006-07-19 09:29:28.000000000 -0400
+@@ -126,8 +126,8 @@
+ {
+   
+ public:
+-  Resource::Resource(ToolWindow *);
+-  Resource::~Resource(void);
++  Resource(ToolWindow *);
++  ~Resource(void);
+   
+   struct FRAME frame;
+   struct LABEL label;