Fix for bug #147388, package.mask can be lifted

svn path=/trunk/; revision=81

4 files changed, 81 insertions, 20 deletions

diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index ab41e6b..25bffa7 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -1,20 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX lcd4linux-0.10.0-gcc4-compat.patch 1900 RMD160 7204be896b38bd473b39d2a8ce2cc0f84975c1f2 SHA1 0d882c28e75c4695cd7fe59aa5073b493d12dc22 SHA256 93709bc1e68048c5e82e3d9abe01867f7159f1f6b82e8c029449dcf60df2e4b7
+MD5 54eefebca300a4907136a15299b035a5 files/lcd4linux-0.10.0-gcc4-compat.patch 1900
+RMD160 7204be896b38bd473b39d2a8ce2cc0f84975c1f2 files/lcd4linux-0.10.0-gcc4-compat.patch 1900
+SHA256 93709bc1e68048c5e82e3d9abe01867f7159f1f6b82e8c029449dcf60df2e4b7 files/lcd4linux-0.10.0-gcc4-compat.patch 1900
 AUX lcd4linux-0.9.11-modular-x.patch 511 RMD160 eea3d8d972e4c8d51f0bd2a386fde2ce1f1b2a81 SHA1 62b23be4a3a9c84709b1f5e35fa382cab17bc5e5 SHA256 170c44c963a14d73974f910e6fd3b58c3cb7adbae1155b5b494f0c8253894c10
 MD5 6ede29698c02eb80e3d9561bfa951681 files/lcd4linux-0.9.11-modular-x.patch 511
 RMD160 eea3d8d972e4c8d51f0bd2a386fde2ce1f1b2a81 files/lcd4linux-0.9.11-modular-x.patch 511
 SHA256 170c44c963a14d73974f910e6fd3b58c3cb7adbae1155b5b494f0c8253894c10 files/lcd4linux-0.9.11-modular-x.patch 511
 DIST lcd4linux-0.10.0.tar.gz 294851 RMD160 98f810297de3d746d559998516b83a2939fc8568 SHA1 325d8549c83bb62e31492285001a1007d1f9960b SHA256 0b880d4baf612e5689d3b97d7c699df864cdb690b354eadd2a3d4e341511e909
 DIST lcd4linux-0.9.11.tar.gz 218557 RMD160 55257d7c5951938ce7a1b878935139e436514ef0 SHA1 9dec2d2b8d236adba59d531f1167fab295f0c1b0 SHA256 7d90fd3fbd5907c1db56f78b88eddaf80cef9b2012214ad3118f9b6f72c35627
-EBUILD lcd4linux-0.10.0.ebuild 2779 RMD160 0351e8febb3ebe092270055dcae6efb653f9304e SHA1 0e1288afc70574c0d0b10592b343f3db02267354 SHA256 9fb7297578ec2f0fa35062ec0fbb3130d80303e62ad26b0f91cf30202346fe9f
-MD5 ae3dc226f2533fdbfb3741f2a5711bef lcd4linux-0.10.0.ebuild 2779
-RMD160 0351e8febb3ebe092270055dcae6efb653f9304e lcd4linux-0.10.0.ebuild 2779
-SHA256 9fb7297578ec2f0fa35062ec0fbb3130d80303e62ad26b0f91cf30202346fe9f lcd4linux-0.10.0.ebuild 2779
-EBUILD lcd4linux-0.9.11.ebuild 1588 RMD160 684c977006a5968259562348f93f4dd319c2bbd5 SHA1 e339b60f166ee2191d67644685d3e1e3f9aa2412 SHA256 912bb5b842dbe8c2770e1b35301a5f31facbe4565e6c1ca0cfefdcc47da282af
-MD5 e9bd2a2f5f85ac93b7dde4145ff46cb0 lcd4linux-0.9.11.ebuild 1588
-RMD160 684c977006a5968259562348f93f4dd319c2bbd5 lcd4linux-0.9.11.ebuild 1588
-SHA256 912bb5b842dbe8c2770e1b35301a5f31facbe4565e6c1ca0cfefdcc47da282af lcd4linux-0.9.11.ebuild 1588
+EBUILD lcd4linux-0.10.0.ebuild 2866 RMD160 4a4c802d09f1b74f0bb5fee2c394877d6caeca79 SHA1 40a5375737272bb04f7b6bdc297817669fd12e2b SHA256 330bb8fcc7e7c81e54fdaf13e954c60f27eda79ee995df0bced95334d7973833
+MD5 f824243faf36bf6ed8b76c79fd80abad lcd4linux-0.10.0.ebuild 2866
+RMD160 4a4c802d09f1b74f0bb5fee2c394877d6caeca79 lcd4linux-0.10.0.ebuild 2866
+SHA256 330bb8fcc7e7c81e54fdaf13e954c60f27eda79ee995df0bced95334d7973833 lcd4linux-0.10.0.ebuild 2866
+EBUILD lcd4linux-0.9.11.ebuild 1595 RMD160 7b7e57bfcf2582a1ae20e8e36a1bb10db13d1fd0 SHA1 b59afadbe3279f3364616239f0553ac69aa60472 SHA256 22ef690dbb4dad20ad2c6f13816ea26f683df204b11cbef93e156cc4a12f1658
+MD5 7a901b132984cff026aae2a8cb8ee54c lcd4linux-0.9.11.ebuild 1595
+RMD160 7b7e57bfcf2582a1ae20e8e36a1bb10db13d1fd0 lcd4linux-0.9.11.ebuild 1595
+SHA256 22ef690dbb4dad20ad2c6f13816ea26f683df204b11cbef93e156cc4a12f1658 lcd4linux-0.9.11.ebuild 1595
 MISC ChangeLog 3016 RMD160 c12fdc1e4228e782db05b38e53f0468e3448c49d SHA1 d670880bf048e8187e6db0f09809a61154d55396 SHA256 dc090e5ebe9fab061729aaa0f4bb873326632cbe26bda99ff0311e9cab2b53cf
 MD5 57c8a3e356c75ec278564aebbf05c0bb ChangeLog 3016
 RMD160 c12fdc1e4228e782db05b38e53f0468e3448c49d ChangeLog 3016
