From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1483882-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B459715800F
for <garchives@archives.gentoo.org>; Sat, 4 Feb 2023 07:08:05 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A969FE07E0;
Sat, 4 Feb 2023 07:08:04 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 8DAE6E07E0
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Feb 2023 07:08:04 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9BF72340CE1
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Feb 2023 07:08:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DC1868A1
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Feb 2023 07:08:00 +0000 (UTC)
From: "Hans de Graaff" <graaff@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" <graaff@gentoo.org>
Message-ID: <1675494472.cb5f042b87250429f5d49f12796f31eb87d6cca0.graaff@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/faker/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-ruby/faker/faker-2.23.0-r1.ebuild dev-ruby/faker/faker-3.1.0.ebuild
X-VCS-Directories: dev-ruby/faker/
X-VCS-Committer: graaff
X-VCS-Committer-Name: Hans de Graaff
X-VCS-Revision: cb5f042b87250429f5d49f12796f31eb87d6cca0
X-VCS-Branch: master
Date: Sat, 4 Feb 2023 07:08:00 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f7d04413-34cd-4084-918f-aeeac2e3c296
X-Archives-Hash: 18d646b2b915dc486fec80eae93c36f8
commit: cb5f042b87250429f5d49f12796f31eb87d6cca0
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 12:24:07 2023 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 07:07:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb5f042b
dev-ruby/faker: fix file collision between slots
Closes: https://bugs.gentoo.org/892611
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
dev-ruby/faker/{faker-3.1.0.ebuild => faker-2.23.0-r1.ebuild} | 3 ++-
dev-ruby/faker/faker-3.1.0.ebuild | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dev-ruby/faker/faker-3.1.0.ebuild b/dev-ruby/faker/faker-2.23.0-r1.ebuild
similarity index 92%
copy from dev-ruby/faker/faker-3.1.0.ebuild
copy to dev-ruby/faker/faker-2.23.0-r1.ebuild
index 5332cb86e976..d8d60e7f757c 100644
--- a/dev-ruby/faker/faker-3.1.0.ebuild
+++ b/dev-ruby/faker/faker-2.23.0-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
USE_RUBY="ruby27 ruby30 ruby31"
+RUBY_FAKEGEM_BINWRAP=""
RUBY_FAKEGEM_RECIPE_DOC="none"
RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
diff --git a/dev-ruby/faker/faker-3.1.0.ebuild b/dev-ruby/faker/faker-3.1.0.ebuild
index 5332cb86e976..87391f4b74e7 100644
--- a/dev-ruby/faker/faker-3.1.0.ebuild
+++ b/dev-ruby/faker/faker-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,7 +20,7 @@ SLOT="$(ver_cut 1)"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="test"
-ruby_add_rdepend ">=dev-ruby/i18n-1.8.11:1"
+ruby_add_rdepend ">=dev-ruby/i18n-1.8.11:1 !<dev-ruby/faker-2.23.0-r1"
ruby_add_bdepend "test? ( dev-ruby/timecop )"