gentoo auto-resync : 07:12:2022 - 21:14:14

9 files changed, 43 insertions, 72 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f1ff86d67b64..b67e2abfa167 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/clinfo/Manifest b/dev-util/clinfo/Manifest
index 45313f33ab8d..5b9d59d7c366 100644
--- a/dev-util/clinfo/Manifest
+++ b/dev-util/clinfo/Manifest
@@ -1,4 +1,5 @@
 DIST clinfo-3.0.21.02.21.tar.gz 52783 BLAKE2B 17316bb57e0e2eb3ed39efd64d99301237a3d5b10734e071c89a2d6aba2f8cd2ee7ecee73bbdbac0b4de7c666c1d4e2893469eb658353471d57ab180ea449c62 SHA512 f2fe5ec450edb258412dbb458fc8895530d67cf96589c6b94f27e135227db1796582173c0fa48a578a23c572b73ddce007a6e75c67a23b297986e47792c264ad
-EBUILD clinfo-3.0.21.02.21.ebuild 616 BLAKE2B d0ed6690cd80c7ee66f0bbf21fcf42e1311d6d228994688ac078af85f7cac05f625c88a4cd6c83886a9844411545ca8028cd06a801378acfce3de5f035e38674 SHA512 0e86681c767605e2599c88f0ff4343275a31f9e0ee8d2eb7b13c80b160de4063166693689eb55124fc32de0a23efad0f8d655846b39e934d874450a517cebec0
-EBUILD clinfo-9999.ebuild 616 BLAKE2B cd523e66a26b75509ae2362e0c501a412afade736f1cfe7560e1bb05015a43aaead9f0e72e5cc843c8a6dd1a4e9bc4693de15abd0b139f0a78929afb9c54f856 SHA512 8165ecb50cef7d2645fa2a599b4fe99bf498ad268d0e807052b888d84b5134ac3a4b97b3cb79707cbd08f648d910c88d610cac80c40396cacdeaf76cd99cf999
+EBUILD clinfo-3.0.21.02.21-r1.ebuild 616 BLAKE2B 1bdbba3132e8358f02d98afd6c9b392e30aa6441e2b801e2d4d212989f2edef04ed818e9d8fbafb7b68b01253b60572c6bdd4b9a65faa2146726bff11c39d8ed SHA512 297f7bf14609cff133ada21e121d3f3f79479156d57b7fa4b6f1a0f225e96a12b18b0b9cd5d68c25860f71619826f12590166f6f5ef452a57a71e3075230cc8b
+EBUILD clinfo-3.0.21.02.21.ebuild 616 BLAKE2B f0b38f295f8a245950016ad98d5006fd7bdcef0762e5fd7d60d84fe1796598445672f72438e18a50fff56c271641134b815a0c5422c9ca67f15da85c6367d6a9 SHA512 2b938cf352329a5e5cf2fa8e060a5921d56286045adfb2f82962d9b4d3ef2a4517607721c75065486682ab7efe3dc873b054ea61805450f258cdc9ae51ac7b80
+EBUILD clinfo-9999.ebuild 616 BLAKE2B cc1a02fa653b972c99b06958335100b82b53a83924e2c4b12e5633fed8ff88f4c7ac3a5a4a21cd3df5af3a555cf827306be9fcd1fa0a693b2e8f7abcaecabbcd SHA512 9de95b700b7050f4f49bb7411e8b906076e3022e7bcff2801996134b17a60251a91b0e80c0e8712e834e197b4a692791e7fa29a565af1f8912a7ca968e59c92d
 MISC metadata.xml 328 BLAKE2B 21eff79ce1cc3c5088a2ad5d13d88fac9554f3f8d111651cd047682c66758d07469a63283d138b39e77c7dbc69cd5de70eed3be2816fbf8c51a7627741a5030d SHA512 c720305e388992ea76eb6b5924e997f84449a76a6c8d99ac73fc19a1fddb0970de2ec6596aafc7aad560122fe1cc26ed6dacf364fe6475984d01f30c8be4c2c0
