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-action/descent3: descent3-1.4.0b-r2.ebuild ChangeLog
Date: Mon, 01 Jun 2015 22:05:50
Message-Id: 20150601220545.03637A1C@oystercatcher.gentoo.org
1 mr_bones_ 15/06/01 22:05:44
2
3 Modified: descent3-1.4.0b-r2.ebuild ChangeLog
4 Log:
5 clean up app-emulation/emul-linux which has been removed
6
7 (Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)
8
9 Revision Changes Path
10 1.2 games-action/descent3/descent3-1.4.0b-r2.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/descent3/descent3-1.4.0b-r2.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/descent3/descent3-1.4.0b-r2.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/descent3/descent3-1.4.0b-r2.ebuild?r1=1.1&r2=1.2
15
16 Index: descent3-1.4.0b-r2.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/games-action/descent3/descent3-1.4.0b-r2.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- descent3-1.4.0b-r2.ebuild 27 Jun 2014 11:29:22 -0000 1.1
23 +++ descent3-1.4.0b-r2.ebuild 1 Jun 2015 22:05:44 -0000 1.2
24 @@ -1,9 +1,8 @@
25 -# Copyright 1999-2014 Gentoo Foundation
26 +# Copyright 1999-2015 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/games-action/descent3/descent3-1.4.0b-r2.ebuild,v 1.1 2014/06/27 11:29:22 mgorny Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/games-action/descent3/descent3-1.4.0b-r2.ebuild,v 1.2 2015/06/01 22:05:44 mr_bones_ Exp $
30
31 EAPI=5
32 -
33 inherit eutils unpacker cdrom multilib games
34
35 IUSE="nocd videos"
36 @@ -17,22 +16,12 @@
37 KEYWORDS="~amd64 ~x86"
38 RESTRICT="strip"
39
40 -DEPEND=""
41 RDEPEND="sys-libs/glibc
42 - || (
43 - (
44 - media-libs/libsdl[abi_x86_32(-)]
45 - media-libs/smpeg[abi_x86_32(-)]
46 - virtual/opengl[abi_x86_32(-)]
47 - x11-libs/libX11[abi_x86_32(-)]
48 - x11-libs/libXext[abi_x86_32(-)]
49 - )
50 - amd64? (
51 - app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
52 - app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
53 - app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
54 - )
55 - )"
56 + media-libs/libsdl[abi_x86_32(-)]
57 + media-libs/smpeg[abi_x86_32(-)]
58 + virtual/opengl[abi_x86_32(-)]
59 + x11-libs/libX11[abi_x86_32(-)]
60 + x11-libs/libXext[abi_x86_32(-)]"
61
62 dir=${GAMES_PREFIX_OPT}/${PN}
63 Ddir=${D}/${dir}
64 @@ -70,8 +59,8 @@
65
66 cd "${Ddir}" || die
67 # TODO: move this to src_unpack where it belongs
68 - tar xzf ${CDROM_ROOT}/data.tar.gz || die "uncompressing data"
69 - tar xzf ${CDROM_ROOT}/shared.tar.gz || die "uncompressing shared"
70 + tar xzf ${CDROM_ROOT}/data.tar.gz || die
71 + tar xzf ${CDROM_ROOT}/shared.tar.gz || die
72
73 if use nocd; then
74 doins -r ${CDROM_ROOT}/missions
75 @@ -84,10 +73,10 @@
76
77 cd "${S}"/a || die
78 bin/Linux/x86/loki_patch --verify patch.dat || die
79 - bin/Linux/x86/loki_patch patch.dat "${Ddir}" >& /dev/null || die "patching a"
80 + bin/Linux/x86/loki_patch patch.dat "${Ddir}" >& /dev/null || die
81 cd "${S}"/b || die
82 bin/Linux/x86/loki_patch --verify patch.dat || die
83 - bin/Linux/x86/loki_patch patch.dat "${Ddir}" >& /dev/null || die "patching b"
84 + bin/Linux/x86/loki_patch patch.dat "${Ddir}" >& /dev/null || die
85
86 # now, since these files are coming off a cd, the times/sizes/md5sums wont
87 # be different ... that means portage will try to unmerge some files (!)
88
89
90
91 1.35 games-action/descent3/ChangeLog
92
93 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/descent3/ChangeLog?rev=1.35&view=markup
94 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/descent3/ChangeLog?rev=1.35&content-type=text/plain
95 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/descent3/ChangeLog?r1=1.34&r2=1.35
96
97 Index: ChangeLog
98 ===================================================================
99 RCS file: /var/cvsroot/gentoo-x86/games-action/descent3/ChangeLog,v
100 retrieving revision 1.34
101 retrieving revision 1.35
102 diff -u -r1.34 -r1.35
103 --- ChangeLog 7 Sep 2014 19:57:08 -0000 1.34
104 +++ ChangeLog 1 Jun 2015 22:05:44 -0000 1.35
105 @@ -1,6 +1,10 @@
106 # ChangeLog for games-action/descent3
107 -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
108 -# $Header: /var/cvsroot/gentoo-x86/games-action/descent3/ChangeLog,v 1.34 2014/09/07 19:57:08 ulm Exp $
109 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
110 +# $Header: /var/cvsroot/gentoo-x86/games-action/descent3/ChangeLog,v 1.35 2015/06/01 22:05:44 mr_bones_ Exp $
111 +
112 + 01 Jun 2015; Michael Sterrett <mr_bones_@g.o>
113 + descent3-1.4.0b-r2.ebuild:
114 + clean up app-emulation/emul-linux which has been removed
115
116 07 Sep 2014; Ulrich Müller <ulm@g.o> -descent3-1.4.0b-r1.ebuild:
117 Remove old, bug 517932.