@@ -29,10 +30,3 @@ SHA256 4c83e624811751fc7f8241bb9f0a7b904460fa18841ebce93b464c7858988afd files/di
 MD5 13ed5c0953ded79c7f0bec71639165d3 files/digest-lcd4linux-0.9.11 250
 RMD160 eda6875e2399a5a0dbd6e524ad54dc9eff4d64a5 files/digest-lcd4linux-0.9.11 250
 SHA256 35fd2911bf35973aa9b05f59c3b40d7637d4d89eb9ce4630fab451816619ce9d files/digest-lcd4linux-0.9.11 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFR9pzz974XjDVpbkRAvEVAJ9PoKdgFvBt9Cmc76N6xeUBC5yQjACgsZiF
-L5Tr0tCGRweHJ9BfIPyUrog=
-=VCKu
------END PGP SIGNATURE-----
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch
new file mode 100644
index 0000000..3e66979
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch
@@ -0,0 +1,60 @@
+GCC4 fixes, see bug #147388.
+Patch from upstream SVN
+
+--- /trunk/drv_SimpleLCD.c (revision 547)
++++ /trunk/drv_SimpleLCD.c (revision 581)
+@@ -1,3 +1,3 @@
+-/* $Id: drv_SimpleLCD.c,v 1.4 2005/05/08 04:32:44 reinelt Exp $
++/* $Id: drv_SimpleLCD.c,v 1.5 2005/07/06 04:40:18 reinelt Exp $
+  * 
+  * driver for a simple serial terminal.
+@@ -23,4 +23,7 @@
+  *
+  * $Log: drv_SimpleLCD.c,v $
++ * Revision 1.5  2005/07/06 04:40:18  reinelt
++ * GCC-4 fixes
++ *
+  * Revision 1.4  2005/05/08 04:32:44  reinelt
+  * CodingStyle added and applied
+@@ -199,4 +202,5 @@
+ {
+     int rows = -1, cols = -1;
++    int value;
+     unsigned int flags = 0;
+     char *s;
+@@ -210,7 +214,8 @@
+     }
+ 
+-    cfg_number(section, "BarCharValue", 0, 0, 255, &flags);
+-    bar_char = flags;
+-    cfg_number(section, "Options", 0, 0, 0xffff, &flags);
++    cfg_number(section, "BarCharValue", 0, 0, 255, &value);
++    bar_char = value;
++    cfg_number(section, "Options", 0, 0, 0xffff, &value);
++    flags = value;
+     if (drv_generic_serial_open(section, Name, flags) < 0)
+ 	return -1;
+Index: /trunk/lcd4linux_i2c.h
+===================================================================
+--- /trunk/lcd4linux_i2c.h (revision 562)
++++ /trunk/lcd4linux_i2c.h (revision 581)
+@@ -1,3 +1,3 @@
+-/* $Id: lcd4linux_i2c.h,v 1.2 2005/06/01 12:09:13 reinelt Exp $
++/* $Id: lcd4linux_i2c.h,v 1.3 2005/07/06 04:40:18 reinelt Exp $
+  *
+  * user space i2c sturctures and defines, taken from the official kernel i2c 
+@@ -33,4 +33,7 @@
+  *
+  * $Log: lcd4linux_i2c.h,v $
++ * Revision 1.3  2005/07/06 04:40:18  reinelt
++ * GCC-4 fixes
++ *
+  * Revision 1.2  2005/06/01 12:09:13  reinelt
+  * removed ^M from lcd4linux_i2c.h; indent.sh run
+@@ -79,5 +82,5 @@
+ /* Transfer num messages.
+  */
+-extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num);
++extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num);
+ 
+ /*
diff --git a/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild
index 0accc20..5d5e7ef 100644
--- a/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild,v 1.3 2006/10/31 22:20:25 jokey Exp $
 
-#inherit eutils
+inherit eutils
 
 DESCRIPTION="Shows system and ISDN information on an external display or in a X11 window"
 HOMEPAGE="http://ssl.bulix.org/projects/lcd4linux/"
@@ -28,6 +28,13 @@ pkg_preinst() {
 	einfo "the LCD4LINUX_PLUGINS and LCD4LINUX_DRIVERS environment variables."
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-gcc4-compat.patch"
+}
+
 src_compile() {
 	local myconf myp myd
 
diff --git a/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild b/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild
index 5a90ed1..182f80f 100644
--- a/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild
@@ -7,7 +7,7 @@ WANT_AUTOMAKE="latest"
 inherit eutils autotools
 
 DESCRIPTION="Shows system and ISDN information on an external display or in a X11 window"
-HOMEPAGE="http://lcd4linux.sourceforge.net/"
+HOMEPAGE="http://ssl.bulix.org/projects/lcd4linux/"
 SRC_URI="mirror://sourceforge/lcd4linux/${P}.tar.gz"
 
 LICENSE="GPL-2"