commit: d4f9318ddef1ce270387e23f23dd3244e3ea068d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Mar 18 12:31:16 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Mar 18 12:31:16 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4f9318d
media-sound/hydrogen: Drop 0.9.5-r1 (Qt4-based) Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-sound/hydrogen/Manifest | 1 - .../hydrogen/files/hydrogen-0.9.5-gcc47.patch | 27 --------- .../hydrogen/files/hydrogen-0.9.5-gcc6.patch | 12 ---- .../files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch | 23 -------- media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild | 69 ---------------------- 5 files changed, 132 deletions(-) diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest index d6bf321efed..785fee5f214 100644 --- a/media-sound/hydrogen/Manifest +++ b/media-sound/hydrogen/Manifest @@ -1,2 +1 @@ -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 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 3ea43e36e3c..00000000000 --- 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 586e82af22a..00000000000 --- 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 6c862eac583..00000000000 --- 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 0a19547038c..00000000000 --- 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 -}
