games-arcade/meandmyshadow: respect GAMES_ variables as per bug 408811

svn path=/sunrise/; revision=12845

diff --git a/games-arcade/meandmyshadow/ChangeLog b/games-arcade/meandmyshadow/ChangeLog
index 0256a2be49f499eefcb940901b2e9dc9641ccd8d..7ac442bc01787756855d4376f59cb9b6900421e7 100644 (file)
--- a/games-arcade/meandmyshadow/ChangeLog
+++ b/games-arcade/meandmyshadow/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Mar 2012; hasufell <julian.ospald@googlemail.com>
+  meandmyshadow-0.3.ebuild, files/meandmyshadow-0.3-cmake.patch:
+  respect GAMES_ variables as per bug 408811
+
 *meandmyshadow-0.3 (26 Mar 2012)
 
   26 Mar 2012; hasufell <julian.ospald@googlemail.com>

diff --git a/games-arcade/meandmyshadow/Manifest b/games-arcade/meandmyshadow/Manifest
index f850c6f0d133eefdea0637fe927ef3cf607323cf..b3f4d4728ccff912748f749aeebb62e731e29824 100644 (file)
--- a/games-arcade/meandmyshadow/Manifest
+++ b/games-arcade/meandmyshadow/Manifest
@@ -1,5 +1,5 @@
-AUX meandmyshadow-0.3-cmake.patch 1280 RMD160 746266a2c3259dd4c6e0549b77278e3655d1ed90 SHA1 da3ca29648e67805217bae29fe05026a0b234b6a SHA256 dae4ec081e06c8ef89fe6f26aea30d30a1f66e2fb4a62f51467f74012c4c2d34
+AUX meandmyshadow-0.3-cmake.patch 2229 RMD160 95eb72e38cb15dd73b780c6439f2ca351be71099 SHA1 6d5c6934b95b227697bef2643ed45fcf23297adc SHA256 9d1fff4ff67931cef74a7ce4e5724abb04f883d2227ec16bde979475efb7edd4
 DIST meandmyshadow-0.3-src.tar.gz 5316666 RMD160 2cf8b6ce9f7b0801e08463061d1863a28f231d45 SHA1 325fb1c5f50a96d6901e98732bb7efdfbf19cb9d SHA256 21dd17829dd6d4df6dd4cfa8895fb8389c9f5c7cf390aa7a984a2f0c9afd2d3a
-EBUILD meandmyshadow-0.3.ebuild 952 RMD160 bcee34b398d2cb91df4ef7651b9e016f904cd6cf SHA1 40e87751ce8ffbe5e611a9f625814df62c2466ea SHA256 39c5394d5aab3120cbfde24892d0b9b44717949f4b6a52dae4b8648b21bc473a
-MISC ChangeLog 360 RMD160 766c06d5c97a3123767a0b279785da56ac4e476e SHA1 fbccfdbd9bf73026c232198f47e4afebfcdfa097 SHA256 e715d5988f4e297eb0d3390142c9904247e0eddfd2eeecec8cbbb18e5a0f6b82
+EBUILD meandmyshadow-0.3.ebuild 990 RMD160 10f3758f444c9da95410a6bc73a5451e587e41fa SHA1 fee91aac712a26d92ea7c59a04586607be4b1ecb SHA256 ccb6e1b2850125d38f9d7095cc3e6aa07bc9112eb13d4e66be9444ac27aa0b3d
+MISC ChangeLog 526 RMD160 c3fc8decba6dff069ff5a05d91082e431261c0a0 SHA1 6e4c688af7d86ee35f8e7679d2922b0ee8fba633 SHA256 db6b7d35d6039c0be76ea4862957c5441d233e5845fac86e298b1c27eb3052d1
 MISC metadata.xml 214 RMD160 efd8175069efb91061298ff4584218b633e44678 SHA1 d372fdbfcb7fd07a4082961d3f3527be4fca1d60 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154

diff --git a/games-arcade/meandmyshadow/files/meandmyshadow-0.3-cmake.patch b/games-arcade/meandmyshadow/files/meandmyshadow-0.3-cmake.patch
index 7c8a9e17885fb7f6eb978b1c66602d27d505170f..6900e7a6843b5ba0ccc788df65d4a2b4e27b0495 100644 (file)
--- a/games-arcade/meandmyshadow/files/meandmyshadow-0.3-cmake.patch
+++ b/games-arcade/meandmyshadow/files/meandmyshadow-0.3-cmake.patch
@@ -1,23 +1,39 @@
-# fix for modifiable directories
+Creator: hasufell <julian.ospald@googlemail.com>
+Date: Tue Mar 27 18:07:46 CEST 2012
+
+add Path options to build system
+see https://bugs.gentoo.org/show_bug.cgi?id=408811
 
 --- CMakeLists.txt
 +++ CMakeLists.txt
