gentoo resync : 14.05.2020

5 files changed, 7 insertions, 191 deletions

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 224c98c1333b..29fe2b195159 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,9 +1,6 @@
-AUX hydrogen-1.0.0_beta1_pre20180301-gnuinstalldirs.patch 4495 BLAKE2B 8342dd95dc1cd5ad89948d417c440e791e30c62e365fe9d1d3f8d7c5fa40180475d93a27958e64d4b587846067a4266f87a21d76e0b6ea57acde9154fb5d2e4c SHA512 cb7b068bd0690630ac49060aa8cbe2b3f250f6670ccd3035ad0b412df248c21753ea094dc67d5e3ceb80343b066b833cf3377b2c166e58119de1c112c5bb4c42
 AUX hydrogen-1.0.0_beta2-gnuinstalldirs.patch 2045 BLAKE2B 17c2fdf5e7cf5762db0c86bbe40f7edc58d428eadfe1e910e126d727faeb5dc04089a8a5cce0deefc2b3c4dba22dbe0fba9dc7ab2d3cb3585c4bf24e0947fa36 SHA512 c2556a65dab28977cb2a0fe20818b9b5c2bf6852fb8300721e212c9dc6fdcf32e10ee0d5b2efe9116a1621573e5d0f2eb999f68dd937235e19fe9c71b2bd51c3
 AUX hydrogen-9999-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b62088daad51e4ec5951fa547415b96e6f036d927bbfc134e41a3b695b96212de196b3b8acf3aeed3fedf5342277b0caadaeb55a9b SHA512 13ca4375ee79c88ff79e3d9fe4f6c1d9d73526e0dc03e4e99d37fcf436cc74f178df9c8fe474e224c9885722d19c8d2c8e693d944a75411811ea41dd15557792