diff --git a/dev-util/clinfo/clinfo-3.0.21.02.21-r1.ebuild b/dev-util/clinfo/clinfo-3.0.21.02.21-r1.ebuild
new file mode 100644
index 000000000000..24dcd892d0af
--- /dev/null
+++ b/dev-util/clinfo/clinfo-3.0.21.02.21-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Oblomov/clinfo.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/Oblomov/clinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A tool to display info about the system's OpenCL capabilities"
+HOMEPAGE="https://github.com/Oblomov/clinfo"
+LICENSE="CC0-1.0"
+SLOT="0"
+
+DEPEND=">=virtual/opencl-3"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake MANDIR="${ED}"/usr/share/man PREFIX="${ED}"/usr install
+}
diff --git a/dev-util/clinfo/clinfo-3.0.21.02.21.ebuild b/dev-util/clinfo/clinfo-3.0.21.02.21.ebuild
index d215bb747829..eb4487631051 100644
--- a/dev-util/clinfo/clinfo-3.0.21.02.21.ebuild
+++ b/dev-util/clinfo/clinfo-3.0.21.02.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,9 +14,9 @@ fi
 
 DESCRIPTION="A tool to display info about the system's OpenCL capabilities"
 HOMEPAGE="https://github.com/Oblomov/clinfo"
+
 LICENSE="CC0-1.0"
 SLOT="0"
-
 DEPEND=">=virtual/opencl-3"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-util/clinfo/clinfo-9999.ebuild b/dev-util/clinfo/clinfo-9999.ebuild
index fc1ca3477ce1..f4a2249026a2 100644
--- a/dev-util/clinfo/clinfo-9999.ebuild
+++ b/dev-util/clinfo/clinfo-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Oblomov/clinfo.git"
@@ -14,9 +14,9 @@ fi
 
 DESCRIPTION="A tool to display info about the system's OpenCL capabilities"
 HOMEPAGE="https://github.com/Oblomov/clinfo"
+
 LICENSE="CC0-1.0"
 SLOT="0"
-
 DEPEND=">=virtual/opencl-3"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index 4e4596f98034..c2dc1f86ecd3 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,8 +1,6 @@
-DIST cucumber-rails-2.5.0.tar.gz 42030 BLAKE2B 96279b72c597bcb40eebb2270ee996c08fd599f257b91beea50f84cb0cf221258bb5fec4f91ce6a2400d865763072bdd47c1b4c4a03b35b5e35e6384ab3f31fa SHA512 cb689beac565d0b193ebcfb0ce4d673cad2d50fe8db5718fda6779d08d5458e2234ccb5a1ff13eaf22b3048c9a10b4dd6148cfdedf841dd0b41366059acb0b67
 DIST cucumber-rails-2.5.1.tar.gz 42456 BLAKE2B 91448ce88fdfed2e219a6c46b7915deeccb5678ceaaf57db06fc1348facff756b0c1dd67f6d8bcbc1b36ba555ca2d31167fa20c8b5f48138c018ef5d2f65bafc SHA512 2bb1748d9710998f974fc253ae03595d8e972593423d027840d2b437a0f13a60ec0df3cc2fb7d6e30c0003d414d093e4fd3c398e0fa27441ccb431f308f89405
 DIST cucumber-rails-2.6.0.tar.gz 42630 BLAKE2B 2fac80af5cc8d5cbe2ab445d56e58188e34fd86d05ec75893eaefb3d11e58d5f86e677f1349729d21b145912931620bd76ed4e9acbbd5cc124bdfbdae3f007ab SHA512 d691cdca0f4d8a5d7a0794f5a5a15102a244da476ebd8ccda0e1c2e3521f5553373ab4a3b9bcaca20d10fd4a8a836910a938ca09450eff6b39c4446dbc5be5c8
 DIST cucumber-rails-2.6.1.tar.gz 43079 BLAKE2B c45211c8a2375fc2b488d22fb74041e5dcf56027d6644721b5023b8ad9e68f07593c448acb88b7c0e51dcad7da0213d48726e20175ecd5fd04f16174e44b848a SHA512 dd2ed4afecf74e8aac0fa360d81a27407df999b041b21c597e9ac141422cb0ece89eaa74d8da9a4fc2858efaf242837d8237a9ceee44875cff2c50d288fad480
-EBUILD cucumber-rails-2.5.0-r1.ebuild 1300 BLAKE2B 69ccd976c5906d56de8bbe3965354a7cd03d5d7764659c9a20918856773f9174b9db4d3963ab5dcde657efc5901e54595feea2e96be851086e8d1762f6a003ab SHA512 507aea58a6a2bf74018755a683dd2bc02bc505500ab9cbdfcbfdcbc57f13548deaa77d882ce48038a712e9fb0be82fe4b6a162ed5e010cd8aeaa4ac6eb7bc4cd
 EBUILD cucumber-rails-2.5.1.ebuild 1307 BLAKE2B dfdd93177aca8772a7627c5843bae145c9c81edad359bfbbe99a7d31cdc433f6e2c16eea7cfa82ad805378c41b62191f2a0f61e06488c6e8c38bee5c5c87fb82 SHA512 b3a55f93a54b7fc1e7f899eac7039a88c70930d820b3f0a894368bfd7fb35668ed746eb32d0fbcd7269893387be669e51f8e73af0eca8d3a3b4e0a23fe96fcff
 EBUILD cucumber-rails-2.6.0.ebuild 1301 BLAKE2B 5eccb0bec25819114fe9e22707f99da34899f8036bbc44bc964d656f6b85d75914ab04d9136fa653f06cd045345cee9bfe673dd91cefdb2fd5743c95f4ac40ca SHA512 e951c607696e0f4a02136dff50dc32de6e0867426a4d96bb141d419081b52a544227527289cb58a0da6abe0c2420999e60194d0f15953c4806be17230a77cf45
 EBUILD cucumber-rails-2.6.1.ebuild 1300 BLAKE2B 802511bc5fd194e52e03b9f26a68d4fcc0657793cea899b281c02d673bc19a75c82620a4adb26dbc00ea2e5ec3283527fc6dbdae28b911968056ff59b669b83f SHA512 5915c888191eca22ee1f488e93b0fa7466ca9a6c3b896a6f8bca10b2861215e988d2d6b79dff681b3425f32c434a20739df365183a98a2b7dbae5676bac4747a
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.5.0-r1.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.5.0-r1.ebuild
deleted file mode 100644
index 216aa8900a4e..000000000000
--- a/dev-util/cucumber-rails/cucumber-rails-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-# There are also cucumber features. They require a Rails project with
-# factory girl which we don't have packaged yet.
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="https://cucumber.io/"
-SRC_URI="https://github.com/cucumber/cucumber-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-# Restrict tests since Appraisal is now mandatory to manage different
-# rails versions, even for the specs.
-RESTRICT="test"
-#ruby_add_bdepend "
-#	test? (
-#		>=dev-ruby/ammeter-0.2.2
-#		>=dev-ruby/rspec-rails-2.7.0:2
-#	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/capybara-2.18:* <dev-ruby/capybara-4:*
-	>=dev-util/cucumber-3.2 <dev-util/cucumber-8
-	>=dev-ruby/mime-types-3.3:3
-	>=dev-ruby/nokogiri-1.10
-	>=dev-ruby/rails-5.0:* <dev-ruby/rails-8:*
-	dev-ruby/rexml:3
-	>=dev-ruby/webrick-1.7:0
-"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e 's/2.4.0/2.5.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-util/dirdiff/Manifest b/dev-util/dirdiff/Manifest
index 80e21a805a56..06a75deaed57 100644
--- a/dev-util/dirdiff/Manifest
+++ b/dev-util/dirdiff/Manifest
@@ -4,5 +4,5 @@ AUX dirdiff-2.1-include.patch 314 BLAKE2B 379a842839e5ae329fe61b8584204c206ce816
 AUX dirdiff-2.1-tcl8.6.patch 397 BLAKE2B 28ccdc2f87fcb3dda8191710efcc62c5c794bc734fbbe2470e40fa7f7f1337a677e3411b437aefca46afafaab3a94c011603632a26f47c9703668c9c679e8577 SHA512 938c6cf4f815f58f0de2c12b5bd19e8128615aba278c91e9c7a8e462f822b79d22f7d50ff331e095ff77ec979c9fc1a1a3a8bfd80f23c2f0e252a1e05098888e
 AUX dirdiff-2.1-vcs.patch 497 BLAKE2B 1dc187e73fb345074bfda218736137c2b34212186903870b780536ac3023e274a7eb26123deffb121dd153fa0ef00afc46f962a18932318ddd241375b204f517 SHA512 27baa8b3e0710db7ae9b01c1c132681ee71e96e4d19585fe0bdd9584e182ff96e7358df6607a40af054fdb536275b9c5a49581cde2fa934d6cf7f39489eb3a98
 DIST dirdiff-2.1.tar.gz 43105 BLAKE2B 5c9f49cb6b74434482d7d37935d47e235a46e83152d576ff83201c1dd663a101e70f853166624daaea413d9926107b7407790dceca0fbfbf3784fe6999735750 SHA512 826d5a7a633921bec7043c89ccdadff19b4a6328efd09913932b306a48242203fbf6b5bac69d72660acf2c76ce6c8c5e53be62c2e69bbf3e3717e21c544ca261
