Fixed gcc4 compile issues and removed nested c functions, fixes bug #137026.

Package-Manager: portage-2.1.1_pre1-r1

4 files changed, 123 insertions, 14 deletions

diff --git a/x11-wm/matchbox-panel/ChangeLog b/x11-wm/matchbox-panel/ChangeLog
index 8db2f70e1bb9..d4f2ca2726fc 100644
--- a/x11-wm/matchbox-panel/ChangeLog
+++ b/x11-wm/matchbox-panel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/matchbox-panel
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-panel/ChangeLog,v 1.3 2006/06/04 21:42:08 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-panel/ChangeLog,v 1.4 2006/06/20 18:59:46 yvasilev Exp $
+
+  20 Jun 2006; <yvasilev@gentoo.org>
+  +files/matchbox-panel-0.9.3-gcc4-no-nested-functions.patch,
+  matchbox-panel-0.9.3.ebuild:
+  Fixed gcc4 compile issues and removed nested c functions, fixes bug #137026.
 
 *matchbox-panel-0.9.3 (04 Jun 2006)
 
diff --git a/x11-wm/matchbox-panel/Manifest b/x11-wm/matchbox-panel/Manifest
index 429a8ad77bad..62ade348ad5b 100644
--- a/x11-wm/matchbox-panel/Manifest
+++ b/x11-wm/matchbox-panel/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX matchbox-panel-0.9.3-gcc4-no-nested-functions.patch 2077 RMD160 579977819d87c3c825e216d33b05ece979a089e9 SHA1 21d58dfc59e714f49e6195e40c0d7c07d80615fe SHA256 6d6dc5c92c90f5f97a9ce6293f2858d4c43b57392f08a8784a12487788525b9b
+MD5 f0465cb903248d892d115986cc697630 files/matchbox-panel-0.9.3-gcc4-no-nested-functions.patch 2077
+RMD160 579977819d87c3c825e216d33b05ece979a089e9 files/matchbox-panel-0.9.3-gcc4-no-nested-functions.patch 2077
+SHA256 6d6dc5c92c90f5f97a9ce6293f2858d4c43b57392f08a8784a12487788525b9b files/matchbox-panel-0.9.3-gcc4-no-nested-functions.patch 2077
 DIST matchbox-panel-0.9.2.tar.bz2 157604 RMD160 65e5849c04433354cae645af05aff7f6dd9e21e2 SHA1 438830e4f4bd59e953f1c131939a2081c0b6ec95 SHA256 efabe0377c7bd2e82a0b9d648be2213bf5a2af0e8e3fa1f059426f9ebcf35c23
 DIST matchbox-panel-0.9.3.tar.bz2 162477 RMD160 6a91d010c75b3eed1c0b0af79d48e5d41d5a4af2 SHA1 c54a0c1f35fcdc883e529ecdec123977c6325160 SHA256 319b656e2f1f25339d65802a3136f31169141fd54d1ca9131ff4aada62b25ce6
 EBUILD matchbox-panel-0.9.2.ebuild 1067 RMD160 a322544620f8451211943b4a21667102b7a8f2da SHA1 8870715102cf47a1a45cf0b6c5f69f58fc7a6c17 SHA256 df8e4750267b02e26d7d2491e857509a5415a5cfb16d6b185a66aec569ca0ee8
 MD5 ddba5f925f0d45ee264bfdb9caf01e63 matchbox-panel-0.9.2.ebuild 1067
 RMD160 a322544620f8451211943b4a21667102b7a8f2da matchbox-panel-0.9.2.ebuild 1067
 SHA256 df8e4750267b02e26d7d2491e857509a5415a5cfb16d6b185a66aec569ca0ee8 matchbox-panel-0.9.2.ebuild 1067
