Add missing eutils.eclass, fix building with >=gcc-4.4 wrt #376451 by Diego Elio...

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

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 474898a2db5a5ce534eb5e8c6ca1123e0f4d7270..92b9c6d3fa97e00de65298638b329483d37f122b 100644 (file)
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.145 2011/07/19 13:17:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.146 2011/11/03 21:03:49 xarthisius Exp $
+
+  03 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> icewm-1.3.7.ebuild,
+  +files/icewm-1.3.7-gcc44.patch:
+  Add missing eutils.eclass, fix building with >=gcc-4.4 wrt #376451 by Diego
+  Elio Petteno
 
 *icewm-1.3.7 (19 Jul 2011)
 

diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index c5893b1a6edbb5b69929c4fdedaa8fdd7e0593b5..73df813b8ea14d01689464721e85678787e33fa8 100644 (file)
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,19 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX IceWM.desktop 200 RMD160 0b1de8ea8569d3e15006dcee81d582404d73685f SHA1 8d12634a04634d228243c1fb3834c6d18088bc68 SHA256 7564e6a573365eae529b849c7f5723eaef39258d785fd83de42e122cdf8e0eb1
 AUX icewm-1.2.37-gnome2.patch 1194 RMD160 e378782e1c4ede9e776f9b4e4189e6db47f40da3 SHA1 2fad6a6402bc34d94af5a3cccd6a5066d85b0d4e SHA256 c1f64007fe60a898b3f816b08b8ef03a8ed9607a4367aead176220ad0b56c3c9
+AUX icewm-1.3.7-gcc44.patch 434 RMD160 a65340320be77bf03896db3a36b35d75014df2e5 SHA1 5c06dcd409c598eb1c44ea33634529ee79678670 SHA256 60e421ae6de444cacd4e854991b43029422cf1ed1f03a37c17271fb971d0ba76
 AUX icewm-uclibc.patch 708 RMD160 868be4c981dbcb8802d74321d77a43b91b0a3e7a SHA1 557a70d7a4d8193c7d8ca427c142edd9676e792e SHA256 3357b8d27e4979a59fc45298ded733c623832143b1c155da72cfb24aee6d3e95
 DIST icewm-1.2.37.tar.gz 841879 RMD160 1e28eb750fd07321cf66bcaa617fc782acbb82f1 SHA1 bee1ca66d2282888807551bc28a65b08e4108027 SHA256 bfb60165cddafb458cbfd4b4b9203aa351e37cb75e0ad0c64e818b6fd2140595
 DIST icewm-1.3.7.tar.gz 898197 RMD160 0b6682eff832b6b05200d5c9581d293b80af0ebb SHA1 ce8d86190e275dc7db2d8c28472a579264120803 SHA256 ca1a78046ae340c324c441ce24a9675c24a8bafd3eb6ed8205345785da08887b
 EBUILD icewm-1.2.37.ebuild 2913 RMD160 c474cfda2755901be1d746730664b8020d33df1a SHA1 3e3d6a8265e84815cb8c18110a85cd7b12cf777b SHA256 97ee85df7dbb4a0967d185bae151f9ec0624830c058d1f5b30ef31516cd8c3a1
