media-sound/mixxx: Version bump for 1.9.2

svn path=/sunrise/; revision=12500

6 files changed, 11 insertions, 50 deletions

diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index e4988c798..49e84b3ae 100644
--- a/media-sound/mixxx/ChangeLog
+++ b/media-sound/mixxx/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Nov 2011; Alex Barker (KWhat) <alex@1stleg.com> -mixxx-1.9.0-r2.ebuild,
+  -files/mixxx-1.9.0-flags.patch, -files/mixxx-1.9.0-libsoundtouch.patch,
+  -files/mixxx-1.9.0-linux3.patch, +mixxx-1.9.2.ebuild,
+  +files/mixxx-1.9.2-flags.patch, +files/mixxx-1.9.2-libsoundtouch.patch:
+  Version bump for 1.9.2
+
   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
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 2fe9de396..aa009a235 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,10 +1,9 @@
-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-1.9.2-flags.patch 624 RMD160 b10c1e796fd71c35c24781cfbdbb33f7955cc4ac SHA1 f9d8e2eb698b90a50b2c110902b94ddb6300b847 SHA256 1387d7c8e886d5c98b48639628b6ec5c73bcb507b92e0220ee8648a3c7b08dd5
+AUX mixxx-1.9.2-libsoundtouch.patch 3342 RMD160 a85ff591389c9fa6b25de55f3cda7e8e0ea6fcbe SHA1 212673d3b024934ca7c8c39591055e66b6d5016f SHA256 234e058145ca14bbbbb0f34fe1c07e5d0ff55999d952547b054744edc5feaa0d
 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
+DIST mixxx-1.9.2-src.tar.gz 7444069 RMD160 4062fb626f5ce49c2081b57641fb6bc7ba52a540 SHA1 41cc27b5fd7a7b2e999ba337114f5e6b4fa9d7be SHA256 2cefee1f5cf91344f12df5c1e9320e30d5ad29361a0bc590e6f5b9d2e969af77
+EBUILD mixxx-1.9.2.ebuild 1770 RMD160 ce05bfc60f3df3613fbae72425c7ad060c53bacf SHA1 413c29c549b7fdacd36ebcc5dd0e7e961a04f87c SHA256 9f8cd3b6ed81d2501dc11c05057d9ddfdb4f0d0ff8c17beae45686119c3cb775
 EBUILD mixxx-9999.ebuild 1732 RMD160 c8736787c76d6de1c07f97ab35a512fff8203110 SHA1 0088664d8f9b4aa6d605ffc398d70f49118d8d20 SHA256 a37c953b5433e3e700a5a09e23f2381946e74095c9dda3026b6c7462d8cb9d56
-MISC ChangeLog 1838 RMD160 fac0f9156328a4846dd68119c1fbe27bcb9cafbf SHA1 cabc5465bbd2fdb52be9782251d4ee479a59edb9 SHA256 8c0de8ac00f09f3ef2ac742421b4412e8092b720a057e73869dbf643a42ffa9a
+MISC ChangeLog 2145 RMD160 3ca39ee2c8155a6e486bf773ae441fcef2fec4e9 SHA1 4d024fd5bc4365870d3169d8e5b0930435a19786 SHA256 200d02c526bf4bd07cb375e22b54f009a332bbaa2d424d0b39c2a2745c305247
 MISC metadata.xml 410 RMD160 8b5dee500da763730f1ffd02863d23221cb4f04b SHA1 e09418482c729b27b392f42ecf3e4344f71c56b9 SHA256 812fc2fb4d75f2035068cd2f547174c6aedf91799a1fc64ef54d15c611a28128
diff --git a/media-sound/mixxx/files/mixxx-1.9.0-linux3.patch b/media-sound/mixxx/files/mixxx-1.9.0-linux3.patch
deleted file mode 100644
index 89bac8eaa..000000000
--- a/media-sound/mixxx/files/mixxx-1.9.0-linux3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-=== modified file 'mixxx/build/mixxx.py'
---- mixxx/build/mixxx.py	2011-06-13 01:29:39 +0000
-+++ mixxx/build/mixxx.py	2011-06-17 17:37:59 +0000
-@@ -188,7 +188,7 @@
-         # Should cover {Net,Open,Free,DragonFly}BSD, but only tested on OpenBSD
-         if 'bsd' in sys.platform:
-             return 'bsd'
--        if 'linux2' == sys.platform:
-+        if sys.platform in ['linux2', 'linux3']:
-             return 'linux'
-         if sys.platform == 'darwin':
-             return 'osx'
---- mixxx/build/qt4.py	2011-09-15 01:05:21.872433812 +0100
-+++ mixxx/build/qt4.py	2011-09-15 01:06:34.628431259 +0100
-@@ -409,7 +409,7 @@
- 		self.AppendUnique(CPPFLAGS=['-DQT_GUI_LIB'])
- 
- 	debugSuffix = ''
--	if sys.platform == "linux2" :
-+	if sys.platform in ["linux2", "linux3"]:
- 		if debug : debugSuffix = '_debug'
- 		for module in modules :
- 			if module not in pclessModules : continue
diff --git a/media-sound/mixxx/files/mixxx-1.9.0-flags.patch b/media-sound/mixxx/files/mixxx-1.9.2-flags.patch
index 09c008823..c543e76cb 100644
--- a/media-sound/mixxx/files/mixxx-1.9.0-flags.patch
+++ b/media-sound/mixxx/files/mixxx-1.9.2-flags.patch
@@ -1,14 +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'):
 --- 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-1.9.0-libsoundtouch.patch b/media-sound/mixxx/files/mixxx-1.9.2-libsoundtouch.patch
index 25f349c3a..25f349c3a 100644
--- a/media-sound/mixxx/files/mixxx-1.9.0-libsoundtouch.patch
+++ b/media-sound/mixxx/files/mixxx-1.9.2-libsoundtouch.patch
diff --git a/media-sound/mixxx/mixxx-1.9.0-r2.ebuild b/media-sound/mixxx/mixxx-1.9.2.ebuild
index 6a0a8cc3c..311ed6e57 100644
--- a/media-sound/mixxx/mixxx-1.9.0-r2.ebuild
+++ b/media-sound/mixxx/mixxx-1.9.2.ebuild
@@ -43,17 +43,7 @@ DEPEND="${RDEPEND}
 
 SCONS_MIN_VERSION="2.0.1"
 
-src_unpack() {
-	unpack ${A}
-
-	#Fix the src dir
-	mv * "${S}" || die
-}
-
 src_prepare() {
-	# patch for linux 3.0 support
-	epatch "${FILESDIR}"/${P}-linux3.patch
-
 	# patch CFLAGS issue
 	epatch "${FILESDIR}"/${P}-flags.patch