-EBUILD matchbox-panel-0.9.3.ebuild 1106 RMD160 709cb65655d6b21db0cdfb5167cc98bf171011cf SHA1 6955b1932e2e5aed6a94b7f8c7186f7ec3fec4bd SHA256 5d61458f865a384864d4fdcfc44210727865804b633297dd3f0de1d98852a363
-MD5 18dbb279b2dd3c60385cdbb22394b375 matchbox-panel-0.9.3.ebuild 1106
-RMD160 709cb65655d6b21db0cdfb5167cc98bf171011cf matchbox-panel-0.9.3.ebuild 1106
-SHA256 5d61458f865a384864d4fdcfc44210727865804b633297dd3f0de1d98852a363 matchbox-panel-0.9.3.ebuild 1106
-MISC ChangeLog 659 RMD160 831410076aaa505b103875de5bfb5f29415b9aab SHA1 64878e67f3ee60425a810017911981a91a40177b SHA256 74f42b4fc599f64a29bd695da1d887c91384119844770f6d2301cc7c063136dd
-MD5 9d6b95448f61002c221135de372be95d ChangeLog 659
-RMD160 831410076aaa505b103875de5bfb5f29415b9aab ChangeLog 659
-SHA256 74f42b4fc599f64a29bd695da1d887c91384119844770f6d2301cc7c063136dd ChangeLog 659
+EBUILD matchbox-panel-0.9.3.ebuild 1213 RMD160 76ffc54ba244f8ff0c3356ab7ac6fdc2d894f3d2 SHA1 c5c2e8045414a2186b127be67453fa5485e250e3 SHA256 3eff133f3c60404d3d24d6c3f3be3e59211e2df62d2165ddeba305f78255e575
+MD5 293f94c93b4f518ee31d29923b531de2 matchbox-panel-0.9.3.ebuild 1213
+RMD160 76ffc54ba244f8ff0c3356ab7ac6fdc2d894f3d2 matchbox-panel-0.9.3.ebuild 1213
+SHA256 3eff133f3c60404d3d24d6c3f3be3e59211e2df62d2165ddeba305f78255e575 matchbox-panel-0.9.3.ebuild 1213
+MISC ChangeLog 869 RMD160 413d2f0dfe6d084530af6192502c471310f55728 SHA1 3eec5720be7b2ae7251dde9bff817ff55d07a162 SHA256 ba5a2bc9449bc95f4c45a15cbcab3e556f08a2f7ec6c95959bd58aca506e092a
+MD5 804320386a56f8831c255ec63aba3380 ChangeLog 869
+RMD160 413d2f0dfe6d084530af6192502c471310f55728 ChangeLog 869
+SHA256 ba5a2bc9449bc95f4c45a15cbcab3e556f08a2f7ec6c95959bd58aca506e092a ChangeLog 869
 MISC metadata.xml 247 RMD160 49e7f36b66be574d7f3341589ebff702e1c8c8a9 SHA1 af1f5473be400926e7bf9a98a354866150c8b7a7 SHA256 09c798d19a28d8e2ee2b8494e011929f5fc1617190315d82bd03c32e911def55
 MD5 a80bc50cf196a9e5a2764d6f6081b56a metadata.xml 247
 RMD160 49e7f36b66be574d7f3341589ebff702e1c8c8a9 metadata.xml 247
