[patch] updated 'diff -u'

0ad-99999.ebuild.diff (text/plain), 1.61 KB, created by Nils Freydank on 2013-08-14 07:26:49 UTC

--- /usr/portage/overlays/layman/hasufell/games-strategy/0ad/0ad-99999.ebuild	2013-08-09 22:46:57.042312248 +0200
+++ 0ad-99999.ebuild	2013-08-14 09:10:30.702990628 +0200
@@ -16,7 +16,7 @@
 ESVN_REPO_URI="http://svn.wildfiregames.com/public/ps/trunk"
 
 LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 as-is"
-SLOT="0"
+SLOT="svn"
 KEYWORDS=""
 IUSE="+audio editor fam pch test"
 
@@ -24,7 +24,6 @@
 	~dev-lang/spidermonkey-1.8.5
 	dev-libs/boost
 	dev-libs/libxml2
-	!games-strategy/0ad-data
 	media-gfx/nvidia-texture-tools
 	media-libs/libpng:0
 	media-libs/libsdl[X,opengl,video]
@@ -70,8 +69,8 @@
 		$(usex audio "" "--without-audio") \
 		$(use_enable editor atlas) \
 		--bindir="${GAMES_BINDIR}" \
-		--libdir="$(games_get_libdir)"/${PN} \
-		--datadir="${GAMES_DATADIR}"/${PN}
+		--libdir="$(games_get_libdir)"/${PN}-${SLOT} \
+		--datadir="${GAMES_DATADIR}"/${PN}-${SLOT}
 }
 
 src_compile() {
@@ -85,22 +84,21 @@
 
 src_install() {
 	# data
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto "${GAMES_DATADIR}"/${PN}-${SLOT}
 	doins -r binaries/data/*
 
 	# bin
-	dogamesbin binaries/system/pyrogenesis
+	newgamesbin binaries/system/pyrogenesis 0ad-${SLOT}
 
 	# libs
-	exeinto "$(games_get_libdir)"/${PN}
+	exeinto "$(games_get_libdir)"/${PN}-${SLOT}
 	doexe binaries/system/libCollada.so
 	use editor && doexe binaries/system/libAtlasUI.so
 
 	# other
 	dodoc binaries/system/readme.txt
-	doicon build/resources/${PN}.png
-	games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis"
-	make_desktop_entry ${PN} "0 A.D."
+	newicon build/resources/${PN}.png ${PN}-${SLOT}.png
+	make_desktop_entry ${PN}-${SLOT} "0 A.D. (svn)"
 
 	# permissions
 	prepgamesdirs