media-sound/hydrogen: Import 0.9.5-r1 from before slot 4 removal

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --force
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

6 files changed, 138 insertions, 2 deletions

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index ca127550..70419100 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1 +1,2 @@
-DIST hydrogen-0.9.3.tar.gz 2771792 SHA256 b570568b32a0be9ad2ef90538e3156de6a9c50d8dd5f2863d6955290d98c841a
+DIST hydrogen-0.9.3.tar.gz 2771792 BLAKE2B dc379ab1ee4a60a4a1b487a51f34dbf8fb717774389cd3d082e85ff9d70d82c6399f94b2507927c8a0b51c8b09b4feda05eebf1251976e04d9dea80dd4f8b0cc SHA512 d25becb06758fe40c256049315f61b4e5173fdfeb9ba87814cbccb1520b6111bf94bc745a8d730fdc9fd0d155f4ad88784d6906b0d2b87b74829edb878852c44
+DIST hydrogen-0.9.5.tar.gz 5239702 BLAKE2B 5fb1e7561b65587a6a4b8e642a4e0262cf8521a6847f04e57d4f99af2ef38fecb05f779cd5b0c25d487360db6455b0912729e7deac0d9959e8c32938a44b1adb SHA512 0053f0cb301c541326b66eb416dc548561a973ade993c055e7bc2acbdf28732e627a605061c8b487644026510f5b8395946bba209ddfd19230c960e9bb619f97
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch
new file mode 100644
index 00000000..3ea43e36
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 00000000..586e82af
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 00000000..6c862eac
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch
@@ -0,0 +1,23 @@
+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)
+ 
diff --git a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
new file mode 100644
index 00000000..7079b060
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="Advanced drum machine"
+HOMEPAGE="http://hydrogen-music.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="alsa +archive jack ladspa lash oss portaudio"
+
+RDEPEND="dev-qt/qtgui:4 dev-qt/qtcore:4
+	archive? ( app-arch/libarchive )
+	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+	>=media-libs/libsndfile-1.0.18
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	ladspa? ( media-libs/liblrdf )
+	lash? ( media-sound/lash )
+	portaudio? ( >=media-libs/portaudio-19_pre )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/scons"
+
+src_prepare() {
+	sed -i -e '/cppflags +=/d' Sconstruct || die
+	epatch \
+		patches/portaudio.patch \
+		"${FILESDIR}"/${P}-use_lrdf_pkgconfig.patch \
+		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-gcc6.patch
+}
+
+src_compile() {
+	# FIXME: The -I/usr/include/raptor2 gets lost in middle of build
+	# despite -use_lrdf_pkgconfig.patch
+	use ladspa && append-flags $($(tc-getPKG_CONFIG) --cflags lrdf)
+
+	export QTDIR="/usr/$(get_libdir)"
+	local myconf='portmidi=0' #90614
+
+	use alsa || myconf+=' alsa=0'
+	use archive && myconf+=' libarchive=1'
+	use jack || myconf+=' jack=0'
+	use ladspa || myconf+=' lrdf=0'
+	use lash && myconf+=' lash=1'
+	use oss || myconf+=' oss=0'
+	use portaudio && myconf+=' portaudio=1'
+
+	scons \
+		prefix=/usr \
+		DESTDIR="${D}" \
+		optflags="${CXXFLAGS}" \
+		${myconf} || die
+}
+
+src_install() {
+	dobin hydrogen
+	insinto /usr/share/hydrogen
+	doins -r data
+	doicon data/img/gray/h2-icon.svg
+	domenu hydrogen.desktop
+	dosym /usr/share/hydrogen/data/doc /usr/share/doc/${PF}/html
+	dodoc AUTHORS ChangeLog README.txt
+}
diff --git a/media-sound/hydrogen/metadata.xml b/media-sound/hydrogen/metadata.xml
index 942721e0..0e24fd6b 100644
--- a/media-sound/hydrogen/metadata.xml
+++ b/media-sound/hydrogen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->  
+<!-- maintainer-needed -->
+	<use>
+		<flag name="archive">Use libarchive instead of libtar</flag>
+	</use>
 </pkgmetadata>