gentoo auto-resync : 25:06:2023 - 19:30:41

5 files changed, 60 insertions, 2 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 042aaec75000..68f2a0e7746e 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest
index 9efa079042b4..b998d1aac67c 100644
--- a/app-admin/fluentd/Manifest
+++ b/app-admin/fluentd/Manifest
@@ -3,5 +3,5 @@ AUX fluentd.confd 85 BLAKE2B 742ae368e0a8dd99f2f697c9438fc0ae4814693ee547be39b3b
 AUX fluentd.initd 400 BLAKE2B 7c073341f652e393b3ffc8d1fc2bc54b72edc912dc9175263b4b1313e052016454cf5831747539222d6b06b6c28bff8056d3cd9d9d7047ae8e6f771b08e98b7b SHA512 6ca68c87adc6377b6fbfcc14329747b3b2e8c29c2edb842513122ff1f1cbaccd59e35f08aacb092acf115942a24b44d96fe524618c289d3885dbcf708be4f4ac
 AUX fluentd.logrotate 191 BLAKE2B da3f35ab90d627f35aba5a1b5e51ec54d649c725bb50ca2e5cc66561c94bedb2eaa83e6489051dbf2c1ea209fe35f0b77be1228f1b8e46d61aa00775e65abfbd SHA512 f74c0ef04f479adb7c11074ddd803c2574fadb7ce90022f3efc28c1d44d0b77b1483c7bb217652decf22f879a69c7ba1ee7bdc78e5b153762a4f535ea5faa404
 DIST fluentd-1.14.4.gem 852480 BLAKE2B d358a067dbfd50164583e629133632039543560104ba5c2b71fb44e3eba0d4119e73556a64f20f60d1c4d67c9c430fa4ab9e3c37e6d0cba166de9396a9dc339b SHA512 09770d0a02e1a29cc0504cd384365fff9445ba5257950b7154f7ba939dbaefcc6b9b1441838cb89d4ddb3101f1715c271de27e1cf46aac430daf968ce145fbe0
-EBUILD fluentd-1.14.4.ebuild 1484 BLAKE2B 7785eb3b700dd566bed2267c2db12b8f0cb89ae5ca0bd135998e71ad265f915a0ac376d10d133e948cf60963b2cb8a000a13bcb91b4fdb29be1835e1bdc43814 SHA512 12de72c3a076ea06eac2a753286fa6a496e072a60ccdc2619578dd321ab28db600e99c508a008d5a206998863c8a0b71ca2e79d7679fda1044d0e5fabb43c58c
+EBUILD fluentd-1.14.4.ebuild 1491 BLAKE2B 8bac4a13d5cafff0190dc6cde8d281035ada9015b742030ef270ff5264785bc2f7000dd4f16254c9798c0a9a5c2d8f6c585f1dbc86f99c4b2c7c65076fe58c01 SHA512 2a841aa5c4a7e83aa49f7c7f70ba9c89a3bb156a9ad31423fb6ced64335dcebcc1e6c8ef32a49c641ada21fedc43baea02afddfd16ec5d1d770025c16171c7ff
 MISC metadata.xml 558 BLAKE2B 99fdce6d7b1b9a5a624b92f8d231e9b52aad53aa227fe3f59eb2b936751e613919517a2cc86078b7e6681c5b6fb82cbaea8c74857613de05671f6519b7f56677 SHA512 6daf1af528802d95ecacb1cd579fc4515699c85c408ca63d9bede8b24a0f7a85a6de07ea3ad75a183c23caa8bd279bac69a32dcc38727c9a5850845cc59e135c
diff --git a/app-admin/fluentd/fluentd-1.14.4.ebuild b/app-admin/fluentd/fluentd-1.14.4.ebuild
index f321af8ee374..bce8cd6013be 100644
--- a/app-admin/fluentd/fluentd-1.14.4.ebuild
+++ b/app-admin/fluentd/fluentd-1.14.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index f686ed40bb57..959ef2dbd528 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,3 +1,5 @@
 DIST r10k-3.15.0.gem 257536 BLAKE2B 50ddb734bef782d9b061f17338d05c8fd824d0cc1e6005c538c4ef91c584bfe9ecbfb5bc5dc033317344bad7b14825cea6a56e136efec5081778582b8c714b18 SHA512 97cbb0a3e6f23591370de339e3320d9cbff726968b3b73d2bb00ebca7637406a371d1464d3ac955b7aacc4f5cfa898b828095aebaebe24bffd7d90be462457a9
