respect FHS

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

4 files changed, 35 insertions, 21 deletions

diff --git a/games-arcade/opensonic/ChangeLog b/games-arcade/opensonic/ChangeLog
index bdbf0a012330..561271480aa4 100644
--- a/games-arcade/opensonic/ChangeLog
+++ b/games-arcade/opensonic/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-arcade/opensonic
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/opensonic/ChangeLog,v 1.2 2012/05/16 18:50:11 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/opensonic/ChangeLog,v 1.3 2012/05/17 00:42:37 hasufell Exp $
+
+*opensonic-0.1.4-r1 (17 May 2012)
+
+  17 May 2012; Julian Ospald <hasufell@gentoo.org> -opensonic-0.1.4.ebuild,
+  +opensonic-0.1.4-r1.ebuild, -files/opensonic-0.1.4-cmake.patch,
+  +files/opensonic-0.1.4-r1-cmake.patch:
+  respect FHS
 
   16 May 2012; Julian Ospald <hasufell@gentoo.org> opensonic-0.1.4.ebuild:
   we want fetch not mirror restrict
diff --git a/games-arcade/opensonic/Manifest b/games-arcade/opensonic/Manifest
index c0fea1e12d5a..ab7daec37ccd 100644
--- a/games-arcade/opensonic/Manifest
+++ b/games-arcade/opensonic/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX opensonic-0.1.4-cmake.patch 4226 RMD160 f2f689d9d27d5202946d5cdd5c6529647a463f95 SHA1 921a17a737cb672acff7361790846a9c9906cdea SHA256 ac94400a49ffcecb9a4cf93be782f5ac5752d5c050d670c33100d382bb69eec3
+AUX opensonic-0.1.4-r1-cmake.patch 4448 RMD160 1167c3fb7e8ee80a30e5c83c5ef80ba35ce539ca SHA1 5e3fb32f787c1feedb0e8f8e205b15cd8fdfd7d5 SHA256 ca051e690a2010dfedcffea0fa4b6358a9318b7d5c63ad3b80596950753d1047
 DIST opensnc-src-0.1.4.tar.gz 10525059 RMD160 4cbcdfa3ef4ed054ea113b1e2456c46c678fd017 SHA1 7c8bda81d22640e2eddeba74aa425783317e17d3 SHA256 3a4c3fa9538ee27c04b5ea848c9ad0a83f335471936d4617a18d3648c42588e9
-EBUILD opensonic-0.1.4.ebuild 1181 RMD160 649e370662cd5f1a69305c671138734f1e17bd89 SHA1 29f83513e5d10406b128640e2d941de5a5eaa3b2 SHA256 e8dc2e355ecd5e356d24f567b7f325b77ebe7fed2ab89d37f4750bb570b2831d
-MISC ChangeLog 522 RMD160 f9e250142109ef4e843eb578b8f29dc28c491d45 SHA1 c14c50eb16e39fd56cf7e4493304ccdeedcab45f SHA256 6f6cc2c6baa1411228438b60de45f9dc7010342c023288cd0045bd88c863c1bc
+EBUILD opensonic-0.1.4-r1.ebuild 1368 RMD160 80e25bae296dec510d80d536215e2728561b9143 SHA1 46d1029f2b9015f5ff3b8206dfd0f224445b4773 SHA256 bc845a7da784efaa18acd4d797bf86eac235fb07838292c43cccebb4dd426dcc
+MISC ChangeLog 755 RMD160 7918fcc7a6cfa89e7edd8ad7de99bb0cc0e83492 SHA1 d2445ef70a56cd598b4bef1c7b743827feeef52e SHA256 abdf86e3a1287cd8af1524be51cf715df10441f8b353ce83e77eb2ee1a1b8092
 MISC metadata.xml 303 RMD160 18a2923accf1bc9742b71cfd6c0d55139df57c6f SHA1 bfe58ab7c9b3ef9146784ab42ef3923b2edea61d SHA256 5911ff9b1fe7902561c2a7df152aadfad612e131810cbbf8c74e63b047114591
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPs/ZiAAoJEFpvPKfnPDWzwaEIAKUfgukpINtK/eXclmaHj9ix
-kK0mEc2k9yaWgGNpG2WrHERT81eAnqUOHneTAkeAP1vvMqAzTKgdvePVfh1Nm1hJ
-enHmGngJTmb3mjgE6DPObUJnbyObfjyFLTIOsnvpM9Vx+y5aMy/Utvk929HY4Ifv
-8a9JwOnWbnfGNIRXadcU7tF1bNqLcgTCxgKDEqi3NVshNoEX+9PJ+lMpYjPsTF8g
-jwWrsyMlW5fGR7xEPU1Vpj5Ipbho3QcAsz5gmQGeE/jtvzkNDHxvpIGsncQ0DN/s
-fc90sVA3uX7gcqR60Eo2rfC+G71pCl+yzTKVExaeniiQ1sGFWq2SU/fTR2wDaBw=
-=Q04X
+iQEcBAEBAgAGBQJPtEj/AAoJEFpvPKfnPDWz9FMH/RgSy1UOzS3jFfOdZOrN4l6T
+6EiYJXht6UaE8mopZcHx0RKFHsj5cIt7qN4RV5mzkL9E2IzHm9/C4VzSE0dL0JPn
+G3lskW2E+6XZeoHw8n/9NaejShuSj02B+V/HHdhy/teiRVRBVMKmbg+lpbZTjrSE
+8GBj5NDrxsQC6UUzaZ/rwrgd97M7OscNBLe95mEwf1N22k0T6Db2+MVKzE8LANHV
+0jGJgTI0Jz60XJegW3DZkPh3MHs0ezhVrw5BWOfT9KrsFZKUZo8beUxEcpKdUu15
+SK7+urRDbH+75sawU28qCYCeMxdldHgPRxEGlntfwFm08qvfnTW5NSs3BEA+gpA=
+=vi2k
 -----END PGP SIGNATURE-----
