From: Tristan Heaven Date: Fri, 6 Apr 2007 05:34:06 +0000 (+0000) Subject: use games_get_libdir X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=45a42b606ea1ee9d959a1ca88e15d29aaea631c5;p=gentoo.git use games_get_libdir Package-Manager: portage-2.1.2.3 --- diff --git a/games-fps/warsow/Manifest b/games-fps/warsow/Manifest index 7d462c3fb9ec..1a1150528d08 100644 --- a/games-fps/warsow/Manifest +++ b/games-fps/warsow/Manifest @@ -7,14 +7,10 @@ RMD160 4d0ca4bf10c204094f515c0778d1a720a880855d files/warsow-0.21-inverted-mouse SHA256 0884a4f7e5ed6e8a1b8abc6ede5ca4399d7e3b498c9f04d2dc0dcba55a9b7bec files/warsow-0.21-inverted-mouse.patch 391 DIST warsow_0.21_linux.tar.gz 80219586 RMD160 1d4e5672a79bb38c594e9bcfcad09b6a1a59c47d SHA1 9faf775721ee88c3db98aa186aa8e805ff4edb7b SHA256 fa927e2559620bea8926eed141106815c28099c8fff227f21463ebb1be9748d4 DIST warsow_0.21_sdk.zip 7469755 RMD160 416e646463fd4a4bc51bf84eebceed725dab1744 SHA1 a79b50dfb7e0ab83337371d9ef1eecc812dd2053 SHA256 81b9fd550d826cb0b466b05106bff1729270ceb7682debb4c0a333b8b8dfa3f7 -EBUILD warsow-0.21-r1.ebuild 4054 RMD160 c97070e86a98c69b15f7d1026a02dbd51a1cdfef SHA1 9a13c9d22599dd7bea9312394a9189766e590a0b SHA256 ae612bf6e44547252d45f57ea1ecaf9790f4319c5ca0af85e97ff5be1a5ec36c -MD5 085f7ba2967fc54fd103f46e7cc3fa33 warsow-0.21-r1.ebuild 4054 -RMD160 c97070e86a98c69b15f7d1026a02dbd51a1cdfef warsow-0.21-r1.ebuild 4054 -SHA256 ae612bf6e44547252d45f57ea1ecaf9790f4319c5ca0af85e97ff5be1a5ec36c warsow-0.21-r1.ebuild 4054 -EBUILD warsow-0.21.ebuild 4004 RMD160 e06abaeb9a021733258f94d0d3e68cb6cfb90b24 SHA1 76c430d23a5fd2ac53ffe6b43358f8e7cc6f8855 SHA256 d10e0638f0885a5c4c02cd1c4a340b065cb870500225de0c6f5964a999bba4cc -MD5 862e790d02ff52c57f2e8d52ec6a4905 warsow-0.21.ebuild 4004 -RMD160 e06abaeb9a021733258f94d0d3e68cb6cfb90b24 warsow-0.21.ebuild 4004 -SHA256 d10e0638f0885a5c4c02cd1c4a340b065cb870500225de0c6f5964a999bba4cc warsow-0.21.ebuild 4004 +EBUILD warsow-0.21-r1.ebuild 3680 RMD160 a56cb41cc4fb3193f9d285d30d9b67d68ab8df75 SHA1 b29630845d347ae688f887396c6ac9bfa4e4e61c SHA256 380d22e84bfa3ea36059ebf5c0ffce7d158fa36484c28af749ecd3a7a2fc7353 +MD5 0bd0770ab5b8d5cd04befef5c26c07c9 warsow-0.21-r1.ebuild 3680 +RMD160 a56cb41cc4fb3193f9d285d30d9b67d68ab8df75 warsow-0.21-r1.ebuild 3680 +SHA256 380d22e84bfa3ea36059ebf5c0ffce7d158fa36484c28af749ecd3a7a2fc7353 warsow-0.21-r1.ebuild 3680 MISC ChangeLog 652 RMD160 2ab167305611493e1cf4087690eb2b3284e2a5fc SHA1 ac066c8bde58968bf2e2da4f35c68d710dea1490 SHA256 7d027a269761678d66e693fce1ef8db94e36bbf7c9cfb0fc9628648051cc782b MD5 874199162af840da07e4c5dab342c793 ChangeLog 652 RMD160 2ab167305611493e1cf4087690eb2b3284e2a5fc ChangeLog 652 @@ -23,16 +19,13 @@ MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be525 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 -MD5 49ee91b0d73835723e0df47a505cfd5d files/digest-warsow-0.21 500 -RMD160 c62e208455dea7faa087739cb8a19920edfad6af files/digest-warsow-0.21 500 -SHA256 84f51f0e02d127a3ea3809c0ce12c4ab5932bacacda14d3a22e2d35cdcdafd57 files/digest-warsow-0.21 500 MD5 49ee91b0d73835723e0df47a505cfd5d files/digest-warsow-0.21-r1 500 RMD160 c62e208455dea7faa087739cb8a19920edfad6af files/digest-warsow-0.21-r1 500 SHA256 84f51f0e02d127a3ea3809c0ce12c4ab5932bacacda14d3a22e2d35cdcdafd57 files/digest-warsow-0.21-r1 500 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFFwoUudz7hIScOURERAqktAJ9OWWA8va8Qc5/qSKaBEZ5nArj85ACdH3GW -d/ylviEz25AmjpvVxVTWJBY= -=YWLk +iD8DBQFGFdvpdz7hIScOURERArYBAKDdCE0ACqi1/pr7hwJTgUkh55ibiQCeLynj +aDrLVJ53mytJEB4Hgcl4fSw= +=2H5h -----END PGP SIGNATURE----- diff --git a/games-fps/warsow/files/digest-warsow-0.21 b/games-fps/warsow/files/digest-warsow-0.21 deleted file mode 100644 index 99a42184c662..000000000000 --- a/games-fps/warsow/files/digest-warsow-0.21 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 0ee0835a1fe9092c9562113253d0f79a warsow_0.21_linux.tar.gz 80219586 -RMD160 1d4e5672a79bb38c594e9bcfcad09b6a1a59c47d warsow_0.21_linux.tar.gz 80219586 -SHA256 fa927e2559620bea8926eed141106815c28099c8fff227f21463ebb1be9748d4 warsow_0.21_linux.tar.gz 80219586 -MD5 ce66288c5d345c8cf3985cbb1e51e199 warsow_0.21_sdk.zip 7469755 -RMD160 416e646463fd4a4bc51bf84eebceed725dab1744 warsow_0.21_sdk.zip 7469755 -SHA256 81b9fd550d826cb0b466b05106bff1729270ceb7682debb4c0a333b8b8dfa3f7 warsow_0.21_sdk.zip 7469755 diff --git a/games-fps/warsow/warsow-0.21-r1.ebuild b/games-fps/warsow/warsow-0.21-r1.ebuild index 93fab6a47d96..eab7c5c692c9 100644 --- a/games-fps/warsow/warsow-0.21-r1.ebuild +++ b/games-fps/warsow/warsow-0.21-r1.ebuild @@ -1,24 +1,13 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-0.21-r1.ebuild,v 1.1 2007/02/02 00:26:13 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-0.21-r1.ebuild,v 1.2 2007/04/06 05:34:06 nyhm Exp $ inherit eutils toolchain-funcs games -MY_PV=${PV/_/} -F=${PN}_${MY_PV}_linux.tar.gz -SDK=${PN}_${MY_PV}_sdk.zip DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)" HOMEPAGE="http://www.warsow.net/" -SRC_URI="ftp://ftp.club-internet.fr/pub/games/nofrag/${PN}/${F} - ftp://ftp.club-internet.fr/pub/games/nofrag/${PN}/${SDK} - http://www.bef-warsow.de/files/${F} - http://www.bef-warsow.de/files/${SDK} - http://wsw.surreal-xenotronic.com/${F} - http://wsw.surreal-xenotronic.com/${SDK} - http://ik.spinther.com/${PN}/${F} - http://warsow.routed-gaming.co.uk/downloads/${F} - http://warsownews.game-server.cc/${F} - http://warsownews.game-server.cc/${SDK}" +SRC_URI="ftp://ftp.club-internet.fr/pub/games/nofrag/${PN}/${PN}_${PV/_/}_linux.tar.gz + ftp://ftp.club-internet.fr/pub/games/nofrag/${PN}/${PN}_${PV/_/}_sdk.zip" LICENSE="GPL-2" SLOT="0" @@ -47,9 +36,6 @@ DEPEND="${RDEPEND} app-arch/unzip" S=${WORKDIR}/source -SDATA=${WORKDIR}/${PN} -dir=${GAMES_DATADIR}/${PN} -libdir=${GAMES_LIBDIR}/${PN} src_unpack() { unpack ${A} @@ -60,19 +46,17 @@ src_unpack() { # Add libdir as game directory. sed -i qcommon/files.c \ -e 's:"fs_usehomedir", "0":"fs_usehomedir", "1":' \ - -e "s:\"fs_basepath\", \"\.\":\"fs_basepath\", \"${dir}\":" \ + -e "s:\"fs_basepath\", \"\.\":\"fs_basepath\", \"${GAMES_DATADIR}/${PN}\":" \ || die "sed files.c failed" # Remove pre-compiled binaries, because they are compiled in src_compile() # Also remove the startup scripts. - rm "${SDATA}"/{${PN}*,wsw_server*} - rm -r "${SDATA}"/libs/*.so - - # Remove copy of licence. - rm "${SDATA}"/docs/gnu.txt + rm -f "${WORKDIR}"/${PN}/{${PN}*,wsw_server*} + rm -rf "${WORKDIR}"/${PN}/libs/*.so # Move docs to a convenient directory, away from the files to be installed. - mv "${SDATA}"/docs "${S}" + rm -f "${WORKDIR}"/${PN}/docs/gnu.txt + mv "${WORKDIR}"/${PN}/docs "${S}" sed -i Makefile \ -e '/^CFLAGS_RELEASE/s/=.* \(-fno.* \).* .* /=\1/' \ @@ -106,46 +90,40 @@ src_compile() { || die "emake failed" mv -f release/basewsw/*.so "${WORKDIR}" || die "mv *.so failed" - cp -rf release/basewsw "${SDATA}" || die "cp basewsw failed" + cp -rf release/basewsw "${WORKDIR}"/${PN} || die "cp basewsw failed" } src_install() { - cd "${SDATA}" + cd "${WORKDIR}"/${PN} if use sdl || use openal || ! use dedicated ; then - # Install client-only components. - dogamesbin "${S}/release/${PN}" \ - || die "dogamesbin ${PN} failed" + dogamesbin "${S}"/release/${PN} || die "dogamesbin ${PN} failed" make_desktop_entry ${PN} "Warsow" fi if use dedicated ; then - # Install server-only components. - dogamesbin "${S}/release/${PN}-ded" \ - || die "dogamesbin ${PN}-ded failed" + dogamesbin "${S}"/release/${PN}-ded || die "dogamesbin ${PN}-ded failed" fi - # Install common components. - insinto "${dir}" - doins -r * || die "doins -r failed" + insinto "${GAMES_DATADIR}"/${PN} + doins -r * || die "doins failed" - # Game libraries. - exeinto "${libdir}"/basewsw + exeinto "$(games_get_libdir)"/${PN}/basewsw local lib for lib in $(cd "${WORKDIR}" && ls -A *.so) ; do - doexe "${WORKDIR}/${lib}" || die "doexe ${lib} failed" - dosym "${libdir}/basewsw/${lib}" "${dir}"/basewsw/ + doexe "${WORKDIR}"/${lib} || die "doexe ${lib} failed" + dosym "$(games_get_libdir)"/${PN}/basewsw/${lib} \ + "${GAMES_DATADIR}"/${PN}/basewsw/ || die "dosym basewsw failed" done - # "Shared" Libraries. - exeinto "${libdir}" + exeinto "$(games_get_libdir)"/${PN} local lib2 - for lib2 in $(cd "${S}"/release/libs/ && ls -A *.so) ; do - doexe "${S}"/release/libs/"${lib2}" || die "doexe ${lib2} failed" - dosym "${libdir}/${lib2}" "${dir}"/libs/ + for lib2 in $(cd "${S}"/release/libs && ls -A *.so) ; do + doexe "${S}"/release/libs/${lib2} || die "doexe ${lib2} failed" + dosym "$(games_get_libdir)"/${PN}/${lib2} \ + "${GAMES_DATADIR}"/${PN}/libs/ || die "dosym libs failed" done dodoc "${S}"/docs/* - prepgamesdirs } diff --git a/games-fps/warsow/warsow-0.21.ebuild b/games-fps/warsow/warsow-0.21.ebuild deleted file mode 100644 index dbdd050f5630..000000000000 --- a/games-fps/warsow/warsow-0.21.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-0.21.ebuild,v 1.2 2006/11/18 19:17:26 peper Exp $ - -inherit eutils toolchain-funcs games - -MY_PV=${PV/_/} -F=${PN}_${MY_PV}_linux.tar.gz -SDK=${PN}_${MY_PV}_sdk.zip - -DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)" -HOMEPAGE="http://www.warsow.net/" -SRC_URI="ftp://ftp.club-internet.fr/pub/games/nofrag/${PN}/${F} - ftp://ftp.club-internet.fr/pub/games/nofrag/${PN}/${SDK} - http://www.bef-warsow.de/files/${F} - http://www.bef-warsow.de/files/${SDK} - http://wsw.surreal-xenotronic.com/${F} - http://wsw.surreal-xenotronic.com/${SDK} - http://ik.spinther.com/${PN}/${F} - http://warsow.routed-gaming.co.uk/downloads/${F} - http://warsownews.game-server.cc/${F} - http://warsownews.game-server.cc/${SDK}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug dedicated irc openal sdl" - -UIRDEPEND="media-libs/jpeg - media-libs/libogg - media-libs/libvorbis - net-misc/curl - virtual/opengl - >=media-libs/libsdl-1.2.8-r1 - >=media-libs/sdl-sound-1.0.1-r1 - openal? ( media-libs/openal ) - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext" -UIDEPEND="x11-proto/xf86dgaproto - x11-proto/xf86vidmodeproto" -RDEPEND="sdl? ( ${UIRDEPEND} ) - !sdl? ( !dedicated? ( ${UIRDEPEND} ) )" -DEPEND="${RDEPEND} - sdl? ( ${UIDEPEND} ) - !sdl? ( !dedicated? ( ${UIDEPEND} ) ) - app-arch/unzip" - -S=${WORKDIR}/source -SDATA=${WORKDIR}/${PN} -dir=${GAMES_DATADIR}/${PN} -libdir=${GAMES_LIBDIR}/${PN} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Make fs_usehomedir default to 1, so the game will write to ~/.warsow/ - # Make fs_basepath default to correct path. - # Add libdir as game directory. - sed -i qcommon/files.c \ - -e 's:"fs_usehomedir", "0":"fs_usehomedir", "1":' \ - -e "s:\"fs_basepath\", \"\.\":\"fs_basepath\", \"${dir}\":" \ - || die "sed files.c failed" - - # Remove pre-compiled binaries, because they are compiled in src_compile() - # Also remove the startup scripts. - rm "${SDATA}"/{${PN}*,wsw_server*} - rm -r "${SDATA}"/libs/*.so - - # Remove copy of licence. - rm "${SDATA}"/docs/gnu.txt - - # Move docs to a convenient directory, away from the files to be installed. - mv "${SDATA}"/docs "${S}" - - sed -i Makefile \ - -e '/^CFLAGS_RELEASE/s/=.* \(-fno.* \).* .* /=\1/' \ - -e '/^CFLAGS_DEBUG/s/-O0 -ggdb/-fno-strict-aliasing/' \ - || die "sed Makefile failed" -} - -src_compile() { - yesno() { useq $1 && echo YES || echo NO ; } - - local client="NO" - - if use sdl || ! use dedicated ; then - client="YES" - fi - - emake \ - BUILD_CLIENT=${client} \ - BUILD_SERVER=$(yesno dedicated) \ - BUILD_IRC=$(yesno irc) \ - BUILD_SND_QF=${client} \ - BUILD_SND_OPENAL=$(yesno openal) \ - DEBUG_BUILD=$(yesno debug) \ - BINDIR=release \ - SERVER_EXE=${PN}-ded \ - CLIENT_EXE=${PN} \ - CC="$(tc-getCC)" \ - LD="$(tc-getCC)" \ - || die "emake failed" - - mv -f release/basewsw/*.so "${WORKDIR}" || die "mv *.so failed" - cp -rf release/basewsw "${SDATA}" || die "cp basewsw failed" -} - -src_install() { - cd "${SDATA}" - - if use sdl || use openal || ! use dedicated ; then - # Install client-only components. - dogamesbin "${S}/release/${PN}" \ - || die "dogamesbin ${PN} failed" - make_desktop_entry ${PN} "Warsow" - fi - - if use dedicated ; then - # Install server-only components. - dogamesbin "${S}/release/${PN}-ded" \ - || die "dogamesbin ${PN}-ded failed" - fi - - # Install common components. - insinto "${dir}" - doins -r * || die "doins -r failed" - - # Game libraries. - exeinto "${libdir}"/basewsw - local lib - for lib in $(cd "${WORKDIR}" && ls -A *.so) ; do - doexe "${WORKDIR}/${lib}" || die "doexe ${lib} failed" - dosym "${libdir}/basewsw/${lib}" "${dir}"/basewsw/ - done - - # "Shared" Libraries. - exeinto "${libdir}" - local lib2 - for lib2 in $(cd "${S}"/release/libs/ && ls -A *.so) ; do - doexe "${S}"/release/libs/"${lib2}" || die "doexe ${lib2} failed" - dosym "${libdir}/${lib2}" "${dir}"/libs/ - done - - dodoc "${S}"/docs/* - - prepgamesdirs -}