-EBUILD dirdiff-2.1-r3.ebuild 912 BLAKE2B 806b4b6caa0ecc4f5136662c1f99cae872952731d9fd1505061be156932afbe15efb34c44813ddaa1f04d8d508d0e508a3dccfbeac8b8d4dc92221855fbfcd17 SHA512 ab8e5f9880fe4212f874d84b7b80f6bd64f3cc4a306090c2631d29c91bf5cca96c856f9f9e69849817ec23f4a42643780c9ed5e09ddbe44eb8badcd3b3842877
+EBUILD dirdiff-2.1-r4.ebuild 886 BLAKE2B 1b45605354e3a9ea0033604053733343822905fa34201255254854c502519599131ec11f39e762720182571abfc779b87da8741d7b831cfc7864a91805523600 SHA512 c24f787c0197e01d45f8d7c2aa1ea8377954b78a342ba74a43d444ca166b83c42f0929969d83c702c7b5c8255e1c377a63e5f171eea8452eefb982c6d4daced4
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-util/dirdiff/dirdiff-2.1-r3.ebuild b/dev-util/dirdiff/dirdiff-2.1-r4.ebuild
index d3cf75549950..d6cd123d8c4f 100644
--- a/dev-util/dirdiff/dirdiff-2.1-r3.ebuild
+++ b/dev-util/dirdiff/dirdiff-2.1-r4.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A tool for differing and merging directories"
-SRC_URI="https://www.samba.org/ftp/paulus/${P}.tar.gz"
 HOMEPAGE="https://www.samba.org/ftp/paulus/"
+SRC_URI="https://www.samba.org/ftp/paulus/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~mips ppc x86"
 
 DEPEND="
-	dev-lang/tk:0=
-	dev-lang/tcl:0="
+	dev-lang/tk:=
+	dev-lang/tcl:=
+"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
@@ -26,16 +27,13 @@ PATCHES=(
 	"${FILESDIR}/${P}-funky-chars.patch"
 )
 
-DOCS=( README )
-
-src_prepare() {
-	default
+src_configure() {
 	tc-export CC
-	append-cppflags -I"${EPREFIX}"/usr/include/tcl
+	append-cppflags -I"${ESYSROOT}"/usr/include/tcl
 }
 
 src_install() {
-	dobin "${PN}"
+	dobin ${PN}
 	dolib.so libfilecmp.so.0.0
 	dosym libfilecmp.so.0.0 /usr/$(get_libdir)/libfilecmp.so.0
 	dosym libfilecmp.so.0.0 /usr/$(get_libdir)/libfilecmp.so