-@@ -85,8 +85,13 @@
+@@ -85,12 +85,20 @@
      ${CRYPTO_LIBRARY}
  )
  
 -install(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION share/meandmyshadow/)
 -install(TARGETS meandmyshadow RUNTIME DESTINATION bin)
-+set(MEANDMYSHADOW_EXECUTABLE_DIR "bin" CACHE STRING "Path that represents the directory with meandmyshadow executable, CMAKE_INSTALL_PREFIX gets prepended")
-+set(MEANDMYSHADOW_DATA_DIR "share/meandmyshadow/data" CACHE STRING "Path that represents the directory with meandmyshadow data, CMAKE_INSTALL_PREFIX gets prepended")
++# Path options
++set(BINDIR "bin" CACHE STRING "Where to install binaries")
++set(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Sets the root of data directories to a non-default location")
++set(ICONDIR "${DATAROOTDIR}/icons" CACHE STRING "Sets the icon directory for desktop entry to a non-default location.")
++set(DESKTOPDIR "${DATAROOTDIR}/applications" CACHE STRING "Sets the desktop file directory for desktop entry to a non-default location.")
 +
 +# install locations
-+install(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION "${MEANDMYSHADOW_DATA_DIR}/meandmyshadow")
-+install(TARGETS meandmyshadow RUNTIME DESTINATION "${MEANDMYSHADOW_EXECUTABLE_DIR}")
++install(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION ${DATAROOTDIR}/meandmyshadow/)
++install(TARGETS meandmyshadow RUNTIME DESTINATION ${BINDIR})
 +
  if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") 
-       install(FILES meandmyshadow.desktop DESTINATION share/applications/)
-       install(FILES icons/16x16/meandmyshadow.png DESTINATION share/icons/hicolor/16x16/apps/)
+-      install(FILES meandmyshadow.desktop DESTINATION share/applications/)
+-      install(FILES icons/16x16/meandmyshadow.png DESTINATION share/icons/hicolor/16x16/apps/)
+-      install(FILES icons/32x32/meandmyshadow.png DESTINATION share/icons/hicolor/32x32/apps/)
+-      install(FILES icons/48x48/meandmyshadow.png DESTINATION share/icons/hicolor/48x48/apps/)
+-      install(FILES icons/64x64/meandmyshadow.png DESTINATION share/icons/hicolor/64x64/apps/)
++      install(FILES meandmyshadow.desktop DESTINATION ${DESKTOPDIR})
++      install(FILES icons/16x16/meandmyshadow.png DESTINATION ${ICONDIR}/hicolor/16x16/apps/)
++      install(FILES icons/32x32/meandmyshadow.png DESTINATION ${ICONDIR}/hicolor/32x32/apps/)
++      install(FILES icons/48x48/meandmyshadow.png DESTINATION ${ICONDIR}/hicolor/48x48/apps/)
++      install(FILES icons/64x64/meandmyshadow.png DESTINATION ${ICONDIR}/hicolor/64x64/apps/)
+ endif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
 --- src/config.h.in
 +++ src/config.h.in
 @@ -4,7 +4,7 @@
@@ -25,7 +41,7 @@
  //#define DATA_PATH
  #else
 -#define DATA_PATH "@CMAKE_INSTALL_PREFIX@/share/meandmyshadow/data/"
-+#define DATA_PATH "@CMAKE_INSTALL_PREFIX@/@MEANDMYSHADOW_DATA_DIR@/meandmyshadow/data/"
++#define DATA_PATH "@DATAROOTDIR@/meandmyshadow/data/"
  #endif
  
  #endif

diff --git a/games-arcade/meandmyshadow/meandmyshadow-0.3.ebuild b/games-arcade/meandmyshadow/meandmyshadow-0.3.ebuild
index d85080ca529910f64291bb781462ec355a06eea2..bc7fc1c8a2e44e50b1faddaa29b10dd6639ceac8 100644 (file)
--- a/games-arcade/meandmyshadow/meandmyshadow-0.3.ebuild
+++ b/games-arcade/meandmyshadow/meandmyshadow-0.3.ebuild
@@ -32,9 +32,11 @@ src_prepare() {
 
 src_configure() {
        mycmakeargs=(
-               -DCMAKE_INSTALL_PREFIX="/usr"
-               -DMEANDMYSHADOW_EXECUTABLE_DIR="${GAMES_BINDIR#/usr/}"
-               -DMEANDMYSHADOW_DATA_DIR="${GAMES_DATADIR#/usr/}"
+               "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
+               "-DBINDIR=${GAMES_BINDIR}"
+               "-DDATAROOTDIR=${GAMES_DATADIR}"
+               "-DICONDIR=/usr/share/icons"
+               "-DDESKTOPDIR=/usr/share/applications"
                )
        cmake-utils_src_configure
 }