[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/

2024-06-15 Thread Miroslav Šulc
commit: 3871c7bb9ffc85303d94cb5abde28fca69a31504
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jun 15 10:46:56 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jun 15 10:46:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3871c7bb

media-sound/hydrogen: updated live ebuild patch

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch 
b/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch
index f08f1af10ddd..8bb93a12366f 100644
--- a/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch
+++ b/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch
@@ -1,10 +1,10 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -173,7 +173,7 @@ endif()
+@@ -174,7 +174,7 @@ endif()
  if(WANT_DEBUG)
-   set(CMAKE_CXX_FLAGS "$ENV{CMAKE_CXX_FLAGS} -O0")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0")
  else()
--  set(CMAKE_CXX_FLAGS "$ENV{CMAKE_CXX_FLAGS} -O3 -ffast-math")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -ffast-math")
 +  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
  endif()
  



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/

2024-04-01 Thread Sam James
commit: fc2e39ec03509d1eea8aa101c7446df215bf5872
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr  1 06:45:39 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr  1 06:45:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc2e39ec

media-sound/hydrogen: fix build w/o PCH

We recently disabled PCH in cmake.eclass 
(3867345f8c2d9f24157508bc6372f479a82cf33f)
which had some fallout.

Add a missing include which this exposes.

Thanks to Christian for giving the patch on the bug.

Closes: https://bugs.gentoo.org/922034
Signed-off-by: Sam James  gentoo.org>

 .../hydrogen/files/hydrogen-1.2.2-no-pch-include.patch| 11 +++
 media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild |  1 +
 2 files changed, 12 insertions(+)

diff --git a/media-sound/hydrogen/files/hydrogen-1.2.2-no-pch-include.patch 
b/media-sound/hydrogen/files/hydrogen-1.2.2-no-pch-include.patch
new file mode 100644
index ..fd0ee64b76a0
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.2.2-no-pch-include.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/922034
+--- a/src/gui/src/Widgets/FileDialog.h
 b/src/gui/src/Widgets/FileDialog.h
+@@ -23,6 +23,7 @@
+ #define FILEDIALOG_H
+ 
+ #include 
++#include 
+ #include 
+ 
+ /** Custom file dialog checking whether the user has write access to

diff --git a/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
index 08ca329f3266..71df9f243599 100644
--- a/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
@@ -61,6 +61,7 @@ DOCS=( AUTHORS ChangeLog DEVELOPERS README.md )
 PATCHES=(
"${FILESDIR}/${PN}-1.2.1-gnuinstalldirs.patch"
"${FILESDIR}/${PN}-1.2.2-cflags.patch"
+   "${FILESDIR}/${P}-no-pch-include.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/

2023-11-14 Thread Miroslav Šulc
commit: 000fd2c16ef1c7c0cabe77ada00bbb5b454e0578
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Nov 14 10:24:39 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Nov 14 10:24:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=000fd2c1

media-sound/hydrogen: updated live ebuild patches + scrubbed patches

Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/hydrogen-1.2.1-gnuinstalldirs.patch  |  4 
 .../hydrogen/files/hydrogen-1.2.2-cflags.patch |  2 --
 .../hydrogen/files/hydrogen-1.3.0-cflags.patch | 11 ++
 .../files/hydrogen-1.3.0-gnuinstalldirs.patch  | 25 ++
 media-sound/hydrogen/hydrogen-.ebuild  |  4 ++--
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch
index d7b6105a42ff..61f94d84bfc7 100644
--- a/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch
+++ b/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch
@@ -1,5 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dc368f7..b764d7c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -418,10 +418,10 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/data/doc/CMakeLists.txt)
@@ -16,8 +14,6 @@ index dc368f7..b764d7c 100644
  ENDIF()
  
  #
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index e96d7ed..79b74e0 100644
 --- a/src/core/CMakeLists.txt
 +++ b/src/core/CMakeLists.txt
 @@ -77,5 +77,5 @@ ENDIF()

diff --git a/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch 
b/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch
index f244b4edcc08..13bd531df885 100644
--- a/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch
+++ b/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch
@@ -1,5 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1fe4013..180aa2f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -141,7 +141,7 @@ ENDIF()

diff --git a/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch 
b/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch
new file mode 100644
index ..f08f1af10ddd
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -173,7 +173,7 @@ endif()
+ if(WANT_DEBUG)
+   set(CMAKE_CXX_FLAGS "$ENV{CMAKE_CXX_FLAGS} -O0")
+ else()
+-  set(CMAKE_CXX_FLAGS "$ENV{CMAKE_CXX_FLAGS} -O3 -ffast-math")
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ endif()
+ 
+ if(WANT_APPIMAGE)

diff --git a/media-sound/hydrogen/files/hydrogen-1.3.0-gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen-1.3.0-gnuinstalldirs.patch
new file mode 100644
index ..c716ca75ac9e
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.3.0-gnuinstalldirs.patch
@@ -0,0 +1,25 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -478,10 +478,10 @@ else()
+ endif()
+ install(DIRECTORY data DESTINATION ${H2_DATA_PATH} PATTERN ".git" EXCLUDE 
PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
+ if(NOT MINGW AND NOT APPLE)
+-  install(FILES 
${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.metainfo.xml DESTINATION 
"${CMAKE_INSTALL_DATAROOTDIR}/metainfo")
+-  install(FILES 
${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION 
"${CMAKE_INSTALL_DATAROOTDIR}/applications")
++  install(FILES 
${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.metainfo.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()
+ 
+ #
+--- a/src/core/CMakeLists.txt
 b/src/core/CMakeLists.txt
+@@ -77,5 +77,5 @@ endif()
+ 
+ if(NOT APPLE AND NOT WIN32)
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/core DESTINATION 
"${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" FILES_MATCHING PATTERN "*.h" PATTERN 
".svn" EXCLUDE)
+-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION 
"${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION 
"${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
+ endif()

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 28fdaf94ba63..440fe2ae3992 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -59,8 +59,8 @@ RDEPEND="${CDEPEND}"
 DOCS=( AUTHORS ChangeLog DEVELOPERS.md README.md )
 
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/

2023-10-15 Thread Miroslav Šulc
commit: 63f4e354d90c8691375cd14b209de603073ac82c
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Oct 15 07:58:02 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Oct 15 07:58:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63f4e354

media-sound/hydrogen: dropped obsolete 1.2.1-r1

Bug: https://bugs.gentoo.org/915712
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest  |  1 -
 .../files/hydrogen-1.1.0-gnuinstalldirs.patch  | 29 ---
 media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild  | 98 --
 3 files changed, 128 deletions(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 0f072277bdd9..f67eb3c86039 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,2 +1 @@
-DIST hydrogen-1.2.1.tar.gz 12920203 BLAKE2B 
3ddc92fdab9a07c26aa1d00239a23dd7aeb2014cf5e71023ef3ccfee880fb9a568cad6de94c9cdaf2037bab5dbe500cfbaaac14c02a608f002866927cb75dc61
 SHA512 
aa6faadaf43da1ab6f514223bf7c8b526daac8dcd17916a0fdea098d6f80a33170ca3aaa210e2aedea7546221fb2aacaabf365d1457b5a25fb81f51780405ff2
 DIST hydrogen-1.2.2.tar.gz 12948890 BLAKE2B 
30d8624078a29a0514aee01d56865e5923f755de02acfddde45a26d6ffbd68cf3c8c774827fe4538b7d03faefaabb9ddcfd9a28bb404c535ad7f6734eb5b1aff
 SHA512 
bd6b102b14d30a8e2f4ea7e405199bb34f9b7691b57c3f9f3096c9e30c25c158e3bfd40bcfdd2d449bc153b7d3d9717df401f1e7a086e33dc953247870f1dee0

diff --git a/media-sound/hydrogen/files/hydrogen-1.1.0-gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen-1.1.0-gnuinstalldirs.patch
deleted file mode 100644
index ef70497abf72..
--- a/media-sound/hydrogen/files/hydrogen-1.1.0-gnuinstalldirs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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 ${CMAKE_SOURCE_DIR}/src/core DESTINATION 
"${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" FILES_MATCHING PATTERN "*.h" PATTERN 
".svn" EXCLUDE)
--INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION 
"${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
-+INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION 
"${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
- ENDIF()

diff --git a/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
deleted file mode 100644
index 1b24ce7d4622..
--- a/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://hydrogen-music.org/;
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-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/qtsvg:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   dev-qt/qtxmlpatterns:5
-   

[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-10-14 Thread Sam James
commit: 9a952c7219ac0b993b40fb1ab4cad2651c444d07
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 14 09:05:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 14 09:05:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a952c72

media-sound/hydrogen: Stabilize 1.2.2-r1 x86, #915712

Signed-off-by: Sam James  gentoo.org>

 media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
index 7bc589690362..642b5e75358d 100644
--- a/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-10-14 Thread Sam James
commit: a0a836769e80da05267a9d9b59dbd9319edf6d4a
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 14 09:05:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 14 09:05:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0a83676

media-sound/hydrogen: Stabilize 1.2.2-r1 amd64, #915712

Signed-off-by: Sam James  gentoo.org>

 media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
index c8ceca18e253..346f6acf98cb 100644
--- a/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-10-14 Thread Sam James
commit: c4d79fcbb5e0bb8a65aad5f1df0f3514c2ee44d9
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 14 09:05:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 14 09:05:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4d79fcb

media-sound/hydrogen: Stabilize 1.2.2-r1 ppc64, #915712

Signed-off-by: Sam James  gentoo.org>

 media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
index 346f6acf98cb..7bc589690362 100644
--- a/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/

2023-10-10 Thread Miroslav Šulc
commit: 854bc899f7db9828268d4ae4a5ca0e0f2143ed48
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Oct 10 08:39:18 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Oct 10 08:39:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854bc899

media-sound/hydrogen: fixed cflags propagation

Closes: https://bugs.gentoo.org/913916
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch  | 13 +
 .../{hydrogen-1.2.2.ebuild => hydrogen-1.2.2-r1.ebuild} |  1 +
 media-sound/hydrogen/hydrogen-.ebuild   |  1 +
 3 files changed, 15 insertions(+)

diff --git a/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch 
b/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch
new file mode 100644
index ..f244b4edcc08
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1fe4013..180aa2f 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -141,7 +141,7 @@ ENDIF()
+ IF(WANT_DEBUG)
+   SET(CMAKE_CXX_FLAGS "$ENV{CMAKE_CXX_FLAGS} -O0")
+ ELSE()
+-  SET(CMAKE_CXX_FLAGS "$ENV{CMAKE_CXX_FLAGS} -O3 -ffast-math")
++  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ ENDIF()
+ 
+ IF(WANT_APPIMAGE)

diff --git a/media-sound/hydrogen/hydrogen-1.2.2.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
similarity index 98%
rename from media-sound/hydrogen/hydrogen-1.2.2.ebuild
rename to media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
index 300110e184b2..c8ceca18e253 100644
--- a/media-sound/hydrogen/hydrogen-1.2.2.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
@@ -60,6 +60,7 @@ DOCS=( AUTHORS ChangeLog DEVELOPERS README.md )
 
 PATCHES=(
"${FILESDIR}/${PN}-1.2.1-gnuinstalldirs.patch"
+   "${FILESDIR}/${PN}-1.2.2-cflags.patch"
 )
 
 src_prepare() {

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 705be8cebc76..28fdaf94ba63 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -60,6 +60,7 @@ DOCS=( AUTHORS ChangeLog DEVELOPERS.md README.md )
 
 PATCHES=(
"${FILESDIR}/${PN}-1.2.1-gnuinstalldirs.patch"
+   "${FILESDIR}/${PN}-1.2.2-cflags.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-09-25 Thread Miroslav Šulc
commit: 11f0d0ab0d93d0f294e1d6ce2f75aefe38dee088
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Sep 25 07:00:38 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Sep 25 07:00:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11f0d0ab

media-sound/hydrogen: fixed installation issue in live

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/hydrogen-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 300110e184b2..705be8cebc76 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -56,7 +56,7 @@ DEPEND="
 "
 RDEPEND="${CDEPEND}"
 
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.md )
+DOCS=( AUTHORS ChangeLog DEVELOPERS.md README.md )
 
 PATCHES=(
"${FILESDIR}/${PN}-1.2.1-gnuinstalldirs.patch"



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-09-10 Thread Miroslav Šulc
commit: f7f392d1ed93daed8215a4f8f202a8fd7d0378e6
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Sep 10 06:36:07 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Sep 10 06:36:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7f392d1

media-sound/hydrogen: bump to 1.2.2 + updated live

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest| 1 +
 media-sound/hydrogen/{hydrogen-.ebuild => hydrogen-1.2.2.ebuild} | 2 +-
 media-sound/hydrogen/hydrogen-.ebuild| 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 1c00035212f9..0f072277bdd9 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1 +1,2 @@
 DIST hydrogen-1.2.1.tar.gz 12920203 BLAKE2B 
3ddc92fdab9a07c26aa1d00239a23dd7aeb2014cf5e71023ef3ccfee880fb9a568cad6de94c9cdaf2037bab5dbe500cfbaaac14c02a608f002866927cb75dc61
 SHA512 
aa6faadaf43da1ab6f514223bf7c8b526daac8dcd17916a0fdea098d6f80a33170ca3aaa210e2aedea7546221fb2aacaabf365d1457b5a25fb81f51780405ff2
+DIST hydrogen-1.2.2.tar.gz 12948890 BLAKE2B 
30d8624078a29a0514aee01d56865e5923f755de02acfddde45a26d6ffbd68cf3c8c774827fe4538b7d03faefaabb9ddcfd9a28bb404c535ad7f6734eb5b1aff
 SHA512 
bd6b102b14d30a8e2f4ea7e405199bb34f9b7691b57c3f9f3096c9e30c25c158e3bfd40bcfdd2d449bc153b7d3d9717df401f1e7a086e33dc953247870f1dee0

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.2.ebuild
similarity index 98%
copy from media-sound/hydrogen/hydrogen-.ebuild
copy to media-sound/hydrogen/hydrogen-1.2.2.ebuild
index 951d4fb7a1fc..300110e184b2 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.2.ebuild
@@ -37,7 +37,7 @@ CDEPEND="
dev-qt/qtwidgets:5
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5
-   >=media-libs/libsndfile-1.0.18
+   media-libs/libsndfile
alsa? ( media-libs/alsa-lib )
archive? ( app-arch/libarchive )
!archive? ( dev-libs/libtar )

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 951d4fb7a1fc..300110e184b2 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -37,7 +37,7 @@ CDEPEND="
dev-qt/qtwidgets:5
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5
-   >=media-libs/libsndfile-1.0.18
+   media-libs/libsndfile
alsa? ( media-libs/alsa-lib )
archive? ( app-arch/libarchive )
!archive? ( dev-libs/libtar )



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/

2023-08-09 Thread Miroslav Šulc
commit: ccd8a47995573f318c40991d2ade851a012ed702
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Aug  9 16:53:29 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Aug  9 16:53:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccd8a479

media-sound/hydrogen: updated patch in the live ebuild

Closes: https://bugs.gentoo.org/911490
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/hydrogen-1.2.1-gnuinstalldirs.patch  | 29 ++
 media-sound/hydrogen/hydrogen-.ebuild  |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch
new file mode 100644
index ..d7b6105a42ff
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dc368f7..b764d7c 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -418,10 +418,10 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/data/doc/CMakeLists.txt)
+ ENDIF()
+ INSTALL(DIRECTORY data DESTINATION ${H2_DATA_PATH} PATTERN ".git" EXCLUDE 
PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
+ IF(NOT MINGW AND NOT APPLE)
+-  INSTALL(FILES 
${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.metainfo.xml DESTINATION 
"${CMAKE_INSTALL_DATAROOTDIR}/metainfo")
+-  INSTALL(FILES 
${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION 
"${CMAKE_INSTALL_DATAROOTDIR}/applications")
++  INSTALL(FILES 
${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.metainfo.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 e96d7ed..79b74e0 100644
+--- a/src/core/CMakeLists.txt
 b/src/core/CMakeLists.txt
+@@ -77,5 +77,5 @@ ENDIF()
+ 
+ IF(NOT APPLE AND NOT WIN32)
+ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/core DESTINATION 
"${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" FILES_MATCHING PATTERN "*.h" PATTERN 
".svn" EXCLUDE)
+-INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION 
"${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
++INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION 
"${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
+ ENDIF()

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index cd84978b5281..951d4fb7a1fc 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -59,7 +59,7 @@ RDEPEND="${CDEPEND}"
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.md )
 
 PATCHES=(
-   "${FILESDIR}/${PN}-1.1.0-gnuinstalldirs.patch"
+   "${FILESDIR}/${PN}-1.2.1-gnuinstalldirs.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-07-16 Thread Miroslav Šulc
commit: 4d18b1a87706676b8fc5038e95761cefe940890b
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Jul 16 05:59:55 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Jul 16 05:59:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d18b1a8

media-sound/hydrogen: dropped obsolete 1.2.0

Bug: https://bugs.gentoo.org/908256
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest  |  1 -
 media-sound/hydrogen/hydrogen-1.2.0.ebuild | 98 --
 2 files changed, 99 deletions(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index cb7c6aa2b38a..1c00035212f9 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,2 +1 @@
-DIST hydrogen-1.2.0.tar.gz 12911501 BLAKE2B 
606bfd977e67a962933e331bd1d4985a898e14c3d72656aa38fc3d50fa1daeb301a00778114e46a4890af548816befc8deb598bbc65a122e8a36694ce7740776
 SHA512 
610dc292ab26880897030ee7e969caf11e2758e0cccdc15b21711a2114564e12af855b50f0cf13964689b6697255c5f2080e2114c916ea6fbe3909057e7de1df
 DIST hydrogen-1.2.1.tar.gz 12920203 BLAKE2B 
3ddc92fdab9a07c26aa1d00239a23dd7aeb2014cf5e71023ef3ccfee880fb9a568cad6de94c9cdaf2037bab5dbe500cfbaaac14c02a608f002866927cb75dc61
 SHA512 
aa6faadaf43da1ab6f514223bf7c8b526daac8dcd17916a0fdea098d6f80a33170ca3aaa210e2aedea7546221fb2aacaabf365d1457b5a25fb81f51780405ff2

diff --git a/media-sound/hydrogen/hydrogen-1.2.0.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
deleted file mode 100644
index f39ee5f7020a..
--- a/media-sound/hydrogen/hydrogen-1.2.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://hydrogen-music.org/;
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-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/qtsvg: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 )
-   doc? ( dev-texlive/texlive-fontutils )
-   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.md )
-
-PATCHES=(
-   "${FILESDIR}/${PN}-1.1.0-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_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
-}



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-07-15 Thread Arthur Zamarin
commit: 2e89237b0569f88d7907a71cdee3d394f18f0b4c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jul 15 12:19:35 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jul 15 12:19:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e89237b

media-sound/hydrogen: Stabilize 1.2.1-r1 ppc, #908256

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
index ed7c08f21b45..1b24ce7d4622 100644
--- a/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-07-08 Thread Sam James
commit: 7078e63294255bfe27fce56114a24d8c2710bf5d
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul  8 21:44:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  8 21:44:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7078e632

media-sound/hydrogen: Stabilize 1.2.1-r1 amd64, #908256

Signed-off-by: Sam James  gentoo.org>

 media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
index ffb2cdaccf7d..ed7c08f21b45 100644
--- a/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-07-08 Thread Sam James
commit: 58867a0261922ccfa8e02c567383668328c4f472
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul  8 21:44:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  8 21:44:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58867a02

media-sound/hydrogen: Stabilize 1.2.1-r1 x86, #908256

Signed-off-by: Sam James  gentoo.org>

 media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
index 7c8d77bf0da0..ffb2cdaccf7d 100644
--- a/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-07-08 Thread Sam James
commit: 90b296e5f5a9bfa58b28259039e441bbe97d4cce
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul  8 19:24:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  8 19:24:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90b296e5

media-sound/hydrogen: Stabilize 1.2.1-r1 ppc64, #908256

Signed-off-by: Sam James  gentoo.org>

 media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
index cdc10f9763b0..7c8d77bf0da0 100644
--- a/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-06-19 Thread Miroslav Šulc
commit: 907d83ed3d9520d4ea1e101b86423bb3e7a16026
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Jun 18 09:07:43 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Jun 19 06:47:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=907d83ed

media-sound/hydrogen: update HOMEPAGE

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/hydrogen-1.2.0.ebuild| 2 +-
 media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild | 2 +-
 media-sound/hydrogen/hydrogen-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-1.2.0.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
index 9efeb9d3adcd..f39ee5f7020a 100644
--- a/media-sound/hydrogen/hydrogen-1.2.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit cmake xdg
 
 DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://www.hydrogen-music.org/;
+HOMEPAGE="http://hydrogen-music.org/;
 
 if [[ ${PV} ==  ]]; then
inherit git-r3

diff --git a/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
index 55d35e161d2a..cdc10f9763b0 100644
--- a/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit cmake xdg
 
 DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://www.hydrogen-music.org/;
+HOMEPAGE="http://hydrogen-music.org/;
 
 if [[ ${PV} ==  ]]; then
inherit git-r3

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 56e80eb44109..cd84978b5281 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit cmake xdg
 
 DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://www.hydrogen-music.org/;
+HOMEPAGE="http://hydrogen-music.org/;
 
 if [[ ${PV} ==  ]]; then
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-06-10 Thread Andreas Sturmlechner
commit: 1c16a32788ec3c9878a9ab2bfafce3c05802a585
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 10 18:38:47 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 10 18:39:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c16a327

media-sound/hydrogen: Switch IUSE=pulseaudio to media-libs/libpulse

This had already been done for  but looks like it is not used
as template for new version bumps.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../hydrogen/{hydrogen-1.2.1.ebuild => hydrogen-1.2.1-r1.ebuild}| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.2.1.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
similarity index 98%
rename from media-sound/hydrogen/hydrogen-1.2.1.ebuild
rename to media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
index 53bd859854ea..55d35e161d2a 100644
--- a/media-sound/hydrogen/hydrogen-1.2.1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
@@ -48,7 +48,7 @@ CDEPEND="
osc? ( media-libs/liblo )
portaudio? ( media-libs/portaudio )
portmidi? ( media-libs/portmidi )
-   pulseaudio? ( media-sound/pulseaudio )
+   pulseaudio? ( media-libs/libpulse )
 "
 DEPEND="
${CDEPEND}



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-06-09 Thread Miroslav Šulc
commit: ef73a4742508203d474cf998bfc07458f6adb9e4
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Jun  9 07:04:05 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jun  9 07:04:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef73a474

media-sound/hydrogen: bump to 1.2.1

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest  |  1 +
 media-sound/hydrogen/hydrogen-1.2.1.ebuild | 98 ++
 2 files changed, 99 insertions(+)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 93d5a42013e8..cb7c6aa2b38a 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1 +1,2 @@
 DIST hydrogen-1.2.0.tar.gz 12911501 BLAKE2B 
606bfd977e67a962933e331bd1d4985a898e14c3d72656aa38fc3d50fa1daeb301a00778114e46a4890af548816befc8deb598bbc65a122e8a36694ce7740776
 SHA512 
610dc292ab26880897030ee7e969caf11e2758e0cccdc15b21711a2114564e12af855b50f0cf13964689b6697255c5f2080e2114c916ea6fbe3909057e7de1df
+DIST hydrogen-1.2.1.tar.gz 12920203 BLAKE2B 
3ddc92fdab9a07c26aa1d00239a23dd7aeb2014cf5e71023ef3ccfee880fb9a568cad6de94c9cdaf2037bab5dbe500cfbaaac14c02a608f002866927cb75dc61
 SHA512 
aa6faadaf43da1ab6f514223bf7c8b526daac8dcd17916a0fdea098d6f80a33170ca3aaa210e2aedea7546221fb2aacaabf365d1457b5a25fb81f51780405ff2

diff --git a/media-sound/hydrogen/hydrogen-1.2.1.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.1.ebuild
new file mode 100644
index ..53bd859854ea
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-1.2.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Advanced drum machine"
+HOMEPAGE="http://www.hydrogen-music.org/;
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
+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/qtsvg:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   dev-qt/qtxmlpatterns:5
+   media-libs/libsndfile
+   alsa? ( media-libs/alsa-lib )
+   archive? ( app-arch/libarchive )
+   !archive? ( dev-libs/libtar )
+   doc? ( dev-texlive/texlive-fontutils )
+   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.md )
+
+PATCHES=(
+   "${FILESDIR}/${PN}-1.1.0-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_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
+}



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-05-29 Thread Andreas Sturmlechner
commit: c73bf04894b0b32a980bf7a30eabec714b19025a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon May 29 09:28:11 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon May 29 13:10:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c73bf048

media-sound/hydrogen: Switch IUSE=pulseaudio to media-libs/libpulse

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/hydrogen/hydrogen-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index f04da20e1552..56e80eb44109 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -48,7 +48,7 @@ CDEPEND="
osc? ( media-libs/liblo )
portaudio? ( media-libs/portaudio )
portmidi? ( media-libs/portmidi )
-   pulseaudio? ( media-sound/pulseaudio )
+   pulseaudio? ( media-libs/libpulse )
 "
 DEPEND="
${CDEPEND}



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-05-09 Thread Miroslav Šulc
commit: b1e56be18ee653048dd45012dee01e0e67a187eb
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed May 10 05:24:58 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed May 10 05:24:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1e56be1

media-sound/hydrogen: dropped obsolete 1.1.1

Bug: https://bugs.gentoo.org/905988
Closes: https://bugs.gentoo.org/860864
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest  |  1 -
 media-sound/hydrogen/hydrogen-1.1.1.ebuild | 97 --
 2 files changed, 98 deletions(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 6527063b4adf..93d5a42013e8 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,2 +1 @@
-DIST hydrogen-1.1.1.tar.gz 11417837 BLAKE2B 
52f6f61fc6e247875688dcea2290d92eb7bc85910620f0adcb52506d587b02dcaec6e2ecb72c77cf4eb3134534c75fc64bc4dd76a63f886cc6ea07d9b8812089
 SHA512 
c5e6bd713a0f9ef3b30bf0ae00bc41fea7494c20342c14c9f41ec05d1fdd3be721ffc3ff92bacd011e3b39a68022ea04daf55e60d334f64a00abef17d892cd37
 DIST hydrogen-1.2.0.tar.gz 12911501 BLAKE2B 
606bfd977e67a962933e331bd1d4985a898e14c3d72656aa38fc3d50fa1daeb301a00778114e46a4890af548816befc8deb598bbc65a122e8a36694ce7740776
 SHA512 
610dc292ab26880897030ee7e969caf11e2758e0cccdc15b21711a2114564e12af855b50f0cf13964689b6697255c5f2080e2114c916ea6fbe3909057e7de1df

diff --git a/media-sound/hydrogen/hydrogen-1.1.1.ebuild 
b/media-sound/hydrogen/hydrogen-1.1.1.ebuild
deleted file mode 100644
index 5970af66e1fb..
--- a/media-sound/hydrogen/hydrogen-1.1.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://www.hydrogen-music.org/;
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-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 )
-   doc? ( dev-texlive/texlive-fontutils )
-   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}/${PN}-1.1.0-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_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
-}



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-05-09 Thread Sam James
commit: 411a740b36ec169d9fcacd79f135bd4fcb1ad405
Author: Sam James  gentoo  org>
AuthorDate: Tue May  9 15:58:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  9 15:58:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=411a740b

media-sound/hydrogen: Stabilize 1.2.0 ppc, #905988

Signed-off-by: Sam James  gentoo.org>

 media-sound/hydrogen/hydrogen-1.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.2.0.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
index a2c654b30cf3..9efeb9d3adcd 100644
--- a/media-sound/hydrogen/hydrogen-1.2.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-05-09 Thread Sam James
commit: c910317380f5228c970de58f6813a9c4f679bb12
Author: Sam James  gentoo  org>
AuthorDate: Tue May  9 13:06:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  9 13:06:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9103173

media-sound/hydrogen: Stabilize 1.2.0 ppc64, #905988

Signed-off-by: Sam James  gentoo.org>

 media-sound/hydrogen/hydrogen-1.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.2.0.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
index fbd6d713aa5f..a2c654b30cf3 100644
--- a/media-sound/hydrogen/hydrogen-1.2.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-05-09 Thread Jakov Smolić
commit: ab09fe3f0fac68fe0837cea7a640294ffdd06d2e
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue May  9 10:40:54 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue May  9 10:40:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab09fe3f

media-sound/hydrogen: Stabilize 1.2.0 amd64, #905988

Signed-off-by: Jakov Smolić  gentoo.org>

 media-sound/hydrogen/hydrogen-1.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.2.0.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
index 666751ead38f..fbd6d713aa5f 100644
--- a/media-sound/hydrogen/hydrogen-1.2.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-05-09 Thread Jakov Smolić
commit: ec356b738d50aecc81d8907a341fd4c3c83a50a9
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue May  9 10:40:53 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue May  9 10:40:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec356b73

media-sound/hydrogen: Stabilize 1.2.0 x86, #905988

Signed-off-by: Jakov Smolić  gentoo.org>

 media-sound/hydrogen/hydrogen-1.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.2.0.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
index f04da20e1552..666751ead38f 100644
--- a/media-sound/hydrogen/hydrogen-1.2.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-04-08 Thread Miroslav Šulc
commit: 6aba2712fd0e2573005439e221b38432ac149ce1
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Apr  8 17:59:58 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Apr  8 18:00:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aba2712

media-sound/hydrogen: added missing dep

Closes: https://bugs.gentoo.org/904044
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/hydrogen-1.2.0.ebuild | 1 +
 media-sound/hydrogen/hydrogen-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-sound/hydrogen/hydrogen-1.2.0.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
index 7fc1c8c951be..f04da20e1552 100644
--- a/media-sound/hydrogen/hydrogen-1.2.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
@@ -33,6 +33,7 @@ CDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
+   dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 7fc1c8c951be..f04da20e1552 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -33,6 +33,7 @@ CDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
+   dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-04-08 Thread Miroslav Šulc
commit: 4b09e620c8cfefb345ab046ee0d7850e72471f5c
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Apr  8 05:59:46 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Apr  8 05:59:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b09e620

media-sound/hydrogen: bump to 1.2.0

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest| 1 +
 media-sound/hydrogen/{hydrogen-.ebuild => hydrogen-1.2.0.ebuild} | 2 +-
 media-sound/hydrogen/hydrogen-.ebuild| 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 054fe7a8b71f..6527063b4adf 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1 +1,2 @@
 DIST hydrogen-1.1.1.tar.gz 11417837 BLAKE2B 
52f6f61fc6e247875688dcea2290d92eb7bc85910620f0adcb52506d587b02dcaec6e2ecb72c77cf4eb3134534c75fc64bc4dd76a63f886cc6ea07d9b8812089
 SHA512 
c5e6bd713a0f9ef3b30bf0ae00bc41fea7494c20342c14c9f41ec05d1fdd3be721ffc3ff92bacd011e3b39a68022ea04daf55e60d334f64a00abef17d892cd37
+DIST hydrogen-1.2.0.tar.gz 12911501 BLAKE2B 
606bfd977e67a962933e331bd1d4985a898e14c3d72656aa38fc3d50fa1daeb301a00778114e46a4890af548816befc8deb598bbc65a122e8a36694ce7740776
 SHA512 
610dc292ab26880897030ee7e969caf11e2758e0cccdc15b21711a2114564e12af855b50f0cf13964689b6697255c5f2080e2114c916ea6fbe3909057e7de1df

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
similarity index 97%
copy from media-sound/hydrogen/hydrogen-.ebuild
copy to media-sound/hydrogen/hydrogen-1.2.0.ebuild
index b93c44605a79..7fc1c8c951be 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
@@ -39,7 +39,7 @@ CDEPEND="
>=media-libs/libsndfile-1.0.18
alsa? ( media-libs/alsa-lib )
archive? ( app-arch/libarchive )
-   !archive? ( >=dev-libs/libtar-1.2.11-r3 )
+   !archive? ( dev-libs/libtar )
doc? ( dev-texlive/texlive-fontutils )
jack? ( virtual/jack )
ladspa? ( media-libs/liblrdf )

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index b93c44605a79..7fc1c8c951be 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -39,7 +39,7 @@ CDEPEND="
>=media-libs/libsndfile-1.0.18
alsa? ( media-libs/alsa-lib )
archive? ( app-arch/libarchive )
-   !archive? ( >=dev-libs/libtar-1.2.11-r3 )
+   !archive? ( dev-libs/libtar )
doc? ( dev-texlive/texlive-fontutils )
jack? ( virtual/jack )
ladspa? ( media-libs/liblrdf )



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2023-04-01 Thread Miroslav Šulc
commit: 6137bd9ae56a9eab18c60cdd08c80e3b80e76599
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Apr  1 10:10:41 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Apr  1 10:10:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6137bd9a

media-sound/hydrogen: updated live ebuild

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/hydrogen-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 702e13743568..b93c44605a79 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -55,7 +55,7 @@ DEPEND="
 "
 RDEPEND="${CDEPEND}"
 
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
+DOCS=( AUTHORS ChangeLog DEVELOPERS README.md )
 
 PATCHES=(
"${FILESDIR}/${PN}-1.1.0-gnuinstalldirs.patch"



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/

2022-12-18 Thread Andreas Sturmlechner
commit: 8f3ce8690d846c6da5d9a17a898fc083bfafb8a6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 18 12:11:05 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 18 15:49:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f3ce869

media-sound/hydrogen: drop 1.0.2

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/hydrogen/Manifest  |  1 -
 .../files/hydrogen-1.0.0-gnuinstalldirs.patch  | 29 ---
 media-sound/hydrogen/hydrogen-1.0.2.ebuild | 95 --
 3 files changed, 125 deletions(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index d3456f839b5d..054fe7a8b71f 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,2 +1 @@
-DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B 
a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d
 SHA512 
7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9
 DIST hydrogen-1.1.1.tar.gz 11417837 BLAKE2B 
52f6f61fc6e247875688dcea2290d92eb7bc85910620f0adcb52506d587b02dcaec6e2ecb72c77cf4eb3134534c75fc64bc4dd76a63f886cc6ea07d9b8812089
 SHA512 
c5e6bd713a0f9ef3b30bf0ae00bc41fea7494c20342c14c9f41ec05d1fdd3be721ffc3ff92bacd011e3b39a68022ea04daf55e60d334f64a00abef17d892cd37

diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch
deleted file mode 100644
index 9b8429753072..
--- a/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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.2.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
deleted file mode 100644
index 5b62655b32e1..
--- a/media-sound/hydrogen/hydrogen-1.0.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 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} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-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? ( 

[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2022-12-18 Thread Andreas Sturmlechner
commit: 966b55a3023137ee97025e004f18d786e97dd138
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 18 12:11:58 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 18 15:49:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=966b55a3

media-sound/hydrogen: update EAPI 7 -> 8

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/hydrogen/hydrogen-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 150f2e7c64d1..702e13743568 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2022-01-08 Thread Miroslav Šulc
commit: 0476c21f45414053a1441f4f2b9ed2fdebbd55de
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jan  8 13:11:01 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jan  8 13:11:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0476c21f

media-sound/hydrogen: removed obsolete 1.1.0

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest  |  1 -
 media-sound/hydrogen/hydrogen-1.1.0.ebuild | 97 --
 2 files changed, 98 deletions(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 810d363dc00a..d3456f839b5d 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,3 +1,2 @@
 DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B 
a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d
 SHA512 
7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9
-DIST hydrogen-1.1.0.tar.gz 11413446 BLAKE2B 
8008336d2199bf36d9efca8875217e4a5f3d66c0274e25334525292e7864ca1dc4da75f86cbba981dfdbc19a3dbafebff503ce1ef597adae56fc467b44611a19
 SHA512 
116380be03f03a9294e278be5c7ede90fe088f21bf31db46a5e5df2684d11676e518200e6c4a187063c769f5b97950af9602b9b2694ca37788f73a2666265cc8
 DIST hydrogen-1.1.1.tar.gz 11417837 BLAKE2B 
52f6f61fc6e247875688dcea2290d92eb7bc85910620f0adcb52506d587b02dcaec6e2ecb72c77cf4eb3134534c75fc64bc4dd76a63f886cc6ea07d9b8812089
 SHA512 
c5e6bd713a0f9ef3b30bf0ae00bc41fea7494c20342c14c9f41ec05d1fdd3be721ffc3ff92bacd011e3b39a68022ea04daf55e60d334f64a00abef17d892cd37

diff --git a/media-sound/hydrogen/hydrogen-1.1.0.ebuild 
b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
deleted file mode 100644
index 99394f5d5f81..
--- a/media-sound/hydrogen/hydrogen-1.1.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 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} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-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 )
-   doc? ( dev-texlive/texlive-fontutils )
-   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"
-)
-
-src_prepare() {
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWANT_ALSA=$(usex alsa)
-   -DWANT_CPPUNIT=OFF
-   -DWANT_DEBUG=OFF
-   -DWANT_JACK=$(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
-}



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2022-01-07 Thread Sam James
commit: 2daa2a8a8d7be06df4010f2c16e996af3eacc9a9
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  7 15:30:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  7 15:30:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2daa2a8a

media-sound/hydrogen: Stabilize 1.1.1 ppc64, #830669

Signed-off-by: Sam James  gentoo.org>

 media-sound/hydrogen/hydrogen-1.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.1.1.ebuild 
b/media-sound/hydrogen/hydrogen-1.1.1.ebuild
index e80284f8ba30..5970af66e1fb 100644
--- a/media-sound/hydrogen/hydrogen-1.1.1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.1.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2022-01-07 Thread Jakov Smolić
commit: 063e81fee2a10a3c769696d6bad03a6cc9d97136
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jan  7 09:37:58 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jan  7 09:37:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=063e81fe

media-sound/hydrogen: Stabilize 1.1.1 x86, #830669

Signed-off-by: Jakov Smolić  gentoo.org>

 media-sound/hydrogen/hydrogen-1.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.1.1.ebuild 
b/media-sound/hydrogen/hydrogen-1.1.1.ebuild
index 89c7d2b049dd..e80284f8ba30 100644
--- a/media-sound/hydrogen/hydrogen-1.1.1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.1.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2022-01-06 Thread Arthur Zamarin
commit: 405f2211707737cc1383d94d55458986dc6c7e3d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Jan  6 21:02:26 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Jan  6 21:02:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=405f2211

media-sound/hydrogen: Stabilize 1.1.1 ppc, #830669

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-sound/hydrogen/hydrogen-1.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.1.1.ebuild 
b/media-sound/hydrogen/hydrogen-1.1.1.ebuild
index cf55877eea4d..89c7d2b049dd 100644
--- a/media-sound/hydrogen/hydrogen-1.1.1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.1.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2022-01-06 Thread Sam James
commit: e52cc975575999079e48d8539631527b26134d4a
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  6 13:03:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  6 13:03:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e52cc975

media-sound/hydrogen: Stabilize 1.1.1 amd64, #830669

Signed-off-by: Sam James  gentoo.org>

 media-sound/hydrogen/hydrogen-1.1.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-1.1.1.ebuild 
b/media-sound/hydrogen/hydrogen-1.1.1.ebuild
index da67dbaab4b4..cf55877eea4d 100644
--- a/media-sound/hydrogen/hydrogen-1.1.1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2021-12-06 Thread Miroslav Šulc
commit: 8ea4494a48d61dbe994916202a4862ecc5d7c105
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Dec  6 11:10:50 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Dec  6 11:11:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ea4494a

media-sound/hydrogen: fixed missing dep for [doc]

Closes: https://bugs.gentoo.org/828457
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/hydrogen-1.1.0.ebuild | 1 +
 media-sound/hydrogen/hydrogen-1.1.1.ebuild | 1 +
 media-sound/hydrogen/hydrogen-.ebuild  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/media-sound/hydrogen/hydrogen-1.1.0.ebuild 
b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
index 966393b75e6b..99394f5d5f81 100644
--- a/media-sound/hydrogen/hydrogen-1.1.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
@@ -40,6 +40,7 @@ CDEPEND="
alsa? ( media-libs/alsa-lib )
archive? ( app-arch/libarchive )
!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+   doc? ( dev-texlive/texlive-fontutils )
jack? ( virtual/jack )
ladspa? ( media-libs/liblrdf )
lash? ( media-sound/lash )

diff --git a/media-sound/hydrogen/hydrogen-1.1.1.ebuild 
b/media-sound/hydrogen/hydrogen-1.1.1.ebuild
index 791d9c2f1ceb..da67dbaab4b4 100644
--- a/media-sound/hydrogen/hydrogen-1.1.1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.1.1.ebuild
@@ -40,6 +40,7 @@ CDEPEND="
alsa? ( media-libs/alsa-lib )
archive? ( app-arch/libarchive )
!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+   doc? ( dev-texlive/texlive-fontutils )
jack? ( virtual/jack )
ladspa? ( media-libs/liblrdf )
lash? ( media-sound/lash )

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 6d861d99ffa9..150f2e7c64d1 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -40,6 +40,7 @@ CDEPEND="
alsa? ( media-libs/alsa-lib )
archive? ( app-arch/libarchive )
!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+   doc? ( dev-texlive/texlive-fontutils )
jack? ( virtual/jack )
ladspa? ( media-libs/liblrdf )
lash? ( media-sound/lash )



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2021-12-06 Thread Miroslav Šulc
commit: 7964fc53e0252a85a87f9dadfa8d59ff5e176a5f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Dec  6 09:36:34 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Dec  6 09:36:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7964fc53

media-sound/hydrogen: bump to 1.1.1

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest  |  1 +
 media-sound/hydrogen/hydrogen-1.1.1.ebuild | 96 ++
 2 files changed, 97 insertions(+)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index bf9badcec012..810d363dc00a 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,2 +1,3 @@
 DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B 
a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d
 SHA512 
7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9
 DIST hydrogen-1.1.0.tar.gz 11413446 BLAKE2B 
8008336d2199bf36d9efca8875217e4a5f3d66c0274e25334525292e7864ca1dc4da75f86cbba981dfdbc19a3dbafebff503ce1ef597adae56fc467b44611a19
 SHA512 
116380be03f03a9294e278be5c7ede90fe088f21bf31db46a5e5df2684d11676e518200e6c4a187063c769f5b97950af9602b9b2694ca37788f73a2666265cc8
+DIST hydrogen-1.1.1.tar.gz 11417837 BLAKE2B 
52f6f61fc6e247875688dcea2290d92eb7bc85910620f0adcb52506d587b02dcaec6e2ecb72c77cf4eb3134534c75fc64bc4dd76a63f886cc6ea07d9b8812089
 SHA512 
c5e6bd713a0f9ef3b30bf0ae00bc41fea7494c20342c14c9f41ec05d1fdd3be721ffc3ff92bacd011e3b39a68022ea04daf55e60d334f64a00abef17d892cd37

diff --git a/media-sound/hydrogen/hydrogen-1.1.1.ebuild 
b/media-sound/hydrogen/hydrogen-1.1.1.ebuild
new file mode 100644
index ..791d9c2f1ceb
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-1.1.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Advanced drum machine"
+HOMEPAGE="http://www.hydrogen-music.org/;
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
+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}/${PN}-1.1.0-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_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
+}



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/

2021-10-24 Thread Miroslav Šulc
commit: 30c121c1dd2b0d8c27ab8e940f115fa1ca977789
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Oct 24 07:04:07 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Oct 24 07:05:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30c121c1

Revert "media-sound/hydrogen: removed obsolete 1.0.2"

This reverts commit ba9cfda89c0cd5aaf5a2727d9118363935c2bdb4.

Bug: https://bugs.gentoo.org/819453
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest  |  1 +
 .../files/hydrogen-1.0.0-gnuinstalldirs.patch  | 29 +++
 media-sound/hydrogen/hydrogen-1.0.2.ebuild | 95 ++
 3 files changed, 125 insertions(+)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 3130780c76c..bf9badcec01 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1 +1,2 @@
+DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B 
a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d
 SHA512 
7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9
 DIST hydrogen-1.1.0.tar.gz 11413446 BLAKE2B 
8008336d2199bf36d9efca8875217e4a5f3d66c0274e25334525292e7864ca1dc4da75f86cbba981dfdbc19a3dbafebff503ce1ef597adae56fc467b44611a19
 SHA512 
116380be03f03a9294e278be5c7ede90fe088f21bf31db46a5e5df2684d11676e518200e6c4a187063c769f5b97950af9602b9b2694ca37788f73a2666265cc8

diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch
new file mode 100644
index 000..9b842975307
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.0.0-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.2.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
new file mode 100644
index 000..5b62655b32e
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 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} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
+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
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/

2021-10-17 Thread Miroslav Šulc
commit: ba9cfda89c0cd5aaf5a2727d9118363935c2bdb4
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Oct 17 06:17:11 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Oct 17 06:17:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba9cfda8

media-sound/hydrogen: removed obsolete 1.0.2

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest  |  1 -
 .../files/hydrogen-1.0.0-gnuinstalldirs.patch  | 29 ---
 media-sound/hydrogen/hydrogen-1.0.2.ebuild | 95 --
 3 files changed, 125 deletions(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index bf9badcec01..3130780c76c 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,2 +1 @@
-DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B 
a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d
 SHA512 
7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9
 DIST hydrogen-1.1.0.tar.gz 11413446 BLAKE2B 
8008336d2199bf36d9efca8875217e4a5f3d66c0274e25334525292e7864ca1dc4da75f86cbba981dfdbc19a3dbafebff503ce1ef597adae56fc467b44611a19
 SHA512 
116380be03f03a9294e278be5c7ede90fe088f21bf31db46a5e5df2684d11676e518200e6c4a187063c769f5b97950af9602b9b2694ca37788f73a2666265cc8

diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch
deleted file mode 100644
index 9b842975307..000
--- a/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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.2.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
deleted file mode 100644
index 5b62655b32e..000
--- a/media-sound/hydrogen/hydrogen-1.0.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 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} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-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

[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2021-10-16 Thread Sam James
commit: a9930883deb840d1fffcfa6404b8b43cbbb2305f
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 16 22:08:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 16 22:08:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9930883

media-sound/hydrogen: Stabilize 1.1.0 ppc, #816942

Signed-off-by: Sam James  gentoo.org>

 media-sound/hydrogen/hydrogen-1.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.1.0.ebuild 
b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
index 0f9f652ef4f..966393b75e6 100644
--- a/media-sound/hydrogen/hydrogen-1.1.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2021-10-16 Thread Sam James
commit: f2e5a8c26dbab4bb190b33a70283f51e1daba0e9
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 16 22:02:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 16 22:02:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e5a8c2

media-sound/hydrogen: Stabilize 1.1.0 ppc64, #816942

Signed-off-by: Sam James  gentoo.org>

 media-sound/hydrogen/hydrogen-1.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.1.0.ebuild 
b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
index 609e1a8c665..0f9f652ef4f 100644
--- a/media-sound/hydrogen/hydrogen-1.1.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2021-10-10 Thread Agostino Sarubbo
commit: f02809a12d113deba572f0bfa4af5f91cff90878
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Oct 10 15:37:44 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Oct 10 15:37:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f02809a1

media-sound/hydrogen: x86 stable wrt bug #816942

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/hydrogen/hydrogen-1.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.1.0.ebuild 
b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
index c4745bee99f..609e1a8c665 100644
--- a/media-sound/hydrogen/hydrogen-1.1.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2021-10-10 Thread Agostino Sarubbo
commit: 6c53372529cd4761d437fd6bf64a955eee445edd
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Oct 10 15:32:30 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Oct 10 15:32:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c533725

media-sound/hydrogen: amd64 stable wrt bug #816942

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/hydrogen/hydrogen-1.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.1.0.ebuild 
b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
index 85706a8f385..c4745bee99f 100644
--- a/media-sound/hydrogen/hydrogen-1.1.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/

2021-09-07 Thread Miroslav Šulc
commit: a3d4c8ffc70b4e1b7a7d8d76e5ac32f506f95c92
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Sep  7 18:49:38 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Sep  7 18:49:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3d4c8ff

media-sound/hydrogen: bump to 1.1.0 + updated live

upstream dropped support for jack session

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest  | 1 +
 ...n--gnuinstalldirs.patch => hydrogen-1.1.0-gnuinstalldirs.patch} | 0
 media-sound/hydrogen/{hydrogen-.ebuild => hydrogen-1.1.0.ebuild}   | 1 -
 media-sound/hydrogen/hydrogen-.ebuild  | 3 +--
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index fff259c6586..bf9badcec01 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1 +1,2 @@
 DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B 
a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d
 SHA512 
7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9
+DIST hydrogen-1.1.0.tar.gz 11413446 BLAKE2B 
8008336d2199bf36d9efca8875217e4a5f3d66c0274e25334525292e7864ca1dc4da75f86cbba981dfdbc19a3dbafebff503ce1ef597adae56fc467b44611a19
 SHA512 
116380be03f03a9294e278be5c7ede90fe088f21bf31db46a5e5df2684d11676e518200e6c4a187063c769f5b97950af9602b9b2694ca37788f73a2666265cc8

diff --git a/media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen-1.1.0-gnuinstalldirs.patch
similarity index 100%
rename from media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch
rename to media-sound/hydrogen/files/hydrogen-1.1.0-gnuinstalldirs.patch

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
similarity index 98%
copy from media-sound/hydrogen/hydrogen-.ebuild
copy to media-sound/hydrogen/hydrogen-1.1.0.ebuild
index 8a3c0ad28c9..85706a8f385 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
@@ -70,7 +70,6 @@ src_configure() {
-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)

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 8a3c0ad28c9..6d861d99ffa 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -57,7 +57,7 @@ RDEPEND="${CDEPEND}"
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
 PATCHES=(
-   "${FILESDIR}/${P}-gnuinstalldirs.patch"
+   "${FILESDIR}/${PN}-1.1.0-gnuinstalldirs.patch"
 )
 
 src_prepare() {
@@ -70,7 +70,6 @@ src_configure() {
-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)



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2021-05-14 Thread Miroslav Šulc
commit: b7e693610c0ede485863ff7ebceec2bd7afa1c02
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri May 14 07:52:55 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri May 14 07:52:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7e69361

media-sound/hydrogen: removed obsolete 1.0.1

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest  |  1 -
 media-sound/hydrogen/hydrogen-1.0.1.ebuild | 95 --
 2 files changed, 96 deletions(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 13d265e06ab..fff259c6586 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,2 +1 @@
-DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B 
eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c
 SHA512 
66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0
 DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B 
a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d
 SHA512 
7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9

diff --git a/media-sound/hydrogen/hydrogen-1.0.1.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.1.ebuild
deleted file mode 100644
index 5b62655b32e..000
--- a/media-sound/hydrogen/hydrogen-1.0.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 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} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-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}/${PN}-1.0.0-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
-}



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2021-05-14 Thread Agostino Sarubbo
commit: 0c42406b5ebefa60046ea19fd19db8ab0e5b19d8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri May 14 06:42:03 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri May 14 06:42:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c42406b

media-sound/hydrogen: ppc stable wrt bug #789663

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.2.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
index cb1f50c42ef..5b62655b32e 100644
--- a/media-sound/hydrogen/hydrogen-1.0.2.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2021-05-13 Thread Sam James
commit: 7e7d2c1c894622f712cab440556ab904b655619a
Author: Sam James  gentoo  org>
AuthorDate: Thu May 13 16:43:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 13 16:43:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e7d2c1c

media-sound/hydrogen: Stabilize 1.0.2 x86, #789663

Signed-off-by: Sam James  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.2.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
index c111f04ac76..cb1f50c42ef 100644
--- a/media-sound/hydrogen/hydrogen-1.0.2.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2021-05-13 Thread Sam James
commit: ac573d544328fdd2dbd3384708892090b8bd0d6a
Author: Sam James  gentoo  org>
AuthorDate: Thu May 13 16:23:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 13 16:23:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac573d54

media-sound/hydrogen: Stabilize 1.0.2 ppc64, #789663

Signed-off-by: Sam James  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.2.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
index e734148a42b..c111f04ac76 100644
--- a/media-sound/hydrogen/hydrogen-1.0.2.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2021-05-13 Thread Sam James
commit: cb2d721dbf90cb5300cb79e2d959f932d6eedf04
Author: Sam James  gentoo  org>
AuthorDate: Thu May 13 16:16:15 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 13 16:16:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb2d721d

media-sound/hydrogen: Stabilize 1.0.2 amd64, #789663

Signed-off-by: Sam James  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.2.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
index 69b4555df1e..e734148a42b 100644
--- a/media-sound/hydrogen/hydrogen-1.0.2.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} ==  ]]; then
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2021-04-12 Thread Miroslav Šulc
commit: bd6a39a71be70fa9446de607144409d05a826a1c
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Apr 12 08:25:41 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Apr 12 08:25:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd6a39a7

media-sound/hydrogen: bump to 1.0.2

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest  |  1 +
 media-sound/hydrogen/hydrogen-1.0.2.ebuild | 95 ++
 2 files changed, 96 insertions(+)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index f5fc3caf85c..13d265e06ab 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1 +1,2 @@
 DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B 
eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c
 SHA512 
66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0
+DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B 
a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d
 SHA512 
7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9

diff --git a/media-sound/hydrogen/hydrogen-1.0.2.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
new file mode 100644
index 000..69b4555df1e
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 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} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
+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}/${PN}-1.0.0-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
+}



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/

2020-11-28 Thread Miroslav Šulc
commit: e6eb98765bc67d766c28d3990b0f70a874867c0d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Nov 28 09:12:22 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Nov 28 09:53:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6eb9876

media-sound/hydrogen: updated 's patches

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/hydrogen--gnuinstalldirs.patch   | 29 ++
 .../hydrogen/files/hydrogen--i18n-path.patch   | 13 --
 media-sound/hydrogen/hydrogen-.ebuild  |  3 +--
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch
new file mode 100644
index 000..ef70497abf7
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen--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 ${CMAKE_SOURCE_DIR}/src/core DESTINATION 
"${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" FILES_MATCHING PATTERN "*.h" PATTERN 
".svn" EXCLUDE)
+-INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION 
"${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
++INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION 
"${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
+ ENDIF()

diff --git a/media-sound/hydrogen/files/hydrogen--i18n-path.patch 
b/media-sound/hydrogen/files/hydrogen--i18n-path.patch
deleted file mode 100644
index 3c32e2b3e62..000
--- a/media-sound/hydrogen/files/hydrogen--i18n-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 a/data/i18n/CMakeLists.txt 2020-09-07 09:31:57.481066097 +0200
-+++ b/data/i18n/CMakeLists.txt 2020-09-07 09:29:27.612763184 +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-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 87e5b809fe3..aa141dadf06 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -58,8 +58,7 @@ RDEPEND="${CDEPEND}"
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
 PATCHES=(
-   "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch"
-   "${FILESDIR}/${P}-i18n-path.patch"
+   "${FILESDIR}/${P}-gnuinstalldirs.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/

2020-10-07 Thread Miroslav Šulc
commit: 1dc879391d6243aed4243c1eca2e40220b7d255b
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Oct  7 08:10:12 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Oct  7 08:12:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc87939

media-sound/hydrogen: removed obsolete 1.0.0

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest  |  1 -
 .../hydrogen/files/hydrogen-1.0.0-i18n-path.patch  | 13 ---
 media-sound/hydrogen/hydrogen-1.0.0.ebuild | 99 --
 3 files changed, 113 deletions(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index f7ed7dd1480..f5fc3caf85c 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,2 +1 @@
-DIST hydrogen-1.0.0.tar.gz 11501728 BLAKE2B 
ccb48cddff2b196e934c712f999109ae4b91513579ec123e57f2ef9f6aa288c1408208bde8608a908e58650c741260fbcc1108dabd7968687d74e4c143fb7de3
 SHA512 
68a7634a63d409ff8eef789bb9dd86b65535e17b6101fe1e1bd0153cab4852dc2cfa7ff11b2cfddbead337d2faad9ca4c49eed589c47c09aa5f5aa91c59171a7
 DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B 
eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c
 SHA512 
66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0

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 075d0d444a0..000
--- 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 e2d0ee7185f..000
--- 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} ==  ]]; 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() {
-   

[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2020-10-07 Thread Agostino Sarubbo
commit: 9164f51db63a8afbf3a305ed4a89a83838a4bfb5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct  7 07:06:35 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct  7 07:09:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9164f51d

media-sound/hydrogen: x86 stable wrt bug #746491

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.1.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.1.ebuild
index 295d189c4b4..86ef3e86fe0 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} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-   KEYWORDS="amd64 ppc ppc64"
+   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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2020-10-07 Thread Agostino Sarubbo
commit: 1746c17f0b8e397c1082fdc129ea3c75245dd149
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct  7 06:52:56 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct  7 06:52:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1746c17f

media-sound/hydrogen: ppc64 stable wrt bug #746491

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.1.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.1.ebuild
index 3f27255a73b..295d189c4b4 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} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-   KEYWORDS="amd64 ppc"
+   KEYWORDS="amd64 ppc ppc64"
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2020-10-07 Thread Agostino Sarubbo
commit: 7e634432e6c62a9e335484ec9a7e07adbb132cbd
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct  7 06:49:52 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct  7 06:49:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e634432

media-sound/hydrogen: ppc stable wrt bug #746491

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.1.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.1.ebuild
index 5e3291a78cc..3f27255a73b 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} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-   KEYWORDS="amd64"
+   KEYWORDS="amd64 ppc"
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/

2020-09-18 Thread Miroslav Šulc
commit: 01195d156e0bf3ff5a6440074da0e714e82ec28c
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Sep 18 08:20:43 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Sep 18 08:20:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01195d15

media-sound/hydrogen: removed obsolete 1.0.0_rc1

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest  |  1 -
 .../files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch  | 18 
 media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild  | 96 --
 3 files changed, 115 deletions(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 781de743824..f7ed7dd1480 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,3 +1,2 @@
 DIST hydrogen-1.0.0.tar.gz 11501728 BLAKE2B 
ccb48cddff2b196e934c712f999109ae4b91513579ec123e57f2ef9f6aa288c1408208bde8608a908e58650c741260fbcc1108dabd7968687d74e4c143fb7de3
 SHA512 
68a7634a63d409ff8eef789bb9dd86b65535e17b6101fe1e1bd0153cab4852dc2cfa7ff11b2cfddbead337d2faad9ca4c49eed589c47c09aa5f5aa91c59171a7
-DIST hydrogen-1.0.0_rc1.tar.gz 11502829 BLAKE2B 
2d529c94713f415af1b183ff8dd11d05111da1cfac130eea749aaa5c5fa941bc69b172bdc77cf755ad3a34617609af28690cd94bc975feab3ecb06af6e7965f8
 SHA512 
1615956ed02cfc0553ff09b651f76cb56dd35ec314a535fcb97f9658eebb6eee3eba884779b097767b404c82d6e074e2df342bdaabce77a47ad8278bd18be1be
 DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B 
eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c
 SHA512 
66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0

diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch
deleted file mode 100644
index 4c6512760b8..000
--- a/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 20368f1..b72a272 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -384,10 +384,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/media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild
deleted file mode 100644
index dd0f1fcfd43..000
--- a/media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,96 +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} ==  ]]; 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? ( 

[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2020-09-07 Thread Thomas Deutschmann
commit: cd9b2e15e3483284df9ec6a118af8b0715b2f876
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Sep  7 14:53:14 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Sep  7 14:53:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd9b2e15

media-sound/hydrogen: x86 stable (bug #740834)

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.0.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0.ebuild
index 12ec74567cf..624df725366 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0.ebuild
@@ -11,11 +11,11 @@ HOMEPAGE="http://www.hydrogen-music.org/;
 if [[ ${PV} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-   KEYWORDS=""
+   KEYWORDS="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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/

2020-09-07 Thread Miroslav Šulc
commit: f3a7b2d7aa852019000f5281c765b7d82d64f3ff
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Sep  7 07:49:24 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Sep  7 07:49:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a7b2d7

media-sound/hydrogen: fixed i18n install path

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch | 13 +
 media-sound/hydrogen/files/hydrogen--i18n-path.patch  | 13 +
 media-sound/hydrogen/hydrogen-1.0.0.ebuild|  5 -
 media-sound/hydrogen/hydrogen-.ebuild |  5 -
 4 files changed, 34 insertions(+), 2 deletions(-)

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
new file mode 100644
index 000..075d0d444a0
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch
@@ -0,0 +1,13 @@
+--- 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/files/hydrogen--i18n-path.patch 
b/media-sound/hydrogen/files/hydrogen--i18n-path.patch
new file mode 100644
index 000..3c32e2b3e62
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen--i18n-path.patch
@@ -0,0 +1,13 @@
+--- a/data/i18n/CMakeLists.txt 2020-09-07 09:31:57.481066097 +0200
 b/data/i18n/CMakeLists.txt 2020-09-07 09:29:27.612763184 +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
index bfd663bbc55..12ec74567cf 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0.ebuild
@@ -57,7 +57,10 @@ RDEPEND="${CDEPEND}"
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
+PATCHES=(
+   "${FILESDIR}/${P}-gnuinstalldirs.patch"
+   "${FILESDIR}/${P}-i18n-path.patch"
+)
 
 src_prepare() {
cmake_src_prepare

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 245dc874f11..87e5b809fe3 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -57,7 +57,10 @@ RDEPEND="${CDEPEND}"
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
-PATCHES=( "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch"
+   "${FILESDIR}/${P}-i18n-path.patch"
+)
 
 src_prepare() {
cmake_src_prepare



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2020-09-04 Thread Miroslav Šulc
commit: a0340480dd869b23d6a3ec5b51b2828c22c70853
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Sep  4 07:51:28 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Sep  4 07:51:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0340480

media-sound/hydrogen: bump to 1.0.1

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest  |  1 +
 media-sound/hydrogen/hydrogen-1.0.1.ebuild | 96 ++
 2 files changed, 97 insertions(+)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index ca4de0a3594..781de743824 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,2 +1,3 @@
 DIST hydrogen-1.0.0.tar.gz 11501728 BLAKE2B 
ccb48cddff2b196e934c712f999109ae4b91513579ec123e57f2ef9f6aa288c1408208bde8608a908e58650c741260fbcc1108dabd7968687d74e4c143fb7de3
 SHA512 
68a7634a63d409ff8eef789bb9dd86b65535e17b6101fe1e1bd0153cab4852dc2cfa7ff11b2cfddbead337d2faad9ca4c49eed589c47c09aa5f5aa91c59171a7
 DIST hydrogen-1.0.0_rc1.tar.gz 11502829 BLAKE2B 
2d529c94713f415af1b183ff8dd11d05111da1cfac130eea749aaa5c5fa941bc69b172bdc77cf755ad3a34617609af28690cd94bc975feab3ecb06af6e7965f8
 SHA512 
1615956ed02cfc0553ff09b651f76cb56dd35ec314a535fcb97f9658eebb6eee3eba884779b097767b404c82d6e074e2df342bdaabce77a47ad8278bd18be1be
+DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B 
eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c
 SHA512 
66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0

diff --git a/media-sound/hydrogen/hydrogen-1.0.1.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.1.ebuild
new file mode 100644
index 000..245dc874f11
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-1.0.1.ebuild
@@ -0,0 +1,96 @@
+# 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} ==  ]]; 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="
+   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}/${PN}-1.0.0-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
+}



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/

2020-08-07 Thread Miroslav Šulc
commit: 24c6d851b72c557bc7804d8b21baeeb8f43e60e4
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Aug  7 10:26:27 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Aug  7 10:26:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24c6d851

media-sound/hydrogen: bump to 1.0.0

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest   | 1 +
 ...en--gnuinstalldirs.patch => hydrogen-1.0.0-gnuinstalldirs.patch} | 0
 media-sound/hydrogen/{hydrogen-.ebuild => hydrogen-1.0.0.ebuild}| 0
 media-sound/hydrogen/hydrogen-.ebuild   | 2 +-
 4 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 5b7804a6568..ca4de0a3594 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1 +1,2 @@
+DIST hydrogen-1.0.0.tar.gz 11501728 BLAKE2B 
ccb48cddff2b196e934c712f999109ae4b91513579ec123e57f2ef9f6aa288c1408208bde8608a908e58650c741260fbcc1108dabd7968687d74e4c143fb7de3
 SHA512 
68a7634a63d409ff8eef789bb9dd86b65535e17b6101fe1e1bd0153cab4852dc2cfa7ff11b2cfddbead337d2faad9ca4c49eed589c47c09aa5f5aa91c59171a7
 DIST hydrogen-1.0.0_rc1.tar.gz 11502829 BLAKE2B 
2d529c94713f415af1b183ff8dd11d05111da1cfac130eea749aaa5c5fa941bc69b172bdc77cf755ad3a34617609af28690cd94bc975feab3ecb06af6e7965f8
 SHA512 
1615956ed02cfc0553ff09b651f76cb56dd35ec314a535fcb97f9658eebb6eee3eba884779b097767b404c82d6e074e2df342bdaabce77a47ad8278bd18be1be

diff --git a/media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch
similarity index 100%
rename from media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch
rename to media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0.ebuild
similarity index 100%
copy from media-sound/hydrogen/hydrogen-.ebuild
copy to media-sound/hydrogen/hydrogen-1.0.0.ebuild

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index bfd663bbc55..245dc874f11 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -57,7 +57,7 @@ RDEPEND="${CDEPEND}"
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch" )
 
 src_prepare() {
cmake_src_prepare



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2020-07-20 Thread Miroslav Šulc
commit: 642f1bc0dad7b7cc060be1f9eed43aa3efa97099
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Jul 20 07:31:39 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Jul 20 07:31:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=642f1bc0

media-sound/hydrogen: fixed qttest dep which is needed always

Closes: https://bugs.gentoo.org/733266
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild | 5 ++---
 media-sound/hydrogen/hydrogen-.ebuild | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild
index 5582297535c..dd0f1fcfd43 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild
@@ -21,9 +21,8 @@ fi
 
 LICENSE="GPL-2 ZLIB"
 SLOT="0"
-IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio 
test"
+IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
 
-RESTRICT="!test? ( test )"
 REQUIRED_USE="lash? ( alsa )"
 
 BDEPEND="
@@ -52,7 +51,7 @@ CDEPEND="
 "
 DEPEND="
${CDEPEND}
-   test? ( dev-qt/qttest:5 )
+   dev-qt/qttest:5
 "
 RDEPEND="${CDEPEND}"
 

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 3a4bdcbeb5a..bfd663bbc55 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -21,9 +21,8 @@ fi
 
 LICENSE="GPL-2 ZLIB"
 SLOT="0"
-IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio 
test"
+IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
 
-RESTRICT="!test? ( test )"
 REQUIRED_USE="lash? ( alsa )"
 
 BDEPEND="
@@ -52,7 +51,7 @@ CDEPEND="
 "
 DEPEND="
${CDEPEND}
-   test? ( dev-qt/qttest:5 )
+   dev-qt/qttest:5
 "
 RDEPEND="${CDEPEND}"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/

2020-07-19 Thread Miroslav Šulc
commit: 668ed76cb709dda92f1005ebd3ece95ca8e8ae27
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Jul 19 08:56:05 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Jul 19 08:56:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=668ed76c

media-sound/hydrogen: fixed metainfo installation path

Closes: https://bugs.gentoo.org/733090
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch  | 2 +-
 .../{hydrogen-1.0.0_rc1.ebuild => hydrogen-1.0.0_rc1-r1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch
index a137dc580b8..4c6512760b8 100644
--- a/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch
+++ b/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch
@@ -8,7 +8,7 @@ index 20368f1..b72a272 100644
  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}/appdata")
++  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")

diff --git a/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild
similarity index 100%
rename from media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
rename to media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/

2020-07-19 Thread Miroslav Šulc
commit: dc1a726a1432df849c3ebe11be7db54099d74f5d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Jul 19 08:47:20 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Jul 19 08:47:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc1a726a

media-sound/hydrogen: removed obsolete 1.0.0_beta2

Closes: https://bugs.gentoo.org/726510
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest  |  1 -
 .../hydrogen-1.0.0_beta2-gnuinstalldirs.patch  | 30 ---
 media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild   | 92 --
 3 files changed, 123 deletions(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index d46e36b2dbb..5b7804a6568 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,2 +1 @@
-DIST hydrogen-1.0.0_beta2.tar.gz 11375652 BLAKE2B 
9eaf07d69060e74478dd130722450264a463135dbfb05486ec853c684f09fcbae2537e3a7b032ed831e7103ccba3a3ba7c6866d2fde241464ab11465f8ad9ea9
 SHA512 
8712996adbc820909d1d38ff7d45a2a49ec64c15135d5a99b08b93ebd5a0c05139ce78a317c274059a538eb68031f0f42bb9d22988312c2b9f60fa53c539a242
 DIST hydrogen-1.0.0_rc1.tar.gz 11502829 BLAKE2B 
2d529c94713f415af1b183ff8dd11d05111da1cfac130eea749aaa5c5fa941bc69b172bdc77cf755ad3a34617609af28690cd94bc975feab3ecb06af6e7965f8
 SHA512 
1615956ed02cfc0553ff09b651f76cb56dd35ec314a535fcb97f9658eebb6eee3eba884779b097767b404c82d6e074e2df342bdaabce77a47ad8278bd18be1be

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
deleted file mode 100644
index 6238c47504b..000
--- a/media-sound/hydrogen/files/hydrogen-1.0.0_beta2-gnuinstalldirs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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_beta2.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild
deleted file mode 100644
index b86b1ac0cdd..000
--- a/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild
+++ /dev/null
@@ -1,92 +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} ==  ]]; 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 )"
-

[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2020-07-19 Thread Agostino Sarubbo
commit: c025b9a98c4dfd49bb6310f336dfa93b7d827e1b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jul 19 07:38:04 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jul 19 07:38:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c025b9a9

media-sound/hydrogen: ppc stable wrt bug #732716

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
index c95941ad0a8..9468e8980b2 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
@@ -11,11 +11,11 @@ HOMEPAGE="http://www.hydrogen-music.org/;
 if [[ ${PV} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-   KEYWORDS="amd64 ~ppc ~ppc64 x86"
+   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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2020-07-19 Thread Agostino Sarubbo
commit: 34b2f08d4a3db65027f36bbe52115b3998d2e2b6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jul 19 07:38:31 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jul 19 07:38:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34b2f08d

media-sound/hydrogen: ppc64 stable wrt bug #732716

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
index 9468e8980b2..5582297535c 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
@@ -11,11 +11,11 @@ HOMEPAGE="http://www.hydrogen-music.org/;
 if [[ ${PV} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-   KEYWORDS="amd64 ppc ~ppc64 x86"
+   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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2020-07-17 Thread Agostino Sarubbo
commit: aba0abf0f3bbd3cb2769add9ac6cd573811ab955
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 17 15:16:21 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 17 15:16:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba0abf0

media-sound/hydrogen: x86 stable wrt bug #732716

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
index 895e07bb4cd..c95941ad0a8 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
@@ -11,11 +11,11 @@ HOMEPAGE="http://www.hydrogen-music.org/;
 if [[ ${PV} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-   KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+   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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2020-07-17 Thread Agostino Sarubbo
commit: d60b6433efd5719cf45ab2d50ebd0cb045b99d8c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 17 15:04:12 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 17 15:04:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d60b6433

media-sound/hydrogen: amd64 stable wrt bug #732716

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
index 5f1d184dac5..895e07bb4cd 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
@@ -11,11 +11,11 @@ HOMEPAGE="http://www.hydrogen-music.org/;
 if [[ ${PV} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+   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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2020-07-17 Thread Miroslav Šulc
commit: 0a86726f8aa03d37eb42e2aaba82fd2135b23643
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Jul 17 10:23:23 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jul 17 11:25:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a86726f

media-sound/hydrogen: fixed test deps

Closes: https://bugs.gentoo.org/733046
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild | 11 ---
 media-sound/hydrogen/hydrogen-.ebuild  | 11 ---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
index 7b7b6694b99..5f1d184dac5 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
@@ -21,8 +21,9 @@ fi
 
 LICENSE="GPL-2 ZLIB"
 SLOT="0"
-IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
+IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio 
test"
 
+RESTRICT="!test? ( test )"
 REQUIRED_USE="lash? ( alsa )"
 
 BDEPEND="
@@ -30,7 +31,7 @@ BDEPEND="
virtual/pkgconfig
doc? ( app-doc/doxygen )
 "
-DEPEND="
+CDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
@@ -49,7 +50,11 @@ DEPEND="
portmidi? ( media-libs/portmidi )
pulseaudio? ( media-sound/pulseaudio )
 "
-RDEPEND="${DEPEND}"
+DEPEND="
+   ${CDEPEND}
+   test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${CDEPEND}"
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 9ca42ba68d7..3a4bdcbeb5a 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -21,8 +21,9 @@ fi
 
 LICENSE="GPL-2 ZLIB"
 SLOT="0"
-IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
+IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio 
test"
 
+RESTRICT="!test? ( test )"
 REQUIRED_USE="lash? ( alsa )"
 
 BDEPEND="
@@ -30,7 +31,7 @@ BDEPEND="
virtual/pkgconfig
doc? ( app-doc/doxygen )
 "
-DEPEND="
+CDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
@@ -49,7 +50,11 @@ DEPEND="
portmidi? ( media-libs/portmidi )
pulseaudio? ( media-sound/pulseaudio )
 "
-RDEPEND="${DEPEND}"
+DEPEND="
+   ${CDEPEND}
+   test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${CDEPEND}"
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/

2020-06-15 Thread Miroslav Šulc
commit: aab5d29670a6ce5b4693e9de8537f3e0068261fe
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Jun 15 10:01:32 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Jun 15 10:02:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aab5d296

media-sound/hydrogen: bumped to 1.0.0_rc1

Bug: https://bugs.gentoo.org/726510
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest  |  1 +
 .../files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch  | 18 +
 media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild | 92 ++
 3 files changed, 111 insertions(+)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 9f1e6abb1b7..d46e36b2dbb 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1 +1,2 @@
 DIST hydrogen-1.0.0_beta2.tar.gz 11375652 BLAKE2B 
9eaf07d69060e74478dd130722450264a463135dbfb05486ec853c684f09fcbae2537e3a7b032ed831e7103ccba3a3ba7c6866d2fde241464ab11465f8ad9ea9
 SHA512 
8712996adbc820909d1d38ff7d45a2a49ec64c15135d5a99b08b93ebd5a0c05139ce78a317c274059a538eb68031f0f42bb9d22988312c2b9f60fa53c539a242
+DIST hydrogen-1.0.0_rc1.tar.gz 11502829 BLAKE2B 
2d529c94713f415af1b183ff8dd11d05111da1cfac130eea749aaa5c5fa941bc69b172bdc77cf755ad3a34617609af28690cd94bc975feab3ecb06af6e7965f8
 SHA512 
1615956ed02cfc0553ff09b651f76cb56dd35ec314a535fcb97f9658eebb6eee3eba884779b097767b404c82d6e074e2df342bdaabce77a47ad8278bd18be1be

diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch
new file mode 100644
index 000..a137dc580b8
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 20368f1..b72a272 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -384,10 +384,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}/appdata")
++  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/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
new file mode 100644
index 000..7b7b6694b99
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
@@ -0,0 +1,92 @@
+# 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} ==  ]]; 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 )
+"
+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() 

[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2020-05-13 Thread Miroslav Šulc
commit: 92c481b60bab4157a90d9216130b94022101ebd7
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed May 13 08:47:29 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed May 13 08:47:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92c481b6

media-sound/hydrogen: updated digest for 1.0.0_beta2

Closes: https://bugs.gentoo.org/722658
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 2cd971a65d4..9f1e6abb1b7 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1 +1 @@
-DIST hydrogen-1.0.0_beta2.tar.gz 11375853 BLAKE2B 
a7b5e8f0fa675a9869d84cad922f8d9119c88983e80c278dced2d03140619f4d8f70eb132319fd75be0a130cbd65a247dc4a8176a09b4c0a678d0f02385aa5aa
 SHA512 
e87b57fb52a1ff00ef0d011321ad721902df5d1d31f3136d702498b9b5b3580cc7df43c0d7f4cecf55fd96957caf9c44a400eddb3bef07d7fe2cfda85ca1e00e
+DIST hydrogen-1.0.0_beta2.tar.gz 11375652 BLAKE2B 
9eaf07d69060e74478dd130722450264a463135dbfb05486ec853c684f09fcbae2537e3a7b032ed831e7103ccba3a3ba7c6866d2fde241464ab11465f8ad9ea9
 SHA512 
8712996adbc820909d1d38ff7d45a2a49ec64c15135d5a99b08b93ebd5a0c05139ce78a317c274059a538eb68031f0f42bb9d22988312c2b9f60fa53c539a242



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/

2020-05-12 Thread Miroslav Šulc
commit: 4a3637bed4e198316abd647f3c611d866fd4aa46
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue May 12 08:34:37 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue May 12 08:34:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3637be

media-sound/hydrogen: removed obsolete 1.0.0_beta1_pre20180301

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/Manifest  |   1 -
 ...en-1.0.0_beta1_pre20180301-gnuinstalldirs.patch | 101 -
 .../hydrogen-1.0.0_beta1_pre20180301-r1.ebuild |  82 -
 3 files changed, 184 deletions(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 3c42f5cef06..2cd971a65d4 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,2 +1 @@
-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_beta1_pre20180301-gnuinstalldirs.patch
 
b/media-sound/hydrogen/files/hydrogen-1.0.0_beta1_pre20180301-gnuinstalldirs.patch
deleted file mode 100644
index 59a5486e2ca..000
--- 
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 
-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}"
-+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2020-05-11 Thread Agostino Sarubbo
commit: 8777b407f9c76f4b3940c45d1b0739caf10a83a7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon May 11 11:37:46 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon May 11 11:37:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8777b407

media-sound/hydrogen: x86 stable wrt bug #719012

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild
index c4db66951e3..b86b1ac0cdd 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} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-   KEYWORDS="amd64 ppc ppc64"
+   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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2020-05-07 Thread Agostino Sarubbo
commit: e88df397c35db214c2417ba2aa484bd8f43fbb40
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu May  7 15:57:08 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu May  7 15:57:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e88df397

media-sound/hydrogen: amd64 stable wrt bug #719012

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild
index aedf2b5645c..c4db66951e3 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} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-   KEYWORDS="ppc ppc64"
+   KEYWORDS="amd64 ppc ppc64"
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2020-05-06 Thread Miroslav Šulc
commit: ee3adac6c9c5096e081bcf1fa251f03dffc39d7d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed May  6 09:02:15 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed May  6 09:02:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee3adac6

media-sound/hydrogen: added missing linguist-tools:5 dep

Closes: https://bugs.gentoo.org/721084
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild | 1 +
 media-sound/hydrogen/hydrogen-.ebuild| 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild
index 9a15eaa3c9d..aedf2b5645c 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0_beta2.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 )
 "

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 29b288106e0..9ca42ba68d7 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.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 )
 "



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2020-05-06 Thread Sergei Trofimovich
commit: 62442ae962cdd97cd5bc5173ad5d599e6cb2dfd5
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed May  6 07:11:40 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed May  6 07:17:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62442ae9

media-sound/hydrogen: stable 1.0.0_beta2 for ppc64, bug #719012

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild
index 7a72047ab8e..9a15eaa3c9d 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} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}-music/${PN};
-   KEYWORDS="ppc"
+   KEYWORDS="ppc ppc64"
 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
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/

2020-04-01 Thread Miroslav Šulc
commit: 8b2d2f9604a554ce399bf80e34857223fe2cba94
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Apr  1 16:22:53 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Apr  1 16:22:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b2d2f96

media-sound/hydrogen: updated patch for 

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/hydrogen--gnuinstalldirs.patch   | 29 ++
 media-sound/hydrogen/hydrogen-.ebuild  |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch
new file mode 100644
index 000..9b842975307
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen--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-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 25e3e04fb92..29b288106e0 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
-PATCHES=( "${FILESDIR}/${PN}-1.0.0_beta2-gnuinstalldirs.patch" )
+PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
 
 src_prepare() {
cmake_src_prepare



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/

2020-03-23 Thread Miroslav Šulc
commit: 7490e42dd8acbb71fb69d2713c214cbf16a6ae77
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Mar 23 15:14:24 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Mar 23 15:14:40 2020 +
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-.ebuild => hydrogen-1.0.0_beta2.ebuild} | 23 ++---
 media-sound/hydrogen/hydrogen-.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 000..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 

[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/

2019-06-16 Thread Miroslav Šulc
commit: 42ca400fd2cd38d214a3a849857f579af3edc5ec
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Jun 16 16:35:48 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Jun 16 16:35:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ca400f

media-sound/hydrogen-: removed gnuinstalldirs patch

it has been applied by upstream

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/hydrogen--gnuinstalldirs.patch   | 120 -
 media-sound/hydrogen/hydrogen-.ebuild  |   2 -
 2 files changed, 122 deletions(-)

diff --git a/media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch
deleted file mode 100644
index 14babedefa5..000
--- a/media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 64e251765e58b6948953f0bbc2aac05042daaa55 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Mon, 1 Jan 2018 11:52:18 +0100
-Subject: [PATCH] Use GNUInstallDirs
-
-Fixes multiarch and deprecated man dir location.

- CMakeLists.txt| 19 ---
- 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(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b18508a8..76305ea7 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")
- 
- #
-@@ -144,21 +146,16 @@ IF(APPLE)
- #Without setting this, installation would go into /usr/local, which does 
not exist per default
- SET(CMAKE_INSTALL_PREFIX "/usr" )
- ELSE(APPLE)
--SET(OSS_LIB_PATHS "/usr/lib${LIB_SUFFIX}/oss/lib" 
"/usr/local/lib${LIB_SUFFIX}/oss/lib" )
-+SET(OSS_LIB_PATHS "${CMAKE_INSTALL_FULL_LIBDIR}/oss/lib" 
"/usr/local/lib${LIB_SUFFIX}/oss/lib" )
- ENDIF(APPLE)
- 
- 
- #Installation paths
- # TODO remove data from path
--SET(H2_SYS_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen")
-+SET(H2_SYS_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/hydrogen")
- # TODO remove data from path, could be .config/hydrogen
- SET(H2_USR_PATH ".hydrogen")
- 
--#Changing this to user writable location will allow successful, non-root, 
deployment (e.g: make install).
--IF(NOT MINGW AND NOT APPLE)
--SET(H2_UNIX_ICON_PATH "/usr/share/pixmaps" CACHE STRING "Freedesktop 
default icon path.")
--ENDIF()
--
- SET(MAX_INSTRUMENTS 1000 CACHE STRING "Maximum number of instruments")
- SET(MAX_COMPONENTS  32   CACHE STRING "Maximum number of components")
- SET(MAX_NOTES   192  CACHE STRING "Maximum number of notes")
-@@ -366,10 +363,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/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 
"${H2_UNIX_ICON_PATH}")
--  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_DATAROOTDIR}/appdata")
-+  INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION 
"${CMAKE_INSTALL_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_MANDIR}/man1")
- ENDIF()
- 
- #
-diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
-index f6cd04eb..7725dc83 100644
 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
-index db1333da..0ab61d96 100644
 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}"

[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2019-02-17 Thread Andreas Sturmlechner
commit: 5f2154fd4b0865143496b375f1e23b3fb5ff11f2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 17 12:38:24 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 17 12:39:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f2154fd

media-sound/hydrogen: EAPI-7 bump

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/hydrogen/hydrogen-.ebuild | 30 +++---
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 2d92d83a64c..5bcfaa020fe 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils git-r3 xdg-utils
+inherit git-r3 xdg cmake-utils
 
 DESCRIPTION="Advanced drum machine"
 HOMEPAGE="http://www.hydrogen-music.org/;
@@ -16,7 +16,12 @@ IUSE="alsa +archive doc jack ladspa lash osc oss portaudio 
portmidi pulseaudio"
 
 REQUIRED_USE="lash? ( alsa )"
 
-RDEPEND="
+BDEPEND="
+   virtual/pkgconfig
+   doc? ( app-doc/doxygen )
+"
+DEPEND="
+   dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
@@ -34,10 +39,7 @@ RDEPEND="
portmidi? ( media-libs/portmidi )
pulseaudio? ( media-sound/pulseaudio )
 "
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   doc? ( app-doc/doxygen )
-"
+RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
@@ -71,16 +73,6 @@ src_compile() {
 }
 
 src_install() {
-   use doc && local HTML_DOCS=( ${BUILD_DIR}/docs/html/. )
+   use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
cmake-utils_src_install
 }
-
-pkg_postinst() {
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-}
-
-pkg_postrm() {
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-}



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/

2018-11-08 Thread Andreas Sturmlechner
commit: 142089b01723fd10364178f18703ba702afceb17
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov  9 01:53:09 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov  9 01:53:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=142089b0

media-sound/hydrogen: Rebase  gnuinstalldirs patch, add USE doc

Pending upstream: https://github.com/hydrogen-music/hydrogen/pull/668

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/hydrogen--gnuinstalldirs.patch   | 120 +
 media-sound/hydrogen/hydrogen-.ebuild  |  15 ++-
 2 files changed, 130 insertions(+), 5 deletions(-)

diff --git a/media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch
new file mode 100644
index 000..14babedefa5
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch
@@ -0,0 +1,120 @@
+From 64e251765e58b6948953f0bbc2aac05042daaa55 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Mon, 1 Jan 2018 11:52:18 +0100
+Subject: [PATCH] Use GNUInstallDirs
+
+Fixes multiarch and deprecated man dir location.
+---
+ CMakeLists.txt| 19 ---
+ 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(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b18508a8..76305ea7 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")
+ 
+ #
+@@ -144,21 +146,16 @@ IF(APPLE)
+ #Without setting this, installation would go into /usr/local, which does 
not exist per default
+ SET(CMAKE_INSTALL_PREFIX "/usr" )
+ ELSE(APPLE)
+-SET(OSS_LIB_PATHS "/usr/lib${LIB_SUFFIX}/oss/lib" 
"/usr/local/lib${LIB_SUFFIX}/oss/lib" )
++SET(OSS_LIB_PATHS "${CMAKE_INSTALL_FULL_LIBDIR}/oss/lib" 
"/usr/local/lib${LIB_SUFFIX}/oss/lib" )
+ ENDIF(APPLE)
+ 
+ 
+ #Installation paths
+ # TODO remove data from path
+-SET(H2_SYS_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen")
++SET(H2_SYS_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/hydrogen")
+ # TODO remove data from path, could be .config/hydrogen
+ SET(H2_USR_PATH ".hydrogen")
+ 
+-#Changing this to user writable location will allow successful, non-root, 
deployment (e.g: make install).
+-IF(NOT MINGW AND NOT APPLE)
+-SET(H2_UNIX_ICON_PATH "/usr/share/pixmaps" CACHE STRING "Freedesktop 
default icon path.")
+-ENDIF()
+-
+ SET(MAX_INSTRUMENTS 1000 CACHE STRING "Maximum number of instruments")
+ SET(MAX_COMPONENTS  32   CACHE STRING "Maximum number of components")
+ SET(MAX_NOTES   192  CACHE STRING "Maximum number of notes")
+@@ -366,10 +363,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/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 
"${H2_UNIX_ICON_PATH}")
+-  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_DATAROOTDIR}/appdata")
++  INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION 
"${CMAKE_INSTALL_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_MANDIR}/man1")
+ ENDIF()
+ 
+ #
+diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
+index f6cd04eb..7725dc83 100644
+--- 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
+index db1333da..0ab61d96 100644
+--- 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}"
+-

[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/

2018-03-18 Thread Andreas Sturmlechner
commit: d4f9318ddef1ce270387e23f23dd3244e3ea068d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 18 12:31:16 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 18 12:31:16 2018 +
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..000
--- 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 
- #include 
-+#include 
- 
- 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 
-+#include 
- #include 
- #include 
- 

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..000
--- 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.0 +0100
-+++ hydrogen-0.9.5/libs/hydrogen/src/local_file_mgr.cpp2017-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..000
--- 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..000
--- 

[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2018-03-18 Thread Mikle Kolyada
commit: d749f86a595baa388f68cdcfd933e1133a095229
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Mar 18 12:28:19 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Mar 18 12:28:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d749f86a

media-sound/hydrogen: amd64 stable wrt bug #570814

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
index e7dd2a89b37..ef5832a6ea2 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/${PN}-music/${PN}/archive/${COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio"
 
 REQUIRED_USE="lash? ( alsa )"



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2018-03-17 Thread Thomas Deutschmann
commit: 371153fae0b692984cfb5bcfcf2c035b21624e56
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Mar 18 00:22:25 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Mar 18 00:39:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=371153fa

media-sound/hydrogen: x86 stable (bug #570814)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
index aa2c7c776f2..e7dd2a89b37 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/${PN}-music/${PN}/archive/${COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 x86"
 IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio"
 
 REQUIRED_USE="lash? ( alsa )"



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2018-03-17 Thread Sergei Trofimovich
commit: d7904e08fc892ada16affbac77695d2ac2c9dfee
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Mar 18 00:20:19 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Mar 18 00:20:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7904e08

media-sound/hydrogen: stable 1.0.0_pre20180301-r1 for ppc/ppc64, bug #570814

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc ppc64"

 media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
index 61d6269e79d..aa2c7c776f2 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/${PN}-music/${PN}/archive/${COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio"
 
 REQUIRED_USE="lash? ( alsa )"



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/

2018-03-13 Thread Andreas Sturmlechner
commit: 342c44e9545350abc429cbd44185d4012afbab6a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 13 19:14:49 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 13 19:17:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=342c44e9

media-sound/hydrogen: Fix cmake-patch

Thanks-to: PhobosK  fastmail.fm>
Closes: https://bugs.gentoo.org/650430
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 ...patch => hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch} | 12 ++--
 ...e20180301.ebuild => hydrogen-1.0.0_pre20180301-r1.ebuild} |  2 +-
 media-sound/hydrogen/hydrogen-.ebuild|  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch
similarity index 92%
rename from media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
rename to 
media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch
index e0100eedf7c..59a5486e2ca 100644
--- a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
+++ b/media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch
@@ -30,7 +30,7 @@ index 96dbf47a..2caab298 100644
  #Installation paths
  # TODO remove data from path
 -SET(SYS_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen/data")
-+SET(SYS_DATA_PATH "${CMAKE_FULL_INSTALL_DATAROOTDIR}/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")
  
@@ -42,10 +42,10 @@ index 96dbf47a..2caab298 100644
 -  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_FULL_INSTALL_DATAROOTDIR}/appdata")
-+  INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION 
"${CMAKE_FULL_INSTALL_DATAROOTDIR}/applications")
-+  INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION 
"${CMAKE_FULL_INSTALL_DATAROOTDIR}/pixmaps")
-+  INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION 
"${CMAKE_FULL_INSTALL_MANDIR}/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()
  
  #
@@ -76,7 +76,7 @@ diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
  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_FULL_INSTALL_INCLUDEDIR}/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

diff --git a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
similarity index 97%
rename from media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild
rename to media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
index c54815796c4..61d6269e79d 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
-PATCHES=( "${FILESDIR}/${PN}-gnuinstalldirs.patch" )
+PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
 
 src_configure() {
local mycmakeargs=(

diff --git a/media-sound/hydrogen/hydrogen-.ebuild 
b/media-sound/hydrogen/hydrogen-.ebuild
index 3d14fb4a653..c5712d4665c 100644
--- a/media-sound/hydrogen/hydrogen-.ebuild
+++ b/media-sound/hydrogen/hydrogen-.ebuild
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
-PATCHES=( "${FILESDIR}/${PN}-gnuinstalldirs.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.0.0_pre20180301-gnuinstalldirs.patch" )
 
 src_configure() {
local mycmakeargs=(



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2018-03-13 Thread Andreas Sturmlechner
commit: cf949cd52253bf8a72e278059a70f19c1f4bdb17
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 13 09:56:46 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 13 09:57:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf949cd5

media-sound/hydrogen: Restore keywords

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild 
b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild
index 4033354017a..c54815796c4 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 COMMIT=1a477ffe380f153c5d9fb3495d9874df7f75334f
-inherit cmake-utils git-r3 vcs-snapshot xdg-utils
+inherit cmake-utils vcs-snapshot xdg-utils
 
 DESCRIPTION="Advanced drum machine"
 HOMEPAGE="http://www.hydrogen-music.org/;
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/${PN}-music/${PN}/archive/${COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2 ZLIB"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio"
 
 REQUIRED_USE="lash? ( alsa )"



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/

2018-03-06 Thread Andreas Sturmlechner
commit: 47ebefac39bde969dd959d74604fe09c729d64d2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar  6 17:57:17 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar  6 18:05:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47ebefac

media-sound/hydrogen: Add 1.0.0_pre20180301 Qt5-based snapshot

Bug: https://bugs.gentoo.org/570814
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/hydrogen/Manifest  |  1 +
 .../hydrogen/files/hydrogen-gnuinstalldirs.patch   | 25 ++-
 .../hydrogen/hydrogen-1.0.0_pre20180301.ebuild | 82 ++
 3 files changed, 90 insertions(+), 18 deletions(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 513f3ca3192..d6bf321efed 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1 +1,2 @@
 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-gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
index d42b3971d45..e0100eedf7c 100644
--- a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
+++ b/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
@@ -25,19 +25,12 @@ index 96dbf47a..2caab298 100644
  SET(LIBSNDFILE_VERSION_PREV "1.0.17")
  
  #
-@@ -146,13 +148,13 @@ ELSE(MINGW)
-   #Without setting this, installation would go into /usr/local, 
which does not exist per default
-   SET(CMAKE_INSTALL_PREFIX "/usr" )
- ELSE(APPLE)
--SET(OSS_LIB_PATHS "/usr/lib${LIB_SUFFIX}/oss/lib" 
"/usr/local/lib${LIB_SUFFIX}/oss/lib" )
-+SET(OSS_LIB_PATHS "${CMAKE_INSTALL_LIBDIR}/oss/lib" 
"/usr/local/lib${LIB_SUFFIX}/oss/lib" )
- ENDIF(APPLE)
- ENDIF(MINGW)
+@@ -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_DATAROOTDIR}/hydrogen/data")
++SET(SYS_DATA_PATH "${CMAKE_FULL_INSTALL_DATAROOTDIR}/hydrogen/data")
  # TODO remove data from path, could be .config/hydrogen
  SET(USR_DATA_PATH ".hydrogen/data")
  
@@ -49,15 +42,14 @@ index 96dbf47a..2caab298 100644
 -  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_DATAROOTDIR}/appdata")
-+  INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION 
"${CMAKE_INSTALL_DATAROOTDIR}/applications")
-+  INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION 
"${CMAKE_INSTALL_DATAROOTDIR}/pixmaps")
-+  INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION 
"${CMAKE_INSTALL_MANDIR}/man1")
++  INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml 
DESTINATION "${CMAKE_FULL_INSTALL_DATAROOTDIR}/appdata")
++  INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION 
"${CMAKE_FULL_INSTALL_DATAROOTDIR}/applications")
++  INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION 
"${CMAKE_FULL_INSTALL_DATAROOTDIR}/pixmaps")
++  INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION 
"${CMAKE_FULL_INSTALL_MANDIR}/man1")
  ENDIF()
  
  #
 diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
-index f6cd04eb..7725dc83 100644
 --- a/src/cli/CMakeLists.txt
 +++ b/src/cli/CMakeLists.txt
 @@ -20,4 +20,4 @@ TARGET_LINK_LIBRARIES(h2cli
@@ -67,7 +59,6 @@ index f6cd04eb..7725dc83 100644
 -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
-index db1333da..0ab61d96 100644
 --- a/src/core/CMakeLists.txt
 +++ b/src/core/CMakeLists.txt
 @@ -57,13 +57,13 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION}
@@ -85,10 +76,9 @@ index db1333da..0ab61d96 100644
  IF(NOT APPLE AND NOT WIN32)
  INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" 
FILES_MATCHING PATTERN "*.h" 

[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/

2018-01-01 Thread Andreas Sturmlechner
commit: 63720d87d47cb9c54dee9e64d7bd754c23b1c080
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan  1 10:37:11 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan  1 11:12:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63720d87

media-sound/hydrogen: Add Qt5-based live version

Thanks-to: Samuel Bauer  
bitmessage.ch>
Bug: https://bugs.gentoo.org/570814
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../hydrogen/files/hydrogen-gnuinstalldirs.patch   | 112 +
 media-sound/hydrogen/hydrogen-.ebuild  |  81 +++
 media-sound/hydrogen/metadata.xml  |  21 ++--
 3 files changed, 204 insertions(+), 10 deletions(-)

diff --git a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch 
b/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
new file mode 100644
index 000..d42b3971d45
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
@@ -0,0 +1,112 @@
+From 11c72da8b2bf96f650ca6e1e38af0819c4f49c45 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+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")
+ 
+ #
+@@ -146,13 +148,13 @@ ELSE(MINGW)
+   #Without setting this, installation would go into /usr/local, 
which does not exist per default
+   SET(CMAKE_INSTALL_PREFIX "/usr" )
+ ELSE(APPLE)
+-SET(OSS_LIB_PATHS "/usr/lib${LIB_SUFFIX}/oss/lib" 
"/usr/local/lib${LIB_SUFFIX}/oss/lib" )
++SET(OSS_LIB_PATHS "${CMAKE_INSTALL_LIBDIR}/oss/lib" 
"/usr/local/lib${LIB_SUFFIX}/oss/lib" )
+ ENDIF(APPLE)
+ ENDIF(MINGW)
+ 
+ #Installation paths
+ # TODO remove data from path
+-SET(SYS_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen/data")
++SET(SYS_DATA_PATH "${CMAKE_INSTALL_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_DATAROOTDIR}/appdata")
++  INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION 
"${CMAKE_INSTALL_DATAROOTDIR}/applications")
++  INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION 
"${CMAKE_INSTALL_DATAROOTDIR}/pixmaps")
++  INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION 
"${CMAKE_INSTALL_MANDIR}/man1")
+ ENDIF()
+ 
+ #
+diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
+index f6cd04eb..7725dc83 100644
+--- 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
+index db1333da..0ab61d96 100644
+--- 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 

[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/

2017-09-26 Thread Andreas Hüttel
commit: 2753ebbdac800866fed8a2c7bf8a9da7eba9b151
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Tue Sep 26 18:10:25 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Tue Sep 26 18:10:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2753ebbd

media-sound/hydrogen: Add build fix for gcc-6, bug 598124

Thanks to Carlos Salvador Pérez Salgado for the patch.

Closes: https://bugs.gentoo.org/598124
Package-Manager: Portage-2.3.10, Repoman-2.3.3

 media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch | 12 
 media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild|  5 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch 
b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch
new file mode 100644
index 000..586e82af22a
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch
@@ -0,0 +1,12 @@
+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.0 +0100
 hydrogen-0.9.5/libs/hydrogen/src/local_file_mgr.cpp2017-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/hydrogen-0.9.5-r1.ebuild 
b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
index 04efe86d056..0a19547038c 100644
--- a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -31,7 +31,8 @@ src_prepare() {
epatch \
patches/portaudio.patch \
"${FILESDIR}"/${P}-use_lrdf_pkgconfig.patch \
-   "${FILESDIR}"/${P}-gcc47.patch
+   "${FILESDIR}"/${P}-gcc47.patch \
+   "${FILESDIR}"/${P}-gcc6.patch
 }
 
 src_compile() {



[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

2017-06-18 Thread Alexis Ballier
commit: 7e1f3a0918a13c56a4b2fe81b7f0817b30f5408c
Author: Simon van der Veldt  gmail  com>
AuthorDate: Sun Jun 18 13:19:08 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sun Jun 18 16:41:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e1f3a09

media-sound/hydrogen: depend on virtual/jack

Fixes part of bug 602898 https://bugs.gentoo.org/show_bug.cgi?id=602898

 .../hydrogen/{hydrogen-0.9.5.ebuild => hydrogen-0.9.5-r1.ebuild}| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/hydrogen-0.9.5.ebuild 
b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
similarity index 97%
rename from media-sound/hydrogen/hydrogen-0.9.5.ebuild
rename to media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
index 282a2a88859..04efe86d056 100644
--- a/media-sound/hydrogen/hydrogen-0.9.5.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
@@ -18,7 +18,7 @@ RDEPEND="dev-qt/qtgui:4 dev-qt/qtcore:4
!archive? ( >=dev-libs/libtar-1.2.11-r3 )
>=media-libs/libsndfile-1.0.18
alsa? ( media-libs/alsa-lib )
-   jack? ( media-sound/jack-audio-connection-kit )
+   jack? ( virtual/jack )
ladspa? ( media-libs/liblrdf )
lash? ( media-sound/lash )
portaudio? ( >=media-libs/portaudio-19_pre )"