Gentoo Archives: gentoo-commits

From: Marcel Unbehaun <frostworks@×××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gamerlay:master commit in: games-emulation/pcsx2-meta/, games-emulation/pcsx2/
Date: Sun, 30 Oct 2011 14:21:40
Message-Id: 0256eb84d6dce43ff4ed7b8f0d54d05c7a74eb97.frostwork@gentoo
1 commit: 0256eb84d6dce43ff4ed7b8f0d54d05c7a74eb97
2 Author: Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
3 AuthorDate: Sun Oct 30 14:20:58 2011 +0000
4 Commit: Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
5 CommitDate: Sun Oct 30 14:20:58 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=0256eb84
7
8 [games-emulation/pcsx2-meta] moved plugin use into -meta
9
10 ---
11 games-emulation/{pcsx2 => pcsx2-meta}/metadata.xml | 2 +-
12 games-emulation/pcsx2-meta/pcsx2-meta-9999.ebuild | 34 ++++++++++++++++++++
13 games-emulation/pcsx2/metadata.xml | 17 ----------
14 games-emulation/pcsx2/pcsx2-0.9.8.ebuild | 20 +----------
15 games-emulation/pcsx2/pcsx2-9999.ebuild | 23 +------------
16 5 files changed, 39 insertions(+), 57 deletions(-)
17
18 diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2-meta/metadata.xml
19 similarity index 97%
20 copy from games-emulation/pcsx2/metadata.xml
21 copy to games-emulation/pcsx2-meta/metadata.xml
22 index b96b78d..c83d8c2 100644
23 --- a/games-emulation/pcsx2/metadata.xml
24 +++ b/games-emulation/pcsx2-meta/metadata.xml
25 @@ -7,7 +7,7 @@
26 </maintainer>
27 <herd>games</herd>
28 <longdescription lang="en">
29 -the one and only ps2 emulator
30 +meta pakage for pcsx2 and plugins
31 </longdescription>
32 <use>
33 <flag name="cdvdiso">enable cdvdiso plugin support</flag>
34
35 diff --git a/games-emulation/pcsx2-meta/pcsx2-meta-9999.ebuild b/games-emulation/pcsx2-meta/pcsx2-meta-9999.ebuild
36 new file mode 100644
37 index 0000000..a8ba0df
38 --- /dev/null
39 +++ b/games-emulation/pcsx2-meta/pcsx2-meta-9999.ebuild
40 @@ -0,0 +1,34 @@
41 +# Copyright 1999-2011 Gentoo Foundation
42 +# Distributed under the terms of the GNU General Public License v2
43 +# $Header: $
44 +
45 +EAPI="2"
46 +
47 +inherit eutils
48 +
49 +DESCRIPTION="meta package for pcsx2 and plugins"
50 +HOMEPAGE="http://www.pcsx2.net"
51 +SRC_URI=""
52 +
53 +LICENSE="GPL-3"
54 +SLOT="0"
55 +KEYWORDS="~x86"
56 +IUSE="cdvdiso cdvdlinuz cdvdnull dev9null fwnull gsdx gsnull onepad padnull spu2null spu2-x usbnull zerogs zerospu zzogl"
57 +
58 +RDEPEND=" games-emulation/pcsx2
59 + cdvdiso? ( games-emulation/ps2emu-cdvdiso )
60 + cdvdlinuz? ( games-emulation/ps2emu-cdvdlinuz )
61 + cdvdnull? ( games-emulation/ps2emu-cdvdnull )
62 + dev9null? ( games-emulation/ps2emu-dev9null )
63 + fwnull? ( games-emulation/ps2emu-fwnull )
64 + gsdx? ( games-emulation/ps2emu-gsdx )
65 + gsnull? ( games-emulation/ps2emu-gsnull )
66 + onepad? ( games-emulation/ps2emu-onepad )
67 + padnull? ( games-emulation/ps2emu-padnull )
68 + spu2null? ( games-emulation/ps2emu-spu2null )
69 + spu2-x? ( games-emulation/ps2emu-spu2-x )
70 + usbnull? ( games-emulation/ps2emu-usbnull )
71 + zerogs? ( games-emulation/ps2emu-zerogs )
72 + zerospu? ( games-emulation/ps2emu-zerospu )
73 + zzogl? ( games-emulation/ps2emu-zzogl )
74 + "
75
76 diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml
77 index b96b78d..675d7cb 100644
78 --- a/games-emulation/pcsx2/metadata.xml
79 +++ b/games-emulation/pcsx2/metadata.xml
80 @@ -9,21 +9,4 @@
81 <longdescription lang="en">
82 the one and only ps2 emulator
83 </longdescription>
84 - <use>
85 - <flag name="cdvdiso">enable cdvdiso plugin support</flag>
86 - <flag name="cdvdlinuz">enable cdvdlinuz plugin support</flag>
87 - <flag name="cdvdnull">enable cdvdnull plugin support</flag>
88 - <flag name="dev9null">enable dev9null plugin support</flag>
89 - <flag name="fwnull">enable fwnull plugin support</flag>
90 - <flag name="gsdx">enable gsdx plugin support</flag>
91 - <flag name="gsnull">enable gsnull plugin support</flag>
92 - <flag name="onepad">enable onepad plugin support</flag>
93 - <flag name="padnull">enable padnull plugin support</flag>
94 - <flag name="spu2null">enable spu2null plugin support</flag>
95 - <flag name="spu2-x">enable spu2-x plugin support</flag>
96 - <flag name="usbnull">enable usbnull plugin support</flag>
97 - <flag name="zerogs">enable zerogs plugin support</flag>
98 - <flag name="zerospu">enable zerospu plugin support</flag>
99 - <flag name="zzogl">enable zzogl plugin support</flag>
100 - </use>
101 </pkgmetadata>
102
103 diff --git a/games-emulation/pcsx2/pcsx2-0.9.8.ebuild b/games-emulation/pcsx2/pcsx2-0.9.8.ebuild
104 index 73b3bbd..b656a15 100644
105 --- a/games-emulation/pcsx2/pcsx2-0.9.8.ebuild
106 +++ b/games-emulation/pcsx2/pcsx2-0.9.8.ebuild
107 @@ -15,7 +15,7 @@ SRC_URI="http://forums.pcsx2.net/attachment.php?aid=28280 -> ${P}.7z"
108 LICENSE="GPL-3"
109 SLOT="0"
110 KEYWORDS="~x86"
111 -IUSE="cdvdiso cdvdlinuz cdvdnull dev9null fwnull gsdx gsnull onepad padnull spu2null spu2-x usbnull zerogs zerospu zzogl debug"
112 +IUSE="debug"
113
114 if use amd64; then
115 ABI="x86"
116 @@ -51,23 +51,7 @@ DEPEND="dev-cpp/sparsehash
117 app-emulation/emul-linux-x86-sdl
118 app-emulation/emul-linux-x86-soundlibs
119 app-emulation/emul-linux-x86-wxGTK
120 - )
121 - cdvdiso? ( games-emulation/ps2emu-cdvdiso )
122 - cdvdlinuz? ( games-emulation/ps2emu-cdvdlinuz )
123 - cdvdnull? ( games-emulation/ps2emu-cdvdnull )
124 - dev9null? ( games-emulation/ps2emu-dev9null )
125 - fwnull? ( games-emulation/ps2emu-fwnull )
126 - gsdx? ( games-emulation/ps2emu-gsdx )
127 - gsnull? ( games-emulation/ps2emu-gsnull )
128 - onepad? ( games-emulation/ps2emu-onepad )
129 - padnull? ( games-emulation/ps2emu-padnull )
130 - spu2null? ( games-emulation/ps2emu-spu2null )
131 - spu2-x? ( games-emulation/ps2emu-spu2-x )
132 - usbnull? ( games-emulation/ps2emu-usbnull )
133 - zerogs? ( games-emulation/ps2emu-zerogs )
134 - zerospu? ( games-emulation/ps2emu-zerospu )
135 - zzogl? ( games-emulation/ps2emu-zzogl )
136 - "
137 + )"
138 RDEPEND="${DEPEND}"
139
140 S=${WORKDIR}/${MY_PV}
141
142 diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
143 index 6237e3e..2af3a18 100644
144 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild
145 +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
146 @@ -17,7 +17,7 @@ LICENSE="GPL-3"
147 SLOT="0"
148 KEYWORDS=""
149
150 -IUSE="cdvdiso cdvdlinuz cdvdnull dev9null fwnull gsdx gsnull onepad padnull spu2null spu2-x usbnull zerogs zerospu zzogl debug"
151 +IUSE="debug"
152
153 if use amd64; then
154 ABI="x86"
155 @@ -28,9 +28,6 @@ else
156 CMAKE_BUILD_TYPE="Release"
157 fi
158
159 -PDEPEND="
160 - "
161 -
162 DEPEND="dev-cpp/sparsehash
163 x86? (
164 app-arch/bzip2
165 @@ -56,23 +53,7 @@ DEPEND="dev-cpp/sparsehash
166 app-emulation/emul-linux-x86-sdl
167 app-emulation/emul-linux-x86-soundlibs
168 app-emulation/emul-linux-x86-wxGTK
169 - )
170 - cdvdiso? ( games-emulation/ps2emu-cdvdiso )
171 - cdvdlinuz? ( games-emulation/ps2emu-cdvdlinuz )
172 - cdvdnull? ( games-emulation/ps2emu-cdvdnull )
173 - dev9null? ( games-emulation/ps2emu-dev9null )
174 - fwnull? ( games-emulation/ps2emu-fwnull )
175 - gsdx? ( games-emulation/ps2emu-gsdx )
176 - gsnull? ( games-emulation/ps2emu-gsnull )
177 - onepad? ( games-emulation/ps2emu-onepad )
178 - padnull? ( games-emulation/ps2emu-padnull )
179 - spu2null? ( games-emulation/ps2emu-spu2null )
180 - spu2-x? ( games-emulation/ps2emu-spu2-x )
181 - usbnull? ( games-emulation/ps2emu-usbnull )
182 - zerogs? ( games-emulation/ps2emu-zerogs )
183 - zerospu? ( games-emulation/ps2emu-zerospu )
184 - zzogl? ( games-emulation/ps2emu-zzogl )
185 - "
186 + )"
187 RDEPEND="${DEPEND}"
188
189 src_prepare() {