reworked patch with help of Marien Zwart <marienz@gentoo.org>

Package-Manager: portage-2.1.1-r2

diff --git a/x11-misc/gaia/ChangeLog b/x11-misc/gaia/ChangeLog
index 594b1c1c9c75ffb01314460a330e4326e052eb96..a712f7979d70900413e47d8d54a5416f1d8cdbf3 100644 (file)
--- a/x11-misc/gaia/ChangeLog
+++ b/x11-misc/gaia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/gaia
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/ChangeLog,v 1.5 2006/11/24 11:05:07 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/ChangeLog,v 1.6 2006/11/24 13:03:38 opfer Exp $
+
+  24 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
+  files/gaia-respect_CFLAGS.patch:
+  reworked patch with help of Marien Zwart <marienz@gentoo.org>
 
   24 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
   +files/gaia-respect_CFLAGS.patch, gaia-0.1.0.ebuild:

diff --git a/x11-misc/gaia/Manifest b/x11-misc/gaia/Manifest
index 7ab345971f2328fbc2879dfc951265fed132cece..c0b876e7003ee4263a4b21c1a17c12a711553bea 100644 (file)
--- a/x11-misc/gaia/Manifest
+++ b/x11-misc/gaia/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gaia-respect_CFLAGS.patch 687 RMD160 7811549b32d5e29d89c5c9ee666df9b236c919aa SHA1 2c88cf062e3b8e5df0f1ba2648593865f8d78d6c SHA256 46f539121803b70b57e23162f4e7a1505b395304092d8f663da37f2e2934e7ef
-MD5 a4921d84aa67b1f660170cef2e3fd38d files/gaia-respect_CFLAGS.patch 687
-RMD160 7811549b32d5e29d89c5c9ee666df9b236c919aa files/gaia-respect_CFLAGS.patch 687
-SHA256 46f539121803b70b57e23162f4e7a1505b395304092d8f663da37f2e2934e7ef files/gaia-respect_CFLAGS.patch 687
+AUX gaia-respect_CFLAGS.patch 583 RMD160 7f48acdde2a68a7a650d356ffac2732667d25c65 SHA1 6e9c699acdc9dc11958b99b959fc39e6339b6cdd SHA256 45c13a54c33c906ec7ee84334176c34f64622c554854f7775cb19f4e16d6aaf1
+MD5 d051002fb673c30082e46f63bc4a3cc0 files/gaia-respect_CFLAGS.patch 583
+RMD160 7f48acdde2a68a7a650d356ffac2732667d25c65 files/gaia-respect_CFLAGS.patch 583
+SHA256 45c13a54c33c906ec7ee84334176c34f64622c554854f7775cb19f4e16d6aaf1 files/gaia-respect_CFLAGS.patch 583
 DIST gaia-0.1.0.tar.bz2 64892 RMD160 da0fd41fe6452ac3d20390e7d5a24a4e722c8963 SHA1 cbac9aec0d670f84588ed5a953c8d76db6cd4740 SHA256 83931c8e5316d3b156a4b71c1e92ec693133daa24f803c35ef983580fe42e48b
 EBUILD gaia-0.1.0.ebuild 1751 RMD160 7887621c4ffa2aadcf91fdd3aa31a2a6dda1d3af SHA1 8338b97521284785b6fcd7c80657333eb545539c SHA256 973d190ab5fc986d149a8c4211de6858549f37971e735291cc9d342fa2ae8fbf
 MD5 4f07490c6d3b4e196f6dee87878c9fcd gaia-0.1.0.ebuild 1751
 RMD160 7887621c4ffa2aadcf91fdd3aa31a2a6dda1d3af gaia-0.1.0.ebuild 1751
 SHA256 973d190ab5fc986d149a8c4211de6858549f37971e735291cc9d342fa2ae8fbf gaia-0.1.0.ebuild 1751
