media-sound/mixxx: Modifed flags patch to remove CCCOM and CXXCOM overrides that are not needed after scons 1.0. CCFLAG change for mixxx-9999 has been applied upstream.

svn path=/sunrise/; revision=12422

4 files changed, 8 insertions, 36 deletions

diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index 0b7b0d3d3..e4988c798 100644
--- a/media-sound/mixxx/ChangeLog
+++ b/media-sound/mixxx/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Oct 2011; Alex Barker (KWhat) <alex@1stleg.com>
+  files/mixxx-1.9.0-flags.patch, files/mixxx-9999-flags.patch:
+  Modifed flags patch to remove CCCOM and CXXCOM overrides that are not needed
+  after scons 1.0. CCFLAG change for mixxx-9999 has been applied upstream.
+
   29 Sep 2011; Alex Barker (KWhat) <alex@1stleg.com> mixxx-1.9.0-r2.ebuild,
   mixxx-9999.ebuild:
   Added env vars for installation phase.
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 14c69d683..2fe9de396 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,10 +1,10 @@
-AUX mixxx-1.9.0-flags.patch 1663 RMD160 b55048b592e779ea108c9772349dc2e8bbf4f276 SHA1 94a4eda09ceb1629acfb943c4be8c96a6b8ae754 SHA256 de1350b62dc266c536916f82c03d110578bb2e9bc44507a0b6c4ef28c9e8f88a
+AUX mixxx-1.9.0-flags.patch 1167 RMD160 94c9d86b6ed014bf27986f8a8b5e2a3bf715d452 SHA1 e1cd66f374a0c30235f56ed2c841f734fc45a42d SHA256 491d3a76f704cb739180365d7cd987832c3c0154790e74943ff0753be4563044
 AUX mixxx-1.9.0-libsoundtouch.patch 3342 RMD160 a85ff591389c9fa6b25de55f3cda7e8e0ea6fcbe SHA1 212673d3b024934ca7c8c39591055e66b6d5016f SHA256 234e058145ca14bbbbb0f34fe1c07e5d0ff55999d952547b054744edc5feaa0d
 AUX mixxx-1.9.0-linux3.patch 877 RMD160 bf845fea763a2d7aa98985ccf4fa83a1c4e568d0 SHA1 05552b77da25d3f5981b3cd3a3288e49a7437e03 SHA256 bff40d8de8f6d6aea254c8243fc79f9bde3ac7932fc471aa23ca049fb3614b06
-AUX mixxx-9999-flags.patch 1663 RMD160 b55048b592e779ea108c9772349dc2e8bbf4f276 SHA1 94a4eda09ceb1629acfb943c4be8c96a6b8ae754 SHA256 de1350b62dc266c536916f82c03d110578bb2e9bc44507a0b6c4ef28c9e8f88a
+AUX mixxx-9999-flags.patch 624 RMD160 b10c1e796fd71c35c24781cfbdbb33f7955cc4ac SHA1 f9d8e2eb698b90a50b2c110902b94ddb6300b847 SHA256 1387d7c8e886d5c98b48639628b6ec5c73bcb507b92e0220ee8648a3c7b08dd5
 AUX mixxx-9999-libsoundtouch.patch 3342 RMD160 ecfb3bb0b9f356a5f937a8f9162c8b23fad1da92 SHA1 7ae36d669ff1359fd457be012940c6fb1ce8c2a8 SHA256 fde2401da761e7ea808378dc6df9b49d3858f8c964ebe9a373719559b51ecb71
 DIST mixxx-1.9.0-src.tar.gz 8739299 RMD160 92df03109399d984e7cf26624caf8381be407a1c SHA1 267d08884c2fce5c3c0889aaf85f70ad66105876 SHA256 95a5a9cf74bbc24b55518e81c6563afbd88c4ea2e05b35a6ec7cac69d694bf25
 EBUILD mixxx-1.9.0-r2.ebuild 1912 RMD160 e9d2ca010d324aa45baf07bbe0720c6eb5681421 SHA1 4b836073335e90b350892b23e4c283c42011dda8 SHA256 d40c395177207ba16188916e7388474585dcd7037c0eb901cbe31f415d56f277
 EBUILD mixxx-9999.ebuild 1732 RMD160 c8736787c76d6de1c07f97ab35a512fff8203110 SHA1 0088664d8f9b4aa6d605ffc398d70f49118d8d20 SHA256 a37c953b5433e3e700a5a09e23f2381946e74095c9dda3026b6c7462d8cb9d56
