summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <nyhm@gentoo.org>2007-04-09 18:15:05 +0000
committerTristan Heaven <nyhm@gentoo.org>2007-04-09 18:15:05 +0000
commit9fd3d549e1b01b413bc217c886cc05e89f857eaf (patch)
treeebcbec1e07d5aee329f446a16788aeb5c65dd1ca /games-fps
parentuse games_get_libdir (diff)
downloadgentoo-2-9fd3d549e1b01b413bc217c886cc05e89f857eaf.tar.gz
gentoo-2-9fd3d549e1b01b413bc217c886cc05e89f857eaf.tar.bz2
gentoo-2-9fd3d549e1b01b413bc217c886cc05e89f857eaf.zip
use games_get_libdir
(Portage version: 2.1.2.3)
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/qudos/qudos-0.40.1.ebuild13
-rw-r--r--games-fps/qudos/qudos-9999.ebuild13
2 files changed, 12 insertions, 14 deletions
diff --git a/games-fps/qudos/qudos-0.40.1.ebuild b/games-fps/qudos/qudos-0.40.1.ebuild
index 8cde20af065d..2b6d6ad7dab4 100644
--- a/games-fps/qudos/qudos-0.40.1.ebuild
+++ b/games-fps/qudos/qudos-0.40.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/qudos-0.40.1.ebuild,v 1.6 2007/03/12 15:07:20 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/qudos-0.40.1.ebuild,v 1.7 2007/04/09 18:15:05 nyhm Exp $
inherit eutils toolchain-funcs games
@@ -39,7 +39,6 @@ DEPEND="${UIDEPEND}"
S=${WORKDIR}/${FILE_STEM}
dir=${GAMES_DATADIR}/${MY_PN}
-libdir=${GAMES_LIBDIR}/${PN}
default_client() {
if use opengl || use sdl || ! use dedicated ; then
@@ -105,7 +104,7 @@ src_unpack() {
# Change default sound driver and its location
sed -i src/client/snd_dma.c \
-e "s:\"oss\":\"${snd_drv}\":" \
- -e "s:\"\./snd:\"${libdir}/snd:" \
+ -e "s:\"\./snd:\"$(games_get_libdir)/${PN}/snd:" \
|| die "sed snd_dma.c failed"
}
@@ -132,7 +131,7 @@ src_compile() {
TYPE="${type}" \
DATADIR="${dir}" \
LOCALBASE=/usr \
- LIBDIR="${GAMES_LIBDIR}/${PN}" \
+ LIBDIR="$(games_get_libdir)"/${PN} \
WITH_QMAX=$(yesno qmax) \
BUILD_3ZB2=$(yesno mods) \
BUILD_CTF=$(yesno mods) \
@@ -166,11 +165,11 @@ src_install() {
|| die "newgamesbin QuDos-ded failed"
fi
- insinto "${libdir}"
+ insinto "$(games_get_libdir)"/${PN}
doins -r ${MY_PN}/* || die "doins libs failed"
- rm "${D}/${libdir}"/QuDos
+ rm "${D}/$(games_get_libdir)"/${PN}/QuDos
- insinto "${libdir}"/baseq2
+ insinto "$(games_get_libdir)"/${PN}/baseq2
newins "${DISTDIR}/${PK3_FILE}" qudos.pk3 || die "doins ${PK3_FILE} failed"
dodoc $(find docs -name \*.txt) docs/q2_orig/README*
diff --git a/games-fps/qudos/qudos-9999.ebuild b/games-fps/qudos/qudos-9999.ebuild
index cdef1d512f07..e3e16e0041e9 100644
--- a/games-fps/qudos/qudos-9999.ebuild
+++ b/games-fps/qudos/qudos-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/qudos-9999.ebuild,v 1.5 2007/03/12 15:07:20 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/qudos-9999.ebuild,v 1.6 2007/04/09 18:15:05 nyhm Exp $
inherit eutils subversion toolchain-funcs games
@@ -40,7 +40,6 @@ DEPEND="${UIDEPEND}"
S=${WORKDIR}
dir=${GAMES_DATADIR}/${MY_PN}
-libdir=${GAMES_LIBDIR}/${PN}
default_client() {
if use opengl || use sdl || ! use dedicated ; then
@@ -105,7 +104,7 @@ src_unpack() {
# Change default sound driver and its location
sed -i src/client/snd_dma.c \
-e "s:\"oss\":\"${snd_drv}\":" \
- -e "s:\"\./snd:\"${libdir}/snd:" \
+ -e "s:\"\./snd:\"$(games_get_libdir)/${PN}/snd:" \
|| die "sed snd_dma.c failed"
}
@@ -132,7 +131,7 @@ src_compile() {
TYPE="${type}" \
DATADIR="${dir}" \
LOCALBASE=/usr \
- LIBDIR="${GAMES_LIBDIR}/${PN}" \
+ LIBDIR="$(games_get_libdir)"/${PN} \
WITH_QMAX=$(yesno qmax) \
BUILD_3ZB2=$(yesno mods) \
BUILD_CTF=$(yesno mods) \
@@ -165,11 +164,11 @@ src_install() {
|| die "newgamesbin QuDos-ded failed"
fi
- insinto "${libdir}"
+ insinto "$(games_get_libdir)"/${PN}
doins -r ${MY_PN}/* || die "doins libs failed"
- rm "${D}/${libdir}"/QuDos
+ rm "${D}/$(games_get_libdir)"/${PN}/QuDos
- insinto "${libdir}"/baseq2
+ insinto "$(games_get_libdir)"/${PN}/baseq2
doins data/qudos.pk3 || die "doins qudos.pk3 failed"
dodoc $(find docs -name \*.txt) docs/q2_orig/README*