gentoo auto-resync : 01:02:2023 - 21:05:47

6 files changed, 4 insertions, 150 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 2271094622f0..e80778ff6a50 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 32b414ef7208..e1c13baf6944 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -3,6 +3,5 @@ AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd12
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
 DIST icinga2-2.13.6.tar.gz 9666870 BLAKE2B 50fd463ddb5d5d01ae96cb8457f2c4044c126c308f3d142bb6eb5ac95cf1f5704cd911236acd71ed7b77a596c07e65a96bbebce028bd666126324447d4f91aad SHA512 5fcf480c305487c7988d6cacfcb64c768c0f0e749704247c3d0ded746284ff5485e0a3d25c82fba1305414d47067a9eb80f84de594267ddf050a0b913825cd71
 EBUILD icinga2-2.13.6-r1.ebuild 4033 BLAKE2B a4e8f10d6dbe72a2d7432e56a6dc0caffdbc9ab5831b52df963bc9369b630010938e1f2f669c73714c40dd63f0e44300c58f5d7044b486c70447eab651c524cb SHA512 62c3e63c711ea16d0081f1b0be4610b6f1d19d613d18cf733ffb751894e75f272d8c22354f30792c391d38626cd72a52ef81c2adbed785717dff5eeda1ab85ef
-EBUILD icinga2-2.13.6.ebuild 3983 BLAKE2B 0d4ac0f6455d2ff0193463bfa8472c5dbd8a7115b46efd7721e79b382a29cf0919cc87b85696b39299458fea6cd1739b23b855babc2ea63ec8a00b5a6d46cd03 SHA512 809bf739c2779af8102d3ef01fb34526997284f5446622a90a58de4116d60868688771c4f73eb2ef6ac8e8bce60569298d3c05ef45549760a63f699f8448032c
 EBUILD icinga2-9999.ebuild 3985 BLAKE2B 5f573b61590cdd31f5c3d18b0f58bc3f5639de5b2fa47462fe75b45f9b5d9c6efdf59816477accf950cbbe427f950dfb81a8e1f2990be8728e04a2012dc67595 SHA512 b53e41c683b2492e42f7ed0fc5f92ff1ead0e24e6fd4966b314f8d94af63468b7c71345017407e8f95c0f3ed340e58f4e6050c845f2c44f83abd07de0c05d058
 MISC metadata.xml 871 BLAKE2B ffd6aeebf603ed90bfa4cc34d557e947e435d204c84e062532cedecd3e811710d9bd39f9f43dd70afd575104be5661b5f7e7de3f79365a961d45f61835a602c6 SHA512 3ca0916252061c1705d194066a30a8fc19cfe4341911646b7ed797e131e02f40eeddc91c2449a5b049888be749d16a5103e70678e5d6c1604db0ac3fe9f4e0d7
diff --git a/net-analyzer/icinga2/icinga2-2.13.6.ebuild b/net-analyzer/icinga2/icinga2-2.13.6.ebuild
deleted file mode 100644
index b95acf553b6c..000000000000
--- a/net-analyzer/icinga2/icinga2-2.13.6.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-	dev-libs/openssl:0=
-	dev-libs/boost:=[context]
-	console? ( dev-libs/libedit )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	dev-libs/yajl:=
-	acct-user/icinga
-	acct-group/icinga
-	acct-group/icingacmd"
-BDEPEND="
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35"
-RDEPEND="
-	${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	mail? ( virtual/mailx )
-	acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-		-DICINGA2_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DICINGA2_RUNDIR=/run
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-		-DUSE_SYSTEMD=$(usex systemd)
-		-DLOGROTATE_HAS_SU=ON
-		-DICINGA2_LTO_BUILD=$(usex lto)
-	)
-	# default to off if minimal, allow the flags to be set otherwise
-	if use minimal; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=$(usex postgres)
-			-DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-	if use mysql || use mariadb; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-	fi
-	if use postgres; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
-	fi
-
-	keepdir /etc/icinga2
-	keepdir /var/lib/icinga2/api/zones
-	keepdir /var/lib/icinga2/api/repository
-	keepdir /var/lib/icinga2/api/log
-	keepdir /var/spool/icinga2/perfdata
-
-	rm -r "${D}/run" || die "failed to remove /run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners -R icinga:icinga /etc/icinga2
-	fperms 0750 /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	fowners -R icinga:icingacmd /var/lib/icinga2/api
-	fowners -R icinga:icingacmd /var/lib/icinga2/certificate-requests
-	fowners -R icinga:icingacmd /var/lib/icinga2/certs
-	fowners icinga:icinga /var/spool/icinga2
-	fowners icinga:icinga /var/spool/icinga2/perfdata
-	fowners icinga:icingacmd /var/log/icinga2
-
-	fperms ug+rwX,o-rwx /etc/icinga2
-	fperms ug+rwX,o-rwx /var/lib/icinga2
-	fperms ug+rwX,o-rwx /var/spool/icinga2
-	fperms ug+rwX,o-rwx /var/log/icinga2
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 916d7a97030e..83ca7cd4f3a2 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,9 +7,9 @@ DIST wireshark-3.6.9.tar.xz 39949356 BLAKE2B 8660e57fc1c9667ecd17bbd35918da7d61f
 DIST wireshark-4.0.2.tar.xz 41296132 BLAKE2B 3ca64c5d561fc3262af821a2fed559efc39f9c194d1c03211d27b8154d87fe78c26d390504fc33f80fefbec06aa07d5b4fe27b253a3fc32641ec52292bc0557b SHA512 0f401f639add6483799131dd853a4f4bcf8977fd987915074d0301f553fca9f6cd6e0b7cc47358699c1f4e65872760135dea9889fb34dbb70b917768b6f37ff5
 DIST wireshark-4.0.3.tar.xz 41383164 BLAKE2B 85271a1f52b383db07fdf51f500ae0d6dd9b6f6624176889a88ff51e85e1eb578a7ba43a80018e60cb84ff486aedce850b2b82e127fcabb7f049d479e1d0c3cb SHA512 ef6d20b9b69e1a2b6b6b5bebe5f13545acb73b2faece32198dbe01c4181524d5f8320712b4440c93fc65ef075ab7b6398394581b3dc09a20b1b5b9b90ec2a13c
 EBUILD wireshark-3.6.10.ebuild 7327 BLAKE2B 1ba81dd79715c51f0d6bcedb321a1e65dcb33850c99ce415feb4d0fa387f825fb2f2bc45ef64ab3adcf07f14a2e44e30a5f0194623ed1552cad18f681dbbf657 SHA512 c6d7900f342f8aef0999ab75e1a14721d4b03bb4f5882169fec91826df226fde9cb6ea5ced313ce6bf8b6477beda3c0e18c74acf6a459218c3729955aed335ae
