gentoo resync : 23.03.2018

6 files changed, 2 insertions, 138 deletions

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 02e74c6bd9e1..a6081666cbc1 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,10 +1,5 @@
-AUX hydrogen-0.9.5-gcc47.patch 761 BLAKE2B 4dcf893c24a6cd8f3669af7f1b5517488adfd6aaf5018959732225f46ce0013faea98554a2e370c0d724100f64cd92308e00bf619271e9de4125dc7b7971f1fe SHA512 ff3a06fbafdce19bf04f9fb71c04ff754e22caa36148a0f5e4a56efc53ce9b9478e9f1aeacdcc037234104762d9fce208aef351c70941b044e2d83bac4131304
-AUX hydrogen-0.9.5-gcc6.patch 609 BLAKE2B f34496e0c3c251f135262ff30efaff243ae4fc0a279ad529f0bceb1e6b854b6b8b513a2f2b1c6e15ce1f68d51032817147ae7a357205345bf64876b5f2c7096b SHA512 0078c02e9cb2de557825cd6119ccfb6247f171ccc4a53ea93241891850c82f0924e9e0a4740764d13f1deefcb5e9469137e5d4a69c2bfceedeae8fb110deea8f
-AUX hydrogen-0.9.5-use_lrdf_pkgconfig.patch 858 BLAKE2B c43e9a0de36e1eee2c184b6405b3a01284dea8f058ba77aa415e85ee5e4e2bc27b975ee5a1d959471c64154f9be6cc0fe51e66db31abd7149e0350f91e8a9735 SHA512 251a74287370f66df9eeecd3b6c7963c2614cf6b17a56fc71dc9f99077c3267a2e79469e2993ae22d017ea7f6cc7c581455c97c125e3be73860321112a67fd31
 AUX hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch 4495 BLAKE2B 8342dd95dc1cd5ad89948d417c440e791e30c62e365fe9d1d3f8d7c5fa40180475d93a27958e64d4b587846067a4266f87a21d76e0b6ea57acde9154fb5d2e4c SHA512 cb7b068bd0690630ac49060aa8cbe2b3f250f6670ccd3035ad0b412df248c21753ea094dc67d5e3ceb80343b066b833cf3377b2c166e58119de1c112c5bb4c42
-DIST hydrogen-0.9.5.tar.gz 5239702 BLAKE2B 5fb1e7561b65587a6a4b8e642a4e0262cf8521a6847f04e57d4f99af2ef38fecb05f779cd5b0c25d487360db6455b0912729e7deac0d9959e8c32938a44b1adb SHA512 0053f0cb301c541326b66eb416dc548561a973ade993c055e7bc2acbdf28732e627a605061c8b487644026510f5b8395946bba209ddfd19230c960e9bb619f97
 DIST hydrogen-1.0.0_pre20180301.tar.gz 9865493 BLAKE2B 7a29440189b51f9e85560823a1e41b9a7392b51caf6808c0e06ac693a028580f78fac8f3bfe08eda5800a69d00b0f9b6235b6b5c0b7f19971e6bec4c1cf45d6d SHA512 376013ec99c3a3cdb87c03b11919c365b579a81377879ecfe11ed49ae9e7548a938ba23882e32e1921d6a1085ea7f7bc4e8520bc49bc61311dce1a01c8dc5e47
-EBUILD hydrogen-0.9.5-r1.ebuild 1816 BLAKE2B b66901bef46726ad957b37074ec247d7c9d502f324c8a0a2da2bca3af036a204b6f63fb0047672ef6fa38194c263c210efae02ae33d8eb56a4169bbf4a8529cf SHA512 0bd6ded8debf0915399c1dcc56537730d3c8a8b219262223d567f2240f3019de5675196102da55840c039ab30814ef27ec1f7b1c4313e537e07970e353956b86
-EBUILD hydrogen-1.0.0_pre20180301-r1.ebuild 1941 BLAKE2B e57bd18c9532314ea0f02ad666a1231f43fb07f26022ef91ac6b3296353c7150a4f49e432277c7076324cdca59ec958f757a6f8a18bd46a06a6c4a680792b751 SHA512 8c76340d5a017a548883e37bff8436c4fdd5b760a865fc3c3fae94d58e6946acfa9bfd023c12e92200391e6bd149cc42af511e74cbe5d496643948bffbb5bc76
+EBUILD hydrogen-1.0.0_pre20180301-r1.ebuild 1937 BLAKE2B 1338ca9bed21852edf5219f68a1584b4d2ac7ae46fc63f47ae209f261aeba6c69990a773974e5d7eceb7baf34461aa272bb11837b7b9d642b6972104b8f17bbf SHA512 4c5411a87f399211430ad30c94d933494b919bf0ac62e23bda32aadd7af7988c11f1bb924b5cd3ece46a61b743ff6aa65786eab91e319174560b1129a54312cc
 EBUILD hydrogen-9999.ebuild 1849 BLAKE2B 7c8e0555d88dcd682ef01503f0f80a04851f9515eb411949078cab0f3194ae032fade26cd1dfac870c06ea9fb2fc96c76f9a882cec9c5d51252a8f9f9c1f2ea2 SHA512 aacae6cc35be6f45302b40dde8d997424617ead7681956db9659408aa79d103a980bd376893f72b1305e66c88b2e5e8b3847733f3b31cb17ba58f84da04a6ca7
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
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)
- 
diff --git a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
deleted file mode 100644
index 0a19547038c7..000000000000
--- a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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://www.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/hydrogen-1.0.0_pre20180301-r1.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
index 61d6269e79d3..ef5832a6ea2b 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}-music/${PN}/archive/${COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio"
 
 REQUIRED_USE="lash? ( alsa )"