1 |
maksbotan 12/05/30 16:25:37 |
2 |
|
3 |
Modified: doomsday-1.9.8.ebuild ChangeLog |
4 |
Log: |
5 |
Fix ebuild by games herd standards, thanks to Mr_Bones_ |
6 |
|
7 |
(Portage version: 2.1.10.63/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 games-fps/doomsday/doomsday-1.9.8.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doomsday/doomsday-1.9.8.ebuild?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doomsday/doomsday-1.9.8.ebuild?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doomsday/doomsday-1.9.8.ebuild?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: doomsday-1.9.8.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.9.8.ebuild,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- doomsday-1.9.8.ebuild 30 May 2012 10:45:21 -0000 1.2 |
23 |
+++ doomsday-1.9.8.ebuild 30 May 2012 16:25:36 -0000 1.3 |
24 |
@@ -1,12 +1,12 @@ |
25 |
# Copyright 1999-2012 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.9.8.ebuild,v 1.2 2012/05/30 10:45:21 maksbotan Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.9.8.ebuild,v 1.3 2012/05/30 16:25:36 maksbotan Exp $ |
29 |
|
30 |
EAPI=4 |
31 |
|
32 |
PYTHON_DEPEND="snowberry? 2" |
33 |
|
34 |
-inherit python confutils eutils games qt4-r2 |
35 |
+inherit python confutils eutils qt4-r2 games |
36 |
|
37 |
DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen" |
38 |
HOMEPAGE="http://www.dengine.net/" |
39 |
@@ -20,23 +20,21 @@ |
40 |
DEPEND=" |
41 |
virtual/opengl |
42 |
virtual/glu |
43 |
- media-libs/libsdl[joystick] |
44 |
+ media-libs/libsdl[joystick,audio] |
45 |
media-libs/sdl-mixer |
46 |
media-libs/libpng |
47 |
x11-libs/qt-opengl |
48 |
x11-libs/qt-gui |
49 |
net-misc/curl |
50 |
- openal? ( media-libs/openal ) |
51 |
- " |
52 |
-RDEPEND="${RDEPEND} |
53 |
+ openal? ( media-libs/openal )" |
54 |
+RDEPEND="${DEPEND} |
55 |
snowberry? ( dev-python/wxpython )" |
56 |
PDEPEND=" |
57 |
demo? ( games-fps/doom-data ) |
58 |
freedoom? ( games-fps/freedoom ) |
59 |
- resources? ( games-fps/doomsday-resources ) |
60 |
- " |
61 |
+ resources? ( games-fps/doomsday-resources )" |
62 |
|
63 |
-S="${S}"/${PN} |
64 |
+S=${S}/${PN} |
65 |
|
66 |
REQUIRED_USE="demo? ( doom ) freedoom? ( doom ) resources? ( doom )" |
67 |
PATCHES=( "${FILESDIR}"/${P}-2to3.patch ) |
68 |
@@ -56,7 +54,7 @@ |
69 |
|
70 |
if use openal; then |
71 |
echo "CONFIG += deng_openal" >> config_user.pri |
72 |
- sed -i 's:\# Generic Unix.:LIBS += -lopenal:' doomsday/dep_openal.pri |
73 |
+ sed -i 's:\# Generic Unix.:LIBS += -lopenal:' dep_openal.pri || die |
74 |
epatch "${FILESDIR}"/${P}-openal-link.patch |
75 |
fi |
76 |
|
77 |
@@ -72,6 +70,10 @@ |
78 |
make_desktop_entry $name "${de_title}" ${icon} |
79 |
} |
80 |
|
81 |
+src_configure() { |
82 |
+ qt4-r2_src_configure |
83 |
+} |
84 |
+ |
85 |
src_install() { |
86 |
qt4-r2_src_install |
87 |
|
88 |
|
89 |
|
90 |
|
91 |
1.44 games-fps/doomsday/ChangeLog |
92 |
|
93 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doomsday/ChangeLog?rev=1.44&view=markup |
94 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doomsday/ChangeLog?rev=1.44&content-type=text/plain |
95 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doomsday/ChangeLog?r1=1.43&r2=1.44 |
96 |
|
97 |
Index: ChangeLog |
98 |
=================================================================== |
99 |
RCS file: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v |
100 |
retrieving revision 1.43 |
101 |
retrieving revision 1.44 |
102 |
diff -u -r1.43 -r1.44 |
103 |
--- ChangeLog 30 May 2012 10:45:21 -0000 1.43 |
104 |
+++ ChangeLog 30 May 2012 16:25:36 -0000 1.44 |
105 |
@@ -1,6 +1,10 @@ |
106 |
# ChangeLog for games-fps/doomsday |
107 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
108 |
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.43 2012/05/30 10:45:21 maksbotan Exp $ |
109 |
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.44 2012/05/30 16:25:36 maksbotan Exp $ |
110 |
+ |
111 |
+ 30 May 2012; Maxim Koltsov <maksbotan@g.o> doomsday-1.9.8.ebuild, |
112 |
+ files/doomsday-1.9.8-2to3.patch: |
113 |
+ Fix ebuild by games herd standards, thanks to Mr_Bones_ |
114 |
|
115 |
30 May 2012; Maxim Koltsov <maksbotan@g.o> doomsday-1.9.8.ebuild, |
116 |
files/doomsday-1.9.8-2to3.patch: |