cleanup

19 files changed, 334 insertions, 1082 deletions

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 8507af9..5cc3b32 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,13 +1,8 @@
-AUX mixxx-1.11.0-cflags.patch 641 SHA256 5a4a4256cabc06bf10c532c82f055737748f79f066758ae20038815ca8342549 SHA512 8fcd2ba6dba5fb3b0e0a0058b965fe25b6c34b1d787d1d920666f9426ffffc84253913ef5b606e14fd4b0f5dfb26bfeb04d4424c856fe7d57e62b837144dab37 WHIRLPOOL 8528a3ee74925a4e338fed9b9d803944cd001ef3f385892fc1d1abfdaab462f1118a3365599572005f9795a9763fdcb4345e9d9f008cacfcbba7d0f6751fbfa7
-AUX mixxx-1.11.0-docs.patch 438 SHA256 19377d095e34071010ddda59b03b86a63b82f2663dca32f8dc6771e6d217f1f7 SHA512 c2ebe6043bea9bc793e92d98237ea8369169bc874354f58a88388a59f0d98630e97e44aea169418824b740cd0108689d7b8d4e619b7ce5788c9c72f5ce844846 WHIRLPOOL 31dea2227c3353ade49d7683b32a0c0b9db54870551d30b9d33b69a01762d3dc9a6e452059ee690762632732968043d0c57139fefcd66461c7723f38d66677bf
-AUX mixxx-1.11.0-no-bzr.patch 1468 SHA256 9552c578c02ad5a2654f2d6bd8ce45e3daa790e070638579a0eb60b497c0f6f6 SHA512 4d3f12b60cb15d5e12c17f89d4f17ab5f0f57692e499e3778008d94c5e362c5c450e7d4d4ee29a80c9581bbfd6a845ad58a44f3c1579c761d6b847d70767a104 WHIRLPOOL d6d0500d944b306ebfd35bb209122f9e08a9a051a5db83efbae4beb708567d542c59ebde9d3798509aaf4078d9668fa7bcb5de652f6035b155d24b28617343cb
-AUX mixxx-1.11.0-system-libs.patch 8072 SHA256 996c6a170e06a5b4b0250f6fcefd80be8cb6d51325ee19c231360f1892567cb1 SHA512 d8d6ab9162b365288e224bfe2611c3322d539e35284c26ede0c829a29508a1047ad8e28c08bc769a0c72bfc70e69ebca71ac8e0217fb78c5904582153c1ae267 WHIRLPOOL 0fffac4355f882e01fefaaca19cdbf9cc048d1ef6892f2451c7e7163ad19fa17e41685980acb8cd62d4530010f3ec88db8962827d35fb9f9ec5ff564adaafa89
-AUX mixxx-1.11.9999-cflags.patch 641 SHA256 5a4a4256cabc06bf10c532c82f055737748f79f066758ae20038815ca8342549 SHA512 8fcd2ba6dba5fb3b0e0a0058b965fe25b6c34b1d787d1d920666f9426ffffc84253913ef5b606e14fd4b0f5dfb26bfeb04d4424c856fe7d57e62b837144dab37 WHIRLPOOL 8528a3ee74925a4e338fed9b9d803944cd001ef3f385892fc1d1abfdaab462f1118a3365599572005f9795a9763fdcb4345e9d9f008cacfcbba7d0f6751fbfa7
-AUX mixxx-1.11.9999-docs.patch 438 SHA256 19377d095e34071010ddda59b03b86a63b82f2663dca32f8dc6771e6d217f1f7 SHA512 c2ebe6043bea9bc793e92d98237ea8369169bc874354f58a88388a59f0d98630e97e44aea169418824b740cd0108689d7b8d4e619b7ce5788c9c72f5ce844846 WHIRLPOOL 31dea2227c3353ade49d7683b32a0c0b9db54870551d30b9d33b69a01762d3dc9a6e452059ee690762632732968043d0c57139fefcd66461c7723f38d66677bf
-AUX mixxx-1.11.9999-no-bzr.patch 1468 SHA256 6075410573cd0911623dd0a160cdefe6a48c3f335eeef682d80eebf52b75446e SHA512 d5aa2071a836cad7c995f1e83af3ee06687a4444845583013df2023bc11f58a626c1f887fe49385b562d26d70a156383ba47d4dd6ae61b194790b1ac498e8f7c WHIRLPOOL ff247e659c62bbbe3f0989c78a284c9ea6815e162e185b6fa8844775521d268fbfbed59197b27d2949376f7db070b8aa9a4f4bf5ce9d674c8d763df9908cc0fe
-AUX mixxx-1.11.9999-system-libs.patch 8072 SHA256 996c6a170e06a5b4b0250f6fcefd80be8cb6d51325ee19c231360f1892567cb1 SHA512 d8d6ab9162b365288e224bfe2611c3322d539e35284c26ede0c829a29508a1047ad8e28c08bc769a0c72bfc70e69ebca71ac8e0217fb78c5904582153c1ae267 WHIRLPOOL 0fffac4355f882e01fefaaca19cdbf9cc048d1ef6892f2451c7e7163ad19fa17e41685980acb8cd62d4530010f3ec88db8962827d35fb9f9ec5ff564adaafa89
-AUX mixxx-9999-docs.patch 445 SHA256 9250ab6b2368ad03b8c54d767fda1d23cd826340189cf8989a3156b76b375411 SHA512 cad756af2cfc90433b20d0a867aed9b85ee822691c5c8adc97de6943273823a769d8e6d4912a71f00bbead2cd96cff91cc12fb2fb8de547bf76dabd74372490e WHIRLPOOL 91b48e4577ff127065bbcae34d945613029850b43831209cc1b1f9c2d1da7fc3c02c9fa96dd958fe85f934749bcbace1b2c6c3c358306dc6d6ea91935337a327
-AUX mixxx-9999-system-libs.patch 6166 SHA256 c7fb0e54cc0944cd475eb89a616cb08e6a3cd1500db23d103e6f41cbfa79744a SHA512 4823bac455e8256ea4ae0c898181f8df6922b955e7f01fd70b9af2e33f3261ed15afa417e67c0020775883a1e3ee0d1d513f52063f006551c4c019cca692b776 WHIRLPOOL d7a9a89c924dd0667aaf430a7830f405162a02d640655322000770597437a99e2635b364180c6fb29b2c7200d608f312b690984a0ce911b9fd755f3edbbf7d86
-EBUILD mixxx-9999.ebuild 2338 SHA256 93c27486a95e9e146ddbd534c5e2f5e727ffebed6341dbc5ec73f856fc3a15fc SHA512 3b35a350b4a3d8fd0e713492308608a870e56584caa9087d1bb4aa58daa6c1d5bf23bd117ebe6395aded9a3530e321eac0a8871c81db4b9a1da63509a9cb1321 WHIRLPOOL 32553936091f96cd0eb90ec63f99e9c82180928c730944c5cf05a5142ab6627e8fa894f37c703228a89590e442c2b0311a96a9aaa352d9ee5fade09c542ff046
+AUX mixxx-1.12.9999-docs.patch 445 SHA256 9250ab6b2368ad03b8c54d767fda1d23cd826340189cf8989a3156b76b375411 SHA512 cad756af2cfc90433b20d0a867aed9b85ee822691c5c8adc97de6943273823a769d8e6d4912a71f00bbead2cd96cff91cc12fb2fb8de547bf76dabd74372490e WHIRLPOOL 91b48e4577ff127065bbcae34d945613029850b43831209cc1b1f9c2d1da7fc3c02c9fa96dd958fe85f934749bcbace1b2c6c3c358306dc6d6ea91935337a327
+AUX mixxx-1.12.9999-system-libs.patch 5879 SHA256 daca3a3662ecf4fedffdc610199d36f5ca24ba22cd1f7d82dd264b9762081a5b SHA512 44e71b5e02a32fa2f533dc07d4d320d18fe112e7e1342db594e49080ec987ae389b696f5f7ed17cb3b101789916936367b88a6aa0fd755b8d0e7028741c46bc2 WHIRLPOOL f810b7254de4421eebc28c12e7255d3b05f95e93758d51c8bd992fd9d4152537448eebaeaf7703f15d032e139276503ccae360a49c8766395988b67729b345d1
+AUX mixxx-2.0.0-docs.patch 445 SHA256 9250ab6b2368ad03b8c54d767fda1d23cd826340189cf8989a3156b76b375411 SHA512 cad756af2cfc90433b20d0a867aed9b85ee822691c5c8adc97de6943273823a769d8e6d4912a71f00bbead2cd96cff91cc12fb2fb8de547bf76dabd74372490e WHIRLPOOL 91b48e4577ff127065bbcae34d945613029850b43831209cc1b1f9c2d1da7fc3c02c9fa96dd958fe85f934749bcbace1b2c6c3c358306dc6d6ea91935337a327
+AUX mixxx-2.0.0-system-libs.patch 5879 SHA256 daca3a3662ecf4fedffdc610199d36f5ca24ba22cd1f7d82dd264b9762081a5b SHA512 44e71b5e02a32fa2f533dc07d4d320d18fe112e7e1342db594e49080ec987ae389b696f5f7ed17cb3b101789916936367b88a6aa0fd755b8d0e7028741c46bc2 WHIRLPOOL f810b7254de4421eebc28c12e7255d3b05f95e93758d51c8bd992fd9d4152537448eebaeaf7703f15d032e139276503ccae360a49c8766395988b67729b345d1
+DIST mixxx-2.0.0.tar.gz 25075794 SHA256 688d87d907f3ad3721602f44295a4d0caa41502df8504ca9264ca0c87d8818f1 SHA512 c0ae850408a63c1b916bde6adaadd5860277f1d8fefbed8bf385c4cc7f5b898bcf220d82eba6942493b8551031907160ecf2cb53a1201a8e82726303e6c23149 WHIRLPOOL 6044379535f0d966485f37bb0da9d476230a902dae034b305742e616ac730780e62e29022ec8e40125d229c1b81d9b7cfc030f5f3f7ebc23cbcf301983cd6a70
+EBUILD mixxx-2.0.0.ebuild 3398 SHA256 d1ff5fc66a456cb87c2a1aebef18591b32d9f40de60c3c58f7252873fa42ac81 SHA512 645de19b68fad72a979335dad66683480c99349bb1ce2e4e6898f8f0b80fff1559491c370cee0227e6acc91de7819fa0dea7941b92f806bbd42009868fefd179 WHIRLPOOL 5ff0dd6cb91340e6e823be673a188d28c483ec17cc6e50757d769d80e0789fd958e9f959c87737ef1d4db21152b755cb1e45d2772c1eb499784f925651217e17
 MISC ChangeLog 7853 SHA256 aae49fa4008b5a1c51ac67bc8f8417b957a9cf78cfb61b28587c5612af2423da SHA512 ac90613974fee38c857c0769e680dd343869e6d5caecfe1f51608c4e29cea70686ac97de63e183032b45689f2522a37ae1fbbe3360855b35a4c42ba9bbd79239 WHIRLPOOL 549f652d0058489695b9d779eb4deade4b828aa48bab6baf45d0dd409e7e12e8cc16f0bc45eae1a6c22a2389e9cab2e1be10238345be72864ccbeed69413ef51
 MISC metadata.xml 485 SHA256 2d28e5b3222a404cd0ae26b12d70640ed15c665204a43496862b77f0396f2038 SHA512 cf3578bae5e75f6b5db4ca71cd00a9389878d87d0983b0c5e0b2858336bd30186df13c58b03b9f1f2e698b651d360058ed0ff63771be6ba98128ae30b886d7f7 WHIRLPOOL 275c04e470f80968e15e0c3ef77cfa4f6fe89917b01ce1d94ea7bebdfd30ee54baae32678d79e7d28dde24bd0f4ad1f8756f185638e77421ab22ebca8e42c555
