gentoo resync : 25.11.2020

4 files changed, 3 insertions, 118 deletions

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index e016420e84ec..7af706de6c04 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,9 +1,6 @@
 AUX hydrogen-1.0.0-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b62088daad51e4ec5951fa547415b96e6f036d927bbfc134e41a3b695b96212de196b3b8acf3aeed3fedf5342277b0caadaeb55a9b SHA512 13ca4375ee79c88ff79e3d9fe4f6c1d9d73526e0dc03e4e99d37fcf436cc74f178df9c8fe474e224c9885722d19c8d2c8e693d944a75411811ea41dd15557792
-AUX hydrogen-1.0.0-i18n-path.patch 455 BLAKE2B 099fe7bae1d7a9e5cf7eb8b7fc650f0421c91d0170b7ef3577d0b5249fa23fd71e802d8edd8ac80f9c2487473f9b7aa4a84b912d8fe8f3e4de6d2a5e418ab219 SHA512 cb96acb38f37803676be410082009ca7e0e0e6f83cbfb9d519c0f83212caa903891db12275201ab0395bde5edf1204508f81c45e9ea3e49ae33834719d277517
 AUX hydrogen-9999-i18n-path.patch 457 BLAKE2B dde2e8b80ca79f52c05a2512d2d07333cb118c96da92326716533c27908fd68dfb5159a8015a2e3347bb20cc7be96217bba09ec1833cdef06d4d3c2ace8d4aae SHA512 85f974df6d490650562a34dbb4dc126d6b67c85bdf1e91303967714738999a9299e64fdac3492d1b7da4bbccfb1773972888840f54327dba3b4efb0671023841
-DIST hydrogen-1.0.0.tar.gz 11501728 BLAKE2B ccb48cddff2b196e934c712f999109ae4b91513579ec123e57f2ef9f6aa288c1408208bde8608a908e58650c741260fbcc1108dabd7968687d74e4c143fb7de3 SHA512 68a7634a63d409ff8eef789bb9dd86b65535e17b6101fe1e1bd0153cab4852dc2cfa7ff11b2cfddbead337d2faad9ca4c49eed589c47c09aa5f5aa91c59171a7
 DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c SHA512 66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0
-EBUILD hydrogen-1.0.0.ebuild 2141 BLAKE2B 593e3032d4d642b27be0e2cac1fa755e39639707747edd1472b53e9c845f85f6c65251aae06eff3969c68bcd2e51139e3c8ef810b9e6adb8631c4c61747070fc SHA512 bd68bc8ef58b5f1723f5ad272252fbf1edd11ee646a44a207c351f8d6fcbfc9d55a56dbaad42b3879e801ef7a3134a546c462a91f433ffe1be45b448c5930ec7
-EBUILD hydrogen-1.0.1.ebuild 2096 BLAKE2B 9372a442451a8aee63ab861496fa820e47396ee4ee2b0b9cbfc389ed8f7930c05efbb9e7cd61a9fd672f65c6dd207a98a6ff1ed237c7ceef79ff94bf5f060173 SHA512 e37238a1baf16a6f41ee930dd9c18a0d8d918c99eaba1a7f10deb311374c679355bea9dbee356381489b3e61cb894fd46f927e0aabdea865d628c57ef539a752
+EBUILD hydrogen-1.0.1.ebuild 2111 BLAKE2B 115614e67d1001f2af423710998ee7340838baee2cf67c4289edbdf0ab5ff4423721c2923a7f66b71087ba917dd00c6ca022ca3ce3e69e5fdd7f359701653697 SHA512 c91594162fc4787dfcbafac06985fc2be98370ec773c6284ebe9b822dadb45e70db7ffb66a198653b441e05c42eb7b9b1fb15d12c30c4feca8d59d6b9519e65b
 EBUILD hydrogen-9999.ebuild 2133 BLAKE2B 129548ab21f33bd626ea3b7235ff61471142038109998683dff4aa98884b4fbab2b71c4088297f3ec06924d98eabad62852d58ad2fedb11b49e2a0cd76bd23ee SHA512 5ab310fa51b3a856441b5c332957838aa1725b7da740781dcf56c3a8ab8a08e6760b99a4b9c70ccfa35c741dd6a9bd1fb7e955d18771c4ff2d5fd8551cf32053
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch b/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch
deleted file mode 100644
index 075d0d444a0c..000000000000
--- a/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/data/i18n/CMakeLists.txt	2020-09-07 08:47:15.743516826 +0200
-+++ b/data/i18n/CMakeLists.txt	2020-09-07 09:03:56.084304480 +0200
-@@ -5,4 +5,9 @@
- 
- QT5_ADD_TRANSLATION(QM_FILES ${TS_FILES})
- ADD_CUSTOM_TARGET(translations ALL DEPENDS ${QM_FILES})
--INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
-+
-+IF(MINGW)
-+	INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
-+ELSE()
-+	INSTALL(FILES ${QM_FILES} DESTINATION "${H2_SYS_PATH}/data/i18n")
-+ENDIF()
diff --git a/media-sound/hydrogen/hydrogen-1.0.0.ebuild b/media-sound/hydrogen/hydrogen-1.0.0.ebuild
deleted file mode 100644
index e2d0ee7185f4..000000000000
--- a/media-sound/hydrogen/hydrogen-1.0.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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="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"
-	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="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-CDEPEND="
-	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="
-	${CDEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-
-PATCHES=(
-	"${FILESDIR}/${P}-gnuinstalldirs.patch"
-	"${FILESDIR}/${P}-i18n-path.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-1.0.1.ebuild b/media-sound/hydrogen/hydrogen-1.0.1.ebuild
index 245dc874f114..86ef3e86fe01 100644
--- a/media-sound/hydrogen/hydrogen-1.0.1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.1.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