Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/
Date: Mon, 30 Apr 2018 15:58:33
Message-Id: 1525102789.f9d44b3f8086eeedd82289799efccf5784b32130.floppym@gentoo
1 commit: f9d44b3f8086eeedd82289799efccf5784b32130
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Mon Apr 30 14:18:06 2018 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 30 15:39:49 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9d44b3f
7
8 games-simulation/openrct2: Clean media-libs/speex dependencies.
9
10 games-simulation/openrct2/openrct2-0.1.1.ebuild | 8 +++-----
11 games-simulation/openrct2/openrct2-9999.ebuild | 8 +++-----
12 2 files changed, 6 insertions(+), 10 deletions(-)
13
14 diff --git a/games-simulation/openrct2/openrct2-0.1.1.ebuild b/games-simulation/openrct2/openrct2-0.1.1.ebuild
15 index c93e3088f8a..cc286b38589 100644
16 --- a/games-simulation/openrct2/openrct2-0.1.1.ebuild
17 +++ b/games-simulation/openrct2/openrct2-0.1.1.ebuild
18 @@ -1,4 +1,4 @@
19 -# Copyright 1999-2017 Gentoo Foundation
20 +# Copyright 1999-2018 Gentoo Foundation
21 # Distributed under the terms of the GNU General Public License v2
22
23 EAPI=6
24 @@ -33,10 +33,8 @@ RDEPEND="
25 >=dev-libs/libzip-1.0
26 media-libs/libpng:0=
27 media-libs/libsdl2
28 - || (
29 - media-libs/speexdsp
30 - <media-libs/speex-1.2.0
31 - )
32 + >=media-libs/speex-1.2.0
33 + media-libs/speexdsp
34 multiplayer? (
35 libressl? ( dev-libs/libressl:0= )
36 !libressl? ( dev-libs/openssl:0= )
37
38 diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
39 index c93e3088f8a..cc286b38589 100644
40 --- a/games-simulation/openrct2/openrct2-9999.ebuild
41 +++ b/games-simulation/openrct2/openrct2-9999.ebuild
42 @@ -1,4 +1,4 @@
43 -# Copyright 1999-2017 Gentoo Foundation
44 +# Copyright 1999-2018 Gentoo Foundation
45 # Distributed under the terms of the GNU General Public License v2
46
47 EAPI=6
48 @@ -33,10 +33,8 @@ RDEPEND="
49 >=dev-libs/libzip-1.0
50 media-libs/libpng:0=
51 media-libs/libsdl2
52 - || (
53 - media-libs/speexdsp
54 - <media-libs/speex-1.2.0
55 - )
56 + >=media-libs/speex-1.2.0
57 + media-libs/speexdsp
58 multiplayer? (
59 libressl? ( dev-libs/libressl:0= )
60 !libressl? ( dev-libs/openssl:0= )