Fix building on alpha (drop extra include defining it's own strlen).

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 26 insertions, 15 deletions

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index 8ddb4e2fa5a6..c5a3a5fe50af 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/afterstep
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.91 2010/06/24 09:28:21 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.92 2010/06/26 16:23:39 ssuominen Exp $
+
+  26 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  afterstep-2.2.9.ebuild, +files/afterstep-2.2.9-alpha.patch:
+  Fix building on alpha (drop extra include defining it's own strlen).
 
   24 Jun 2010; Christoph Mende <angelos@gentoo.org> afterstep-2.2.9.ebuild:
   Stable on amd64 wrt bug #306107
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index 07022925f008..441bdaa1c6c5 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX afterstep 29 RMD160 a1fafb8971d47c7cebfe972bb74bbef19de4ac52 SHA1 7ce7a198aef7adb7484981fed4b84798311f5409 SHA256 c6e31f7e4912188f1ce7c41298cb66178944960628e1451efd42331236cbc3c5
+AUX afterstep-2.2.9-alpha.patch 475 RMD160 8945b4685e011e49a0c81c835cbe37bf275046c7 SHA1 d80c3791133c101fa4a914cd442d7b1afe9815e2 SHA256 3208d1126ba14fc8c39c537cea701b2c89bcf9f778645add0e3465ce74139cd6
 AUX afterstep-2.2.9-make_session_data_file.patch 422 RMD160 b4e694ac6514d34dfbee5f6fe15ffa109e5bfbad SHA1 932abcf0c2fb469e45e95035244d97df40c8dfe1 SHA256 3fa0e494903d374db0da66de432e407889356cd50d1072aa4078516f5d31b5a3
 AUX no-alternatives-2.2.9.patch 1214 RMD160 c6a02643da9c82c5228800a399ffd6ce89c0b542 SHA1 140e5d5d011df340ece7f36a88c7f49540786a89 SHA256 f7a87859d043b210dd309128c9338e938f695cf248d2987ae2b8535243405e4f
 AUX no-alternatives.patch 1178 RMD160 de3efea2502d9f8f8dbe403a4cc5c2e796017afd SHA1 11e79670530f8c9846adbe2a4fbe2cfc53a9688e SHA256 c3849ba4cd53fa1de52ab3b743b194b005754577dbe661ad7ee23a4b3eef36fc
 DIST AfterStep-2.2.4.tar.bz2 5707951 RMD160 74ab7c74afce8d5d669a1520a3c02f04882e05b9 SHA1 592da988696a0745c4bef240e49274b3915ee277 SHA256 e1787184faaee583435730666ef3dd1c221ced493ccd9ba0a06f94ac5e5b05ec
 DIST AfterStep-2.2.9.tar.bz2 6094706 RMD160 b332078efa50abde522438c825fca91f31c4d554 SHA1 dfd7dd912866316e93c3be7a8460d34b95cd54a2 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148
 EBUILD afterstep-2.2.4.ebuild 3694 RMD160 75c6e61d8ea1c4ab1433f2c23f3a46f307c29952 SHA1 3ac1affaea4e59d03e5467698f391f14c3bb5f25 SHA256 4a5417a12984e0af4068c8d2e518fbced473acbe242f9008df7f038ce66789e4
-EBUILD afterstep-2.2.9.ebuild 3546 RMD160 0849d13e3df83288795d580ef46feccbc4c70350 SHA1 739d5c9654b1b5d8ab49ff5701ce0449f11bbc05 SHA256 bf9c75542a7a45d5117f4a5581239d07c43509c70975c29aff71e7ee2a28a1d0
-MISC ChangeLog 13075 RMD160 09ffaf795950f93e096cbe415e01964b337af9b9 SHA1 72f28527af8d2376d7edda2530111f15de78e1d4 SHA256 aaabeaaaee6cbe02babe9e921b80b4b17ea9566eae2f5dab40b492196238cb05
+EBUILD afterstep-2.2.9.ebuild 3583 RMD160 8043229c5411c29e9e8d90a10e18e87ec890ced1 SHA1 fe2756287b9a18a186738683744b5bad499875f0 SHA256 30b2dcdc99d432aaa782bb0179e25945e6cc5b42d2bfce0c0609b4e44510143a
+MISC ChangeLog 13265 RMD160 4b0ebbffabcb372869c6c6a7c65190382c849d57 SHA1 859bb66c5a4587c6f1d95bd8d415d9172ac97e33 SHA256 9b3b2134e6f875c51bddc6e38e823a2bcf4502368bd1618b11eb44488d40e90b
 MISC metadata.xml 350 RMD160 8a78f43601183735a3e88e99953e83fa319a2c9c SHA1 a0887e36150abf9d32d108bd1339880ca2a21449 SHA256 ffc449f67b60b79df064e7843b19ce9c16ab0ccc495de3b9cd9b1a38bf6b0c26
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iF4EAREIAAYFAkwjJVIACgkQmWq1bYTyC0PkTAEArUvYEtlxTjNjc9v4L3vrhpBH
-sKL3elhCS/tH515jqRwA/2i1Lp71QM2a+6gASoSoHCiVU2Q7lvzMMXzXUphNl/ke
-=l+0m
------END PGP SIGNATURE-----
diff --git a/x11-wm/afterstep/afterstep-2.2.9.ebuild b/x11-wm/afterstep/afterstep-2.2.9.ebuild
index bdcf8437d628..e675bbb0a47c 100644
--- a/x11-wm/afterstep/afterstep-2.2.9.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.9.ebuild,v 1.10 2010/06/24 09:28:21 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.9.ebuild,v 1.11 2010/06/26 16:23:39 ssuominen Exp $
 
 EAPI=2
 inherit autotools flag-o-matic eutils
@@ -44,7 +44,8 @@ S=${WORKDIR}/AfterStep-${PV}
 
 src_prepare() {
 	epatch "${FILESDIR}"/no-alternatives-${PV}.patch \
-		"${FILESDIR}"/${P}-make_session_data_file.patch
+		"${FILESDIR}"/${P}-make_session_data_file.patch \
+		"${FILESDIR}"/${P}-alpha.patch
 
 	# Do not strip binaries, bug #252119
 	sed -e "/STRIP_BINARIES/s/-s//" \
diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch b/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch
new file mode 100644
index 000000000000..307180b9bae0
--- /dev/null
+++ b/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch
@@ -0,0 +1,15 @@
+libAfterStep/alpha_header.h:15: error: conflicting types for 'strlen'
+
+--- libAfterStep/asapp.h
++++ libAfterStep/asapp.h
+@@ -15,10 +15,6 @@
+ #include "sun_headers.h"
+ #endif
+ 
+-#if defined(__alpha)
+-#include "alpha_header.h"
+-#endif /* NEEDS_ALPHA_HEADER */
+-
+ /* Some people say that AIX and AIXV3 need 3 preceding underscores, other say
+  * no. I'll do both */
+ #if defined ___AIX || defined _AIX || defined __QNX__ || defined ___AIXV3 || defined AIXV3 || defined _SEQUENT_
\ No newline at end of file