public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/
Date: Mon, 30 Apr 2018 15:58:28 +0000 (UTC)	[thread overview]
Message-ID: <1525102789.f9d44b3f8086eeedd82289799efccf5784b32130.floppym@gentoo> (raw)

commit:     f9d44b3f8086eeedd82289799efccf5784b32130
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Apr 30 14:18:06 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 15:39:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9d44b3f

games-simulation/openrct2: Clean media-libs/speex dependencies.

 games-simulation/openrct2/openrct2-0.1.1.ebuild | 8 +++-----
 games-simulation/openrct2/openrct2-9999.ebuild  | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/games-simulation/openrct2/openrct2-0.1.1.ebuild b/games-simulation/openrct2/openrct2-0.1.1.ebuild
index c93e3088f8a..cc286b38589 100644
--- a/games-simulation/openrct2/openrct2-0.1.1.ebuild
+++ b/games-simulation/openrct2/openrct2-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,10 +33,8 @@ RDEPEND="
 	>=dev-libs/libzip-1.0
 	media-libs/libpng:0=
 	media-libs/libsdl2
-	|| (
-		media-libs/speexdsp
-		<media-libs/speex-1.2.0
-	)
+	>=media-libs/speex-1.2.0
+	media-libs/speexdsp
 	multiplayer? (
 		libressl? ( dev-libs/libressl:0= )
 		!libressl? ( dev-libs/openssl:0= )

diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index c93e3088f8a..cc286b38589 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,10 +33,8 @@ RDEPEND="
 	>=dev-libs/libzip-1.0
 	media-libs/libpng:0=
 	media-libs/libsdl2
-	|| (
-		media-libs/speexdsp
-		<media-libs/speex-1.2.0
-	)
+	>=media-libs/speex-1.2.0
+	media-libs/speexdsp
 	multiplayer? (
 		libressl? ( dev-libs/libressl:0= )
 		!libressl? ( dev-libs/openssl:0= )


             reply	other threads:[~2018-04-30 15:58 UTC|newest]

Thread overview: 153+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-30 15:58 Mike Gilbert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-09  2:38 [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/ Sam James
2025-03-09  2:38 Sam James
2025-03-09  2:38 Sam James
2025-03-01  1:14 Conrad Kostecki
2025-02-05 21:43 Conrad Kostecki
2025-02-05 21:43 Conrad Kostecki
2025-02-05 21:43 Conrad Kostecki
2025-02-05 21:43 Conrad Kostecki
2025-02-05 21:43 Conrad Kostecki
2025-02-05 21:43 Conrad Kostecki
2025-01-09 15:13 Conrad Kostecki
2025-01-09 15:13 Conrad Kostecki
2024-12-15 14:52 Conrad Kostecki
2024-12-15 14:52 Conrad Kostecki
2024-11-23 23:36 Conrad Kostecki
2024-11-23 23:36 Conrad Kostecki
2024-11-23 23:36 Conrad Kostecki
2024-11-23 23:36 Conrad Kostecki
2024-11-09  1:41 Conrad Kostecki
2024-10-15 22:13 Conrad Kostecki
2024-10-15 22:13 Conrad Kostecki
2024-10-15 22:13 Conrad Kostecki
2024-10-15 22:13 Conrad Kostecki
2024-09-15 13:50 Conrad Kostecki
2024-09-15 13:50 Conrad Kostecki
2024-09-15 13:50 Conrad Kostecki
2024-08-11 14:22 Conrad Kostecki
2024-08-11 14:22 Conrad Kostecki
2024-07-14 12:30 Conrad Kostecki
2024-07-14 12:30 Conrad Kostecki
2024-06-22 20:01 Conrad Kostecki
2024-06-08  9:37 Arthur Zamarin
2024-05-26  6:01 Sam James
2024-05-25  2:03 Sam James
2024-05-25  0:49 Sam James
2024-05-12 12:29 Conrad Kostecki
2024-05-12 12:29 Conrad Kostecki
2024-05-06 18:32 Conrad Kostecki
2024-05-06  1:51 Ionen Wolkens
2024-04-17 23:59 Sam James
2024-04-17 23:11 Sam James
2024-04-17 22:29 Sam James
2024-04-17 14:13 Conrad Kostecki
2024-04-17 14:13 Conrad Kostecki
2024-04-17 14:13 Conrad Kostecki
2024-03-10 17:06 Arthur Zamarin
2024-03-10 17:06 Arthur Zamarin
2024-03-10 13:25 Conrad Kostecki
2024-03-10 13:25 Conrad Kostecki
2024-03-03 23:16 Conrad Kostecki
2024-03-03 23:16 Conrad Kostecki
2024-02-08 21:51 Conrad Kostecki
2024-01-19 17:14 Arthur Zamarin
2024-01-04 21:08 Conrad Kostecki
2024-01-03  6:22 Sam James
2024-01-02  7:38 Sam James
2024-01-01 17:56 Conrad Kostecki
2023-10-10 23:35 Conrad Kostecki
2023-10-10 23:35 Conrad Kostecki
2023-10-10 23:35 Conrad Kostecki
2023-09-08 16:04 Conrad Kostecki
2023-08-05 22:41 Conrad Kostecki
2023-05-08 20:15 Conrad Kostecki
2023-05-08 20:15 Conrad Kostecki
2023-04-18 20:38 Conrad Kostecki
2023-04-18 20:38 Conrad Kostecki
2023-04-18 20:38 Conrad Kostecki
2023-04-01 19:39 Conrad Kostecki
2023-01-31 15:17 Conrad Kostecki
2023-01-31 15:17 Conrad Kostecki
2023-01-31 15:17 Conrad Kostecki
2022-12-15 21:14 Conrad Kostecki
2022-12-15 21:14 Conrad Kostecki
2022-11-05 19:35 Conrad Kostecki
2022-11-05 19:28 Conrad Kostecki
2022-11-05 19:28 Conrad Kostecki
2022-11-05 19:28 Conrad Kostecki
2022-11-05 19:28 Conrad Kostecki
2022-10-05 20:35 Conrad Kostecki
2022-10-05 20:35 Conrad Kostecki
2022-07-16 20:41 Conrad Kostecki
2022-07-16 20:41 Conrad Kostecki
2022-07-09 21:30 Conrad Kostecki
2022-05-27 22:34 Conrad Kostecki
2022-05-27 22:34 Conrad Kostecki
2022-04-10 22:08 Conrad Kostecki
2021-12-23 19:19 Conrad Kostecki
2021-12-23 19:19 Conrad Kostecki
2021-12-23 19:19 Conrad Kostecki
2021-12-23 19:19 Conrad Kostecki
2021-11-22 21:24 Conrad Kostecki
2021-11-22 21:24 Conrad Kostecki
2021-11-22 21:24 Conrad Kostecki
2021-11-14 13:57 Conrad Kostecki
2021-11-07 12:37 Conrad Kostecki
2021-11-07 12:37 Conrad Kostecki
2021-09-25 19:08 Sam James
2021-08-26 18:10 Conrad Kostecki
2021-08-26 18:10 Conrad Kostecki
2021-08-26 18:10 Conrad Kostecki
2021-08-26 18:10 Conrad Kostecki
2021-07-26 20:05 Conrad Kostecki
2021-07-23 19:50 Conrad Kostecki
2021-07-20 19:03 Conrad Kostecki
2021-07-20 19:03 Conrad Kostecki
2021-05-03  7:01 Mikle Kolyada
2021-04-14 20:08 Conrad Kostecki
2021-04-14 20:08 Conrad Kostecki
2021-04-14 20:08 Conrad Kostecki
2021-04-14 20:08 Conrad Kostecki
2021-03-15  6:38 Sam James
2021-03-14  0:53 Conrad Kostecki
2021-03-14  0:53 Conrad Kostecki
2020-12-17  0:54 Conrad Kostecki
2020-12-17  0:48 Sam James
2020-12-13 21:45 Thomas Deutschmann
2020-11-13 16:57 Sam James
2020-11-03  8:21 Conrad Kostecki
2020-11-03  8:21 Conrad Kostecki
2020-11-03  8:21 Conrad Kostecki
2020-10-04  0:26 Sam James
2020-10-03 14:42 Conrad Kostecki
2020-10-03 14:42 Conrad Kostecki
2020-09-23 21:54 Conrad Kostecki
2020-09-23 10:34 Agostino Sarubbo
2020-09-23 10:20 Agostino Sarubbo
2020-08-19 22:45 Conrad Kostecki
2020-08-19 22:45 Conrad Kostecki
2020-08-11 18:30 Conrad Kostecki
2020-08-11 14:23 Agostino Sarubbo
2020-08-10 12:34 Agostino Sarubbo
2020-07-19  0:08 Sam James
2020-05-10 19:45 Conrad Kostecki
2020-05-10 19:25 Conrad Kostecki
2020-05-10 19:25 Conrad Kostecki
2020-04-07 16:09 Conrad Kostecki
2020-04-07 16:09 Conrad Kostecki
2020-01-21 10:42 Agostino Sarubbo
2020-01-20 12:52 Agostino Sarubbo
2019-12-09 22:18 Conrad Kostecki
2019-12-05 21:47 Conrad Kostecki
2019-12-02 21:16 Conrad Kostecki
2019-10-28 14:43 Joonas Niilola
2019-03-10 22:38 Patrice Clement
2018-09-30 21:35 Andreas Sturmlechner
2018-08-19 12:59 Michał Górny
2018-05-09 12:26 Michał Górny
2018-05-09 12:26 Michał Górny
2018-05-09 12:26 Michał Górny
2018-05-09 12:26 Michał Górny
2017-08-11 22:12 Michał Górny
2017-07-28 12:02 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1525102789.f9d44b3f8086eeedd82289799efccf5784b32130.floppym@gentoo \
    --to=floppym@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox