gentoo Easter resync : 12.04.2020

7 files changed, 178 insertions, 9 deletions

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 1da3238b7209..224c98c1333b 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,5 +1,9 @@
-AUX hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch 4495 BLAKE2B 8342dd95dc1cd5ad89948d417c440e791e30c62e365fe9d1d3f8d7c5fa40180475d93a27958e64d4b587846067a4266f87a21d76e0b6ea57acde9154fb5d2e4c SHA512 cb7b068bd0690630ac49060aa8cbe2b3f250f6670ccd3035ad0b412df248c21753ea094dc67d5e3ceb80343b066b833cf3377b2c166e58119de1c112c5bb4c42
-DIST hydrogen-1.0.0_pre20180301.tar.gz 9865493 BLAKE2B 7a29440189b51f9e85560823a1e41b9a7392b51caf6808c0e06ac693a028580f78fac8f3bfe08eda5800a69d00b0f9b6235b6b5c0b7f19971e6bec4c1cf45d6d SHA512 376013ec99c3a3cdb87c03b11919c365b579a81377879ecfe11ed49ae9e7548a938ba23882e32e1921d6a1085ea7f7bc4e8520bc49bc61311dce1a01c8dc5e47
-EBUILD hydrogen-1.0.0_pre20180301-r1.ebuild 1937 BLAKE2B 1338ca9bed21852edf5219f68a1584b4d2ac7ae46fc63f47ae209f261aeba6c69990a773974e5d7eceb7baf34461aa272bb11837b7b9d642b6972104b8f17bbf SHA512 4c5411a87f399211430ad30c94d933494b919bf0ac62e23bda32aadd7af7988c11f1bb924b5cd3ece46a61b743ff6aa65786eab91e319174560b1129a54312cc
-EBUILD hydrogen-9999.ebuild 1711 BLAKE2B e00443f6825529a90d069c2fb0b5de5bd228bf958ca2b755925a582a06002ca83bad6974a0ca32651b21cf71822077adfca176db6989e286b4bc60ff30a0ad94 SHA512 41f79035ba9441357312aaff23b5fd8b51a7009aea1e822796f4d03ae9ed842827e441afb94e10c9dd6d90cfebc8923cd6b0bfa95d441072006899962d159dc5
+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
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_beta1_pre20180301-gnuinstalldirs.patch
index 59a5486e2cad..59a5486e2cad 100644
--- a/media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch
+++ b/media-sound/hydrogen/files/hydrogen-1.0.0_beta1_pre20180301-gnuinstalldirs.patch
diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0_beta2-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_beta2-gnuinstalldirs.patch
new file mode 100644
index 000000000000..6238c47504b7
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.0.0_beta2-gnuinstalldirs.patch
@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5d9e146..986e435 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -362,10 +362,10 @@ ELSE()
+ 	INSTALL(DIRECTORY data DESTINATION ${H2_SYS_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
+ ENDIF()
+ IF(NOT MINGW AND NOT APPLE)
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps/org.hydrogenmusic.Hydrogen.svg")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "org.hydrogenmusic.Hydrogen.svg")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
+ ENDIF()
+ 
+ #
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index cfdc72a..b7b0dbc 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION}
+ 
+ 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_INCLUDEDIR}/hydrogen" )
++    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
+ ENDIF()
diff --git a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
new file mode 100644
index 000000000000..9b8429753072
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 04aa6380..e979783e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -362,10 +362,10 @@ ELSE()
+ 	INSTALL(DIRECTORY data DESTINATION ${H2_SYS_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
+ ENDIF()
+ IF(NOT MINGW AND NOT APPLE)
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
+ 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "org.hydrogenmusic.Hydrogen.svg")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
+ ENDIF()
+ 
+ #
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index cfdc72a7..b7b0dbcb 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION}
+ 
+ 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_INCLUDEDIR}/hydrogen" )
++    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
+ ENDIF()
diff --git a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_beta1_pre20180301-r1.ebuild
index ef5832a6ea2b..d0e4dc0c6437 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0_beta1_pre20180301-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild
new file mode 100644
index 000000000000..29b288106e02
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Advanced drum machine"
+HOMEPAGE="http://www.hydrogen-music.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
+	KEYWORDS=""
+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"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+fi
+
+LICENSE="GPL-2 ZLIB"
+SLOT="0"
+IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
+
+REQUIRED_USE="lash? ( alsa )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	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 )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
+
+PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+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_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	cmake_src_install
+}
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 9245c1140a0d..29b288106e02 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -1,17 +1,26 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit git-r3 xdg cmake
+inherit cmake xdg
 
 DESCRIPTION="Advanced drum machine"
 HOMEPAGE="http://www.hydrogen-music.org/"
-EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
+	KEYWORDS=""
+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"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+fi
 
 LICENSE="GPL-2 ZLIB"
 SLOT="0"
-KEYWORDS=""
 IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
 
 REQUIRED_USE="lash? ( alsa )"
@@ -43,6 +52,12 @@ RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
+PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DWANT_ALSA=$(usex alsa)