Fixing gcc-4.1 building, bug #131829

Package-Manager: portage-2.1_pre9-r5

5 files changed, 57 insertions, 13 deletions

diff --git a/games-board/slibo/ChangeLog b/games-board/slibo/ChangeLog
index 46df7bf1abed..cbb4a0f8fbd0 100644
--- a/games-board/slibo/ChangeLog
+++ b/games-board/slibo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/slibo
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/slibo/ChangeLog,v 1.7 2004/12/30 00:41:23 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/slibo/ChangeLog,v 1.8 2006/04/30 21:50:37 tupone Exp $
+
+  30 Apr 2006; <Tupone@gentoo.org> +files/slibo-0.4.4-gcc41.patch,
+  slibo-0.4.4.ebuild:
+  Fix for gcc-4.1, bug #131829 by me
 
   29 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
   +files/0.4.4-gcc34.patch, slibo-0.4.4.ebuild:
diff --git a/games-board/slibo/Manifest b/games-board/slibo/Manifest
index da9577e0852a..390fcb9b31a0 100644
--- a/games-board/slibo/Manifest
+++ b/games-board/slibo/Manifest
@@ -1,5 +1,34 @@
-MD5 75e91af84bd534d7cfb9fd86d2fe879b ChangeLog 798
-MD5 8a3f793fc831f69a2b8e179b20946af0 slibo-0.4.4.ebuild 810
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 edaca2f8718114ab18c48cda4794b2d1 files/digest-slibo-0.4.4 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.4.4-gcc34.patch 2638 RMD160 1fcf2af07e493d583159010520f242bcbe0deb60 SHA1 a6a1fbd57b34e6c4bd820884dafa2ff0a8d58ee9 SHA256 095c5e6055b2a1fd0efd696b172e960c1b4426523294c2a413ce041b95052ab9 size 2638
 MD5 2956467632bec1b5ec193090cccbdca9 files/0.4.4-gcc34.patch 2638
+RMD160 1fcf2af07e493d583159010520f242bcbe0deb60 files/0.4.4-gcc34.patch 2638
+SHA256 095c5e6055b2a1fd0efd696b172e960c1b4426523294c2a413ce041b95052ab9 files/0.4.4-gcc34.patch 2638
+AUX slibo-0.4.4-gcc41.patch 441 RMD160 4e8b82e67d06ce08d50af72830f34665a6d6322c SHA1 c6c9ea8f45e2afa0b7763bb55b994cd542a8da70 SHA256 372dd6ea94c35f157ba633dc3ba6f18f4d84710495091b3a88ff4a1ae036a30f size 441
+MD5 12c86df41d9ec9d6a0011ca814c00c6d files/slibo-0.4.4-gcc41.patch 441
+RMD160 4e8b82e67d06ce08d50af72830f34665a6d6322c files/slibo-0.4.4-gcc41.patch 441
+SHA256 372dd6ea94c35f157ba633dc3ba6f18f4d84710495091b3a88ff4a1ae036a30f files/slibo-0.4.4-gcc41.patch 441
+DIST slibo-0.4.4.tar.bz2 897532 RMD160 b8b3d000b6124b548cd310b5981cdd846b81a953 SHA256 83aef936812f9499be0c12a9f9ed76041679e6991bc860572a2e4dd0083ce853 size 897532
+EBUILD slibo-0.4.4.ebuild 793 RMD160 cb53bfc839f6e6a8d79f06ef8ca4ca6b8421116b SHA1 6308c2b2304fbbec8a05a7cb6dc41ee770981630 SHA256 a6a4c320107d7887ad915d417538b08bc01ea4768ed2c3db94bf667f8c5606b8 size 793
+MD5 4ca9795d42b0964545a4b3d3e69c7b56 slibo-0.4.4.ebuild 793
+RMD160 cb53bfc839f6e6a8d79f06ef8ca4ca6b8421116b slibo-0.4.4.ebuild 793
+SHA256 a6a4c320107d7887ad915d417538b08bc01ea4768ed2c3db94bf667f8c5606b8 slibo-0.4.4.ebuild 793
+MISC ChangeLog 922 RMD160 eb2bc20c0e193c8186e0a9ea9081184478538139 SHA1 6431e3486bee82e24ec209935b9e7a643d3edce0 SHA256 51e728366d36ca816a9c02d225a2313b9502286efa84dbf0ada570b9477fda2e size 922
+MD5 f4021237772698fa5903d35f3b578f3e ChangeLog 922
+RMD160 eb2bc20c0e193c8186e0a9ea9081184478538139 ChangeLog 922
+SHA256 51e728366d36ca816a9c02d225a2313b9502286efa84dbf0ada570b9477fda2e ChangeLog 922
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 6970051922eb3912c40cd57748c3db1d files/digest-slibo-0.4.4 238
+RMD160 06014581562f5353732e364bfd7d2642fc4b6e2a files/digest-slibo-0.4.4 238
+SHA256 d6bdf4ac35c824ead93ef98a4fae063a6ffe1d8d9102cef83305a1bc6bc6d989 files/digest-slibo-0.4.4 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEVTFE2CTtIKiFlQIRAkorAJ9T8L65fwLOrxPlIzscMSeSZDhL6QCfe29b
+xdXuNlYgdDWMwvcgJeoC9/U=
+=utnl
+-----END PGP SIGNATURE-----
diff --git a/games-board/slibo/files/digest-slibo-0.4.4 b/games-board/slibo/files/digest-slibo-0.4.4
index 827915e518e9..3b1053fab299 100644
--- a/games-board/slibo/files/digest-slibo-0.4.4
+++ b/games-board/slibo/files/digest-slibo-0.4.4
@@ -1 +1,3 @@
 MD5 145a2bcf3d1e9769ccd30b8f1d1ee8ea slibo-0.4.4.tar.bz2 897532