-MISC ChangeLog 1054 RMD160 c433c605246270fe8d1392b33ce4c69bad225b52 SHA1 325c8afd335ee43bea00ddbf6ef1457029dcdadf SHA256 44dfb5db7e4934ecac93437a4652b486b061d009dc9acbfc8db63cc575e4bde0
-MD5 3f852a9fcca962e7a886b9a4537afc8a ChangeLog 1054
-RMD160 c433c605246270fe8d1392b33ce4c69bad225b52 ChangeLog 1054
-SHA256 44dfb5db7e4934ecac93437a4652b486b061d009dc9acbfc8db63cc575e4bde0 ChangeLog 1054
+MISC ChangeLog 1209 RMD160 f6f3d0f7f50870fe9f1945b0e68d7cc629e69615 SHA1 0a0ca116a22c717532858330fcd01bf7b652a32a SHA256 cddeaf4f4a189860498ce159712cb91d17b0c0d038014a23a57b92384f10688f
+MD5 dc8c757550bde31feda4a19976d97936 ChangeLog 1209
+RMD160 f6f3d0f7f50870fe9f1945b0e68d7cc629e69615 ChangeLog 1209
+SHA256 cddeaf4f4a189860498ce159712cb91d17b0c0d038014a23a57b92384f10688f ChangeLog 1209
 MISC metadata.xml 266 RMD160 ec474d4b2edebeccd738705e8717ecdb4aaca347 SHA1 2eb26e89e18770b3cc373ab290938a2aea6bce97 SHA256 2d1e8e22e242d00cd34f662e4d04d2e7d488951bd1e84fe3132d2b1ebd1b71d2
 MD5 f2e99271e391d686f969c3d65ac24562 metadata.xml 266
 RMD160 ec474d4b2edebeccd738705e8717ecdb4aaca347 metadata.xml 266
@@ -24,7 +24,7 @@ SHA256 083477a60a7f839377a832cabeaba8dd89c055d45341362662a444b1a6180b1c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFZtH9NQqtfCuFneMRAk3mAKCY0DuLnzhTQnRy+yg99wGLNvX8kQCeMtRL
-F8fJOiytdvcFq5uvA/Ljlsc=
-=kgJP
+iD8DBQFFZu27NQqtfCuFneMRAl4RAKCUWfRtyFOyvkJja4bf5SnOU9XGJACfUFk9
+GnUPJB4UrxK+iV+wMuohp7A=
+=ORv+
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/gaia/files/gaia-respect_CFLAGS.patch b/x11-misc/gaia/files/gaia-respect_CFLAGS.patch
index 197de21866e8966bd18a8744168bb692a9c8f9d3..4208c8f82cccac39f16c58958ce85ad525a3bb52 100644 (file)
--- a/x11-misc/gaia/files/gaia-respect_CFLAGS.patch
+++ b/x11-misc/gaia/files/gaia-respect_CFLAGS.patch
@@ -1,20 +1,13 @@
---- SConstruct 2006-11-24 11:53:51.000000000 +0100
-+++ /tmp/SConstruct    2006-11-24 11:55:07.000000000 +0100
-@@ -1,4 +1,5 @@
- import os
-+import re
- 
- #######################################
- # OPTIONS
-@@ -11,8 +12,9 @@
+--- /tmp/SConstruct    2006-11-24 13:55:00.000000000 +0100
++++ SConstruct 2006-11-24 13:58:22.000000000 +0100
+@@ -11,8 +11,8 @@
  #######################################
  # ENVIRONMENT
  #######################################
 -env = Environment( CCFLAGS = [ '-Wall', '-g' ],
 -                 CXXFLAGS = [ '-Wall', '-g' ],
-+
-+env = Environment( CCFLAGS = re.split('\s+', os.environ.get('CFLAGS', '')),
-+                 CXXFLAGS = re.split('\s+', os.environ.get('CXXFLAGS', '')),
++env = Environment( CCFLAGS = [ os.environ.get('CFLAGS', '').split() ],
++                 CXXFLAGS = [ os.environ.get('CXXFLAGS', '').split() ],
                   CPPPATH = [ '/usr/local/include', '/usr/X11R6/include' ],
                   LIBPATH = [ '/usr/X11R6/lib', '/usr/local/lib' ],
                   options = opts )