summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2010-08-09 17:03:27 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2010-08-09 17:03:27 +0000
commitb93c480524a0c87da6a9280fbb88e2300887b3c2 (patch)
treef4620a9c73895976522be1d0631d675b312e7ff2 /games-fps/tenebrae
parentRemove unnecessary KDE_MINIMAL, QA (diff)
downloadhistorical-b93c480524a0c87da6a9280fbb88e2300887b3c2.tar.gz
historical-b93c480524a0c87da6a9280fbb88e2300887b3c2.tar.bz2
historical-b93c480524a0c87da6a9280fbb88e2300887b3c2.zip
EAPI=2; respect LDFLAGS (bug #331793)
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'games-fps/tenebrae')
-rw-r--r--games-fps/tenebrae/ChangeLog5
-rw-r--r--games-fps/tenebrae/Manifest4
-rw-r--r--games-fps/tenebrae/tenebrae-1.04.ebuild26
3 files changed, 18 insertions, 17 deletions
diff --git a/games-fps/tenebrae/ChangeLog b/games-fps/tenebrae/ChangeLog
index 2d967f2eafb3..7b15c03544d3 100644
--- a/games-fps/tenebrae/ChangeLog
+++ b/games-fps/tenebrae/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-fps/tenebrae
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/ChangeLog,v 1.11 2010/03/10 21:46:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/ChangeLog,v 1.12 2010/08/09 17:03:27 mr_bones_ Exp $
+
+ 09 Aug 2010; Michael Sterrett <mr_bones_@gentoo.org> tenebrae-1.04.ebuild:
+ EAPI=2; respect LDFLAGS (bug #331793)
10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> tenebrae-1.04.ebuild:
Fix building with libpng14 wrt #308889 by Locke Shinseiko.
diff --git a/games-fps/tenebrae/Manifest b/games-fps/tenebrae/Manifest
index 5e8c2c5e1378..fa6f6e9cff33 100644
--- a/games-fps/tenebrae/Manifest
+++ b/games-fps/tenebrae/Manifest
@@ -2,6 +2,6 @@ AUX 1.04-glhax.patch 1091 RMD160 e43743b9172fb2497bba7d463db9fd1b53c2dfbf SHA1 f
AUX tenebrae-1.04-exec-stack.patch 642 RMD160 ddb22f84e2daf1f2eee27ad13e30b7175aab2e4f SHA1 3df0fd513eb05e63ac83e897aef0cff51b7dcbb5 SHA256 d04cbf31f16929b27040ea9f4e599db2ea4e14b696708034ae523ff406de011c
DIST tenebrae-1.04.tbz2 625988 RMD160 bc1c10a607619c5a6849e51dcd15f130b45fee87 SHA1 bc6ee34bb583d16c493a3e88f43bd24598a34907 SHA256 61277ecb41dc7c4adbfbad81cd5bfd69e3d63a8e7b41a4860bd879011a735f6c
DIST tenebraedata.zip 3989498 RMD160 2524c6b483d52bc2aca97e8c626bf324023442e3 SHA1 9edc109d204e314d344ee982f2e66cc473bb809f SHA256 35db2e1dfe917ec5e62d8ad50fb5ccc73418a7dc3ef1e16cba9eb01f1e1177b8
-EBUILD tenebrae-1.04.ebuild 1745 RMD160 844f051509e0f513c29dcf61ce4403c0bd60ed75 SHA1 beb87db86d8b7a9fcce1034a1079e8364e5f3b5e SHA256 2e4cf5dc53db4488fd711bfb9961aa902a8083f773da65d541d6b5d2da33e863
-MISC ChangeLog 1453 RMD160 70f480c9314b467ecb1ff694461320052d1166bc SHA1 43d3fbc6317d4c315f6b63e3297490c830a3dced SHA256 25c6dd0bc1c699a6b10cf75875d2cb0fd955519233bca6bbcdbe87d7ce60de2c
+EBUILD tenebrae-1.04.ebuild 1649 RMD160 fbd083f14c1a47e1eb7b14ecc6053124cdd7c173 SHA1 2fd11195d6005a8c7b640a671c36d212204d7c18 SHA256 dd867c4d63e4ef996968f2fe5c51b3c0a6eb2499d10f6ed76022d21f89b5de0f
+MISC ChangeLog 1571 RMD160 5778fddfd1a8a6c03dbfbc88709162f53144fd9e SHA1 6077371ccecdde1e41337be17d6466c68a69d4c5 SHA256 982c98922fd91a3c4c9053c7034db45d1c06be6fc93f6a19bae98bf3d8ea0a1f
MISC metadata.xml 535 RMD160 dc577d8e694987191c2dd42bbb40ad2f01452fae SHA1 3cf32fbcba2c238cb84740d6c22fc3e0f5f692c1 SHA256 f67ad81390e2ee2e5582b15bcc878e804028acce9a240f3885e3634a86a4fc1c
diff --git a/games-fps/tenebrae/tenebrae-1.04.ebuild b/games-fps/tenebrae/tenebrae-1.04.ebuild
index bc6117226f35..22765997f133 100644
--- a/games-fps/tenebrae/tenebrae-1.04.ebuild
+++ b/games-fps/tenebrae/tenebrae-1.04.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/tenebrae-1.04.ebuild,v 1.13 2010/03/10 21:46:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/tenebrae-1.04.ebuild,v 1.14 2010/08/09 17:03:27 mr_bones_ Exp $
+EAPI=2
#ECVS_SERVER="cvs.tenebrae.sourceforge.net:/cvsroot/tenebrae"
#ECVS_MODULE="tenebrae_0"
#inherit cvs
@@ -22,7 +23,6 @@ RDEPEND="virtual/opengl
media-libs/libpng
x11-libs/libXxf86vm
x11-libs/libXxf86dga"
-# sdl? ( media-libs/libsdl )"
DEPEND="${RDEPEND}
x11-proto/xextproto
x11-proto/xf86dgaproto
@@ -37,6 +37,9 @@ src_unpack() {
else
cvs_src_unpack
fi
+}
+
+src_prepare() {
cd tenebrae_0
sed -i \
@@ -47,25 +50,20 @@ src_unpack() {
"${FILESDIR}"/${PV}-glhax.patch \
"${FILESDIR}"/${P}-exec-stack.patch
cd linux
- sed "s:-mpentiumpro -O6:${CFLAGS}:" Makefile.i386linux > Makefile
- #if use sdl ; then
- # cd ../sdl
- # ./autogen.sh
- #fi
+ sed \
+ -e "/^LDFLAGS/s:=:+=:" \
+ -e "s:-mpentiumpro -O6:${CFLAGS}:" \
+ Makefile.i386linux > Makefile \
+ || die "sed failed"
}
src_compile() {
cd "${S}"/tenebrae_0/linux
- make MASTER_DIR="${GAMES_DATADIR}/quake1" build_release || die
- #if use sdl ; then
- # cd ${S}/tenebrae_0/sdl
- # egamesconf || die
- # make || die
- #fi
+ emake MASTER_DIR="${GAMES_DATADIR}/quake1" build_release || die
}
src_install() {
- newgamesbin tenebrae_0/linux/release*/bin/tenebrae.run tenebrae || die "newgamesbin"
+ newgamesbin tenebrae_0/linux/release*/bin/tenebrae.run tenebrae || die
insinto "${GAMES_DATADIR}/quake1/tenebrae"
doins "${WORKDIR}"/tenebrae/* || die "doins data"
dodoc tenebrae_0/linux/README "${WORKDIR}"/Tenebrae_Readme.txt