| 1 |
axs 14/07/08 21:05:13 |
| 2 |
|
| 3 |
Modified: metadata.xml doom3-1.3.1304-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
dropped opengl and alsa use flags as the deps are not actually optional; made USE=dedicated just install dedicated server as it should |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 games-fps/doom3/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/metadata.xml?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/metadata.xml?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/metadata.xml?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/games-fps/doom3/metadata.xml,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- metadata.xml 26 Jul 2008 03:53:08 -0000 1.3 |
| 23 |
+++ metadata.xml 8 Jul 2014 21:05:13 -0000 1.4 |
| 24 |
@@ -11,6 +11,7 @@ |
| 25 |
information, checkout http://www.doom3.com |
| 26 |
</longdescription> |
| 27 |
<use> |
| 28 |
+ <flag name='dedicated'>install only as a dedicated game server</flag> |
| 29 |
<flag name="roe">Adds support for the Resurrection of Evil expansion</flag> |
| 30 |
</use> |
| 31 |
</pkgmetadata> |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.3 games-fps/doom3/doom3-1.3.1304-r1.ebuild |
| 36 |
|
| 37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/doom3-1.3.1304-r1.ebuild?rev=1.3&view=markup |
| 38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/doom3-1.3.1304-r1.ebuild?rev=1.3&content-type=text/plain |
| 39 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/doom3-1.3.1304-r1.ebuild?r1=1.2&r2=1.3 |
| 40 |
|
| 41 |
Index: doom3-1.3.1304-r1.ebuild |
| 42 |
=================================================================== |
| 43 |
RCS file: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1304-r1.ebuild,v |
| 44 |
retrieving revision 1.2 |
| 45 |
retrieving revision 1.3 |
| 46 |
diff -u -r1.2 -r1.3 |
| 47 |
--- doom3-1.3.1304-r1.ebuild 3 Jul 2014 21:53:21 -0000 1.2 |
| 48 |
+++ doom3-1.3.1304-r1.ebuild 8 Jul 2014 21:05:13 -0000 1.3 |
| 49 |
@@ -1,6 +1,6 @@ |
| 50 |
# Copyright 1999-2014 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1304-r1.ebuild,v 1.2 2014/07/03 21:53:21 axs Exp $ |
| 53 |
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1304-r1.ebuild,v 1.3 2014/07/08 21:05:13 axs Exp $ |
| 54 |
|
| 55 |
EAPI=5 |
| 56 |
inherit eutils unpacker games |
| 57 |
@@ -15,27 +15,25 @@ |
| 58 |
LICENSE="DOOM3" |
| 59 |
SLOT="0" |
| 60 |
KEYWORDS="~amd64 ~x86" |
| 61 |
-IUSE="alsa cdinstall dedicated opengl roe" |
| 62 |
+IUSE="cdinstall dedicated roe" |
| 63 |
RESTRICT="strip" |
| 64 |
|
| 65 |
DEPEND="app-arch/bzip2 |
| 66 |
app-arch/tar" |
| 67 |
RDEPEND="sys-libs/glibc |
| 68 |
amd64? ( sys-libs/glibc[multilib] ) |
| 69 |
- || ( |
| 70 |
+ !dedicated? ( || ( |
| 71 |
( |
| 72 |
+ >=virtual/opengl-7.0-r1[abi_x86_32(-)] |
| 73 |
>=x11-libs/libX11-1.6.2[abi_x86_32(-)] |
| 74 |
>=x11-libs/libXext-1.3.2[abi_x86_32(-)] |
| 75 |
+ >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] |
| 76 |
+ ) |
| 77 |
+ ( |
| 78 |
+ app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
| 79 |
+ app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
| 80 |
+ app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
| 81 |
) |
| 82 |
- app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
| 83 |
- ) |
| 84 |
- opengl? ( || ( |
| 85 |
- >=virtual/opengl-7.0-r1[abi_x86_32(-)] |
| 86 |
- app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
| 87 |
- ) ) |
| 88 |
- alsa? ( || ( |
| 89 |
- >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] |
| 90 |
- app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
| 91 |
) ) |
| 92 |
cdinstall? ( |
| 93 |
>=games-fps/doom3-data-1.1.1282-r1 |
| 94 |
@@ -53,25 +51,31 @@ |
| 95 |
QA_EXECSTACK="${dir:1}/doom.x86 |
| 96 |
${dir:1}/doomded.x86" |
| 97 |
|
| 98 |
+pkg_pretend() { |
| 99 |
+ if use dedicated; then |
| 100 |
+ ewarn "${CATEGORY}/${PN}[dedicated] will only install the dedicated game server" |
| 101 |
+ fi |
| 102 |
+} |
| 103 |
+ |
| 104 |
src_unpack() { |
| 105 |
unpack_makeself ${PN}-linux-${MY_PV}.x86.run |
| 106 |
} |
| 107 |
|
| 108 |
src_install() { |
| 109 |
- exeinto "${dir}" |
| 110 |
- doexe openurl.sh bin/Linux/x86/doom{,ded}.x86 |
| 111 |
- |
| 112 |
insinto "${dir}" |
| 113 |
doins License.txt CHANGES README version.info ${PN}.png |
| 114 |
doins -r base d3xp pb |
| 115 |
|
| 116 |
- games_make_wrapper ${PN} ./doom.x86 "${dir}" "${dir}" |
| 117 |
- if use dedicated ; then |
| 118 |
- games_make_wrapper ${PN}-ded ./doomded.x86 "${dir}" "${dir}" |
| 119 |
+ exeinto "${dir}" |
| 120 |
+ doexe openurl.sh bin/Linux/x86/doomded.x86 |
| 121 |
+ if ! use dedicated; then |
| 122 |
+ doexe bin/Linux/x86/doom.x86 |
| 123 |
+ |
| 124 |
+ games_make_wrapper ${PN} ./doom.x86 "${dir}" "${dir}" |
| 125 |
+ doicon "${DISTDIR}"/${PN}.png || die "doicon" |
| 126 |
+ make_desktop_entry ${PN} "Doom III" |
| 127 |
fi |
| 128 |
- |
| 129 |
- doicon "${DISTDIR}"/${PN}.png || die "doicon" |
| 130 |
- make_desktop_entry ${PN} "Doom III" |
| 131 |
+ games_make_wrapper ${PN}-ded ./doomded.x86 "${dir}" "${dir}" |
| 132 |
|
| 133 |
prepgamesdirs |
| 134 |
} |
| 135 |
@@ -84,16 +88,20 @@ |
| 136 |
elog "pak004.pk4 from either your installation media or your hard drive to" |
| 137 |
elog "${dir}/base before running the game," |
| 138 |
elog "or 'emerge games-fps/doom3-data' to install from CD." |
| 139 |
- echo |
| 140 |
if use roe ; then |
| 141 |
+ echo |
| 142 |
elog "To use the Resurrection of Evil expansion pack, you also need to copy" |
| 143 |
elog "pak000.pk4 to ${dir}/d3xp from the RoE CD before running the game," |
| 144 |
elog "or 'emerge doom3-roe' to install from CD." |
| 145 |
fi |
| 146 |
fi |
| 147 |
|
| 148 |
+ if ! use dedicated; then |
| 149 |
echo |
| 150 |
elog "To play the game, run:" |
| 151 |
elog " doom3" |
| 152 |
+ fi |
| 153 |
echo |
| 154 |
+ elog "To start the dedicated server, run:" |
| 155 |
+ elog " doom3-ded" |
| 156 |
} |
| 157 |
|
| 158 |
|
| 159 |
|
| 160 |
1.42 games-fps/doom3/ChangeLog |
| 161 |
|
| 162 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/ChangeLog?rev=1.42&view=markup |
| 163 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/ChangeLog?rev=1.42&content-type=text/plain |
| 164 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/ChangeLog?r1=1.41&r2=1.42 |
| 165 |
|
| 166 |
Index: ChangeLog |
| 167 |
=================================================================== |
| 168 |
RCS file: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v |
| 169 |
retrieving revision 1.41 |
| 170 |
retrieving revision 1.42 |
| 171 |
diff -u -r1.41 -r1.42 |
| 172 |
--- ChangeLog 3 Jul 2014 21:53:21 -0000 1.41 |
| 173 |
+++ ChangeLog 8 Jul 2014 21:05:13 -0000 1.42 |
| 174 |
@@ -1,6 +1,11 @@ |
| 175 |
# ChangeLog for games-fps/doom3 |
| 176 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 177 |
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.41 2014/07/03 21:53:21 axs Exp $ |
| 178 |
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.42 2014/07/08 21:05:13 axs Exp $ |
| 179 |
+ |
| 180 |
+ 08 Jul 2014; Ian Stakenvicius (_AxS_) <axs@g.o> |
| 181 |
+ doom3-1.3.1304-r1.ebuild, metadata.xml: |
| 182 |
+ dropped opengl and alsa use flags as the deps are not actually optional; made |
| 183 |
+ USE=dedicated just install dedicated server as it should |
| 184 |
|
| 185 |
03 Jul 2014; Ian Stakenvicius (_AxS_) <axs@g.o> |
| 186 |
doom3-1.3.1304-r1.ebuild: |
Archives