From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 19F92138350 for ; Mon, 23 Mar 2020 15:14:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56F52E091A; Mon, 23 Mar 2020 15:14:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 306ECE091A for ; Mon, 23 Mar 2020 15:14:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 30D4834EF8F for ; Mon, 23 Mar 2020 15:14:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D6B1817 for ; Mon, 23 Mar 2020 15:14:44 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1584976480.7490e42dd8acbb71fb69d2713c214cbf16a6ae77.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/hydrogen/Manifest media-sound/hydrogen/files/hydrogen-1.0.0_beta1_pre20180301-gnuinstalldirs.patch media-sound/hydrogen/files/hydrogen-1.0.0_beta2-gnuinstalldirs.patch media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch media-sound/hydrogen/hydrogen-1.0.0_beta1_pre20180301-r1.ebuild media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild media-sound/hydrogen/hydrogen-9999.ebuild X-VCS-Directories: media-sound/hydrogen/files/ media-sound/hydrogen/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 7490e42dd8acbb71fb69d2713c214cbf16a6ae77 X-VCS-Branch: master Date: Mon, 23 Mar 2020 15:14:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 87192c4a-635f-4693-b048-269b063bb044 X-Archives-Hash: 27cee777ea2dd6dee4584286bfffdb57 commit: 7490e42dd8acbb71fb69d2713c214cbf16a6ae77 Author: Miroslav Šulc gentoo org> AuthorDate: Mon Mar 23 15:14:24 2020 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Mon Mar 23 15:14:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7490e42d media-sound/hydrogen: bump to 1.0.0_beta2 1) fixed ebuild name from 1.0.0_pre20180301-r1 to 1.0.0_beta1_pre20180301-r1 2) synced live ebuild Package-Manager: Portage-2.3.95, Repoman-2.3.21 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/hydrogen/Manifest | 3 ++- ...n-1.0.0_beta1_pre20180301-gnuinstalldirs.patch} | 0 .../hydrogen-1.0.0_beta2-gnuinstalldirs.patch | 30 ++++++++++++++++++++++ ... => hydrogen-1.0.0_beta1_pre20180301-r1.ebuild} | 2 +- ...gen-9999.ebuild => hydrogen-1.0.0_beta2.ebuild} | 23 ++++++++++++++--- media-sound/hydrogen/hydrogen-9999.ebuild | 23 ++++++++++++++--- 6 files changed, 71 insertions(+), 10 deletions(-) diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest index 785fee5f214..3c42f5cef06 100644 --- a/media-sound/hydrogen/Manifest +++ b/media-sound/hydrogen/Manifest @@ -1 +1,2 @@ -DIST hydrogen-1.0.0_pre20180301.tar.gz 9865493 BLAKE2B 7a29440189b51f9e85560823a1e41b9a7392b51caf6808c0e06ac693a028580f78fac8f3bfe08eda5800a69d00b0f9b6235b6b5c0b7f19971e6bec4c1cf45d6d SHA512 376013ec99c3a3cdb87c03b11919c365b579a81377879ecfe11ed49ae9e7548a938ba23882e32e1921d6a1085ea7f7bc4e8520bc49bc61311dce1a01c8dc5e47 +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 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 similarity index 100% rename from media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch rename to 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 00000000000..6238c47504b --- /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/hydrogen-1.0.0_pre20180301-r1.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_beta1_pre20180301-r1.ebuild similarity index 97% rename from media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild rename to media-sound/hydrogen/hydrogen-1.0.0_beta1_pre20180301-r1.ebuild index ef5832a6ea2..d0e4dc0c643 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-9999.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild similarity index 78% copy from media-sound/hydrogen/hydrogen-9999.ebuild copy to media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild index 9245c1140a0..29b288106e0 100644 --- a/media-sound/hydrogen/hydrogen-9999.ebuild +++ b/media-sound/hydrogen/hydrogen-1.0.0_beta2.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) diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild index 9245c1140a0..25e3e04fb92 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}/${PN}-1.0.0_beta2-gnuinstalldirs.patch" ) + +src_prepare() { + cmake_src_prepare +} + src_configure() { local mycmakeargs=( -DWANT_ALSA=$(usex alsa)