-EBUILD icewm-1.3.7.ebuild 2603 RMD160 171b8f4c22185cecee6369f6401c39efc021ad74 SHA1 691a8b063aad646cf51ded1815d183580f7cc4dc SHA256 b2680a0a0b198b884da6ee06b569d60b3636f1e91bcbb0251b8173e7c684a993
-MISC ChangeLog 22143 RMD160 2d820de80772d67b46c9eb17ddbff99c175bf071 SHA1 0fad67f110bbcf290d1c371e4820ad6b3c1b18ee SHA256 befe2e6ed807b87974081b5def5783235ba5035c4bf069cf44fbda8a255ca053
+EBUILD icewm-1.3.7.ebuild 2665 RMD160 4f07853978a803cfa59bbab1e5444e37f40a92d9 SHA1 033fd9fab17fc32dd693c888ac80e41267f9c250 SHA256 88313e7eef7e3ad8d7e15e303250da25d91fdca741c609c5c892bc83b96888cb
+MISC ChangeLog 22352 RMD160 535666aa8f3820bad75d961c9bbb872ca9e401da SHA1 3f93a04af47d5b5f05e78300ca4be9a4bc1f61b5 SHA256 84548ce6fbdd2f771e3526ec02376ed872cc29c13d061ec51cc4df056ab7c041
 MISC metadata.xml 402 RMD160 8bade9b4bbf71a65376c80ba4492cff2acd9dd20 SHA1 d771e9460126efaeea2e7214f44a1e6ad9acaeee SHA256 d46d24046043ffdcab650808421c66fe7bb9cd8bd3fcc0823244b92fab57bfde
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4lg9IACgkQVWmRsqeSphPL8ACfXd5r5XV+7Jei2kZNOdU5IZw2
-jFAAn0Grsx/LlRSAbJuJbZZP0c9qbIlU
-=V5YM
+iQIcBAEBCAAGBQJOswG/AAoJEF0huFKJUZL51vwQAIGDqoyTVyITrGGD3BeFPrUl
+kKZ7e5veJXpCBfyypjSO93KttydbXVi2hE6VJxRCWvEosHH2EMqPGzy2BY7ewUfw
+FBL602gqZEtdv7UAwchujlIlihnwXum3Zs/iLRqiSWoPu7HroZdO7dLg6yVLjS5s
+CSdYIc+anBfU9DNUxQCv+Xo8Wq2V4yeEy1LllLIfiDsz5WOqXaHRlaXnoYGEKY7u
+XQPG2jlDsnUjtnVDB+qlg4cv9nBLNuFaYIG8C2ijxn5Pc8fX9UIYB9Kt072daMZM
+LNbi7LWVVdwM1nzkh+okwNxzYOVDjt44J17eMdco8Owju6Dth/9qPLZ0br4+yfSt
+L20U9O4W8SpmU/rsGd/7z1PH+V+U4NV98g+6Miq310CCsFN6dJSltyOAyyOepdS/
+sjenIR4myvVDvI+bHO5dv5xryYg22yh1rlHOMUzfW84Z0tyyRBr9zNT3uNjCWgdb
+pWIjHZ1l6LPtyr1MbsPR6+56MeLv5z7rQxRvK3f7n/zJF/sPImyxWBhjt21D20Zv
+Y8vWigOa/wWWPmP4ORngc0Ojq5Y5KSFJB7WdVDpc5XDha1OGZoA80Njf4c5DgsoJ
+gll5Ou7wtxeO2IQ/UZebGGyh6nJDW/wnhIr46kelEDGhuF30uZA3yyJTmcyTHOYf
+cSBa7wR74HSoVOncUaLX
+=NQWY
 -----END PGP SIGNATURE-----

diff --git a/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch b/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch
new file mode 100644 (file)
index 0000000..d500f64
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/show_bug.cgi?id=376451
+
+--- a/src/wmapp.cc
++++ b/src/wmapp.cc
+@@ -337,7 +337,7 @@
+             char ** fontPath(XGetFontPath(xapp->display(), &ndirs));
+ 
+             char ** newFontPath = new char *[ndirs + 1];
+-            newFontPath[ndirs] = fontsdir;
++            newFontPath[ndirs] = (char *)fontsdir;
+ 
+             if (fontPath)
+                 memcpy(newFontPath, fontPath, ndirs * sizeof (char *));

diff --git a/x11-wm/icewm/icewm-1.3.7.ebuild b/x11-wm/icewm/icewm-1.3.7.ebuild
index 42880c1e789b0137e5fd25c2f5576166277dccc3..26558c4ae86cf13f7ad2495f381f3a11938b6f97 100644 (file)
--- a/x11-wm/icewm/icewm-1.3.7.ebuild
+++ b/x11-wm/icewm/icewm-1.3.7.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.3.7.ebuild,v 1.1 2011/07/19 13:17:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.3.7.ebuild,v 1.2 2011/11/03 21:03:49 xarthisius Exp $
 
 EAPI="4"
 
+inherit eutils
+
 DESCRIPTION="Ice Window Manager with Themes"
 HOMEPAGE="http://www.icewm.org/"
 LICENSE="GPL-2"
@@ -45,11 +47,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+       epatch "${FILESDIR}"/${P}-gcc44.patch
        cd "${S}/src"
-       use uclibc && epatch "${FILESDIR}/icewm-uclibc.patch"
+       use uclibc && epatch "${FILESDIR}/${PN}-uclibc.patch"
 
-       echo "#!/bin/sh" > "$T/icewm"
-       echo "/usr/bin/icewm-session" >> "$T/icewm"
+       echo "#!/bin/sh" > "$T/${PN}"
+       echo "/usr/bin/icewm-session" >> "$T/${PN}"
 }
 
 src_configure() {