7 files changed, 327 insertions, 61 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 0446b5b2ecb2..0a0ba7eb5335 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 241c049532a0..6787c9e98cf2 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,7 +1,9 @@
 DIST conky-1.17.0.tar.gz 1699311 BLAKE2B 9aead9e1e9bf4bf61c1b3e09c6e319135ccce19c43740c1bb3c6142c936c2a045820078f4684ea037fc26a8b02343e11b5372f74258fdf2c5386459410498cc9 SHA512 4da55ba3835e8ff42747f2bc01c34a94b2819e08eb74ddb913fd34bf4b682d75331119745ee006d842d3d2142fc53eeada16afdf698a60f37b566f55896aa2db
 DIST conky-1.19.2.tar.gz 1715080 BLAKE2B 1e7ee050ab6525a1cc0dd513e25ea2e98a21fa6a70a3f3feb95cda9dc4b3bfa4625889c91093f7643746325f897e7165b199da38308699c9dadeb87cdebfc896 SHA512 a9b565ab2e6b92efe8a10db69e88fb720ba00f09e63b21a5741f95c8a05c78dd58aa23fdbf34f8f0c9137e04ce76b1fe197594ebc1b2ad99d7fd9bf8e6127ad3
 DIST conky-1.19.3.tar.gz 1722486 BLAKE2B 46f9d2750f30b4afec1e7cdb9590a1e0cdad8dfe1552be43473857ecd7bca028f087e8987e44b0ea916061b7c2cd2f4b7e9be90e789104e6d4bfb66e8d7aca46 SHA512 6677d423836deac52502f2e9c31cf70d8c16f5c8b867b54db1965b1a790122ed05ee45e9e590dc82fe9607ee8a478e0d4711112ad2def9e27d084842ac80ac55
+DIST conky-1.19.4.tar.gz 1724291 BLAKE2B 478c9f1c3c9ced8d1f9384a5d1d9b918245049ee9282304828c5c5e4ccbb96cd0404d6095f5d03b6d8efd06b7f6b2f34f070734877c1496efff7cd49cb06faee SHA512 3856a059d2c21da3df9cad42a4bd36cccc5ba87b2b581985c1b7d9b04b3465e99f230b5b973ab4f5b986058abf02afcc9779e1ab05696791c7952372c2e29615
 EBUILD conky-1.17.0-r1.ebuild 5305 BLAKE2B 3be64246dc3d608306fb826df96995e781e33bf5788c3ba4489fbca341232bb739167a9054cb0f6632eb0d6297f28f9ddc4a4200d144caa2aca22cf37159eb7e SHA512 ad743614c1e277985f2d31ec2c73f2470ffb5b32b0de8c4767c4aab54c0e3dd80ddac64a9df1dbfc681e79f05d8505e48531dcfaaee99821a31e5dfc362caaa0
 EBUILD conky-1.19.2-r1.ebuild 5445 BLAKE2B c32044f2011cd6679d6caedfe1f9aa7cd2fecf2671df8935041a7a121bfefc4d4614ed66d58205d4f2a7457655b1d4d2a05f2ee9c40e9b1bc29b29d68a7d0bf0 SHA512 1840bb3b2e5a102600cc77bb3f0b1404560e8b72df8e4e6bc014f79191b4b3406fd0bd02bb44ae9ed654c6d95adb9f8c6250128e0dc1c4763256f236e179fbda
 EBUILD conky-1.19.3.ebuild 5448 BLAKE2B e823cc8c1e50c12038b1f4dd08d3e98cf1bac7c0113f9e41ed572d1558eb706828a820067d22439177d5e5eba59fd45592926b88f8076e9ba9f36ba290bd3136 SHA512 0654cdfc34052e08c4142865af6e95a4279a8a7fc84a1887f8b97711066e15556a962c5b2ac6a2cc7f929c47afc4db0bb675f8655becdb272e2cd507159491b1
+EBUILD conky-1.19.4.ebuild 5467 BLAKE2B 78c1ad9da78914b44ae11b5e3be4504eba942f60235ad0ea8ddb4d3eb5e3dc3604e69a93682d3661f2f712d40c179b69c296685a0be9d957e926329c13eace3d SHA512 0354b92185c4558b42b0b878cedbc1a7d65f2980166483823c18f6ffe73dfcede80cc5e5d35460b8606f5d617167c7f36be85dfbc8bfd23813249fbc334060f5
 MISC metadata.xml 2406 BLAKE2B d535320fc855c3ee9e321a7181153f0928b43820fdb72a4e3c4e68239070e4ec8a1a5ced292e559d5f19337622a369647f4bf21a2fc3c0c3c573cb24110cb36e SHA512 36e5a0fc2c570577b64e1ccdd7378d9f0ffac100ce6d322d4d9f09b0e1e287dd97347ef82db8507c5b8e8c615b02917fe45113a7091ef1a2faec2456304a9326
diff --git a/app-admin/conky/conky-1.19.4.ebuild b/app-admin/conky/conky-1.19.4.ebuild
new file mode 100644
index 000000000000..41a5bd379f95
--- /dev/null
+++ b/app-admin/conky/conky-1.19.4.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+PYTHON_COMPAT=( python{3_9,3_10,3_11} )
+
+inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib
+	intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd
+	mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
+	wayland webserver wifi X xinerama xmms2"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	ical? ( dev-libs/libical:= )
+	iconv? ( virtual/libiconv )
+	imlib? ( media-libs/imlib2[X] )
+	irc? ( net-libs/libircclient )
+	lua-cairo? ( x11-libs/cairo[X] )
+	lua-imlib? ( media-libs/imlib2[X] )
+	lua-rsvg? ( gnome-base/librsvg )
+	mysql? ( dev-db/mysql-connector-c )
+	ncurses? ( sys-libs/ncurses:= )
+	nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+	pulseaudio? ( media-libs/libpulse )
+	rss? (
+		dev-libs/libxml2
+		net-misc/curl
+		dev-libs/glib:2
+	)
+	systemd? ( sys-apps/systemd )
+	truetype? (
+		x11-libs/libXft
+		>=media-libs/freetype-2
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/pango
+	)
+	wifi? ( net-wireless/wireless-tools )
+	webserver? ( net-libs/libmicrohttpd:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+		x11-libs/libXext
+	)
+	xinerama? ( x11-libs/libXinerama )
+	xmms2? ( media-sound/xmms2 )
+	${LUA_DEPS}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	apcupsd? ( sys-power/apcupsd )
+	cmus? ( media-sound/cmus )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+	extras? (
+		app-editors/nano
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	wayland? (
+		dev-libs/wayland-protocols
+	)
+"
+BDEPEND="
+	doc? (
+		virtual/pandoc
+		$(python_gen_any_dep '
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+		')
+	)
+	extras? (
+		$(python_gen_any_dep '
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+		')
+	)
+	wayland? ( dev-util/wayland-scanner )
+"
+
+python_check_deps() {
+	use doc || use extras || return 0
+	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+REQUIRED_USE="
+	imlib? ( X )
+	lua-cairo? ( X  bundled-toluapp )
+	lua-imlib? ( X  bundled-toluapp )
+	lua-rsvg? ( X  bundled-toluapp )
+	nvidia? ( X )
+	truetype? ( X )
+	xinerama? ( X )
+"
+
+CONFIG_CHECK="~IPV6"
+
+DOCS=( README.md AUTHORS )
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
+To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf and edit it to your liking.
+
+There are pretty html docs available at https://conky.cc/.
+
+Also see https://github.com/brndnmtthws/conky/wiki or https://wiki.gentoo.org/wiki/Conky"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	lua-single_pkg_setup
+	if use doc || use extras; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# pin lua 5.4
+	sed -i -e 's|Lua "5.3" REQUIRED|Lua "5.4" EXACT|g' \
+		cmake/ConkyPlatformChecks.cmake || die "ConkyPlatformChecks.cmake"
+
+	cmake_src_prepare
+	xdg_environment_reset
+}
+
+src_configure() {
+	local mycmakeargs=()
+
+	if use X; then
+		mycmakeargs+=(
+			-DBUILD_ARGB=yes
+			-DBUILD_X11=yes
+			-DBUILD_XDAMAGE=yes
+			-DBUILD_XDBE=yes
+			-DBUILD_XSHAPE=yes
+			-DBUILD_MOUSE_EVENTS=yes
+			-DOWN_WINDOW=yes
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_X11=no
+		)
+	fi
+
+	mycmakeargs+=(
+		-DBUILD_APCUPSD=$(usex apcupsd)
+		-DBUILD_AUDACIOUS=no
+		-DBUILD_BUILTIN_CONFIG=yes
+		-DBUILD_CMUS=$(usex cmus)
+		-DBUILD_CURL=$(usex curl)
+		-DBUILD_DOCS=$(usex doc)
+		-DBUILD_EXTRAS=$(usex extras)
+		-DBUILD_HDDTEMP=$(usex hddtemp)
+		-DBUILD_HTTP=$(usex webserver)
+		-DBUILD_I18N=yes
+		-DBUILD_IBM=$(usex thinkpad)
+		-DBUILD_ICAL=$(usex ical)
+		-DBUILD_ICONV=$(usex iconv)
+		-DBUILD_IMLIB2=$(usex imlib)
+		-DBUILD_INTEL_BACKLIGHT=$(usex intel-backlight)
+		-DBUILD_IOSTATS=$(usex iostats)
+		-DBUILD_IPV6=yes
+		-DBUILD_IRC=$(usex irc)
+		-DBUILD_JOURNAL=$(usex systemd)
+		-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+		-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+		-DBUILD_LUA_RSVG=$(usex lua-rsvg)
+		-DBUILD_MATH=$(usex math)
+		-DBUILD_MOC=$(usex moc)
+		-DBUILD_MPD=$(usex mpd)
+		-DBUILD_MYSQL=$(usex mysql)
+		-DBUILD_NCURSES=$(usex ncurses)
+		-DBUILD_NVIDIA=$(usex nvidia)
+		-DBUILD_OLD_CONFIG=yes
+		-DBUILD_PORT_MONITORS=$(usex portmon)
+		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_RSS=$(usex rss)
+		-DBUILD_WAYLAND=$(usex wayland)
+		-DBUILD_WLAN=$(usex wifi)
+		-DBUILD_XFT=$(usex truetype)
+		-DBUILD_XINERAMA=$(usex xinerama)
+		-DBUILD_XMMS2=$(usex xmms2)
+		-DDOC_PATH=/usr/share/doc/${PF}
+		-DMAINTAINER_MODE=no
+		-DRELEASE=yes
+	)
+
+	if use doc || use extras; then
+		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use extras; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${BUILD_DIR}"/extras/vim/syntax/conkyrc.vim
+
+		insinto /usr/share/nano/
+		doins "${BUILD_DIR}"/extras/nano/conky.nanorc
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	xdg_pkg_postinst
+}
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 888213681d3f..cb19e55b6e87 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -1,10 +1,7 @@
 AUX filebeat.confd 269 BLAKE2B f9cc2a3d96be870d755c41606a274e94d6f6a2a5be71aeb3fc10f989d58b1bb5cc3683b38ede75f7e34937daa4189eccdd30c306b20e219c91bc90ac22d21b40 SHA512 89f2a8ead476750b3fd9a94dcc84311503907e78e66c70d151f27c7fdc8835e7bae6667a6aed0b6470a8f9b42c850396973fd09b1b6aec2d170e3774c8cfddff
 AUX filebeat.initd 1385 BLAKE2B c69021a76aa4c49212edf8612b6e672b9d92365ff77fddb24d5b34b78260ed49214366a7ca9ea58c9ea490d914bfe5c506141f5cf2cb7f02f7f89eafc75e5c32 SHA512 f48fcb51464797eed586619de7f9cbfcab678d2832671b1dbb5717f2ab544391ba7a517269e1fdcdff9d43c1e07e95916302a91f79e7a4b734dd19d5802cba7d
 AUX filebeat.initd.1 1385 BLAKE2B 889ea416c252efa60fd6c7c8fae8937f5064455bb6289e1fa6127ddd1535387dbdfe9a91afb091745a7d0e5cd058e2296a5d270e52494595ee0e72111500fd64 SHA512 d34bcc9d2e032ebc79f0ff1272974ba4346bdd7a32c24c005eaa3b2a8dde6767fd88460b7b79f2f0b98a624f371f2b3a5483ef92909da4b21e4f0967ddcd86c8
-DIST filebeat-7.17.3-deps.tar.xz 548178056 BLAKE2B 3c149f839405a7fda885c8269c58bdf973645470d5de1e916094fa018ebcc7c2e735ded1cc35e2607917186d0a1bb45b5ff16acb35e8d2a67a7e4106d5bc2f10 SHA512 f71fc619326b2dffc295f191a259641a473403e2528a6788ade6ac5a9d127c1c49ac6ae70123263897d30d1aac9f723f36b80af6d677dddd6958bff210280026
-DIST filebeat-7.17.3.tar.gz 101455865 BLAKE2B 57159a2495dfdcead4539a49422fb5509ca21820b68051082f74c6b2adea79c5a9066183a06c518382f74208611e1e25422e9b63d543290c63ae992a9e0593c6 SHA512 40b1cf3bafc50f9e33b0350f1432952b47a1b695aa9368bc029303f834bc795c691a2f4732fbba615d826e14bd21b8b74dca23157b796cd302db1844c186bc02
 DIST filebeat-7.17.5-deps.tar.xz 548163248 BLAKE2B 720a91b3e5a2fe16394ef3502f133837bd64d326bda6fadc066ae6517d9682a82614c6c699f9edacbe6d987ef326542bbf875a4063e2a4513ea296259f9b2445 SHA512 3b3cc39bdd966998a5b7867e60d390a539e1dd80ec7b8d68e3b0b9c1aab9eecca3810d1e989c74f15c20385a7c9a41e820129e28d33c2e47c2ba90d5e236a077
 DIST filebeat-7.17.5.tar.gz 101518610 BLAKE2B 4736a097e82741981841b78b18947b47fef32a50d6f6b498b4377f2e9ffedc79196b9ea0d70398a9830864f36520538ee868fcdf6081ea5b157e69aabe316ab9 SHA512 c82bc5c85492b6fe85b172d52d3faf4a6a2e8d8ec3f1964549beea6eda5a5e76ad0c55e084ad42ce429d0caac18fc7f0da769b9242c7959558800e0e3de7e14b
-EBUILD filebeat-7.17.3.ebuild 1359 BLAKE2B 874629d809bc7ba1476dae31b8dab2da8db31656fbe41bbe156a8d3c33b73d24adbc0d50bb2cdcc9c8376c8a4197bc802d2a3111705771d38c32970b0c0e3b78 SHA512 92af2ca8c46dfb7f9f441927f0854296afea93b952fa8d5ec93e7cd6121ae298dba26f5b8194407482462e4d3ca79130877b5aae9b41f72a8d328597c6f505dd
 EBUILD filebeat-7.17.5.ebuild 1359 BLAKE2B 064a4a0407e5f899584137d6aa5eb7a3d31dc4b268384801c6c71abbadd621d96c7e1fed6a474417e7bd7e808dcace34357bdb9acf819d05dcea9a1496f18806 SHA512 19ec33820cdbd6ad0b50efbc35bf6909a003fcc51f6aef79267499947f0c8486959a56c8f5ad23529941176384b915f5dee8f9aeee494193a0bc3c480a7d8a2a
 MISC metadata.xml 492 BLAKE2B 6b16876306316f37d59bf32aac33a2ff918c63dbf2ca0f71448249b20e99e5576f20dbad997a227730cb836c7f244ea8301dae62603e1961127bd755ab87f5b0 SHA512 c42a8bc75fd53383ea094d5049ba5f294cb8a2f0b0fe435eb74427bc82751bfbe4e4bfe076abbd052946ae6b0cf2f7129040a47b439a704629c6846ce6b7fdec
diff --git a/app-admin/filebeat/filebeat-7.17.3.ebuild b/app-admin/filebeat/filebeat-7.17.3.ebuild
deleted file mode 100644
index 808b401322c3..000000000000
--- a/app-admin/filebeat/filebeat-7.17.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit go-module
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://media.githubusercontent.com/media/hydrapolic/gentoo-dist/master/filebeat/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-RESTRICT="test"
-
-S="${WORKDIR}/beats-${PV}"
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 81338e1bdd00..c46267915dfd 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -4,9 +4,12 @@ AUX logstash.confd-r2 767 BLAKE2B fa251570a13b2bc2d0779e0f00549f40bc957f211be0f4
 AUX logstash.initd-r2 1997 BLAKE2B 4a2e36bcd171950ddea636f9269708416536b4f54c620b36eca91839b894f0b4242775ec85aadbe93714b8aa7cd535774cd0558f4bc90096638d0640e4f3961f SHA512 23203f99610d1666247ee8584b1d1452216f65c6c06345007768eac494c9de755a79bd74b3fd241e62f2239d52394626a61e06100486f89b7f3a2b8282389d56
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
 DIST logstash-7.17.10-linux-x86_64.tar.gz 364617045 BLAKE2B da08d74aa970525d232221f78695817d479a2b3ad1422f46f3a4e54473991aa6ff63d5e7cbd4aaf885c3d187abfd096ddfac8d2fd8a4c692d29eb1c1cb516d1a SHA512 5391bfef09c403a365518a3a8e8f075bb7974b137095b3c7fd2a0173cfa6dbd4a7451170a3657afef3e6a468e90a38d6e7a5b669799878f9389fa44ff8fee026
+DIST logstash-7.17.12-linux-x86_64.tar.gz 363841975 BLAKE2B eff842a58d4d970bf8eae286c581d9ee0e331db9789e7c3f41ddba9cc639772f3e894924612cdb66eb7042248fc1dfeb3ddd5738cb85c1da9478a578bf291c83 SHA512 4395a9a2c577456bab9269f0e7b451c329cfb6f6f3e69c85315f670665ba16b4ef174f7d788c262511077c29e92c26dc06a86550b233764794ffc6ca1a058118
 DIST logstash-7.17.9-linux-x86_64.tar.gz 364476389 BLAKE2B b02e52e0a9e9a8b7d6b7487333417a95363316dab8530c180b8a42e63f35a20628d9830cd596a6a960d6cb67603dd1f1bfc293ba2705a4683824aafafd8acbc6 SHA512 a43d592e70f023a594f31a3fba365a9cca6611599bd61f998cb1fc38ddd177d459bce23eaf54f811fe0a87a47cdd4bf4b4d4c8008dab1ac03173371f63b91b6c
 DIST logstash-oss-7.17.10-linux-x86_64.tar.gz 364424431 BLAKE2B 24553974cd0762424dce27ae1cefc44173e7786d32ce2973f07ec3acf8fd5632e36e36f3f0170f2b1ff8df0f716b9de835df55af800ef639afdba29f47b988bb SHA512 ba22c4c414f47515387bb28cc47612bea58aff97c407f2571863e83174a2bef273627f65dd531ed833e40668c79144a501d49c3ec691c1b1c4d8fb0cb124b052
+DIST logstash-oss-7.17.12-linux-x86_64.tar.gz 363645002 BLAKE2B 2ee159118a07685499bff7cad10aeba39991d65797ce45e75ed733e3aafa45913b0504ec97d28d2353643150606fae36e5e9c380eefd06eb0357e90beb716e33 SHA512 da20df2765a15eef81976dc3778a7561660fad04156b4ebc197581f94234934b3f4b20aec2e39eab3af9c8694b1a3e36a429170852c238451e0dbb24ea9dfd2a
 DIST logstash-oss-7.17.9-linux-x86_64.tar.gz 364275206 BLAKE2B 06befbe70974ebe740caad79527b92d78d034de37461bf1883862463fe6b063d7a3759729a6191277c2c5724faaccec315c77c77ac384858f34a9594d400abfa SHA512 7c3f9867853582e5d06b9f895b4740abf56a9b6ce34dfbfb624cf9a4b956f489145cd13f3194a7fb16efc52410f55e797c269dc2957a35bdebf9e1aaa3547eaa
 EBUILD logstash-bin-7.17.10.ebuild 2532 BLAKE2B 37fd25d286bcf9f3f95521ea72dd07c5407946c91643fb2e748d2a79e74f31dd28a18f4263fc44da91937fb3d47da857cd55a7f709a3950ebc3bed35003e6d90 SHA512 b4230597a20002df6e1a49135921ef73de1c24325b51806f4f2f6795b697962607a8635c8d05f6e95960fd0152d596a056f01ff31dc65f54b5a0d1ef9a57de2f
+EBUILD logstash-bin-7.17.12.ebuild 2532 BLAKE2B 37fd25d286bcf9f3f95521ea72dd07c5407946c91643fb2e748d2a79e74f31dd28a18f4263fc44da91937fb3d47da857cd55a7f709a3950ebc3bed35003e6d90 SHA512 b4230597a20002df6e1a49135921ef73de1c24325b51806f4f2f6795b697962607a8635c8d05f6e95960fd0152d596a056f01ff31dc65f54b5a0d1ef9a57de2f
 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.12.ebuild b/app-admin/logstash-bin/logstash-bin-7.17.12.ebuild
new file mode 100644
index 000000000000..684ea639d771
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-7.17.12.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 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"
+}