added ~amd64 to KEYWORDS, fixes #83663. also added patch to enable successful compilation with gcc3.4

(Portage version: 2.0.51.19)

5 files changed, 27 insertions, 9 deletions

diff --git a/x11-misc/xtrlock/ChangeLog b/x11-misc/xtrlock/ChangeLog
index 08089cecdfa0..994277c851de 100644
--- a/x11-misc/xtrlock/ChangeLog
+++ b/x11-misc/xtrlock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xtrlock
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtrlock/ChangeLog,v 1.6 2004/06/24 22:46:03 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtrlock/ChangeLog,v 1.7 2005/03/29 17:50:04 luckyduck Exp $
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/xtrlock-2.0-gcc34.patch, xtrlock-2.0-r1.ebuild:
+  added ~amd64 to KEYWORDS, fixes #83663. also added patch to enable successful
+  compilation with gcc3.4
 
   14 Jun 2004; <pyrania@gentoo.org> xtrlock-2.0-r1.ebuild:
   Added IUSE.
diff --git a/x11-misc/xtrlock/Manifest b/x11-misc/xtrlock/Manifest
index de7d3da0b720..b25c47b3637d 100644
--- a/x11-misc/xtrlock/Manifest
+++ b/x11-misc/xtrlock/Manifest
@@ -1,7 +1,8 @@
-MD5 689bd13b538dd2c1a7bc7bb76d0a4b5a xtrlock-2.0-r1.ebuild 827
+MD5 f3ff88fbb7337cd4a1e3137df7718e5e xtrlock-2.0-r1.ebuild 909
 MD5 2a38f3d0701a4d2bd31e03dbd6814d79 xtrlock-2.0.ebuild 728
 MD5 2c5dcff63154631c6050538beb939106 ChangeLog 1437
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
+MD5 5cd5750d76f6d3cc6e18d5db25e64acb files/xtrlock-2.0-gcc34.patch 310
 MD5 9c5d390720d5c846a174088a8214c7c8 files/digest-xtrlock-2.0-r1 63
 MD5 4bbac4dd2e60384f0e40af9e37159cd2 files/xtrlock-2.0-overflow.patch 712
 MD5 9c5d390720d5c846a174088a8214c7c8 files/digest-xtrlock-2.0 63
diff --git a/x11-misc/xtrlock/files/xtrlock-2.0-gcc34.patch b/x11-misc/xtrlock/files/xtrlock-2.0-gcc34.patch
new file mode 100644
index 000000000000..8f35d317b773
--- /dev/null
+++ b/x11-misc/xtrlock/files/xtrlock-2.0-gcc34.patch
@@ -0,0 +1,11 @@
+diff -urpN xtrlock-2.0.orig/xtrlock.c xtrlock-2.0/xtrlock.c
+--- xtrlock-2.0.orig/xtrlock.c	2005-03-29 19:44:36.312162552 +0200
++++ xtrlock-2.0/xtrlock.c	2005-03-29 19:45:05.019798328 +0200
+@@ -197,6 +197,7 @@ int main(int argc, char **argv){
+       }
+       break;
+     default:
++      ;
+     }
+   }
+  loop_x:
diff --git a/x11-misc/xtrlock/xtrlock-2.0-r1.ebuild b/x11-misc/xtrlock/xtrlock-2.0-r1.ebuild
index 7d92ef39a9f0..984e4e8ccef2 100644
--- a/x11-misc/xtrlock/xtrlock-2.0-r1.ebuild
+++ b/x11-misc/xtrlock/xtrlock-2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtrlock/xtrlock-2.0-r1.ebuild,v 1.6 2004/06/24 22:46:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtrlock/xtrlock-2.0-r1.ebuild,v 1.7 2005/03/29 17:50:04 luckyduck Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 MY_P=${P/-/_}-6
 DESCRIPTION="A simplistic screen locking program for X"
@@ -11,7 +11,7 @@ HOMEPAGE="ftp://ftp.debian.org/debian/dists/stable/main/source/x11/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
+KEYWORDS="x86 ppc ~amd64"
 IUSE=""
 
 DEPEND="virtual/x11"
@@ -20,6 +20,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-overflow.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
 }
 
 src_compile() {
diff --git a/x11-misc/xtrlock/xtrlock-2.0.ebuild b/x11-misc/xtrlock/xtrlock-2.0.ebuild
index 9af812cb139e..d8c47f221c22 100644
--- a/x11-misc/xtrlock/xtrlock-2.0.ebuild
+++ b/x11-misc/xtrlock/xtrlock-2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtrlock/xtrlock-2.0.ebuild,v 1.5 2004/07/15 00:58:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtrlock/xtrlock-2.0.ebuild,v 1.6 2005/03/29 17:50:04 luckyduck Exp $
 
 MY_P=${P/-/_}-6
 DESCRIPTION="A simplistic screen locking program for X"