gentoo resync : 23.03.2018

3 files changed, 0 insertions, 62 deletions

diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch
deleted file mode 100644
index 3ea43e36e3cd..000000000000
--- a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Build with gcc 4.7
-https://bugs.gentoo.org/show_bug.cgi?id=421913
-
-Index: hydrogen-0.9.5/gui/src/MainForm.cpp
-===================================================================
---- hydrogen-0.9.5.orig/gui/src/MainForm.cpp
-+++ hydrogen-0.9.5/gui/src/MainForm.cpp
-@@ -70,6 +70,7 @@ using namespace H2Core;
- 
- #include <memory>
- #include <cassert>
-+#include <unistd.h>
- 
- using namespace std;
- using namespace H2Core;
-Index: hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp
-===================================================================
---- hydrogen-0.9.5.orig/gui/src/SongEditor/SongEditor.cpp
-+++ hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp
-@@ -21,6 +21,7 @@
-  */
- 
- #include <assert.h>
-+#include <unistd.h>
- #include <algorithm>
- #include <memory>
- 
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch
deleted file mode 100644
index 586e82af22a1..000000000000
--- a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN hydrogen-0.9.5.orig/libs/hydrogen/src/local_file_mgr.cpp hydrogen-0.9.5/libs/hydrogen/src/local_file_mgr.cpp
---- hydrogen-0.9.5.orig/libs/hydrogen/src/local_file_mgr.cpp	2011-01-29 00:33:23.000000000 +0100
-+++ hydrogen-0.9.5/libs/hydrogen/src/local_file_mgr.cpp	2017-09-26 20:07:31.128723252 +0200
-@@ -980,7 +980,7 @@
- 	
- 	std::string playlistInfoFile = patternname;
- 	std::ifstream verify( playlistInfoFile.c_str() , std::ios::in | std::ios::binary );
--	if ( verify == NULL ) {
-+	if ( !verify ) {
- 		//ERRORLOG( "Load Playlist: Data file " + playlistInfoFile + " not found." );
- 		return NULL;
- 	}
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch
deleted file mode 100644
index 6c862eac5836..000000000000
--- a/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-conf.CheckCHeader lrdf.h check fails because of missing -I/usr/include/raptor2, use pkg-config instead
-
---- Sconstruct
-+++ Sconstruct
-@@ -268,7 +268,8 @@
- 		env.Append( LIBPATH = 'C:\Program Files\GnuWin32\lib' )
- 		env.Append( LIBS = [ "pthread" ] )
- 	
--        if str(env['lrdf']) == "1": env.Append( LIBS = ["lrdf"] )
-+        if str(env['lrdf']) == "1":
-+		env.ParseConfig('pkg-config --cflags --libs lrdf')
- 	if str(env['jack']) == "1": env.Append( LIBS = ["jack"])
- 	if str(env['alsa']) == "1": env.Append( LIBS = ["asound"])
- 	if str(env['libarchive']) == "1": env.Append( LIBS = ["archive"])
-@@ -449,7 +450,7 @@
-    Exit(1)
- 
- #lrdf: categorizing of ladspa effects
--if str(env['lrdf']) == "1" and not conf.CheckCHeader('lrdf.h'):
-+if str(env['lrdf']) == "1" and not conf.CheckPKG('lrdf >= 0.4.0'):
-     print 'lrdf must be installed!'
-     Exit(1)
-