-EBUILD wireshark-3.6.11.ebuild 7328 BLAKE2B 3ad5726ed68c4bcb90a86941bf2b7817a63041438d30ddf8f36baf6f95e8129a7c3cce052a9e547cc8f89ea5d6d18ad78fac65804c34ae6b2ca68a8884f7fb7d SHA512 78fad85e48bd3304f8ea4499c579bd0025c5960550775db5f3ce5656e4f5595282cd2b4b6a8bf545063e5842a099ed028d2f6f90df7d6a0ad1f2ffee9c5d4c1a
+EBUILD wireshark-3.6.11.ebuild 7327 BLAKE2B cd26f31327b2540af7ca583bc828e930c3f2780381af6205db5b77e60154b16fd79a44c988fbff201770eb700b7d5389977f04564fdc9da3554d3d5890251e99 SHA512 4d1e33f7c5849180edcaec5dca597197db1e3b3d5b6293d468c18502f636a0c72a54bd301416c23236630fae3dd8a9081b30e11f6bc821f17a5e24aff16d0736
 EBUILD wireshark-3.6.9.ebuild 7326 BLAKE2B 1e703734bd8ea26253acf1b914fd6d7b21dd7f28b8aad3fec2e1fe2804096a40fa668230e329793d0237fd3a0f2896d3fdd1623b329ea57057b56fd1eddfbb46 SHA512 f3a1f993c3c992b075da00335c00e700f453dbe8a43ebe88c66979593ba98d9161800c9ee82999e697f73e536ef010c3cbed6bfd85e1da5778916ccc12c76225
 EBUILD wireshark-4.0.2.ebuild 7993 BLAKE2B af39863733e8e53ed24b90631266b7396419298f9b5d5f9cc12d035a89927936b0e1fdcaec02b6b92fca08d73d89427c12243b2c84f44c118936665ae0425bf4 SHA512 13c0149235117f443c834d85c3f9b02ba332bb602e369f383ddc13e105620c1146c3819f2374b9ffa4a6e96ecef70e70c33172439dd9162edbdbae186eb69c1e
-EBUILD wireshark-4.0.3.ebuild 7845 BLAKE2B 69def3777ff7fda527170517f41e5a6e87efa6371adcc154c0ee985ec5439e05c5dbc5561422787673bbb07787dd95771b8296af05f717bd05607624b7c10ae5 SHA512 cb26774868de4c849c63f8c3ecfa55eb67fe822b066f8fc226ee13c752f08839f9f01fc36365621c48f8789e2cbf0917d217648b1334991a4867209850bf7b58
+EBUILD wireshark-4.0.3.ebuild 7843 BLAKE2B 36995c8a8063a70b22219cb0ebd6daf7d8c3b2b852f9e3bd0d5a60c67418418e6686697bc11acf933dffc281f2e48b9e3de86f711c310e92c0e64e97fbc3746d SHA512 6dcedf0e4fd719fad1fea62760970bdd4eff93dbbe85692422d09614e5352784cf87143b93aa86ba6e8fda42a755be0ae4e0c5055a7748e2e151b13bbdf96d25
 EBUILD wireshark-9999.ebuild 7993 BLAKE2B af39863733e8e53ed24b90631266b7396419298f9b5d5f9cc12d035a89927936b0e1fdcaec02b6b92fca08d73d89427c12243b2c84f44c118936665ae0425bf4 SHA512 13c0149235117f443c834d85c3f9b02ba332bb602e369f383ddc13e105620c1146c3819f2374b9ffa4a6e96ecef70e70c33172439dd9162edbdbae186eb69c1e
 MISC metadata.xml 5488 BLAKE2B d3d216dbc02421c620a6c7fcb04caede1ce604ad134fb9332dfb6f96ee3a7d39d3c2b14dfbd2e0be757f558ad5cd98f2440a415a9d74668fe482a7c18629e199 SHA512 e31157a17c7907f380248fe530114fea29be570f0bc6f2a15a7a898ace88534dd5b9d15ee8cf22920f8330910a629d035ca9afdde06a6b631479b2843c1d30ba
diff --git a/net-analyzer/wireshark/wireshark-3.6.11.ebuild b/net-analyzer/wireshark/wireshark-3.6.11.ebuild
index cfd76089522d..e7c5d5f4f5e4 100644
--- a/net-analyzer/wireshark/wireshark-3.6.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.11.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/wireshark/wireshark-4.0.3.ebuild b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
index ab3fdea34f32..152c11941a11 100644
--- a/net-analyzer/wireshark/wireshark-4.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
@@ -19,7 +19,7 @@ else
 	S="${WORKDIR}/${P/_/}"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
 	fi
 fi