@@ -28,7 +32,7 @@ SHA256 e2bd3a5de2ceee17e65791305a7c7feb3088db7212415166e54403988ff90cce files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEg1N1yZl4piiTjjYRAsAOAKCXXY8kfflcj/ggmzJXHFTKJVjuEQCg0o6Y
-rAyQZZzTm1qQF8EXQWHaRGw=
-=LTHC
+iD8DBQFEmEVhyZl4piiTjjYRAuXVAKDGIl6Jr8o5hI3SUd4kXe7zKoURaACeL7SP
+wR7Pwtq/7b8mtsKhs0a+5CY=
+=Yu91
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/matchbox-panel/files/matchbox-panel-0.9.3-gcc4-no-nested-functions.patch b/x11-wm/matchbox-panel/files/matchbox-panel-0.9.3-gcc4-no-nested-functions.patch
new file mode 100644
index 000000000000..8dcafbd7d93b
--- /dev/null
+++ b/x11-wm/matchbox-panel/files/matchbox-panel-0.9.3-gcc4-no-nested-functions.patch
@@ -0,0 +1,93 @@
+diff -Naurp matchbox-panel-0.9.3.orig/applets/mb-applet-battery.c matchbox-panel-0.9.3/applets/mb-applet-battery.c
+--- matchbox-panel-0.9.3.orig/applets/mb-applet-battery.c	2006-02-07 22:27:24.000000000 +0000
++++ matchbox-panel-0.9.3/applets/mb-applet-battery.c	2006-06-20 18:12:00.000000000 +0000
+@@ -157,50 +157,50 @@ struct avg_consumption {
+ 
+ static struct avg_consumption a;
+ 
++enum ac_state { AC_UNKNOWN = -1, AC_OFFLINE = 0, AC_ONLINE = 1 };
++enum bat_state { BAT_UNKNOWN = -1, BAT_CHARGING = 1, BAT_DISCHARGING = 2 };
++
++struct entry {
++	char *key;
++	char *value;
++	char *unit;
++};
++
++struct acpi_status {
++	enum ac_state	ac_state;
++	enum bat_state	bat_state;
++	unsigned long	design_capacity;
++	unsigned long	remaining_capacity;
++	unsigned long	present_rate;
++};
++
+ static int
+-read_apm(int *values)
++line_parse(char *line, struct entry *e)
+ {
+-	enum ac_state { AC_UNKNOWN = -1, AC_OFFLINE = 0, AC_ONLINE = 1 };
+-	enum bat_state { BAT_UNKNOWN = -1, BAT_CHARGING = 1, BAT_DISCHARGING = 2 };
+-
+-	struct entry {
+-		char *key;
+-		char *value;
+-		char *unit;
+-	};
+-
+-	struct acpi_status {
+-		enum ac_state	ac_state;
+-		enum bat_state	bat_state;
+-		unsigned long	design_capacity;
+-		unsigned long	remaining_capacity;
+-		unsigned long	present_rate;
+-	};
++	char *ptr;
+ 
+-	static int
+-	line_parse(char *line, struct entry *e)
+-	{
+-		char *ptr;
+-		
+-		ptr = strchr(line, ':');
+-		if (!ptr)
+-			return -1;
+-		e->key = line;
+-		*ptr = 0;
+-		while (*++ptr && *ptr == ' ');
+-		e->value = ptr;
+-		while (*++ptr && *ptr != '\n' && *ptr != ' ');
++	ptr = strchr(line, ':');
++	if (!ptr)
++		return -1;
++	e->key = line;
++	*ptr = 0;
++	while (*++ptr && *ptr == ' ');
++	e->value = ptr;
++	while (*++ptr && *ptr != '\n' && *ptr != ' ');
++	*ptr = 0;
++	if (*++ptr) {
++		e->unit = ptr;
++		while (*++ptr && *ptr != '\n');
+ 		*ptr = 0;
+-		if (*++ptr) {
+-			e->unit = ptr;
+-			while (*++ptr && *ptr != '\n');
+-			*ptr = 0;
+-		} else
+-			e->unit = 0;
+-	
+-		return 0;
+-	}
++	} else
++		e->unit = 0;
++
++	return 0;
++}
+ 
++static int
++read_apm(int *values)
++{
+ 	FILE *f;
+ 	char line[1024];
+ 	struct entry e;
diff --git a/x11-wm/matchbox-panel/matchbox-panel-0.9.3.ebuild b/x11-wm/matchbox-panel/matchbox-panel-0.9.3.ebuild
index 08e9e4b3efd3..05713c05363f 100644
--- a/x11-wm/matchbox-panel/matchbox-panel-0.9.3.ebuild
+++ b/x11-wm/matchbox-panel/matchbox-panel-0.9.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 2006-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-panel/matchbox-panel-0.9.3.ebuild,v 1.1 2006/06/04 21:42:08 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-panel/matchbox-panel-0.9.3.ebuild,v 1.2 2006/06/20 18:59:46 yvasilev Exp $
 
-inherit versionator
+inherit eutils versionator
 
 DESCRIPTION="The Matchbox Panel"
 HOMEPAGE="http://projects.o-hand.com/matchbox/"
@@ -20,6 +20,13 @@ DEPEND=">=x11-libs/libmatchbox-1.5
 RDEPEND="${DEPEND}
 	x11-wm/matchbox-common"
 
+src_unpack () {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-gcc4-no-nested-functions.patch"
+}
+
 src_compile() {
 	econf	$(use_enable debug) \
 		$(use_enable nls) \