-DIST hydrogen-1.0.0_beta1_pre20180301.tar.gz 9865493 BLAKE2B 7a29440189b51f9e85560823a1e41b9a7392b51caf6808c0e06ac693a028580f78fac8f3bfe08eda5800a69d00b0f9b6235b6b5c0b7f19971e6bec4c1cf45d6d SHA512 376013ec99c3a3cdb87c03b11919c365b579a81377879ecfe11ed49ae9e7548a938ba23882e32e1921d6a1085ea7f7bc4e8520bc49bc61311dce1a01c8dc5e47
-DIST hydrogen-1.0.0_beta2.tar.gz 11375853 BLAKE2B a7b5e8f0fa675a9869d84cad922f8d9119c88983e80c278dced2d03140619f4d8f70eb132319fd75be0a130cbd65a247dc4a8176a09b4c0a678d0f02385aa5aa SHA512 e87b57fb52a1ff00ef0d011321ad721902df5d1d31f3136d702498b9b5b3580cc7df43c0d7f4cecf55fd96957caf9c44a400eddb3bef07d7fe2cfda85ca1e00e
-EBUILD hydrogen-1.0.0_beta1_pre20180301-r1.ebuild 1934 BLAKE2B 8172be96edf774b338efd5e2dc80188a0cd54e766904e735f933b6dbb9dfbd999ba79c0e0cfae92eeda9960ebe548f18fde45fe0c05b4209fd70f42c03bf8d8e SHA512 dddae4c23e7dd7854431c3085bfb7dbb811bdd180592db03196500933a8924235d4a54b45d7cf1e9a6ca831377eb9310763d71349e1c00daf0bb6911368326aa
-EBUILD hydrogen-1.0.0_beta2.ebuild 2022 BLAKE2B dd894e38ae3a1267356666dddc25035e434534f5af0aa3b7faeb995a3020487ff80fa9310f43a524f03f066453c8ea0c762e822a8091b483d3b0eb7e5a4cee91 SHA512 06eb247ce12836dc5c5fa9d4845ec3b2fd124d03a185145929cb2044ef4392468e2b080cdd69bc3b042a99b3862adc1a4fa92e2af3777d81be703bb3d3246fb0
-EBUILD hydrogen-9999.ebuild 2022 BLAKE2B dd894e38ae3a1267356666dddc25035e434534f5af0aa3b7faeb995a3020487ff80fa9310f43a524f03f066453c8ea0c762e822a8091b483d3b0eb7e5a4cee91 SHA512 06eb247ce12836dc5c5fa9d4845ec3b2fd124d03a185145929cb2044ef4392468e2b080cdd69bc3b042a99b3862adc1a4fa92e2af3777d81be703bb3d3246fb0
+DIST hydrogen-1.0.0_beta2.tar.gz 11375652 BLAKE2B 9eaf07d69060e74478dd130722450264a463135dbfb05486ec853c684f09fcbae2537e3a7b032ed831e7103ccba3a3ba7c6866d2fde241464ab11465f8ad9ea9 SHA512 8712996adbc820909d1d38ff7d45a2a49ec64c15135d5a99b08b93ebd5a0c05139ce78a317c274059a538eb68031f0f42bb9d22988312c2b9f60fa53c539a242
+EBUILD hydrogen-1.0.0_beta2.ebuild 2062 BLAKE2B 0289014d76351d56ba5c00631b8d403e1a8fb6bbb61a7aceb507e086e85907d074d9470b72a49cb43e2bbae43fac6f13fe79bd1a5efcdb77a13d9c06aa40c78a SHA512 4a007b1a2535b0f8774958646e9f362b3f0ce1bdcf536d94f52509cc0bfdf893c733095e8c07fb342243fa039815d68a28143cc8d421c01a0499670517a25613
+EBUILD hydrogen-9999.ebuild 2047 BLAKE2B 51d1cec2bbb952555e0f76a9be02d4f9cbb5ba8abb3f4ffa835b07ba5b829a82cac91289076710daf1d6e2c780a5d52c247bfeba35b7d2fdb83370b701af54e9 SHA512 fe85e1e03b10ad11b8076166ec66cf803216e496116f127f5cad63e6ed2db6258dd1bf38d05934fb0b4df756aa524b20833b2e64793d2ff6d799bc6be931c81e
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0_beta1_pre20180301-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_beta1_pre20180301-gnuinstalldirs.patch
deleted file mode 100644
index 59a5486e2cad..000000000000
--- a/media-sound/hydrogen/files/hydrogen-1.0.0_beta1_pre20180301-gnuinstalldirs.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 11c72da8b2bf96f650ca6e1e38af0819c4f49c45 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Mon, 1 Jan 2018 11:52:18 +0100
-Subject: [PATCH] Use GNUInstallDirs
-
-Fixes multiarch and deprecated man dir location.
----
- CMakeLists.txt            | 14 ++++++++------
- src/cli/CMakeLists.txt    |  2 +-
- src/core/CMakeLists.txt   |  6 +++---
- src/gui/CMakeLists.txt    |  2 +-
- src/player/CMakeLists.txt |  2 +-
- 5 files changed, 14 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 96dbf47a..2caab298 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -30,6 +30,8 @@ ELSE()
- 	SET(DISPLAY_VERSION "${VERSION}-${GIT_REVISION}")
- ENDIF(VERSION_SUFFIX)
- 
-+include(GNUInstallDirs)
-+
- SET(LIBSNDFILE_VERSION_PREV "1.0.17")
- 
- #
-@@ -150,7 +152,7 @@ ELSE(MINGW)
- 
- #Installation paths
- # TODO remove data from path
--SET(SYS_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen/data")
-+SET(SYS_DATA_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/hydrogen/data")
- # TODO remove data from path, could be .config/hydrogen
- SET(USR_DATA_PATH ".hydrogen/data")
- 
-@@ -358,10 +360,10 @@ ELSE()
- 	INSTALL(DIRECTORY data DESTINATION ${SYS_DATA_PATH}/.. PATTERN ".git" EXCLUDE)
- ENDIF()
- IF(NOT MINGW AND NOT APPLE)
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "/usr/share/pixmaps")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/appdata")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
- ENDIF()
- 
- #
-diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
---- a/src/cli/CMakeLists.txt
-+++ b/src/cli/CMakeLists.txt
-@@ -20,4 +20,4 @@ TARGET_LINK_LIBRARIES(h2cli
- 
- ADD_DEPENDENCIES(h2cli hydrogen-core-${VERSION})
- 
--INSTALL(TARGETS h2cli RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-+INSTALL(TARGETS h2cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -57,13 +57,13 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION}
- #SET_TARGET_PROPERTIES(hydrogen-core-${VERSION} PROPERTIES PUBLIC_HEADER   "${hydrogen_INCLUDES}" )
- 
- INSTALL(TARGETS hydrogen-core-${VERSION}
--    LIBRARY DESTINATION "lib${LIB_SUFFIX}"
--    ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
-+    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-     # do not copy directory hierarchy
-     #PUBLIC_HEADER DESTINATION include/hydrogen
- )
- 
- IF(NOT APPLE AND NOT WIN32)
-     INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
--    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/hydrogen" )
-+    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
- ENDIF()
-diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
---- a/src/gui/CMakeLists.txt
-+++ b/src/gui/CMakeLists.txt
-@@ -57,4 +57,4 @@ TARGET_LINK_LIBRARIES(hydrogen
- qt5_use_modules(hydrogen Widgets)
- ADD_DEPENDENCIES(hydrogen hydrogen-core-${VERSION})
- 
--INSTALL(TARGETS hydrogen RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-+INSTALL(TARGETS hydrogen RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/src/player/CMakeLists.txt b/src/player/CMakeLists.txt
---- a/src/player/CMakeLists.txt
-+++ b/src/player/CMakeLists.txt
-@@ -16,4 +16,4 @@ TARGET_LINK_LIBRARIES(h2player
- 
- ADD_DEPENDENCIES(h2player hydrogen-core-${VERSION})
- 
--INSTALL(TARGETS h2player RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-+INSTALL(TARGETS h2player RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
--- 
-2.15.1
-
diff --git a/media-sound/hydrogen/hydrogen-1.0.0_beta1_pre20180301-r1.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_beta1_pre20180301-r1.ebuild
deleted file mode 100644
index d0e4dc0c6437..000000000000
--- a/media-sound/hydrogen/hydrogen-1.0.0_beta1_pre20180301-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=1a477ffe380f153c5d9fb3495d9874df7f75334f
-inherit cmake-utils vcs-snapshot xdg-utils
-
-DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://www.hydrogen-music.org/"
-SRC_URI="https://github.com/${PN}-music/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio"
-
-REQUIRED_USE="lash? ( alsa )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/libsndfile-1.0.18
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/liblrdf )
-	lash? ( media-sound/lash )
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_CPPUNIT=OFF
-		-DWANT_DEBUG=OFF
-		-DWANT_JACK=$(usex jack)
-		-DWANT_JACKSESSION=$(usex jack)
-		-DWANT_LADSPA=$(usex ladspa)
-		-DWANT_LASH=$(usex lash)
-		-DWANT_LIBARCHIVE=$(usex archive)
-		-DWANT_LRDF=$(usex ladspa)
-		-DWANT_OSC=$(usex osc)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PORTAUDIO=$(usex portaudio)
-		-DWANT_PORTMIDI=$(usex portmidi)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_RUBBERBAND=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dosym ../../${PN}/data/doc /usr/share/doc/${PF}/html
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild
index 29b288106e02..b86b1ac0cdda 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild
@@ -11,11 +11,11 @@ HOMEPAGE="http://www.hydrogen-music.org/"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
-	KEYWORDS=""
+	KEYWORDS="amd64 ppc ppc64 x86"
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 	S="${WORKDIR}"/${PN}-${MY_PV}
 fi
 
@@ -26,6 +26,7 @@ IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
 REQUIRED_USE="lash? ( alsa )"
 
 BDEPEND="
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 29b288106e02..9ca42ba68d70 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -26,6 +26,7 @@ IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
 REQUIRED_USE="lash? ( alsa )"
 
 BDEPEND="
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "