gentoo auto-resync : 11:03:2023 - 18:08:11

6 files changed, 7 insertions, 96 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 17700ba23034..1ffaa5e21ddd 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index d96d0ba5107c..0c35ad7e19d9 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -2,6 +2,6 @@ DIST conky-1.13.1.tar.gz 2443276 BLAKE2B e51610172e830d0368e8c9a48ea056285efe482
 DIST conky-1.17.0.tar.gz 1699311 BLAKE2B 9aead9e1e9bf4bf61c1b3e09c6e319135ccce19c43740c1bb3c6142c936c2a045820078f4684ea037fc26a8b02343e11b5372f74258fdf2c5386459410498cc9 SHA512 4da55ba3835e8ff42747f2bc01c34a94b2819e08eb74ddb913fd34bf4b682d75331119745ee006d842d3d2142fc53eeada16afdf698a60f37b566f55896aa2db
 DIST conky-1.18.1.tar.gz 1703018 BLAKE2B ba3c0f9624bfcf229de4376a9446ad05285db4241d1caf4a7a8ac92971f57d022192504c9831a786e3c02db140d70f10cf34d7e146c8647cb2a2b923e6acc2cc SHA512 e390d2aa8a3f3b570b2e3dc43ef71ff0001e36f3b42ce5a9c01b8dca656a23b1af80ee2ee138f38b12b4581dd03711562445fb53e23ca0f26e8b8af878aa2ba1
 EBUILD conky-1.13.1.ebuild 4795 BLAKE2B daff0445b97281fcd8fd737b681b862fae0570c15bbdcd9dd25fbaf5db825e8b6e0eeba771b34d09329ca338e869d341cd83b3ace80f31b28ccc103d59a66829 SHA512 75bd14e46fb12acc2d31b933adcfccf3a25e0202c8a40238bc585c9275c875e145833ae5e9870a9d0697bcf2b04b1ae5bbbb680fcd3c023ca21350fd6ead6e7f
-EBUILD conky-1.17.0.ebuild 5290 BLAKE2B fd68d822a4a6236fcba4fc12f690f8d06ebce043550b6b1840fb4a3e1f4677fd9b1f34fe1b6de00a54cf7f813924d421fb69e409d4217bbee4949890bc03b5cd SHA512 45c934e10f0a114bc42bc2c35a8889885fc1864e94de9874f978cab0adf18d78277d26aee51c3a5420d85f203dc8d7627277805b4235fcae614d73e1066eb15b
+EBUILD conky-1.17.0.ebuild 5305 BLAKE2B e8e3480f4c13c1eb939154ec9019bd66821d433719accf6bafc3763fb29b8bd8ce1e6ac656010959855f43e32977263a31da19185a6abf0a8b1f6545d9afbc65 SHA512 4ff429e7766ae867daf3a23e962996be1d85a53d8cd5110b9ce07c1245d856f06f981295660b86b23b2d23fc12cce648fdcc75fd370db1ff8b458c82b7ce2947
 EBUILD conky-1.18.1.ebuild 5443 BLAKE2B e90677a3ea0cb529aaf27a9bc29852129f88e940f4b0dbbccbfebe2694c2d5f4a61a062987ccb79a7c2d4ae2178fdb6d2f6427c240b5cb1124b4a4f932cd9eb3 SHA512 f40b45c43dede63420b63e2e53e623b319df66883dcf6424f986f38a9d6794969eaad3145a74454844025696437c728a979118ebb0a7441014c5d7a890487e39
 MISC metadata.xml 2576 BLAKE2B 428d10d3666770317f470e6898d103180370866abdfcc55c81450c3df58a7c0eef5a2cf4d4980a36d22803479af7f10aaf3a4245041f729fefe26ccb0a29a516 SHA512 6db4ad92cf3d3afc81b7047c8f23d157d1efc6cf02aa5e4ab435c8785355445d6929e314fcadb007b2d084560c0f1afeff8889ff390852846fad8f52c29d8e48
diff --git a/app-admin/conky/conky-1.17.0.ebuild b/app-admin/conky/conky-1.17.0.ebuild
index 3db5a0db1c8d..3d636bcc7df5 100644
--- a/app-admin/conky/conky-1.17.0.ebuild
+++ b/app-admin/conky/conky-1.17.0.ebuild
@@ -38,7 +38,6 @@ COMMON_DEPEND="
 	truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
 	wayland? (
 		dev-libs/wayland
-		dev-libs/wayland-protocols
 		x11-libs/pango
 	)
 	wifi? ( net-wireless/wireless-tools )
@@ -66,6 +65,9 @@ RDEPEND="
 "
 DEPEND="
 	${COMMON_DEPEND}
+	wayland? (
+		dev-libs/wayland-protocols
+	)
 "
 BDEPEND="
 	doc? (
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 902be68f4b2a..b471144060a2 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -3,10 +3,7 @@ AUX logstash-plugin.eselect 1768 BLAKE2B 539246fb1c6e00fa0928af146d3c32ef69f61e3
 AUX logstash.confd-r2 767 BLAKE2B fa251570a13b2bc2d0779e0f00549f40bc957f211be0f4164829f7bf731221e5adabdb27341c703f1ea67b19455e8832f5d822fd41ffc64994007201690feff6 SHA512 83eecf30baa160041f33fd3dafce317c1692efaf676d0fdc9bee04965eafb15f1e01d07a09607d345665f6bebc4db90d17a0abd1c7fd4962d6926ac069f16768
 AUX logstash.initd-r2 1997 BLAKE2B 4a2e36bcd171950ddea636f9269708416536b4f54c620b36eca91839b894f0b4242775ec85aadbe93714b8aa7cd535774cd0558f4bc90096638d0640e4f3961f SHA512 23203f99610d1666247ee8584b1d1452216f65c6c06345007768eac494c9de755a79bd74b3fd241e62f2239d52394626a61e06100486f89b7f3a2b8282389d56
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
-DIST logstash-7.17.7-linux-x86_64.tar.gz 364120719 BLAKE2B 42622b2a4f3b53151de4effcc248e2225d2a2bb42a2e8ee5b0408c671050c27006910a956cdf8c4ad97ae9cce36a119d86d8234a86eeae3f19cdaa3da36bda3c SHA512 eb8d01ad82808598c4d34da9194f069a0c55e86d70a9d0c7d78555fc47d156ec4b19ed1df9096b953171e8ee918ec97db6a46c7871fe328ee544848b22812bdc
-DIST logstash-7.17.8-linux-x86_64.tar.gz 364452036 BLAKE2B aa71108bd3632a8feb66de6d1b6ff4baaf195cdc808753c6321bc941973c51c759431fb814faba4c2eb3d15d848584098319bccdabb5fa8bbcdd30025921665d SHA512 b78fd253ca575f6392cec32c148c63df1c6d146f50e18fa3231c6e47174d3b7024e65efd88a06f0822d4a7f058737d96b8ef0b2d09b3491e166f4f8cef6144df
-DIST logstash-oss-7.17.7-linux-x86_64.tar.gz 363922131 BLAKE2B 2cc8754b0edd5d1354c258e6da163a6cd806d8e9e58f291b4c81e5a39a6b9c267fea807a4b062e7cb171adce926cb711a075f29804d1629d07bb28bcef47620f SHA512 f8a9a09bcc234598cf47334f59bb8651255ed16780baec0547f21cdd79c47caa5da1330c652c0dfb0bb147ac262e1ec9320e80b76f37ad89e05350c6239e4dad
-DIST logstash-oss-7.17.8-linux-x86_64.tar.gz 364254903 BLAKE2B 7072ac8634ab8530f740d3e72c8899b2c9ef213aa122460a43b5a532e6ca1aed47c08890f4e83482f49d1e1191523bd6ef583f35fa5e37c080db5926150f996a SHA512 d770c7666fdf04d2d09f7213ba436e66b09e6e650fbe0f0a147914525d55d545c8c85e50afef0803483850dee0661b1da09ab81e43553424afcc957d94d4dc81
-EBUILD logstash-bin-7.17.7.ebuild 2532 BLAKE2B dfd8efa6e7fdc93820836f68a21bf02e4c0c1eb1c907c4d6a1005d6f253eb83012334d2a9ecd75ac569309d2579331b1e44c8738474f5fd9e071ae9ac81b79cc SHA512 4872a97be23d3276f5722d00e120d336136cd235cd4f10a5b2823baebb00f28e1a5775f0a9476723e8ff41feefde1d53c96fcf1fbdab6d6c1832428985bf73e3
-EBUILD logstash-bin-7.17.8.ebuild 2532 BLAKE2B 37fd25d286bcf9f3f95521ea72dd07c5407946c91643fb2e748d2a79e74f31dd28a18f4263fc44da91937fb3d47da857cd55a7f709a3950ebc3bed35003e6d90 SHA512 b4230597a20002df6e1a49135921ef73de1c24325b51806f4f2f6795b697962607a8635c8d05f6e95960fd0152d596a056f01ff31dc65f54b5a0d1ef9a57de2f
+DIST logstash-7.17.9-linux-x86_64.tar.gz 364476389 BLAKE2B b02e52e0a9e9a8b7d6b7487333417a95363316dab8530c180b8a42e63f35a20628d9830cd596a6a960d6cb67603dd1f1bfc293ba2705a4683824aafafd8acbc6 SHA512 a43d592e70f023a594f31a3fba365a9cca6611599bd61f998cb1fc38ddd177d459bce23eaf54f811fe0a87a47cdd4bf4b4d4c8008dab1ac03173371f63b91b6c
+DIST logstash-oss-7.17.9-linux-x86_64.tar.gz 364275206 BLAKE2B 06befbe70974ebe740caad79527b92d78d034de37461bf1883862463fe6b063d7a3759729a6191277c2c5724faaccec315c77c77ac384858f34a9594d400abfa SHA512 7c3f9867853582e5d06b9f895b4740abf56a9b6ce34dfbfb624cf9a4b956f489145cd13f3194a7fb16efc52410f55e797c269dc2957a35bdebf9e1aaa3547eaa
+EBUILD logstash-bin-7.17.9.ebuild 2532 BLAKE2B 37fd25d286bcf9f3f95521ea72dd07c5407946c91643fb2e748d2a79e74f31dd28a18f4263fc44da91937fb3d47da857cd55a7f709a3950ebc3bed35003e6d90 SHA512 b4230597a20002df6e1a49135921ef73de1c24325b51806f4f2f6795b697962607a8635c8d05f6e95960fd0152d596a056f01ff31dc65f54b5a0d1ef9a57de2f
 MISC metadata.xml 571 BLAKE2B 8fb52685ec095fe2a192d477c7e5737be2ab526fe5ee9c77f62c8aa1799dea7c471eb3ea073352b2d09e3f1ba82b0dea05dd03648eb810e32504a2707342832e SHA512 36de48dec06abe08515d48f2e2fb86e5125ab6e9331f989dea8fff9d2511b337afffc75a842bf85b051fbe968b220676a4610c0a4d1a6b2c3b83759f9c2ca199
diff --git a/app-admin/logstash-bin/logstash-bin-7.17.7.ebuild b/app-admin/logstash-bin/logstash-bin-7.17.7.ebuild
deleted file mode 100644
index bcfbba4ea846..000000000000
--- a/app-admin/logstash-bin/logstash-bin-7.17.7.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="acct-group/logstash
-	acct-user/logstash
-	virtual/jre"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	local d
-	for d in aarch64-FreeBSD aarch64-Linux arm-Linux Darwin i386-Linux i386-SunOS \
-		i386-Windows mips64el-Linux ppc64-AIX ppc64le-Linux ppc64-Linux \
-		ppc-AIX s390x-Linux sparcv9-Linux sparcv9-SunOS x86_64-DragonFlyBSD \
-		x86_64-FreeBSD x86_64-OpenBSD x86_64-SunOS x86_64-Windows; do
-			rm -r vendor/jruby/lib/jni/$d || die
-	done
-
-	# remove bundled java
-	rm -r jdk || die
-}
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/{pipelines.yml,startup.options} || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	doins "${FILESDIR}/pipelines.yml"
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT}/usr/share/${MY_PN}"
-	elog
-	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-7.17.8.ebuild b/app-admin/logstash-bin/logstash-bin-7.17.9.ebuild
index 684ea639d771..684ea639d771 100644
--- a/app-admin/logstash-bin/logstash-bin-7.17.8.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.17.9.ebuild