EAPI=2; fix building with newer glibc (patch submitted by Michał Górny via bug #260111)

Package-Manager: portage-2.1.6.7/cvs/Linux i686

4 files changed, 27 insertions, 13 deletions

diff --git a/games-util/etswitch/ChangeLog b/games-util/etswitch/ChangeLog
index ba1824846615..9087b8d828fb 100644
--- a/games-util/etswitch/ChangeLog
+++ b/games-util/etswitch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-util/etswitch
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/etswitch/ChangeLog,v 1.3 2008/11/24 16:27:49 ssuominen Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/etswitch/ChangeLog,v 1.4 2009/02/24 19:08:21 mr_bones_ Exp $
+
+  24 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/etswitch-0.1.14-glibc.patch, etswitch-0.1.14.ebuild:
+  EAPI=2; fix building with newer glibc (patch submitted by Michał Górny via
+  bug #260111)
 
   24 Nov 2008; <ssuominen@gentoo.org> metadata.xml:
   Re-assign to games herd.
diff --git a/games-util/etswitch/Manifest b/games-util/etswitch/Manifest
index 87b3cdd8fec6..eb35ebdd54a8 100644
--- a/games-util/etswitch/Manifest
+++ b/games-util/etswitch/Manifest
@@ -1,5 +1,6 @@
 AUX etswitch-0.1.14-desktop-entry.patch 465 RMD160 c9629dd0e551743ebdee07878f53c3446475be18 SHA1 3b323cc87e0288d9f40c150986278bac2b042d67 SHA256 27dd3604f851daf8ace76beb68b38d07dd83db48efeba96544b148dcc8b5a044
+AUX etswitch-0.1.14-glibc.patch 628 RMD160 c455f652cec024fd788f6a14f08574bc2f981236 SHA1 0c3d05353edf57cfff3d44dfa79e82f72bb90e04 SHA256 c6f3565cf252e05c97aac0444e8808f006901ba53ce80c5616c823cb9204d43e
 DIST etswitch-0.1.14.tar.gz 165811 RMD160 ee18e2fab96da4e6cda27345d71be8492888098d SHA1 31ee43cb84b21911a73b8754801b2612c24c9841 SHA256 8519b2e913704eab0535bbb3693b186cb16f69536fae5ccec371d2a3e4407399
-EBUILD etswitch-0.1.14.ebuild 958 RMD160 e12c8b97aaa348a81d3cc8f12857f59980b1a0cd SHA1 30507fcfca6de06394da5d132c38c406f2f1529d SHA256 4f2efd60d381e03b19002b612b57c921a5ac8ff53327fc7dd52a4b2fae277e7e
-MISC ChangeLog 622 RMD160 fc1a3edbaba884f5a485ac3800274d1e0d170cbf SHA1 9cccce4149d99511426bc3f74569886d56200170 SHA256 c01dcbec02ba5476a2d578872e9281b01e8cb57cdf61dfc367379f8ae675e7fe
+EBUILD etswitch-0.1.14.ebuild 937 RMD160 7c72380e21b021dbce04fcc764238cfb4bc2bf4c SHA1 366050ce89d03479ffad28fc2950e715ab30ac89 SHA256 d3bcbd2d2a4edba2ef9fb11e3bf93a84848c1eccd407a324bba196055f7e3207
+MISC ChangeLog 834 RMD160 17a3d2eb7735495d18514c07daa227d29ae8ba12 SHA1 04f30b477abf85771caca1c7c337c9b15e944735 SHA256 af6dfc58be4e9cdc0a21e86d33bd6c74030f8a9aef545ec7e2795b748ae124e3
 MISC metadata.xml 159 RMD160 9ce79fb2f245a86f0fd9896ef34c65b6dc2a97bf SHA1 e8d4e28f664e8bd524cb04b5077852adc2f57d90 SHA256 a222ada7640e6dfb21d27151813829e91a72a6878d809dfddaa41581455f6b69
diff --git a/games-util/etswitch/etswitch-0.1.14.ebuild b/games-util/etswitch/etswitch-0.1.14.ebuild
index 7f8ee297bef8..2ece4d74a067 100644
--- a/games-util/etswitch/etswitch-0.1.14.ebuild
+++ b/games-util/etswitch/etswitch-0.1.14.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/etswitch/etswitch-0.1.14.ebuild,v 1.5 2008/06/29 10:27:03 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/etswitch/etswitch-0.1.14.ebuild,v 1.6 2009/02/24 19:08:21 mr_bones_ Exp $
 
+EAPI=2
 inherit eutils games
 
 DESCRIPTION="*nix minimizer for a few games"
@@ -23,15 +24,10 @@ DEPEND="${RDEPEND}
 	x11-proto/recordproto
 	x11-proto/xf86vidmodeproto"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-desktop-entry.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-desktop-entry.patch "${FILESDIR}"/${P}-glibc.patch ) 
 
-src_compile() {
+src_configure() {
 	egamesconf --datadir=/usr/share
-	emake || die "emake failed."
 }
 
 src_install() {
diff --git a/games-util/etswitch/files/etswitch-0.1.14-glibc.patch b/games-util/etswitch/files/etswitch-0.1.14-glibc.patch
new file mode 100644
index 000000000000..a51862d6722d
--- /dev/null
+++ b/games-util/etswitch/files/etswitch-0.1.14-glibc.patch
@@ -0,0 +1,12 @@
+diff -dupr etswitch-old/src/etswitch.c etswitch-0.1.14/src/etswitch.c
+--- etswitch-old/src/etswitch.c	2009-02-24 11:20:29.594339029 +0100
++++ etswitch-0.1.14/src/etswitch.c	2009-02-24 11:28:12.100463404 +0100
+@@ -461,7 +461,7 @@ int main(int argc, char *argv[]){
+     /* setup lock, fixme */
+     /* use temp var */
+     lock_file = "/tmp/.etswitch.pid";    /* now this isnt failsafe but at least something */
+-    lock_fd = open(lock_file, O_CREAT | O_RDWR);
++    lock_fd = open(lock_file, O_CREAT | O_RDWR, 0600);
+     if (lock_fd < 0) {
+ 	#ifdef DEBUG
+ 	fprintf(stdout, "'%s' allready exits, will try to open.\n",lock_file);