+RMD160 b8b3d000b6124b548cd310b5981cdd846b81a953 slibo-0.4.4.tar.bz2 897532
+SHA256 83aef936812f9499be0c12a9f9ed76041679e6991bc860572a2e4dd0083ce853 slibo-0.4.4.tar.bz2 897532
diff --git a/games-board/slibo/files/slibo-0.4.4-gcc41.patch b/games-board/slibo/files/slibo-0.4.4-gcc41.patch
new file mode 100644
index 000000000000..dfb84f01cbc7
--- /dev/null
+++ b/games-board/slibo/files/slibo-0.4.4-gcc41.patch
@@ -0,0 +1,13 @@
+--- src/sliboengine/search.c	2006-04-30 01:47:33.000000000 +0200
++++ src/sliboengine/search.c.new	2006-04-30 01:56:28.000000000 +0200
+@@ -282,7 +282,9 @@
+         inCheckSig(b);
+         b->color = -b->color;
+     Move *lastMove = movegen((constBoard *)b, firstMove);
+-    (ply <= 0) ? stats.qPos : stats.pos += lastMove - firstMove;
++    if (ply > 0) {
++      stats.pos += lastMove - firstMove;
++    }
+ 
+     Move bestMove;
+ #ifdef PREHASH
diff --git a/games-board/slibo/slibo-0.4.4.ebuild b/games-board/slibo/slibo-0.4.4.ebuild
index adcb8ecb1a3f..c743e582c010 100644
--- a/games-board/slibo/slibo-0.4.4.ebuild
+++ b/games-board/slibo/slibo-0.4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/slibo/slibo-0.4.4.ebuild,v 1.9 2004/12/30 00:41:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/slibo/slibo-0.4.4.ebuild,v 1.10 2006/04/30 21:50:37 tupone Exp $
 
 inherit eutils kde
 
@@ -16,11 +16,7 @@ IUSE=""
 DEPEND="=dev-db/sqlite-2*"
 need-kde 3
 
-src_unpack() {
-	kde_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}-gcc34.patch"
-}
+PATCHES="${FILESDIR}/${PV}-gcc34.patch ${FILESDIR}/${P}-gcc41.patch"
 
 pkg_postinst() {
 	einfo "If you updated from an older version, please do a"