-MISC ChangeLog 1567 RMD160 df587c1616fdeee067207d38e688bda95b55fa1e SHA1 1825efe397ec93fb851605cb83bcff6b6b184ab4 SHA256 d022da9b5b5e3c971f4c8aefa3c665f38f7bc800078e55070498cc3de0be6f8b
+MISC ChangeLog 1838 RMD160 fac0f9156328a4846dd68119c1fbe27bcb9cafbf SHA1 cabc5465bbd2fdb52be9782251d4ee479a59edb9 SHA256 8c0de8ac00f09f3ef2ac742421b4412e8092b720a057e73869dbf643a42ffa9a
 MISC metadata.xml 410 RMD160 8b5dee500da763730f1ffd02863d23221cb4f04b SHA1 e09418482c729b27b392f42ecf3e4344f71c56b9 SHA256 812fc2fb4d75f2035068cd2f547174c6aedf91799a1fc64ef54d15c611a28128
diff --git a/media-sound/mixxx/files/mixxx-1.9.0-flags.patch b/media-sound/mixxx/files/mixxx-1.9.0-flags.patch
index d202a0a9d..09c008823 100644
--- a/media-sound/mixxx/files/mixxx-1.9.0-flags.patch
+++ b/media-sound/mixxx/files/mixxx-1.9.0-flags.patch
@@ -9,17 +9,6 @@
          if os.environ.has_key('CXX'):
              self.env['CXX'] = os.environ['CXX']
          if os.environ.has_key('CXXFLAGS'):
-@@ -203,6 +203,10 @@
-         self.env['LIBS'] = []
-         self.env['LIBPATH'] = []
- 
-+        # Tell Scons how to call the CC and CXX to account for the custom flags.
-+        self.env['CCCOM'] = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
-+        self.env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
-+
-     def install_options(self):
-         # Global cache directory Put all project files in it so a rm -rf cache
-         # will clean up the config
 --- build/depends.py.orig	2010-12-22 11:13:22.000000000 -0800
 +++ build/depends.py	2010-12-22 11:14:02.000000000 -0800
 @@ -587,10 +587,8 @@
diff --git a/media-sound/mixxx/files/mixxx-9999-flags.patch b/media-sound/mixxx/files/mixxx-9999-flags.patch
index d202a0a9d..c543e76cb 100644
--- a/media-sound/mixxx/files/mixxx-9999-flags.patch
+++ b/media-sound/mixxx/files/mixxx-9999-flags.patch
@@ -1,25 +1,3 @@
---- build/mixxx.py.orig	2010-12-22 11:21:56.000000000 -0800
-+++ build/mixxx.py	2010-12-22 11:16:22.000000000 -0800
-@@ -189,7 +189,7 @@
-         if os.environ.has_key('CC'):
-             self.env['CC'] = os.environ['CC']
-         if os.environ.has_key('CFLAGS'):
--            self.env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+            self.env['CFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-         if os.environ.has_key('CXX'):
-             self.env['CXX'] = os.environ['CXX']
-         if os.environ.has_key('CXXFLAGS'):
-@@ -203,6 +203,10 @@
-         self.env['LIBS'] = []
-         self.env['LIBPATH'] = []
- 
-+        # Tell Scons how to call the CC and CXX to account for the custom flags.
-+        self.env['CCCOM'] = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
-+        self.env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
-+
-     def install_options(self):
-         # Global cache directory Put all project files in it so a rm -rf cache
-         # will clean up the config
 --- build/depends.py.orig	2010-12-22 11:13:22.000000000 -0800
 +++ build/depends.py	2010-12-22 11:14:02.000000000 -0800
 @@ -587,10 +587,8 @@