diff --git a/media-sound/mixxx/files/mixxx-1.11.0-cflags.patch b/media-sound/mixxx/files/mixxx-1.11.0-cflags.patch
deleted file mode 100644
index 94ef76e..0000000
--- a/media-sound/mixxx/files/mixxx-1.11.0-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mixxx-9999/build/depends.py	2010-12-22 11:13:22.000000000 -0800
-+++ mixxx-9999/build/depends.py	2010-12-22 11:14:02.000000000 -0800
-@@ -587,10 +587,8 @@
-         if build.toolchain_is_gnu:
-             # Default GNU Options
-             # TODO(XXX) always generate debugging info?
--            build.env.Append(CCFLAGS = '-pipe')
-             build.env.Append(CCFLAGS = '-Wall')
-             build.env.Append(CCFLAGS = '-Wextra')
--            build.env.Append(CCFLAGS = '-g')
- 
-             # Check that g++ is present (yeah, SCONS is a bit dumb here)
-             if os.system("which g++ > /dev/null"): #Checks for non-zero return code
diff --git a/media-sound/mixxx/files/mixxx-1.11.0-docs.patch b/media-sound/mixxx/files/mixxx-1.11.0-docs.patch
deleted file mode 100644
index 65bd39d..0000000
--- a/media-sound/mixxx/files/mixxx-1.11.0-docs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mixxx-9999/src/SConscript

-+++ mixxx-9999/src/SConscript

-@@ -223,7 +223,6 @@

-                 env.Alias('install', keyboardmappings)

-                 if int(flags['ladspa']):

-                         env.Alias('install', ladspapresets)

--                env.Alias('install', docs)

-                 env.Alias('install', dotdesktop)

-                 env.Alias('install', icon)

-                 env.Alias('install', promotracks)

