public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
Date: Thu, 20 Oct 2022 04:25:08 +0000 (UTC)	[thread overview]
Message-ID: <1666239744.53cbf3cf4dd1b3c608bab9994aa8b1af6c40341a.sam@gentoo> (raw)

commit:     53cbf3cf4dd1b3c608bab9994aa8b1af6c40341a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 04:22:09 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 04:22:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53cbf3cf

games-action/prismlauncher: add !games-action/polymc

They may install the same JAR files.

Bug: https://github.com/gentoo/gentoo/pull/27860
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-action/prismlauncher/prismlauncher-5.0.ebuild  | 2 ++
 games-action/prismlauncher/prismlauncher-9999.ebuild | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/games-action/prismlauncher/prismlauncher-5.0.ebuild b/games-action/prismlauncher/prismlauncher-5.0.ebuild
index ae1e581ba2f0..1de25bc2a4f4 100644
--- a/games-action/prismlauncher/prismlauncher-5.0.ebuild
+++ b/games-action/prismlauncher/prismlauncher-5.0.ebuild
@@ -97,6 +97,8 @@ DEPEND="
 RDEPEND="
 	${COMMON_DEPENDS}
 
+	!games-action/polymc
+
 	!qt6? ( >=dev-qt/qtsvg-${MIN_QT_5_VERSION}:5 )
 	 qt6? ( >=dev-qt/qtsvg-${MIN_QT_6_VERSION}:6 )
 

diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
index ae1e581ba2f0..1de25bc2a4f4 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -97,6 +97,8 @@ DEPEND="
 RDEPEND="
 	${COMMON_DEPENDS}
 
+	!games-action/polymc
+
 	!qt6? ( >=dev-qt/qtsvg-${MIN_QT_5_VERSION}:5 )
 	 qt6? ( >=dev-qt/qtsvg-${MIN_QT_6_VERSION}:6 )
 


             reply	other threads:[~2022-10-20  4:25 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-20  4:25 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-06-26 20:07 [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/ Sam James
2025-06-22 19:40 Arthur Zamarin
2025-05-10 12:14 Arthur Zamarin
2025-04-18 14:38 Nowa Ammerlaan
2024-12-31 12:47 Sam James
2024-11-23 17:43 Andreas Sturmlechner
2024-11-23 17:43 Andreas Sturmlechner
2024-11-23 17:43 Andreas Sturmlechner
2024-11-21 13:47 Jakov Smolić
2024-08-31 13:31 Andrew Ammerlaan
2024-07-20 13:12 Andrew Ammerlaan
2024-07-20 13:12 Andrew Ammerlaan
2024-05-17 14:13 Andrew Ammerlaan
2024-04-16 16:33 Andrew Ammerlaan
2024-04-16 16:31 Arthur Zamarin
2024-04-16 13:49 Andrew Ammerlaan
2024-04-11  9:14 Andrew Ammerlaan
2024-04-11  9:00 Arthur Zamarin
2024-03-14 19:34 Andrew Ammerlaan
2023-11-09  7:47 Andrew Ammerlaan
2023-11-09  7:47 Andrew Ammerlaan
2023-11-09  7:47 Andrew Ammerlaan
2023-11-09  7:47 Andrew Ammerlaan
2023-11-09  7:47 Andrew Ammerlaan
2023-11-09  7:47 Andrew Ammerlaan
2023-09-12  6:44 Joonas Niilola
2023-07-29 12:17 Andrew Ammerlaan
2023-07-29 12:17 Andrew Ammerlaan
2023-07-29 12:17 Andrew Ammerlaan
2023-06-18 19:37 Andrew Ammerlaan
2023-06-18 19:37 Andrew Ammerlaan
2023-06-13 19:51 Andrew Ammerlaan
2023-06-13 19:51 Andrew Ammerlaan
2023-06-13 19:51 Andrew Ammerlaan
2023-02-03 19:33 Andrew Ammerlaan
2023-02-03 19:33 Andrew Ammerlaan
2022-12-20  9:54 Andrew Ammerlaan
2022-12-20  9:54 Andrew Ammerlaan
2022-12-12 17:56 Andrew Ammerlaan
2022-12-12 17:56 Andrew Ammerlaan
2022-12-12 17:56 Andrew Ammerlaan
2022-11-16  9:26 Andrew Ammerlaan
2022-11-16  9:26 Andrew Ammerlaan
2022-11-15 22:24 Sam James
2022-11-15 22:24 Sam James
2022-11-15 21:03 Andrew Ammerlaan
2022-11-15 21:03 Andrew Ammerlaan
2022-11-02 11:49 Andrew Ammerlaan
2022-11-02 11:49 Andrew Ammerlaan
2022-11-02 11:49 Andrew Ammerlaan
2022-10-20 12:23 Jakov Smolić
2022-10-20  4:25 Sam James
2022-10-20  4:25 Sam James
2022-10-20  4:25 Sam James

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=1666239744.53cbf3cf4dd1b3c608bab9994aa8b1af6c40341a.sam@gentoo \
    --to=sam@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