Adding GCC4 patch and marking ~ppc-macos

Package-Manager: portage-2.0.51.22-r2

4 files changed, 38 insertions, 16 deletions

diff --git a/net-irc/scrollz/ChangeLog b/net-irc/scrollz/ChangeLog
index 57d01ccbf8ac..84b1a3c7c0e9 100644
--- a/net-irc/scrollz/ChangeLog
+++ b/net-irc/scrollz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/scrollz
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/scrollz/ChangeLog,v 1.22 2005/08/27 02:31:49 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/scrollz/ChangeLog,v 1.23 2005/09/02 17:49:07 grobian Exp $
+
+  02 Sep 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/scrollz-1.9.5-gcc4.patch, scrollz-1.9.5.ebuild:
+  Adding a GCC4 compilation patch and marking ~ppc-macos (bug #90165)
 
   27 Aug 2005; Sven Wegener <swegener@gentoo.org> -scrollz-1.9.ebuild:
   Remmove old ebuild.
diff --git a/net-irc/scrollz/Manifest b/net-irc/scrollz/Manifest
index 4a50076dd135..460dfee8983c 100644
--- a/net-irc/scrollz/Manifest
+++ b/net-irc/scrollz/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e7e5960968c5d903658614548f2d2e95 ChangeLog 2630
-MD5 20e8698cbd256ce79b493107ca25feca files/digest-scrollz-1.9.5 65
+MD5 5c3b9a13b489d533cb39ae07754f9593 scrollz-1.9.5.ebuild 1146
+MD5 bedba1a9033a40bf64b11b529ea3bba9 ChangeLog 2808
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 16976df5012129191973272de6e11948 scrollz-1.9.5.ebuild 1015
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDD9ChI1lqEGTUzyQRAif1AKDWRqh45b+QrPcVpbueaDXJXvYgmQCfSjHs
-nrNqJGGi7225eY7YuEKcGpo=
-=1x+l
------END PGP SIGNATURE-----
+MD5 20e8698cbd256ce79b493107ca25feca files/digest-scrollz-1.9.5 65
+MD5 7a16999fdfb8da867520ddf7016d8887 files/scrollz-1.9.5-gcc4.patch 758
diff --git a/net-irc/scrollz/files/scrollz-1.9.5-gcc4.patch b/net-irc/scrollz/files/scrollz-1.9.5-gcc4.patch
new file mode 100644
index 000000000000..25ca7254cdee
--- /dev/null
+++ b/net-irc/scrollz/files/scrollz-1.9.5-gcc4.patch
@@ -0,0 +1,19 @@
+--- ScrollZ-1.9.5/rijndael-alg-ref.c.orig	2005-09-02 19:19:06.000000000 +0200
++++ ScrollZ-1.9.5/source/rijndael-alg-ref.c	2005-09-02 19:33:03.000000000 +0200
+@@ -36,11 +36,11 @@
+ }; 
+ 
+ word8 mul(word8, word8);
+-void KeyAddition(word8 [][], word8 [][], word8);
+-void Substitution(word8 [][], word8 box[], word8);
+-void ShiftRow(word8 [][], word8, word8);
+-void MixColumn(word8 [][], word8);
+-void InvMixColumn(word8 [][], word8);
++void KeyAddition(word8 [4][MAXBC], word8 [4][MAXBC], word8);
++void Substitution(word8 [4][MAXBC], word8 [256], word8);
++void ShiftRow(word8 [4][MAXBC], word8, word8);
++void MixColumn(word8 [4][MAXBC], word8);
++void InvMixColumn(word8 [4][MAXBC], word8);
+ 
+ word8 mul(word8 a, word8 b) {
+    /* multiply two elements of GF(2^m)
diff --git a/net-irc/scrollz/scrollz-1.9.5.ebuild b/net-irc/scrollz/scrollz-1.9.5.ebuild
index c22c4ad92b21..9602b0ff4ec3 100644
--- a/net-irc/scrollz/scrollz-1.9.5.ebuild
+++ b/net-irc/scrollz/scrollz-1.9.5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/scrollz/scrollz-1.9.5.ebuild,v 1.4 2005/08/24 23:45:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/scrollz/scrollz-1.9.5.ebuild,v 1.5 2005/09/02 17:49:07 grobian Exp $
+
+inherit eutils
 
 MY_P=ScrollZ-${PV}
 
@@ -10,7 +12,7 @@ HOMEPAGE="http://www.scrollz.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ia64 ~ppc x86"
+KEYWORDS="amd64 ia64 ~ppc ~ppc-macos x86"
 IUSE="ipv6 socks5 ssl"
 
 DEPEND="virtual/libc
@@ -18,6 +20,12 @@ DEPEND="virtual/libc
 
 S="${WORKDIR}"/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	# Darwin/OSX has GCC4 and needs this
+	epatch ${FILESDIR}/${P}-gcc4.patch
+}
+
 src_compile() {
 	econf \
 		--with-default-server=irc.freenode.net \