+DIST r10k-3.15.4.tar.gz 258268 BLAKE2B 6f2f69895d84e13f54f2a7e6dba086c5b4234f0644709dafa8f88366dbe37fe8f165ef2d316f4c5b60df843448d164132878d67750bc3a65a2b8f66b205d3266 SHA512 521cf69a7372a60db74c3795b608c5ab4148f628365210228d79d9146a80d7105e4c757241e891e8e37027ae0cc2f37e59773c9838bd88042b0fdab13e36cd88
 EBUILD r10k-3.15.0.ebuild 1280 BLAKE2B 07783efec4028a34c7d870c844f27375b4ce2dc92080bdce3a5d9f1839f91a0e4951eebb52d1154687115c7311382c34088ddf346b668aa6012f966436544db3 SHA512 bfbaa654b1516994e384d91cc9915ef856e2f4d21c9e10e808475cf961b3916b62a9020b1b3fd36ab51f470fd5b3403de5eb3494a958f664d461bb561e75aebc
+EBUILD r10k-3.15.4.ebuild 1392 BLAKE2B 272088e7e8e0cfc59afba5e904dd490745664670905f2c3f9cfa81ef3347048821893f9fb9d8978f17d0dc5c364d725406e3277911f8f9a7f4fca111eeaae763 SHA512 e91232a6afbffda1dcc8e1f11a5ecf1cda219ea91c947eab47914959aa0ae40d0d175dba892133552e9800bdb26e3a6c5dd871a96f2e45f9378baaf9fe892dda
 MISC metadata.xml 583 BLAKE2B ba9d1aa2afa56933206aac7d21a4d68eba309714a20ceebdd93d3e2ec96a08af0b6ca67a0badc24065cf3422e0cf3ec8538fe4574e099715cfb0c923ad4b318c SHA512 609f9a84804a73f28fcebe1081296735b34cd54927b770fd10ef82113ffeceb2f04c3e8dd100d5c018659f11227d6807d138de318e65c8e5f6fe1dd800a2c207
diff --git a/app-admin/r10k/r10k-3.15.4.ebuild b/app-admin/r10k/r10k-3.15.4.ebuild
new file mode 100644
index 000000000000..f969291853b8
--- /dev/null
+++ b/app-admin/r10k/r10k-3.15.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL=locales
+
+inherit ruby-fakegem
+
+DESCRIPTION="Puppet environment and module deployment"
+HOMEPAGE="https://github.com/puppetlabs/r10k"
+SRC_URI="https://github.com/puppetlabs/r10k/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+git"
+
+ruby_add_rdepend "
+	~dev-ruby/colored2-3.1.2
+	>=dev-ruby/cri-2.15.10:0
+	>=dev-ruby/gettext-setup-0.24:0
+	|| ( dev-ruby/fast_gettext:2 >=dev-ruby/fast_gettext-1.1:0 )
+	>=dev-ruby/jwt-2.2.3:2
+	>=dev-ruby/ruby-gettext-3.0.2:0
+	~dev-ruby/log4r-1.1.10
+	>=dev-ruby/minitar-0.9:0
+	>=dev-ruby/multi_json-1.10:0
+	=dev-ruby/puppet_forge-3*
+"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/minitar-0.9
+)"
+
+RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
+
+all_ruby_prepare() {
+	sed -e '/s.files/d' \
+		-e '/fast_gettext/ s/1.1.0/1.1/' \
+		-e "/gettext/ s/'< 3.3.0'//" \
+		-e '/jwt/ s/~>/>=/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs for unpackaged rugget git provider
+	rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
+
+	# Avoid spec making assumptions on availability of relative symlinks
+	rm -f spec/integration/util/purageable_spec.rb || die
+}