diff --git a/games-arcade/opensonic/files/opensonic-0.1.4-cmake.patch b/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch
index f7ca95f3e358..684685100d86 100644
--- a/games-arcade/opensonic/files/opensonic-0.1.4-cmake.patch
+++ b/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch
@@ -48,7 +48,7 @@ add rules for icon, desktop-file and game-wrapper
  ENDIF(UNIX)
  
  
-@@ -407,19 +406,42 @@
+@@ -407,19 +406,43 @@
  SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES PROJECT_NAME "${GAME_NAME}")
  
  
@@ -59,6 +59,7 @@ add rules for icon, desktop-file and game-wrapper
 -  SET(GAME_FINAL_DIR "/usr/bin")
 +  SET(GAME_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/${GAME_UNIXNAME}" CACHE PATH "")
 +  SET(GAME_FINAL_DIR "bin" CACHE PATH "")
++  SET(GAME_LIBDIR "games/lib" CACHE PATH "")
 +  SET(GAME_DOCDIR "share/doc/${GAME_UNIXNAME}-${GAME_VERSION}" CACHE PATH "")
 +  SET(GAME_HTMLDIR "share/doc/${GAME_UNIXNAME}-${GAME_VERSION}/html" CACHE PATH "")
 +  SET(GAME_ICONDIR "share/pixmaps" CACHE PATH "")
@@ -66,11 +67,15 @@ add rules for icon, desktop-file and game-wrapper
 +
 +  FILE(WRITE ${GAME_UNIXNAME}.sh
 +"#!/bin/sh
-+cd ${GAME_INSTALL_DIR}
++cd ${GAME_LIBDIR}
 +exec ./${GAME_UNIXNAME} \"$@\"
 +"
 +)
-+
+ 
+-  INSTALL(CODE "MESSAGE(\"Installing ${GAME_NAME} ${GAME_VERSION}... Make sure you have root privileges.\")")
+-  INSTALL(TARGETS ${GAME_UNIXNAME} RUNTIME DESTINATION ${GAME_INSTALL_DIR})
+-  INSTALL(FILES license.txt readme.html DESTINATION ${GAME_INSTALL_DIR})
+-  INSTALL(DIRECTORY objects sprites config images levels licenses musics quests samples screenshots themes languages DESTINATION ${GAME_INSTALL_DIR} PATTERN ".svn" EXCLUDE)
 +  FILE(WRITE ${GAME_UNIXNAME}.desktop
 +"[Desktop Entry]
 +Name=${GAME_NAME}
@@ -83,13 +88,10 @@ add rules for icon, desktop-file and game-wrapper
 +"
 +)
  
-   INSTALL(CODE "MESSAGE(\"Installing ${GAME_NAME} ${GAME_VERSION}... Make sure you have root privileges.\")")
-   INSTALL(TARGETS ${GAME_UNIXNAME} RUNTIME DESTINATION ${GAME_INSTALL_DIR})
--  INSTALL(FILES license.txt readme.html DESTINATION ${GAME_INSTALL_DIR})
--  INSTALL(DIRECTORY objects sprites config images levels licenses musics quests samples screenshots themes languages DESTINATION ${GAME_INSTALL_DIR} PATTERN ".svn" EXCLUDE)
--
 -  INSTALL(CODE "MESSAGE(\"Creating files at ${GAME_FINAL_DIR}...\")")
 -  INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"cmake\" \"-E\" \"copy\" \"${GAME_INSTALL_DIR}/${GAME_UNIXNAME}\" \"${GAME_FINAL_DIR}/${GAME_UNIXNAME}\")")
++  INSTALL(CODE "MESSAGE(\"Installing ${GAME_NAME} ${GAME_VERSION}... Make sure you have root privileges.\")")
++  INSTALL(TARGETS ${GAME_UNIXNAME} RUNTIME DESTINATION ${GAME_LIBDIR})
 +#  INSTALL(FILES license.txt DESTINATION ${GAME_DOCDIR})
 +  INSTALL(FILES readme.html DESTINATION ${GAME_HTMLDIR})
 +  INSTALL(FILES icon.png DESTINATION ${GAME_ICONDIR} RENAME ${GAME_UNIXNAME}.png)
diff --git a/games-arcade/opensonic/opensonic-0.1.4.ebuild b/games-arcade/opensonic/opensonic-0.1.4-r1.ebuild
index 6e96c0801288..ee301963934e 100644
--- a/games-arcade/opensonic/opensonic-0.1.4.ebuild
+++ b/games-arcade/opensonic/opensonic-0.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/opensonic/opensonic-0.1.4.ebuild,v 1.2 2012/05/16 18:50:11 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/opensonic/opensonic-0.1.4-r1.ebuild,v 1.1 2012/05/17 00:42:37 hasufell Exp $
 
 EAPI=3
 
@@ -36,13 +36,14 @@ pkg_nofetch() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cmake.patch
+	epatch "${FILESDIR}"/${PF}-cmake.patch
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DGAME_INSTALL_DIR="${GAMES_DATADIR}"/${PN}
 		-DGAME_FINAL_DIR="${GAMES_BINDIR}"
+		-DGAME_LIBDIR="$(games_get_libdir)/${PN}"
 	)
 
 	cmake-utils_src_configure
@@ -50,5 +51,9 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
+	for i in $(ls "${D}${GAMES_DATADIR}/${PN}") ; do
+		dosym "${GAMES_DATADIR}/${PN}/${i}" \
+			"$(games_get_libdir)/${PN}/${i}" || die
+	done
 	prepgamesdirs
 }