summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Koltsov <maksbotan@gentoo.org>2012-05-30 16:25:36 +0000
committerMaxim Koltsov <maksbotan@gentoo.org>2012-05-30 16:25:36 +0000
commitf1910f6278ec61bef5acbd98a62c28117abeceae (patch)
tree262493a560def9eb55648d352b2ed4b399087d3d /games-fps
parentStable for HPPA (bug #416623). (diff)
downloadgentoo-2-f1910f6278ec61bef5acbd98a62c28117abeceae.tar.gz
gentoo-2-f1910f6278ec61bef5acbd98a62c28117abeceae.tar.bz2
gentoo-2-f1910f6278ec61bef5acbd98a62c28117abeceae.zip
Fix ebuild by games herd standards, thanks to Mr_Bones_
(Portage version: 2.1.10.63/cvs/Linux x86_64)
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/doomsday/ChangeLog6
-rw-r--r--games-fps/doomsday/doomsday-1.9.8.ebuild22
2 files changed, 17 insertions, 11 deletions
diff --git a/games-fps/doomsday/ChangeLog b/games-fps/doomsday/ChangeLog
index 2b1859be22e6..be7480165556 100644
--- a/games-fps/doomsday/ChangeLog
+++ b/games-fps/doomsday/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-fps/doomsday
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.43 2012/05/30 10:45:21 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.44 2012/05/30 16:25:36 maksbotan Exp $
+
+ 30 May 2012; Maxim Koltsov <maksbotan@gentoo.org> doomsday-1.9.8.ebuild,
+ files/doomsday-1.9.8-2to3.patch:
+ Fix ebuild by games herd standards, thanks to Mr_Bones_
30 May 2012; Maxim Koltsov <maksbotan@gentoo.org> doomsday-1.9.8.ebuild,
files/doomsday-1.9.8-2to3.patch:
diff --git a/games-fps/doomsday/doomsday-1.9.8.ebuild b/games-fps/doomsday/doomsday-1.9.8.ebuild
index 4a299fa5fa76..794ec2e2f99d 100644
--- a/games-fps/doomsday/doomsday-1.9.8.ebuild
+++ b/games-fps/doomsday/doomsday-1.9.8.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.9.8.ebuild,v 1.2 2012/05/30 10:45:21 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.9.8.ebuild,v 1.3 2012/05/30 16:25:36 maksbotan Exp $
EAPI=4
PYTHON_DEPEND="snowberry? 2"
-inherit python confutils eutils games qt4-r2
+inherit python confutils eutils qt4-r2 games
DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
HOMEPAGE="http://www.dengine.net/"
@@ -20,23 +20,21 @@ IUSE="openal snowberry +doom demo freedoom heretic hexen resources"
DEPEND="
virtual/opengl
virtual/glu
- media-libs/libsdl[joystick]
+ media-libs/libsdl[joystick,audio]
media-libs/sdl-mixer
media-libs/libpng
x11-libs/qt-opengl
x11-libs/qt-gui
net-misc/curl
- openal? ( media-libs/openal )
- "
-RDEPEND="${RDEPEND}
+ openal? ( media-libs/openal )"
+RDEPEND="${DEPEND}
snowberry? ( dev-python/wxpython )"
PDEPEND="
demo? ( games-fps/doom-data )
freedoom? ( games-fps/freedoom )
- resources? ( games-fps/doomsday-resources )
- "
+ resources? ( games-fps/doomsday-resources )"
-S="${S}"/${PN}
+S=${S}/${PN}
REQUIRED_USE="demo? ( doom ) freedoom? ( doom ) resources? ( doom )"
PATCHES=( "${FILESDIR}"/${P}-2to3.patch )
@@ -56,7 +54,7 @@ src_prepare() {
if use openal; then
echo "CONFIG += deng_openal" >> config_user.pri
- sed -i 's:\# Generic Unix.:LIBS += -lopenal:' doomsday/dep_openal.pri
+ sed -i 's:\# Generic Unix.:LIBS += -lopenal:' dep_openal.pri || die
epatch "${FILESDIR}"/${P}-openal-link.patch
fi
@@ -72,6 +70,10 @@ doom_make_wrapper() {
make_desktop_entry $name "${de_title}" ${icon}
}
+src_configure() {
+ qt4-r2_src_configure
+}
+
src_install() {
qt4-r2_src_install