Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
Date: Sat, 27 Oct 2018 08:04:04
Message-Id: 1540627427.63f72d4c5ec950a080be28f51dee984844b1bf2e.mgorny@gentoo
1 commit: 63f72d4c5ec950a080be28f51dee984844b1bf2e
2 Author: Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
3 AuthorDate: Thu Oct 25 18:53:03 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 27 08:03:47 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63f72d4c
7
8 games-emulation/pcsx2: update live ebuild.
9
10 1. EAPI version bump.
11 2. Added virtual/libudev dependency.
12 3. Dropped l10n.eclass
13
14 Closes: https://bugs.gentoo.org/669398
15 Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
16 Closes: https://github.com/gentoo/gentoo/pull/10229
17 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
18
19 games-emulation/pcsx2/pcsx2-9999.ebuild | 17 ++++-------------
20 1 file changed, 4 insertions(+), 13 deletions(-)
21
22 diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
23 index 1ab14376a93..8a2a3fc4c02 100644
24 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild
25 +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
26 @@ -1,10 +1,9 @@
27 -# Copyright 1999-2017 Gentoo Foundation
28 +# Copyright 1999-2018 Gentoo Authors
29 # Distributed under the terms of the GNU General Public License v2
30
31 -EAPI=5
32 -PLOCALES="ar_SA ca_ES cs_CZ de_DE es_ES fi_FI fr_FR hr_HR hu_HU id_ID it_IT ja_JP ko_KR ms_MY nb_NO pl_PL pt_BR ru_RU sv_SE th_TH tr_TR zh_CN zh_TW"
33 +EAPI=6
34
35 -inherit cmake-utils git-r3 l10n multilib toolchain-funcs wxwidgets
36 +inherit cmake-utils git-r3 multilib toolchain-funcs wxwidgets
37
38 DESCRIPTION="A PlayStation 2 emulator"
39 HOMEPAGE="https://www.pcsx2.net"
40 @@ -26,6 +25,7 @@ RDEPEND="
41 media-libs/portaudio[abi_x86_32(-)]
42 >=sys-libs/zlib-1.2.4[abi_x86_32(-)]
43 virtual/jpeg:62[abi_x86_32(-)]
44 + virtual/libudev[abi_x86_32(-)]
45 virtual/opengl[abi_x86_32(-)]
46 x11-libs/gtk+:2[abi_x86_32(-)]
47 x11-libs/libICE[abi_x86_32(-)]
48 @@ -40,10 +40,6 @@ DEPEND="${RDEPEND}
49 >=dev-cpp/sparsehash-1.5
50 "
51
52 -clean_locale() {
53 - rm -R "${S}"/locales/"${1}" || die
54 -}
55 -
56 pkg_setup() {
57 if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
58 if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 8 ]] ; then
59 @@ -52,11 +48,6 @@ pkg_setup() {
60 fi
61 }
62
63 -src_prepare() {
64 - cmake-utils_src_prepare
65 - l10n_for_each_disabled_locale_do clean_locale
66 -}
67 -
68 src_configure() {
69 multilib_toolchain_setup x86