diff --git a/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch b/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch
deleted file mode 100644
index 728db4d..0000000
--- a/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- mixxx/src/SConscript	2012-09-07 21:48:19 +0000
-+++ mixxx/src/SConscript	2012-09-13 04:47:25 +0000
-@@ -12,8 +12,8 @@
- from build import util, depends
- 
- mixxx_version = util.get_mixxx_version()
--branch_name = util.get_bzr_branch_name()
--bazaar_revision = util.get_bzr_revision()
-+#branch_name = util.get_bzr_branch_name()
-+#bazaar_revision = util.get_bzr_revision()
- print "WE ARE IN:", os.getcwd()
- 
- plugins = []
-
---- mixxx/src/SConscript.env	2012-09-06 08:04:47 +0000
-+++ mixxx/src/SConscript.env	2012-09-13 04:46:47 +0000
-@@ -20,19 +20,6 @@
-     print "Deleting deprecated build file: %s" % defs
-     os.remove(defs)
- 
--#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun
--## instead, embed BZR version into build
--## Put version info into a file, so it doesn't force a rebuild of everything :)
--
--if os.path.exists(os.path.join('..', 'build.h')):
--    # If a build.h exists in the project root mixxx/ directory then use that
--    # instead of writing our own. This is mostly since when we build Debian
--    # packages we don't have any of the Bazaar metadata so we can't write one
--    # ourselves.
--    shutil.copy(os.path.join('..', 'build.h'), 'build.h')
--else:
--    util.write_build_header('build.h')
--
- 
- #Check for dependencies if we're not doing a clean...
- #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']):
-
diff --git a/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch b/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch
deleted file mode 100644
index e7ad4b2..0000000
--- a/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-=== modified file 'mixxx/build/depends.py'
---- mixxx/build/depends.py	2013-01-19 09:47:43 +0000
-+++ mixxx/build/depends.py	2013-02-06 00:25:30 +0000
-@@ -290,25 +290,10 @@
- 
- class FidLib(Dependence):
- 
--    def sources(self, build):
--        symbol = None
--        if build.platform_is_windows:
--            if build.toolchain_is_msvs:
--                symbol = 'T_MSVC'
--            elif build.crosscompile:
--                # Not sure why, but fidlib won't build with mingw32msvc and
--                # T_MINGW
--                symbol = 'T_LINUX'
--            elif build.toolchain_is_gnu:
--                symbol = 'T_MINGW'
--        else:
--            symbol = 'T_LINUX'
--
--        return [build.env.StaticObject('#lib/fidlib-0.9.10/fidlib.c',
--                                       CPPDEFINES=symbol)]
--
-     def configure(self, build, conf):
--        build.env.Append(CPPPATH='#lib/fidlib-0.9.10/')
-+        if not conf.CheckLib('fidlib'):
-+            raise Exception('Did not find fidlib library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib'])
- 
- class ReplayGain(Dependence):
- 
-@@ -319,7 +304,6 @@
-         build.env.Append(CPPPATH="#lib/replaygain")
- 
- class SoundTouch(Dependence):
--    SOUNDTOUCH_PATH = 'soundtouch-1.6.0'
- 
-     def sse_enabled(self, build):
-         optimize = int(util.get_flags(build.env, 'optimize', 1))
-@@ -328,30 +312,7 @@
-                 (build.toolchain_is_gnu and optimize > 1))
- 
-     def sources(self, build):
--        sources = ['engine/enginebufferscalest.cpp',
--                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
--
--        # SoundTouch CPU optimizations are only for x86
--        # architectures. SoundTouch automatically ignores these files when it is
--        # not being built for an architecture that supports them.
--        cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else \
--            '#lib/%s/cpu_detect_x86_gcc.cpp'
--        sources.append(cpu_detection % self.SOUNDTOUCH_PATH)
--
--        # Check if the compiler has SSE extention enabled
--        # Allways the case on x64 (core instructions)
--        if self.sse_enabled(build):
--            sources.extend(
--                ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
--                 '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,])
--        return sources
-+        return ['engine/enginebufferscalest.cpp']
- 
-     def configure(self, build, conf, env=None):
-         if env is None:
-@@ -359,13 +320,10 @@
-         if build.platform_is_windows:
-             # Regardless of the bitwidth, ST checks for WIN32
-             env.Append(CPPDEFINES = 'WIN32')
--        env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
--
--        # Check if the compiler has SSE extention enabled
--        # Allways the case on x64 (core instructions)
--        optimize = int(util.get_flags(env, 'optimize', 1))
--        if self.sse_enabled(build):
--            env.Append(CPPDEFINES='SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS')
-+        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
-+            raise Exception('Did not find SoundTouch library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
-+        build.env.Append(LIBS='SoundTouch')
- 
- class TagLib(Dependence):
-     def configure(self, build, conf):
-
-=== modified file 'mixxx/build/features.py'
---- mixxx/build/features.py	2012-11-22 14:14:06 +0000
-+++ mixxx/build/features.py	2013-02-06 00:54:37 +0000
-@@ -48,7 +48,6 @@
-                 'controllers/midi/hss1394enumerator.cpp']
- 
- class HID(Feature):
--    HIDAPI_INTERNAL_PATH = '#lib/hidapi-0.8.0-pre'
-     def description(self):
-         return "HID controller support"
- 
-@@ -64,9 +63,6 @@
-     def configure(self, build, conf):
-         if not self.enabled(build):
-             return
--        # TODO(XXX) allow external hidapi install, but for now we just use our
--        # internal one.
--        build.env.Append(CPPPATH=[os.path.join(self.HIDAPI_INTERNAL_PATH, 'hidapi')])
- 
-         if build.platform_is_linux:
-             build.env.ParseConfig('pkg-config libusb-1.0 --silence-errors --cflags --libs')
-@@ -86,19 +82,17 @@
- 
-         build.env.Append(CPPDEFINES = '__HID__')
- 
-+        if not conf.CheckLib('hidapi-libusb'):
-+            raise Exception('Did not find HID API library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/hidapi'])
-+        build.env.Append(LIBS='hidapi-libusb')
-+
-+
-     def sources(self, build):
-         sources = ['controllers/hid/hidcontroller.cpp',
-                    'controllers/hid/hidenumerator.cpp',
-                    'controllers/hid/hidcontrollerpresetfilehandler.cpp']
- 
--        if build.platform_is_windows:
--            # Requires setupapi.lib which is included by the above check for
--            # setupapi.
--            sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
--        elif build.platform_is_linux:
--            sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'linux/hid-libusb.c'))
--        elif build.platform_is_osx:
--            sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c'))
-         return sources
- 
- class Bulk(Feature):
-@@ -722,25 +716,15 @@
-         test_env.Append(CCFLAGS = '-pthread')
-         test_env.Append(LINKFLAGS = '-pthread')
- 
--        test_env.Append(CPPPATH="#lib/gtest-1.5.0/include")
--        gtest_dir = test_env.Dir("#lib/gtest-1.5.0")
--        #gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0'))
--        #build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin'  # example, optional
--        test_env['LIB_OUTPUT'] = '#/lib/gtest-1.5.0/lib'
--
--        env = test_env
--        SCons.Export('env')
--        env.SConscript(env.File('SConscript', gtest_dir))
--
--        # build and configure gmock
--        test_env.Append(CPPPATH="#lib/gmock-1.5.0/include")
--        gmock_dir = test_env.Dir("#lib/gmock-1.5.0")
--        #gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
--        test_env['LIB_OUTPUT'] = '#/lib/gmock-1.5.0/lib'
--
--        env.SConscript(env.File('SConscript', gmock_dir))
--
--        return []
-+        if not conf.CheckLib('gtest'):
-+            raise Exception('Did not find gtest library, exiting!')
-+        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest'])
-+        test_env.Append(LIBS='gtest')
-+
-+        if not conf.CheckLib('gmock'):
-+            raise Exception('Did not find gmock library, exiting!')
-+        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock'])
-+        test_env.Append(LIBS='gmock')
- 
- class Shoutcast(Feature):
-     def description(self):
-
-=== modified file 'mixxx/src/engine/enginefilter.h'
---- mixxx/src/engine/enginefilter.h	2011-07-24 21:50:31 +0000
-+++ mixxx/src/engine/enginefilter.h	2013-02-06 00:34:16 +0000
-@@ -20,7 +20,7 @@
- 
- #define MIXXX
- #include "engine/engineobject.h"
--#include "../lib/fidlib-0.9.10/fidlib.h"
-+#include <fidlib.h>
- #include "defs.h"
- 
- enum filterType{
-
-=== modified file 'mixxx/src/engine/enginefilterbutterworth8.cpp'
---- mixxx/src/engine/enginefilterbutterworth8.cpp	2011-07-24 21:50:31 +0000
-+++ mixxx/src/engine/enginefilterbutterworth8.cpp	2013-02-06 00:34:01 +0000
-@@ -20,7 +20,7 @@
- #include "engine/enginefilterbutterworth8.h"

- #include "engine/enginefilter.h"

- #include "engine/engineobject.h"

--#include "../lib/fidlib-0.9.10/fidlib.h"

-+#include <fidlib.h>

- 

- /* Local Prototypes */

- inline double _processLowpass(double *coef, double *buf, register double val);

-
diff --git a/media-sound/mixxx/files/mixxx-1.11.9999-cflags.patch b/media-sound/mixxx/files/mixxx-1.11.9999-cflags.patch
deleted file mode 100644
index 94ef76e..0000000
--- a/media-sound/mixxx/files/mixxx-1.11.9999-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mixxx-9999/build/depends.py	2010-12-22 11:13:22.000000000 -0800
-+++ mixxx-9999/build/depends.py	2010-12-22 11:14:02.000000000 -0800
-@@ -587,10 +587,8 @@
-         if build.toolchain_is_gnu:
-             # Default GNU Options
-             # TODO(XXX) always generate debugging info?
--            build.env.Append(CCFLAGS = '-pipe')
-             build.env.Append(CCFLAGS = '-Wall')
-             build.env.Append(CCFLAGS = '-Wextra')
--            build.env.Append(CCFLAGS = '-g')
- 
-             # Check that g++ is present (yeah, SCONS is a bit dumb here)
-             if os.system("which g++ > /dev/null"): #Checks for non-zero return code
diff --git a/media-sound/mixxx/files/mixxx-1.11.9999-no-bzr.patch b/media-sound/mixxx/files/mixxx-1.11.9999-no-bzr.patch
deleted file mode 100644
index f7f5448..0000000
--- a/media-sound/mixxx/files/mixxx-1.11.9999-no-bzr.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- mixxx/src/SConscript	2013-05-20 20:40:21 +0000
-+++ mixxx/src/SConscript	2013-05-22 02:58:18 +0000
-@@ -12,8 +12,8 @@
- from build import util, depends
- 
- mixxx_version = util.get_mixxx_version()
--branch_name = util.get_bzr_branch_name()
--bazaar_revision = util.get_bzr_revision()
-+#branch_name = util.get_bzr_branch_name()
-+#bazaar_revision = util.get_bzr_revision()
- print "WE ARE IN:", os.getcwd()
- 
- plugins = []
-
---- mixxx/src/SConscript.env	2012-09-06 08:04:47 +0000
-+++ mixxx/src/SConscript.env	2013-05-22 03:00:12 +0000
-@@ -20,19 +20,6 @@
-     print "Deleting deprecated build file: %s" % defs
-     os.remove(defs)
- 
--#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun
--## instead, embed BZR version into build
--## Put version info into a file, so it doesn't force a rebuild of everything :)
--
--if os.path.exists(os.path.join('..', 'build.h')):
--    # If a build.h exists in the project root mixxx/ directory then use that
--    # instead of writing our own. This is mostly since when we build Debian
--    # packages we don't have any of the Bazaar metadata so we can't write one
--    # ourselves.
--    shutil.copy(os.path.join('..', 'build.h'), 'build.h')
--else:
--    util.write_build_header('build.h')
--
- 
- #Check for dependencies if we're not doing a clean...
- #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']):
-
diff --git a/media-sound/mixxx/files/mixxx-1.11.9999-system-libs.patch b/media-sound/mixxx/files/mixxx-1.11.9999-system-libs.patch
deleted file mode 100644
index e7ad4b2..0000000
--- a/media-sound/mixxx/files/mixxx-1.11.9999-system-libs.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-=== modified file 'mixxx/build/depends.py'
---- mixxx/build/depends.py	2013-01-19 09:47:43 +0000
-+++ mixxx/build/depends.py	2013-02-06 00:25:30 +0000
-@@ -290,25 +290,10 @@
- 
- class FidLib(Dependence):
- 
--    def sources(self, build):
--        symbol = None
--        if build.platform_is_windows:
--            if build.toolchain_is_msvs:
--                symbol = 'T_MSVC'
--            elif build.crosscompile:
--                # Not sure why, but fidlib won't build with mingw32msvc and
--                # T_MINGW
--                symbol = 'T_LINUX'
--            elif build.toolchain_is_gnu:
--                symbol = 'T_MINGW'
--        else:
--            symbol = 'T_LINUX'
--
--        return [build.env.StaticObject('#lib/fidlib-0.9.10/fidlib.c',
--                                       CPPDEFINES=symbol)]
--
-     def configure(self, build, conf):
--        build.env.Append(CPPPATH='#lib/fidlib-0.9.10/')
-+        if not conf.CheckLib('fidlib'):
-+            raise Exception('Did not find fidlib library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib'])
- 
- class ReplayGain(Dependence):
- 
-@@ -319,7 +304,6 @@
-         build.env.Append(CPPPATH="#lib/replaygain")
- 
- class SoundTouch(Dependence):
--    SOUNDTOUCH_PATH = 'soundtouch-1.6.0'
- 
-     def sse_enabled(self, build):
-         optimize = int(util.get_flags(build.env, 'optimize', 1))
-@@ -328,30 +312,7 @@
-                 (build.toolchain_is_gnu and optimize > 1))
- 
-     def sources(self, build):
--        sources = ['engine/enginebufferscalest.cpp',
--                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
--
--        # SoundTouch CPU optimizations are only for x86
--        # architectures. SoundTouch automatically ignores these files when it is
--        # not being built for an architecture that supports them.
--        cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else \
--            '#lib/%s/cpu_detect_x86_gcc.cpp'
--        sources.append(cpu_detection % self.SOUNDTOUCH_PATH)
--
--        # Check if the compiler has SSE extention enabled
--        # Allways the case on x64 (core instructions)
--        if self.sse_enabled(build):
--            sources.extend(
--                ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
--                 '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,])
--        return sources
-+        return ['engine/enginebufferscalest.cpp']
- 
-     def configure(self, build, conf, env=None):
-         if env is None:
-@@ -359,13 +320,10 @@
-         if build.platform_is_windows:
-             # Regardless of the bitwidth, ST checks for WIN32
-             env.Append(CPPDEFINES = 'WIN32')
--        env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
--
--        # Check if the compiler has SSE extention enabled
--        # Allways the case on x64 (core instructions)
--        optimize = int(util.get_flags(env, 'optimize', 1))
--        if self.sse_enabled(build):
--            env.Append(CPPDEFINES='SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS')
-+        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
-+            raise Exception('Did not find SoundTouch library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
-+        build.env.Append(LIBS='SoundTouch')
- 
- class TagLib(Dependence):
-     def configure(self, build, conf):
-
-=== modified file 'mixxx/build/features.py'
---- mixxx/build/features.py	2012-11-22 14:14:06 +0000
-+++ mixxx/build/features.py	2013-02-06 00:54:37 +0000
-@@ -48,7 +48,6 @@
-                 'controllers/midi/hss1394enumerator.cpp']
- 
- class HID(Feature):
--    HIDAPI_INTERNAL_PATH = '#lib/hidapi-0.8.0-pre'
-     def description(self):
-         return "HID controller support"
- 
-@@ -64,9 +63,6 @@
-     def configure(self, build, conf):
-         if not self.enabled(build):
-             return
--        # TODO(XXX) allow external hidapi install, but for now we just use our
--        # internal one.
--        build.env.Append(CPPPATH=[os.path.join(self.HIDAPI_INTERNAL_PATH, 'hidapi')])
- 
-         if build.platform_is_linux:
-             build.env.ParseConfig('pkg-config libusb-1.0 --silence-errors --cflags --libs')
-@@ -86,19 +82,17 @@
- 
-         build.env.Append(CPPDEFINES = '__HID__')
- 
-+        if not conf.CheckLib('hidapi-libusb'):
-+            raise Exception('Did not find HID API library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/hidapi'])
-+        build.env.Append(LIBS='hidapi-libusb')
-+
-+
-     def sources(self, build):
-         sources = ['controllers/hid/hidcontroller.cpp',
-                    'controllers/hid/hidenumerator.cpp',
-                    'controllers/hid/hidcontrollerpresetfilehandler.cpp']
- 
--        if build.platform_is_windows:
--            # Requires setupapi.lib which is included by the above check for
--            # setupapi.
--            sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
--        elif build.platform_is_linux:
--            sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'linux/hid-libusb.c'))
--        elif build.platform_is_osx:
--            sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c'))
-         return sources
- 
- class Bulk(Feature):
-@@ -722,25 +716,15 @@
-         test_env.Append(CCFLAGS = '-pthread')
-         test_env.Append(LINKFLAGS = '-pthread')
- 
--        test_env.Append(CPPPATH="#lib/gtest-1.5.0/include")
--        gtest_dir = test_env.Dir("#lib/gtest-1.5.0")
--        #gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0'))
--        #build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin'  # example, optional
--        test_env['LIB_OUTPUT'] = '#/lib/gtest-1.5.0/lib'
--
--        env = test_env
--        SCons.Export('env')
--        env.SConscript(env.File('SConscript', gtest_dir))
--
--        # build and configure gmock
--        test_env.Append(CPPPATH="#lib/gmock-1.5.0/include")
--        gmock_dir = test_env.Dir("#lib/gmock-1.5.0")
--        #gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
--        test_env['LIB_OUTPUT'] = '#/lib/gmock-1.5.0/lib'
--
--        env.SConscript(env.File('SConscript', gmock_dir))
--
--        return []
-+        if not conf.CheckLib('gtest'):
-+            raise Exception('Did not find gtest library, exiting!')
-+        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest'])
-+        test_env.Append(LIBS='gtest')
-+
-+        if not conf.CheckLib('gmock'):
-+            raise Exception('Did not find gmock library, exiting!')
-+        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock'])
-+        test_env.Append(LIBS='gmock')
- 
- class Shoutcast(Feature):
-     def description(self):
-
-=== modified file 'mixxx/src/engine/enginefilter.h'
---- mixxx/src/engine/enginefilter.h	2011-07-24 21:50:31 +0000
-+++ mixxx/src/engine/enginefilter.h	2013-02-06 00:34:16 +0000
-@@ -20,7 +20,7 @@
- 
- #define MIXXX
- #include "engine/engineobject.h"
--#include "../lib/fidlib-0.9.10/fidlib.h"
-+#include <fidlib.h>
- #include "defs.h"
- 
- enum filterType{
-
-=== modified file 'mixxx/src/engine/enginefilterbutterworth8.cpp'
---- mixxx/src/engine/enginefilterbutterworth8.cpp	2011-07-24 21:50:31 +0000
-+++ mixxx/src/engine/enginefilterbutterworth8.cpp	2013-02-06 00:34:01 +0000
-@@ -20,7 +20,7 @@
- #include "engine/enginefilterbutterworth8.h"

- #include "engine/enginefilter.h"

- #include "engine/engineobject.h"

--#include "../lib/fidlib-0.9.10/fidlib.h"

-+#include <fidlib.h>

- 

- /* Local Prototypes */

- inline double _processLowpass(double *coef, double *buf, register double val);

-
diff --git a/media-sound/mixxx/files/mixxx-9999-docs.patch b/media-sound/mixxx/files/mixxx-1.12.9999-docs.patch
index bc26d58..bc26d58 100644
--- a/media-sound/mixxx/files/mixxx-9999-docs.patch
+++ b/media-sound/mixxx/files/mixxx-1.12.9999-docs.patch
diff --git a/media-sound/mixxx/files/mixxx-9999-system-libs.patch b/media-sound/mixxx/files/mixxx-1.12.9999-system-libs.patch
index ae5f3b4..60c293f 100644
--- a/media-sound/mixxx/files/mixxx-9999-system-libs.patch
+++ b/media-sound/mixxx/files/mixxx-1.12.9999-system-libs.patch
@@ -1,42 +1,8 @@
-diff --git a/build/depends.py b/build/depends.py
-index ad71733..a33d68e 100644
---- a/build/depends.py
-+++ b/build/depends.py
-@@ -347,25 +347,11 @@
- 
- class FidLib(Dependence):
- 
--    def sources(self, build):
--        symbol = None
--        if build.platform_is_windows:
--            if build.toolchain_is_msvs:
--                symbol = 'T_MSVC'
--            elif build.crosscompile:
--                # Not sure why, but fidlib won't build with mingw32msvc and
--                # T_MINGW
--                symbol = 'T_LINUX'
--            elif build.toolchain_is_gnu:
--                symbol = 'T_MINGW'
--        else:
--            symbol = 'T_LINUX'
--
--        return [build.env.StaticObject('#lib/fidlib-0.9.10/fidlib.c',
--                                       CPPDEFINES=symbol)]
--
-     def configure(self, build, conf):
--        build.env.Append(CPPPATH='#lib/fidlib-0.9.10/')
-+        if not conf.CheckLib('fidlib'):
-+            raise Exception('Did not find fidlib library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib']) 
-+
- 
- 
- class ReplayGain(Dependence):
-@@ -378,42 +364,19 @@
- 
- 
- class SoundTouch(Dependence):
--    SOUNDTOUCH_PATH = 'soundtouch-1.8.0'
+diff -dNur a/build/depends.py b/build/depends.py
+--- a/build/depends.py	2015-12-01 17:29:47.731520477 +0000
++++ b/build/depends.py	2015-12-01 17:34:59.412854685 +0000
+@@ -403,39 +403,15 @@
+     SOUNDTOUCH_PATH = 'soundtouch-1.8.0'
  
      def sources(self, build):
 -        return ['engine/enginebufferscalest.cpp',
@@ -64,31 +30,30 @@ index ad71733..a33d68e 100644
          if env is None:
              env = build.env
 -        env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
- 
+-
 -        # Prevents circular import.
 -        from features import Optimize
-+        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
-+            raise Exception('Did not find SoundTouch library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
-+        build.env.Append(LIBS='SoundTouch')
- 
+-
 -        # If we do not want optimizations then disable them.
 -        optimize = (build.flags['optimize'] if 'optimize' in build.flags
--                    else Optimize.get_optimization_level())
+-                    else Optimize.get_optimization_level(build))
 -        if optimize == Optimize.LEVEL_OFF:
 -            env.Append(CPPDEFINES='SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS')
++        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
++            raise Exception('Did not find SoundTouch library, exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
++        build.env.Append(LIBS='SoundTouch')
  
  
  class RubberBand(Dependence):
-diff --git a/build/features.py b/build/features.py
-index b61de86..639e143 100644
---- a/build/features.py
-+++ b/build/features.py
+diff -dNur a/build/features.py b/build/features.py
+--- a/build/features.py	2015-12-01 17:29:47.731520477 +0000
++++ b/build/features.py	2015-12-01 17:40:15.398209140 +0000
 @@ -45,7 +45,6 @@
  
  
  class HID(Feature):
--    HIDAPI_INTERNAL_PATH = '#lib/hidapi-0.8.0-pre'
+-    HIDAPI_INTERNAL_PATH = '#lib/hidapi-0.8.0-rc1'
  
      def description(self):
          return "HID controller support"
@@ -103,7 +68,7 @@ index b61de86..639e143 100644
  
          if build.platform_is_linux:
              build.env.ParseConfig(
-@@ -90,22 +85,16 @@
+@@ -90,25 +85,17 @@
  
          build.env.Append(CPPDEFINES='__HID__')
  
@@ -112,8 +77,10 @@ index b61de86..639e143 100644
 +        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/hidapi'])
 +        build.env.Append(LIBS='hidapi-libusb')
 +
++
      def sources(self, build):
-         sources = ['controllers/hid/hidcontroller.cpp',
+-        sources = ['controllers/hid/hidcontroller.cpp',
++        return ['controllers/hid/hidcontroller.cpp',
                     'controllers/hid/hidenumerator.cpp',
                     'controllers/hid/hidcontrollerpresetfilehandler.cpp']
  
@@ -123,17 +90,20 @@ index b61de86..639e143 100644
 -            sources.append(
 -                os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
 -        elif build.platform_is_linux:
+-            # hidapi compiles the libusb implementation by default on Linux
 -            sources.append(
--                os.path.join(self.HIDAPI_INTERNAL_PATH, 'linux/hid-libusb.c'))
+-                os.path.join(self.HIDAPI_INTERNAL_PATH, 'libusb/hid.c'))
 -        elif build.platform_is_osx:
 -            sources.append(
 -                os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c'))
-         return sources
- 
+-        return sources
+-
  
-@@ -717,25 +706,6 @@
-         test_env.Append(CCFLAGS='-pthread')
-         test_env.Append(LINKFLAGS='-pthread')
+ class Bulk(Feature):
+     def description(self):
+@@ -745,25 +732,16 @@
+             test_env.Append(CCFLAGS='-pthread')
+             test_env.Append(LINKFLAGS='-pthread')
  
 -        test_env.Append(CPPPATH="#lib/gtest-1.7.0/include")
 -        gtest_dir = test_env.Dir("#lib/gtest-1.7.0")
@@ -151,10 +121,17 @@ index b61de86..639e143 100644
 -        gmock_dir = test_env.Dir("#lib/gmock-1.7.0")
 -        # gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
 -        test_env['LIB_OUTPUT'] = '#/lib/gmock-1.7.0/lib'
--
+ 
 -        env.SConscript(env.File('SConscript', gmock_dir))
--
++        if not conf.CheckLib('gtest'):
++            raise Exception('Did not find gtest library, exiting!')
++        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest'])
++        test_env.Append(LIBS='gtest')
+ 
++        if not conf.CheckLib('gmock'):
++            raise Exception('Did not find gmock library, exiting!')
++        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock'])
++        test_env.Append(LIBS='gmock')
          return []
  
  
-
diff --git a/media-sound/mixxx/files/mixxx-1.11.9999-docs.patch b/media-sound/mixxx/files/mixxx-2.0.0-docs.patch
index 65bd39d..bc26d58 100644
--- a/media-sound/mixxx/files/mixxx-1.11.9999-docs.patch
+++ b/media-sound/mixxx/files/mixxx-2.0.0-docs.patch
@@ -1,9 +1,9 @@
 --- mixxx-9999/src/SConscript

 +++ mixxx-9999/src/SConscript

-@@ -223,7 +223,6 @@

+@@ -290,7 +290,6 @@

+                 env.Alias('install', controllermappings)

+                 env.Alias('install', translations)

                  env.Alias('install', keyboardmappings)

-                 if int(flags['ladspa']):

-                         env.Alias('install', ladspapresets)

 -                env.Alias('install', docs)

                  env.Alias('install', dotdesktop)

                  env.Alias('install', icon)

diff --git a/media-sound/mixxx/files/mixxx-2.0.0-system-libs.patch b/media-sound/mixxx/files/mixxx-2.0.0-system-libs.patch
new file mode 100644
index 0000000..60c293f
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.0.0-system-libs.patch
@@ -0,0 +1,137 @@
+diff -dNur a/build/depends.py b/build/depends.py
+--- a/build/depends.py	2015-12-01 17:29:47.731520477 +0000
++++ b/build/depends.py	2015-12-01 17:34:59.412854685 +0000
+@@ -403,39 +403,15 @@
+     SOUNDTOUCH_PATH = 'soundtouch-1.8.0'
+ 
+     def sources(self, build):
+-        return ['engine/enginebufferscalest.cpp',
+-                '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH,
+-                '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
+-                '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                '#lib/%s/InterpolateCubic.cpp' % self.SOUNDTOUCH_PATH,
+-                '#lib/%s/InterpolateLinear.cpp' % self.SOUNDTOUCH_PATH,
+-                '#lib/%s/InterpolateShannon.cpp' % self.SOUNDTOUCH_PATH,
+-                '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
+-                '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
+-                '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
+-                '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
+-                # SoundTouch CPU optimizations are only for x86
+-                # architectures. SoundTouch automatically ignores these files
+-                # when it is not being built for an architecture that supports
+-                # them.
+-                '#lib/%s/cpu_detect_x86.cpp' % self.SOUNDTOUCH_PATH,
+-                '#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH]
++        return ['engine/enginebufferscalest.cpp']
+ 
+     def configure(self, build, conf, env=None):
+         if env is None:
+             env = build.env
+-        env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
+-
+-        # Prevents circular import.
+-        from features import Optimize
+-
+-        # If we do not want optimizations then disable them.
+-        optimize = (build.flags['optimize'] if 'optimize' in build.flags
+-                    else Optimize.get_optimization_level(build))
+-        if optimize == Optimize.LEVEL_OFF:
+-            env.Append(CPPDEFINES='SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS')
++        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
++            raise Exception('Did not find SoundTouch library, exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
++        build.env.Append(LIBS='SoundTouch')
+ 
+ 
+ class RubberBand(Dependence):
+diff -dNur a/build/features.py b/build/features.py
+--- a/build/features.py	2015-12-01 17:29:47.731520477 +0000
++++ b/build/features.py	2015-12-01 17:40:15.398209140 +0000
+@@ -45,7 +45,6 @@
+ 
+ 
+ class HID(Feature):
+-    HIDAPI_INTERNAL_PATH = '#lib/hidapi-0.8.0-rc1'
+ 
+     def description(self):
+         return "HID controller support"
+@@ -62,10 +61,6 @@
+     def configure(self, build, conf):
+         if not self.enabled(build):
+             return
+-        # TODO(XXX) allow external hidapi install, but for now we just use our
+-        # internal one.
+-        build.env.Append(
+-            CPPPATH=[os.path.join(self.HIDAPI_INTERNAL_PATH, 'hidapi')])
+ 
+         if build.platform_is_linux:
+             build.env.ParseConfig(
+@@ -90,25 +85,17 @@
+ 
+         build.env.Append(CPPDEFINES='__HID__')
+ 
++        if not conf.CheckLib('hidapi-libusb'):
++            raise Exception('Did not find HID API library, exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/hidapi'])
++        build.env.Append(LIBS='hidapi-libusb')
++
++
+     def sources(self, build):
+-        sources = ['controllers/hid/hidcontroller.cpp',
++        return ['controllers/hid/hidcontroller.cpp',
+                    'controllers/hid/hidenumerator.cpp',
+                    'controllers/hid/hidcontrollerpresetfilehandler.cpp']
+ 
+-        if build.platform_is_windows:
+-            # Requires setupapi.lib which is included by the above check for
+-            # setupapi.
+-            sources.append(
+-                os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
+-        elif build.platform_is_linux:
+-            # hidapi compiles the libusb implementation by default on Linux
+-            sources.append(
+-                os.path.join(self.HIDAPI_INTERNAL_PATH, 'libusb/hid.c'))
+-        elif build.platform_is_osx:
+-            sources.append(
+-                os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c'))
+-        return sources
+-
+ 
+ class Bulk(Feature):
+     def description(self):
+@@ -745,25 +732,16 @@
+             test_env.Append(CCFLAGS='-pthread')
+             test_env.Append(LINKFLAGS='-pthread')
+ 
+-        test_env.Append(CPPPATH="#lib/gtest-1.7.0/include")
+-        gtest_dir = test_env.Dir("#lib/gtest-1.7.0")
+-        # gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0'))
+-        # build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin'  # example,
+-        # optional
+-        test_env['LIB_OUTPUT'] = '#/lib/gtest-1.7.0/lib'
+-
+-        env = test_env
+-        SCons.Export('env')
+-        env.SConscript(env.File('SConscript', gtest_dir))
+-
+-        # build and configure gmock
+-        test_env.Append(CPPPATH="#lib/gmock-1.7.0/include")
+-        gmock_dir = test_env.Dir("#lib/gmock-1.7.0")
+-        # gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
+-        test_env['LIB_OUTPUT'] = '#/lib/gmock-1.7.0/lib'
+ 
+-        env.SConscript(env.File('SConscript', gmock_dir))
++        if not conf.CheckLib('gtest'):
++            raise Exception('Did not find gtest library, exiting!')
++        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest'])
++        test_env.Append(LIBS='gtest')
+ 
++        if not conf.CheckLib('gmock'):
++            raise Exception('Did not find gmock library, exiting!')
++        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock'])
++        test_env.Append(LIBS='gmock')
+         return []
+ 
+ 
diff --git a/media-sound/mixxx/mixxx-2.0.0.ebuild b/media-sound/mixxx/mixxx-2.0.0.ebuild
new file mode 100644
index 0000000..e935c5b
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.0.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils multilib scons-utils toolchain-funcs
+
+DESCRIPTION="A Qt based Digital DJ tool"
+HOMEPAGE="http://www.mixxx.org/"
+SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac debug doc ffmpeg hid mp3 mp4 pulseaudio +qt4 qt5 shout wavpack"
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="dev-libs/protobuf
+	media-libs/chromaprint
+	media-libs/flac
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libsndfile
+	>=media-libs/libsoundtouch-1.5
+	media-libs/libvorbis
+	>=media-libs/portaudio-19_pre
+	media-libs/portmidi
+	media-libs/rubberband
+	>=media-libs/taglib-1.10
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0
+	virtual/glu
+	virtual/opengl
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+		dev-qt/qtsql:4
+		dev-qt/qtsvg:4
+		dev-qt/qttest:4
+		dev-qt/qtwebkit:4
+		dev-qt/qtxmlpatterns:4
+	)
+	qt5? (
+		>=dev-qt/qtscript-5.4.2:5[scripttools]
+		>=dev-qt/qtsvg-5.4.2:5
+		>=dev-qt/qtsql-5.4.2:5
+		>=dev-qt/qtxml-5.4.2:5
+		>=dev-qt/qtopengl-5.4.2:5
+		>=dev-qt/qtgui-5.4.2:5
+		>=dev-qt/qtnetwork-5.4.2:5
+		>=dev-qt/qtcore-5.4.2:5
+		>=dev-qt/qtwidgets-5.4.2:5
+		>=dev-qt/qttest-5.4.2:5
+		>=dev-qt/qtxmlpatterns-5.4.2:5
+		>=dev-qt/qtconcurrent-5.4.2:5
+	)
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	hid? ( dev-libs/hidapi )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	ffmpeg? ( virtual/ffmpeg )
+	pulseaudio? ( media-sound/pulseaudio )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-release-${PV/_/-}"
+
+pkg_pretend() {
+	if use ffmpeg; then
+		ewarn "You enabled USE flag 'ffmpeg'. This is an experimental feature and suffers"
+		ewarn "seek and performance issues."
+		ewarn ""
+	fi
+	if use qt5; then
+		ewarn "You enabled USE flag 'qt5'. This is an experimental feature and not"
+		ewarn "recommended by upstream."
+		ewarn ""
+	fi
+	ewarn "It is recommended by upstream to build libsoundtouch with SSE and CXXFLAGS=\"-ffast-math\"."
+	ewarn "To enable this, please add this line to /etc/portage/env/media-libs/libsoundtouch:"
+	ewarn "CXXFLAGS=\"\${CXXFLAGS} -ffast-math\""
+	ewarn "Please note that \"-ffast-math\" breaks IEEE compliance and may change floating point results."
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-system-libs.patch
+	epatch "${FILESDIR}"/${P}-docs.patch
+
+	# use multilib compatible directory for plugins
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+}
+
+src_configure() {
+	if use qt5 ; then
+		QTDIR=${EPREFIX}/usr/$(get_libdir)/qt5
+	else
+		QTDIR=${EPREFIX}/usr/$(get_libdir)/qt4
+	fi
+
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		qtdir="${QTDIR}"
+		hifieq=1
+		vinylcontrol=1
+		optimize=0
+		$(use_scons qt5)
+		$(use_scons aac faad)
+		$(use_scons debug qdebug)
+		$(use_scons hid hid)
+		$(use_scons mp3 mad)
+		$(use_scons mp4 m4a)
+		$(use_scons ffmpeg)
+		$(use_scons shout shoutcast)
+		$(use_scons wavpack wv)
+	)
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBPATH="${EPREFIX}/usr/$(get_libdir)" escons
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBPATH="${EPREFIX}/usr/$(get_libdir)" escons install \
+		install_root="${ED}"/usr
+
+	dodoc README Mixxx-Manual.pdf
+}
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
deleted file mode 100644
index 1e69bdc..0000000
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils git-2 multilib scons-utils toolchain-funcs
-
-DESCRIPTION="A Qt based Digital DJ tool"
-HOMEPAGE="http://www.mixxx.org/"
-EGIT_REPO_URI="git://github.com/mixxxdj/${PN}.git"
-EGIT_BRANCH="master"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="aac debug doc ffmpeg hid mp3 mp4 pulseaudio shout wavpack"
-
-RDEPEND="dev-libs/protobuf
-	media-libs/chromaprint
-	>media-libs/fidlib-0.9.10-r1
-	media-libs/flac
-	media-libs/libid3tag
-	media-libs/libogg
-	media-libs/libsndfile
-	>=media-libs/libsoundtouch-1.5
-	media-libs/libvorbis
-	>=media-libs/portaudio-19_pre
-	media-libs/portmidi
-	media-libs/rubberband
-	media-libs/taglib
-	media-libs/vamp-plugin-sdk
-	sci-libs/fftw:3.0
-	virtual/glu
-	virtual/opengl
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsql:4
-	dev-qt/qtsvg:4
-	dev-qt/qttest:4
-	dev-qt/qtwebkit:4
-	dev-qt/qtxmlpatterns:4
-	aac? (
-		media-libs/faad2
-		media-libs/libmp4v2:0
-	)
-	ffmpeg? ( virtual/ffmpeg )
-	hid? ( dev-libs/hidapi )
-	mp3? ( media-libs/libmad )
-	mp4? ( media-libs/libmp4v2 )
-	pulseaudio? ( media-sound/pulseaudio )
-	shout? ( media-libs/libshout )
-	wavpack? ( media-sound/wavpack )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${S}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-system-libs.patch
-	epatch "${FILESDIR}"/${P}-docs.patch
-
-	# use multilib compatible directory for plugins
-	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
-
-	# alter startup command when pulseaudio support is disabled
-	if ! use pulseaudio ; then
-		sed -i -e 's:pasuspender ::' src/mixxx.desktop || die
-	fi
-}
-
-src_configure() {
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		qtdir="${EPREFIX}/usr/$(get_libdir)/qt4"
-		hifieq=1
-		vinylcontrol=1
-		optimize=0
-		$(use_scons aac faad)
-		$(use_scons debug qdebug)
-		$(use_scons hid hid)
-		$(use_scons mp3 mad)
-		$(use_scons mp4 m4a)
-		$(use_scons shout shoutcast)
-		$(use_scons wavpack wv)
-		$(use_scons ffmpeg ffmpeg)
-	)
-}
-
-src_compile() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBPATH="${EPREFIX}/usr/$(get_libdir)" escons
-}
-
-src_install() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBPATH="${EPREFIX}/usr/$(get_libdir)" escons install \
-		install_root="${ED}"/usr
-
-	dodoc README Mixxx-Manual.pdf
-}
diff --git a/sys-fs/ori/Manifest b/sys-fs/ori/Manifest
index 970e7d6..3bd50bb 100644
--- a/sys-fs/ori/Manifest
+++ b/sys-fs/ori/Manifest
@@ -1,4 +1,3 @@
-AUX ori-0.8.0-scons-destdir.patch 2009 SHA256 1896d86f90e7a37286c03760d9b039b3662c6c885cbfc335fbbcc2d556b49d73 SHA512 09d2fab404b2d361b6159b1b98eb6c9d2c1a1498b88a031265a48a10a8e9ae9d3ee73b8dbf370619143c355dde70fe4f89f2024c9bb20c74e0b08ad0fa6820a0 WHIRLPOOL f27a786211f367907a4df6061b9179a37431cee997c140e00880421323b22ac5dfa78ea72df6c427461a49b06e79ff9e727b53052a9464d91f11dce54684cf69
-AUX ori-0.8.0-scons-variables.patch 12884 SHA256 69ba491b714a8bb2b31e0a7246a571a75cf6fbffe3583c47f4bea8017210e6f0 SHA512 bb07088b287486e51fa8f81f256e4d6bd03eb664a35637be3bbab2a412392126a04ba2c0ae706f7f3f495a3ad1ea5e7b340a75419c9163a24135c5fc0c740d90 WHIRLPOOL 0fe56974fdc6c71354431d35f48c9a40de97435a7a3386187ba6d026feaf61c9d7a2016035d25d39399f1ff8c4cb49646f6f040f62dea49ae3d0fd9f8bb57bfc
-DIST ori-0.8.0.tar.xz 295208 SHA256 0589db3480e733dbeba2a1f6be6553701684b283507437c7500ad069f4b49631 SHA512 d28a9d42f9967cad29ff6bb9d4cfaa28603a4057e9a0ef81ba79b136a992b7d60abfb111099711b265820c02e777bca4b2a6c5c640ff506a061e680efc8415e3 WHIRLPOOL 6762cfc173ec1e234a248a286e412254318de394fa338517912c0d372839f358c2d5a57e89efd4feccc7f6ae1aee3db6e5791c7e0a72211eb2827e3c24c9d3f0
-EBUILD ori-0.8.0.ebuild 1588 SHA256 9ff1bac431547b5563d8304abbe532cda07466c65f6008aa7596260bb35f3a0b SHA512 65d480d27f455638ba82f8f6613dd94573f85c3ede0a40f0988dd33a6da600d33d4a57c3ee2035738f88f320e2815c6f43df4e4136b6114d6d70142a77f93473 WHIRLPOOL feed03134c0ffff680a28e9381de2946bda9629a5c53fb9a443349e454d507786a1370ee82de78b525b3f2e1d4c135dd998b061ea6602537834ac9d6bd87d347
+AUX ori-0.8.1-scons-multiprocessing.patch 244 SHA256 7d812ebd5302eb1e1b6f7624baf05c3b5bc04954d0619d19b9939a6efb635075 SHA512 bdd8a598de13b25f3f0a4ab985ab6f9f4b917ff2dae33f9b0b20ecb985797bf87e85ab2ad7758bc597e991e4964b3130b1206f05e59bfb53999660d4ff49cefc WHIRLPOOL 6a29d7102cacfbce83ebacabdc4f5db3817869b8654e285e52b14ba8f92ef3f7e5b80cc0130e5a138e68dbc7ccb831f54ff786ceba70f11d7ac9fbee18360c2d
+DIST ori-0.8.1.tar.xz 296216 SHA256 8ce1a3dfbb6d1538885e993616bdfe71be44711d48f7f6798ff6bc0a39b3deca SHA512 9b02ff3bed73bff8e8ccaaf2fb3a65516e5c91791d637c913586ca9eb730bf7457b2140ddacbef7a6f2fe0364cd7390b2b40ad3284ac93289e7cf706fd872670 WHIRLPOOL 6b708a6c19ef965516b74915074a71d7e7b0a9d0964ebe6b0365ef7b02f07fc5ba5086eb911cd5316cbc530792c3c168659e2398fea96286b32a409001abde14
+EBUILD ori-0.8.1.ebuild 1542 SHA256 68da349c1c658638a657f282b121e0a284d1c7c75dc9914c80a6d06bccdd95f6 SHA512 0139c0de05d7cfa8703c424c9f656579ef0399d7b470005b8b5c910a4405deada019e4fb9183a2e650d391a760492fb62b77b36e45f2b41cdbf29336f57e482b WHIRLPOOL 9e7c75888a61b596398d3fec53c13693e5267bced7c7a2c8bf91e98fdaa77dc5de7bf48cfe1c061c24097b1ceb420563923408e610b00ff579859dc23d7d19f9
diff --git a/sys-fs/ori/files/ori-0.8.0-scons-destdir.patch b/sys-fs/ori/files/ori-0.8.0-scons-destdir.patch
deleted file mode 100644
index ef34e5b..0000000
--- a/sys-fs/ori/files/ori-0.8.0-scons-destdir.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- ori-0.8.0/SConstruct.orig	2014-01-06 13:13:19.885571025 +0100
-+++ ori-0.8.0/SConstruct	2014-01-06 13:15:30.026810304 +0100
-@@ -54,6 +54,7 @@
-         "FASTLZ"),
-     ("CHUNKING_ALGO", "Chunking algorithm (RK; FIXED).", "RK"),
--    ("PREFIX", "Installation target directory.", "/usr/local/bin/")
-+    ("PREFIX", "Installation target directory.", "/usr/local/bin/"),
-+    ("DESTDIR", "The root directory to install into. Useful mainly for binary package building", ""),
- )
- 
- env = Environment(options = opts,
-@@ -375,21 +376,21 @@
- 
- # Install Targets
- if env["WITH_FUSE"] == "1":
--    env.Install('$PREFIX/bin','build/orifs/orifs')
--env.Install('$PREFIX/bin','build/ori/ori')
--env.Install('$PREFIX/bin','build/oridbg/oridbg')
--env.Install('$PREFIX/bin','build/orisync/orisync')
-+    env.Install('$DESTDIR$PREFIX/bin','build/orifs/orifs')
-+env.Install('$DESTDIR$PREFIX/bin','build/ori/ori')
-+env.Install('$DESTDIR$PREFIX/bin','build/oridbg/oridbg')
-+env.Install('$DESTDIR$PREFIX/bin','build/orisync/orisync')
- if env["WITH_LIBS3"] == "1":
--    env.Install('$PREFIX/bin','build/ori/oris3')
-+    env.Install('$DESTDIR$PREFIX/bin','build/ori/oris3')
- if env["WITH_HTTPD"] == "1":
--    env.Install('$PREFIX/bin','build/ori_httpd/ori_httpd')
-+    env.Install('$DESTDIR$PREFIX/bin','build/ori_httpd/ori_httpd')
- if env["WITH_ORILOCAL"] == "1":
--    env.Install('$PREFIX/bin','build/orilocal/orilocal')
-+    env.Install('$DESTDIR$PREFIX/bin','build/orilocal/orilocal')
- 
--env.Install('$PREFIX/share/man/man1','docs/ori.1')
--env.Install('$PREFIX/share/man/man1','docs/orifs.1')
--env.Install('$PREFIX/share/man/man1','docs/orisync.1')
--env.Install('$PREFIX/share/man/man1','docs/oridbg.1')
-+env.Install('$DESTDIR$PREFIX/share/man/man1','docs/ori.1')
-+env.Install('$DESTDIR$PREFIX/share/man/man1','docs/orifs.1')
-+env.Install('$DESTDIR$PREFIX/share/man/man1','docs/orisync.1')
-+env.Install('$DESTDIR$PREFIX/share/man/man1','docs/oridbg.1')
- 
--env.Alias('install','$PREFIX')
-+env.Alias('install','$DESTDIR$PREFIX')
- 
diff --git a/sys-fs/ori/files/ori-0.8.0-scons-variables.patch b/sys-fs/ori/files/ori-0.8.0-scons-variables.patch
deleted file mode 100644
index 8291e0b..0000000
--- a/sys-fs/ori/files/ori-0.8.0-scons-variables.patch
+++ /dev/null
@@ -1,342 +0,0 @@
---- ori-0.8.0/SConstruct.orig	2014-01-06 14:28:39.949716544 +0100
-+++ ori-0.8.0/SConstruct	2014-01-06 14:35:39.663340382 +0100
-@@ -32,29 +32,27 @@
-     ("CXX", "C++ Compiler"),
-     ("AS", "Assembler"),
-     ("LINK", "Linker"),
--    ("BUILDTYPE", "Build type (RELEASE, DEBUG, or PERF)", "RELEASE"),
--    ("VERBOSE", "Show full build information (0 or 1)", "0"),
--    ("NUMCPUS", "Number of CPUs to use for build (0 means auto).", "0"),
--    ("WITH_FUSE", "Include FUSE file system (0 or 1).", "1"),
--    ("WITH_HTTPD", "Include HTTPD server (0 or 1).", "0"),
--    ("WITH_ORILOCAL", "Include Ori checkout CLI (0 or 1).", "0"),
--    ("WITH_MDNS", "Include Zeroconf (through DNS-SD) support (0 or 1).", "0"),
--    ("WITH_GPROF", "Include gprof profiling (0 or 1).", "0"),
--    ("WITH_GOOGLEHEAP", "Link to Google Heap Cheker.", "0"),
--    ("WITH_GOOGLEPROF", "Link to Google CPU Profiler.", "0"),
--    ("WITH_TSAN", "Enable Clang Race Detector.", "0"),
--    ("WITH_ASAN", "Enable Clang AddressSanitizer.", "0"),
--    ("WITH_LIBS3", "Include support for Amazon S3 (0 or 1).", "0"),
--    ("BUILD_BINARIES", "Build binaries (0 or 1).", "1"),
--    ("CROSSCOMPILE", "Cross compile (0 or 1).", "0"),
--    ("USE_FAKES3", "Send S3 requests to fakes3 instead of Amazon (0 or 1).",
--        "0"),
--    ("HASH_ALGO", "Hash algorithm (SHA256).", "SHA256"),
--    ("COMPRESSION_ALGO", "Compression algorithm (LZMA; FASTLZ; SNAPPY; NONE).",
--        "FASTLZ"),
--    ("CHUNKING_ALGO", "Chunking algorithm (RK; FIXED).", "RK"),
--    ("PREFIX", "Installation target directory.", "/usr/local/bin/"),
--    ("DESTDIR", "The root directory to install into. Useful mainly for binary package building", ""),
-+    ("NUMCPUS", "Number of CPUs to use for build (0 means auto)", 0, None, int),
-+    EnumVariable("BUILDTYPE", "Build type", "RELEASE", ["RELEASE", "DEBUG", "PERF"]),
-+    BoolVariable("VERBOSE", "Show full build information", 0),
-+    BoolVariable("WITH_FUSE", "Include FUSE file system", 1),
-+    BoolVariable("WITH_HTTPD", "Include HTTPD server", 0),
-+    BoolVariable("WITH_ORILOCAL", "Include Ori checkout CLI", 0),
-+    BoolVariable("WITH_MDNS", "Include Zeroconf (through DNS-SD) support", 0),
-+    BoolVariable("WITH_GPROF", "Include gprof profiling", 0),
-+    BoolVariable("WITH_GOOGLEHEAP", "Link to Google Heap Cheker", 0),
-+    BoolVariable("WITH_GOOGLEPROF", "Link to Google CPU Profiler", 0),
-+    BoolVariable("WITH_TSAN", "Enable Clang Race Detector", 0),
-+    BoolVariable("WITH_ASAN", "Enable Clang AddressSanitizer", 0),
-+    BoolVariable("WITH_LIBS3", "Include support for Amazon S3", 0),
-+    BoolVariable("BUILD_BINARIES", "Build binaries", 1),
-+    BoolVariable("CROSSCOMPILE", "Cross compile", 0),
-+    BoolVariable("USE_FAKES3", "Send S3 requests to fakes3 instead of Amazon", 0),
-+    EnumVariable("HASH_ALGO", "Hash algorithm", "SHA256", ["SHA256"]),
-+    EnumVariable("COMPRESSION_ALGO", "Compression algorithm", "FASTLZ", ["LZMA", "FASTLZ", "SNAPPY", "NONE"]),
-+    EnumVariable("CHUNKING_ALGO", "Chunking algorithm", "RK", ["RK", "FIXED"]),
-+    PathVariable("PREFIX", "Installation target directory", "/usr/local/bin/", PathVariable.PathAccept),
-+    PathVariable("DESTDIR", "The root directory to install into. Useful mainly for binary package building", "", PathVariable.PathAccept),
- )
- 
- env = Environment(options = opts,
-@@ -82,7 +80,7 @@
- 
- # Windows Configuration Changes
- if sys.platform == "win32":
--    env["WITH_FUSE"] = "0"
-+    env["WITH_FUSE"] = False
-     env.Append(CPPFLAGS = ['-DWIN32'])
- 
- #env.Append(CPPFLAGS = [ "-Wall", "-Wformat=2", "-Wextra", "-Wwrite-strings",
-@@ -120,16 +118,16 @@
-     print "Error unsupported chunking algorithm"
-     sys.exit(-1)
- 
--if env["WITH_MDNS"] != "1":
-+if not env["WITH_MDNS"]:
-     env.Append(CPPFLAGS = [ "-DWITHOUT_MDNS" ])
- 
--if env["WITH_LIBS3"] == "1":
-+if env["WITH_LIBS3"]:
-     env.Append(CPPFLAGS = [ "-DWITH_LIBS3" ])
- 
--if env["USE_FAKES3"] == "1":
-+if env["USE_FAKES3"]:
-     env.Append(CPPDEFINES = ['USE_FAKES3'])
- 
--if env["WITH_GPROF"] == "1":
-+if env["WITH_GPROF"]:
-     env.Append(CPPFLAGS = [ "-pg" ])
-     env.Append(LINKFLAGS = [ "-pg" ])
- 
-@@ -160,7 +158,7 @@
- except IOError:
-     pass
- 
--if env["VERBOSE"] == "0":
-+if not env["VERBOSE"]:
-     env["CCCOMSTR"] = "Compiling $SOURCE"
-     env["CXXCOMSTR"] = "Compiling $SOURCE"
-     env["SHCCCOMSTR"] = "Compiling $SOURCE"
-@@ -170,18 +168,18 @@
-     env["LINKCOMSTR"] = "Linking $TARGET"
- 
- def GetNumCPUs(env):
--    if env["NUMCPUS"] != "0":
-+    if env["NUMCPUS"] > 0:
-         return int(env["NUMCPUS"])
-     return 2*multiprocessing.cpu_count()
- 
- env.SetOption('num_jobs', GetNumCPUs(env))
- 
- # Modify CPPPATH and LIBPATH
--if sys.platform != "darwin" and sys.platform != "win32" and env["CROSSCOMPILE"] == "0":
-+if sys.platform != "darwin" and sys.platform != "win32" and not env["CROSSCOMPILE"]:
-     env.Append(CPPFLAGS = "-D_FILE_OFFSET_BITS=64")
-     env.Append(LIBPATH = [ "/usr/local/lib/event2" ])
- 
--if sys.platform != "win32" and env["CROSSCOMPILE"] == "0":
-+if sys.platform != "win32" and not env["CROSSCOMPILE"]:
-     env.Append(CPPPATH = [ "/usr/local/include" ])
-     env.Append(LIBPATH = [ "$LIBPATH", "/usr/local/lib" ])
- 
-@@ -219,10 +217,10 @@
-     print 'Your C++ compiler and/or environment is incorrectly configured.'
-     CheckFailed()
- 
--if (sys.platform == "win32") or env["CROSSCOMPILE"] == "1":
--    env["HAS_PKGCONFIG"] = "0"
-+if (sys.platform == "win32") or env["CROSSCOMPILE"]:
-+    env["HAS_PKGCONFIG"] = False
- else:
--    env["HAS_PKGCONFIG"] = "1"
-+    env["HAS_PKGCONFIG"] = True
-     if not conf.CheckPkgConfig():
-         print 'pkg-config not found!'
-         Exit(1)
-@@ -280,12 +278,12 @@
-         print 'Please install liblzma'
-         Exit(1)
- 
--if env["WITH_FUSE"] == "1":
--    if env["HAS_PKGCONFIG"] == "1" and not conf.CheckPkg('fuse'):
-+if env["WITH_FUSE"]:
-+    if env["HAS_PKGCONFIG"] and not conf.CheckPkg('fuse'):
-         print 'FUSE is not registered in pkg-config'
-         Exit(1)
- 
--if env["HAS_PKGCONFIG"] == "1":
-+if env["HAS_PKGCONFIG"]:
-     if not conf.CheckPkg('libevent'):
-         print 'libevent is not registered in pkg-config'
-         Exit(1)
-@@ -295,16 +293,16 @@
-     env.ParseConfig('pkg-config --libs --cflags libevent')
- 
- has_event = conf.CheckLibWithHeader('', 'event2/event.h', 'C', 'event_init();')
--if not (has_event or (env["CROSSCOMPILE"] == "1")):
-+if not (has_event or (env["CROSSCOMPILE"])):
-     print 'Cannot link test binary with libevent 2.0+'
-     Exit(1)
- 
--if (env["WITH_MDNS"] == "1") and (sys.platform != "darwin"):
-+if (env["WITH_MDNS"]) and (sys.platform != "darwin"):
-     if not conf.CheckLibWithHeader('dns_sd','dns_sd.h','C'):
- 	print 'Please install libdns_sd'
- 	Exit(1)
- 
--if env["HAS_PKGCONFIG"] == "1":
-+if env["HAS_PKGCONFIG"]:
-     if not conf.CheckPkg("openssl"):
-         print 'openssl is not registered in pkg-config'
-         Exit(1)
-@@ -328,7 +326,7 @@
-     env.Append(LIBS = ["pthread"])
- 
- # Optional Components
--if env["WITH_LIBS3"] == "1":
-+if env["WITH_LIBS3"]:
-     env.Append(CPPPATH = '#libs3-2.0/inc')
-     SConscript('libs3-2.0/SConscript', variant_dir='build/libs3-2.0')
- if env["COMPRESSION_ALGO"] == "SNAPPY":
-@@ -341,17 +339,17 @@
-     SConscript('libfastlz/SConscript', variant_dir='build/libfastlz')
- 
- # Debugging Tools
--if env["WITH_GOOGLEHEAP"] == "1":
-+if env["WITH_GOOGLEHEAP"]:
-     env.Append(LIBS = ["tcmalloc"])
--if env["WITH_GOOGLEPROF"] == "1":
-+if env["WITH_GOOGLEPROF"]:
-     env.Append(LIBS = ["profiler"])
--if env["WITH_TSAN"] == "1":
-+if env["WITH_TSAN"]:
-     env.Append(CPPFLAGS = ["-fsanitize=thread", "-fPIE"])
-     env.Append(LINKFLAGS = ["-fsanitize=thread", "-pie"])
--if env["WITH_ASAN"] == "1":
-+if env["WITH_ASAN"]:
-     env.Append(CPPFLAGS = ["-fsanitize=address"])
-     env.Append(LINKFLAGS = ["-fsanitize=address"])
--if env["WITH_TSAN"] == "1" and env["WITH_ASAN"] == "1":
-+if env["WITH_TSAN"] and env["WITH_ASAN"]:
-     print "Cannot set both WITH_TSAN and WITH_ASAN!"
-     sys.exit(-1)
- 
-@@ -361,30 +359,30 @@
- SConscript('liboriutil/SConscript', variant_dir='build/liboriutil')
- 
- # Ori Utilities
--if env["BUILD_BINARIES"] == "1":
-+if env["BUILD_BINARIES"]:
-     SConscript('ori/SConscript', variant_dir='build/ori')
-     SConscript('oridbg/SConscript', variant_dir='build/oridbg')
-     SConscript('orisync/SConscript', variant_dir='build/orisync')
--    if env["WITH_LIBS3"] == "1":
-+    if env["WITH_LIBS3"]:
-         SConscript('oris3/SConscript', variant_dir='build/oris3')
--    if env["WITH_FUSE"] == "1":
-+    if env["WITH_FUSE"]:
-         SConscript('orifs/SConscript', variant_dir='build/orifs')
--    if env["WITH_HTTPD"] == "1":
-+    if env["WITH_HTTPD"]:
-         SConscript('ori_httpd/SConscript', variant_dir='build/ori_httpd')
--    if env["WITH_ORILOCAL"] == "1":
-+    if env["WITH_ORILOCAL"]:
-         SConscript('orilocal/SConscript', variant_dir='build/orilocal')
- 
- # Install Targets
--if env["WITH_FUSE"] == "1":
-+if env["WITH_FUSE"]:
-     env.Install('$DESTDIR$PREFIX/bin','build/orifs/orifs')
- env.Install('$DESTDIR$PREFIX/bin','build/ori/ori')
- env.Install('$DESTDIR$PREFIX/bin','build/oridbg/oridbg')
- env.Install('$DESTDIR$PREFIX/bin','build/orisync/orisync')
--if env["WITH_LIBS3"] == "1":
-+if env["WITH_LIBS3"]:
-     env.Install('$DESTDIR$PREFIX/bin','build/ori/oris3')
--if env["WITH_HTTPD"] == "1":
-+if env["WITH_HTTPD"]:
-     env.Install('$DESTDIR$PREFIX/bin','build/ori_httpd/ori_httpd')
--if env["WITH_ORILOCAL"] == "1":
-+if env["WITH_ORILOCAL"]:
-     env.Install('$DESTDIR$PREFIX/bin','build/orilocal/orilocal')
- 
- env.Install('$DESTDIR$PREFIX/share/man/man1','docs/ori.1')
---- ori-0.8.0/orisync/SConscript.orig	2014-01-06 14:40:04.246566391 +0100
-+++ ori-0.8.0/orisync/SConscript	2014-01-06 14:40:18.071160723 +0100
-@@ -30,7 +30,7 @@
- 
- if sys.platform != "darwin":
-     libs += ['rt', 'pthread']
--    if env["WITH_MDNS"] == "1":
-+    if env["WITH_MDNS"]:
-         libs += ['dns_sd']
- 
- if sys.platform == "linux2":
---- ori-0.8.0/oris3/SConscript.orig	2014-01-06 14:40:04.250566273 +0100
-+++ ori-0.8.0/oris3/SConscript	2014-01-06 14:40:29.045838718 +0100
-@@ -19,7 +19,7 @@
- 
- if sys.platform != "darwin":
-     libs += ['rt']
--    if env["WITH_MDNS"] == "1":
-+    if env["WITH_MDNS"]:
-         libs += ['dns_sd']
- 
- if sys.platform == "linux2":
---- ori-0.8.0/orilocal/SConscript.orig	2014-01-06 14:40:04.252566215 +0100
-+++ ori-0.8.0/orilocal/SConscript	2014-01-06 14:40:35.364653334 +0100
-@@ -47,7 +47,7 @@
- 
- if sys.platform != "darwin":
-     libs += ['rt']
--    if env["WITH_MDNS"] == "1":
-+    if env["WITH_MDNS"]:
-         libs += ['dns_sd']
- 
- if sys.platform == "linux2":
---- ori-0.8.0/orifs/SConscript.orig	2014-01-06 14:40:04.254566156 +0100
-+++ ori-0.8.0/orifs/SConscript	2014-01-06 14:40:47.781289080 +0100
-@@ -23,7 +23,7 @@
- orifs_env.ParseConfig('pkg-config --libs --cflags fuse')
- if sys.platform != "darwin":
-     libs += ['rt']
--    if env["WITH_MDNS"] == "1":
-+    if env["WITH_MDNS"]:
-         libs += ['dns_sd']
- if sys.platform == "linux2":
-     libs += ['uuid']
---- ori-0.8.0/oridbg/SConscript.orig	2014-01-06 14:40:04.258566038 +0100
-+++ ori-0.8.0/oridbg/SConscript	2014-01-06 14:40:56.821023915 +0100
-@@ -47,7 +47,7 @@
- 
- if sys.platform != "darwin":
-     libs += ['rt']
--    if env["WITH_MDNS"] == "1":
-+    if env["WITH_MDNS"]:
-         libs += ['dns_sd']
- 
- if sys.platform == "linux2":
---- ori-0.8.0/ori_httpd/SConscript.orig	2014-01-06 14:40:04.261565950 +0100
-+++ ori-0.8.0/ori_httpd/SConscript	2014-01-06 14:41:05.300775195 +0100
-@@ -17,7 +17,7 @@
-     libs += ['resolv']
- else:
-     libs += ['rt']
--    if env["WITH_MDNS"] == "1":
-+    if env["WITH_MDNS"]:
-         libs += ['dns_sd']
- 
- if sys.platform == "linux2":
---- ori-0.8.0/ori/SConscript.orig	2014-01-06 14:40:04.264565862 +0100
-+++ ori-0.8.0/ori/SConscript	2014-01-06 14:41:11.972579525 +0100
-@@ -48,7 +48,7 @@
- 
- if sys.platform != "darwin":
-     libs += ['rt']
--    if env["WITH_MDNS"] == "1":
-+    if env["WITH_MDNS"]:
-         libs += ['dns_sd']
- 
- if sys.platform == "linux2":
---- ori-0.8.0/liboriutil/SConscript.orig	2014-01-06 14:40:04.269565716 +0100
-+++ ori-0.8.0/liboriutil/SConscript	2014-01-06 14:41:30.356040406 +0100
-@@ -27,13 +27,13 @@
- else:
-     print "Error unsupported operating system!"
- 
--if env["WITH_MDNS"] == "1":
-+if env["WITH_MDNS"]:
-     src.append("zeroconf.cc")
- 
- env.StaticLibrary("oriutil", src)
- 
- # Test Binaries
--if env["BUILD_BINARIES"] == "1":
-+if env["BUILD_BINARIES"]:
-     env_testori = env.Clone()
-     libs = ["crypto", "stdc++"]
-     if sys.platform != "darwin":
---- ori-0.8.0/libori/SConscript.orig	2014-01-06 14:40:04.272565628 +0100
-+++ ori-0.8.0/libori/SConscript	2014-01-06 14:41:35.940876624 +0100
-@@ -35,7 +35,7 @@
- env.StaticLibrary("ori", src)
- 
- # Test Binaries
--if env["BUILD_BINARIES"] == "1":
-+if env["BUILD_BINARIES"]:
-     env.Program("rkchunker", "rkchunker.cc")
-     env.Program("fchunker", "fchunker.cc")
- 
diff --git a/sys-fs/ori/files/ori-0.8.1-scons-multiprocessing.patch b/sys-fs/ori/files/ori-0.8.1-scons-multiprocessing.patch
new file mode 100644
index 0000000..62a7c4f
--- /dev/null
+++ b/sys-fs/ori/files/ori-0.8.1-scons-multiprocessing.patch
@@ -0,0 +1,9 @@
+--- SConstruct.orig	2014-01-25 02:38:49.590860610 +0100
++++ SConstruct	2014-01-25 02:48:14.535797827 +0100
+@@ -1,5 +1,6 @@
+ import sys
+ import os
++from subprocess import _args_from_interpreter_flags
+ import multiprocessing
+ import SCons.Util
+ 
diff --git a/sys-fs/ori/ori-0.8.0.ebuild b/sys-fs/ori/ori-0.8.1.ebuild
index 06283aa..59b8174 100644
--- a/sys-fs/ori/ori-0.8.0.ebuild
+++ b/sys-fs/ori/ori-0.8.1.ebuild
@@ -8,7 +8,7 @@ inherit eutils scons-utils toolchain-funcs linux-info
 
 DESCRIPTION="distributed file system built for offline operation"
 HOMEPAGE="http://ori.scs.stanford.edu/"
-SRC_URI="https://bitbucket.org/orifs/ori/downloads/ori-0.8.0.tar.xz"
+SRC_URI="https://bitbucket.org/orifs/ori/downloads/${P}.tar.xz"
 
 LICENSE="as-is"
 SLOT="0"
@@ -44,9 +44,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}"-scons-destdir.patch \
-		"${FILESDIR}/${P}"-scons-variables.patch
+	epatch "${FILESDIR}/${P}"-scons-multiprocessing.patch
 }
 
 src_configure() {