Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-fps/nexuiz: nexuiz-2.5.2.ebuild ChangeLog
Date: Thu, 21 Nov 2013 20:05:29
Message-Id: 20131121200521.660402004B@flycatcher.gentoo.org
1 mr_bones_ 13/11/21 20:05:21
2
3 Modified: nexuiz-2.5.2.ebuild ChangeLog
4 Log:
5 EAPI=5; tidy
6
7 (Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
8
9 Revision Changes Path
10 1.7 games-fps/nexuiz/nexuiz-2.5.2.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/nexuiz/nexuiz-2.5.2.ebuild?rev=1.7&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/nexuiz/nexuiz-2.5.2.ebuild?rev=1.7&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/nexuiz/nexuiz-2.5.2.ebuild?r1=1.6&r2=1.7
15
16 Index: nexuiz-2.5.2.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/games-fps/nexuiz/nexuiz-2.5.2.ebuild,v
19 retrieving revision 1.6
20 retrieving revision 1.7
21 diff -u -r1.6 -r1.7
22 --- nexuiz-2.5.2.ebuild 19 Nov 2013 01:03:52 -0000 1.6
23 +++ nexuiz-2.5.2.ebuild 21 Nov 2013 20:05:21 -0000 1.7
24 @@ -1,8 +1,8 @@
25 # Copyright 1999-2013 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/nexuiz-2.5.2.ebuild,v 1.6 2013/11/19 01:03:52 hasufell Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/nexuiz-2.5.2.ebuild,v 1.7 2013/11/21 20:05:21 mr_bones_ Exp $
29
30 -EAPI=2
31 +EAPI=5
32 inherit eutils games
33
34 MY_PN=Nexuiz
35 @@ -72,43 +72,40 @@
36 -e "s:-O2:${CFLAGS}:" \
37 -e "/-lm/s:$: ${LDFLAGS}:" \
38 -e '/^STRIP/s/strip/true/' \
39 - makefile.inc \
40 - || die "sed failed"
41 + makefile.inc || die
42
43 sed -i \
44 -e '1i DP_LINK_TO_LIBJPEG=1' \
45 -e "s:ifdef DP_.*:DP_FS_BASEDIR=${GAMES_DATADIR}/nexuiz\n&:" \
46 - makefile \
47 - || die "sed failed"
48 + makefile || die
49
50 if ! use alsa ; then
51 sed -i \
52 -e "/DEFAULT_SNDAPI/s:ALSA:OSS:" \
53 - makefile \
54 - || die "sed failed"
55 + makefile || die
56 fi
57 }
58
59 src_compile() {
60 if use opengl || ! use dedicated ; then
61 - emake cl-${PN} || die "emake cl-${PN} failed"
62 + emake cl-${PN}
63 if use sdl ; then
64 - emake sdl-${PN} || die "emake sdl-${PN} failed"
65 + emake sdl-${PN}
66 fi
67 fi
68
69 if use dedicated ; then
70 - emake sv-${PN} || die "emake sv-${PN} failed"
71 + emake sv-${PN}
72 fi
73 }
74
75 src_install() {
76 if use opengl || ! use dedicated ; then
77 - dogamesbin ${PN}-glx || die "dogamesbin glx failed"
78 + dogamesbin ${PN}-glx
79 doicon ${PN}.xpm
80 make_desktop_entry ${PN}-glx "Nexuiz (GLX)"
81 if use sdl ; then
82 - dogamesbin ${PN}-sdl || die "dogamesbin sdl failed"
83 + dogamesbin ${PN}-sdl
84 make_desktop_entry ${PN}-sdl "Nexuiz (SDL)"
85 dosym ${PN}-sdl "${GAMES_BINDIR}"/${PN}
86 else
87 @@ -117,10 +114,10 @@
88 fi
89
90 if use dedicated ; then
91 - dogamesbin ${PN}-dedicated || die "dogamesbin dedicated failed"
92 + dogamesbin ${PN}-dedicated
93 fi
94
95 - cd "${WORKDIR}"/${MY_PN}
96 + cd "${WORKDIR}"/${MY_PN} || die
97
98 dodoc Docs/*.txt
99 dohtml -r readme.html Docs
100 @@ -128,11 +125,10 @@
101 insinto "${GAMES_DATADIR}"/${PN}
102
103 if use dedicated ; then
104 - doins -r server || die "doins server failed"
105 + doins -r server
106 fi
107
108 - doins -r data || die "doins data failed"
109 - doins -r havoc || die "doins havoc failed"
110 + doins -r data havoc
111
112 prepgamesdirs
113 }
114
115
116
117 1.41 games-fps/nexuiz/ChangeLog
118
119 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/nexuiz/ChangeLog?rev=1.41&view=markup
120 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/nexuiz/ChangeLog?rev=1.41&content-type=text/plain
121 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/nexuiz/ChangeLog?r1=1.40&r2=1.41
122
123 Index: ChangeLog
124 ===================================================================
125 RCS file: /var/cvsroot/gentoo-x86/games-fps/nexuiz/ChangeLog,v
126 retrieving revision 1.40
127 retrieving revision 1.41
128 diff -u -r1.40 -r1.41
129 --- ChangeLog 19 Nov 2013 01:03:52 -0000 1.40
130 +++ ChangeLog 21 Nov 2013 20:05:21 -0000 1.41
131 @@ -1,6 +1,9 @@
132 # ChangeLog for games-fps/nexuiz
133 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
134 -# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/ChangeLog,v 1.40 2013/11/19 01:03:52 hasufell Exp $
135 +# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/ChangeLog,v 1.41 2013/11/21 20:05:21 mr_bones_ Exp $
136 +
137 + 21 Nov 2013; Michael Sterrett <mr_bones_@g.o> nexuiz-2.5.2.ebuild:
138 + EAPI=5; tidy
139
140 19 Nov 2013; Julian Ospald <hasufell@g.o>
141 +files/nexuiz-2.5.2-libpng-1.4.patch, nexuiz-2.5.2.ebuild: