media-sound/hydrogen: updated patch for 9999

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

diff --git a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
new file mode 100644 (file)
index 0000000..9b84297
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 04aa6380..e979783e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -362,10 +362,10 @@ ELSE()
+       INSTALL(DIRECTORY data DESTINATION ${H2_SYS_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
+ ENDIF()
+ IF(NOT MINGW AND NOT APPLE)
+-      INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
+-      INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
++      INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo")
++      INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
+       INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "org.hydrogenmusic.Hydrogen.svg")
+-      INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
++      INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
+ ENDIF()
+ 
+ #
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index cfdc72a7..b7b0dbcb 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION}
+ 
+ IF(NOT APPLE AND NOT WIN32)
+     INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
+-    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
++    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
+ ENDIF()

diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 25e3e04fb92981eebd6a7e6921ae04a3fc88deb0..29b288106e020209c33159b7ca0568a2cc4afe6a 100644 (file)
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.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