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

["Andreas Sturmlechner" <asturm@gentoo.org>]

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

media-sound/hydrogen: Fix cmake-patch

Thanks-to: PhobosK <phobosk <AT> 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-9999.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-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 3d14fb4a653..c5712d4665c 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.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=(