gentoo resync : 29.12.2022

3 files changed, 2 insertions, 70 deletions

diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index 8a41653c5233..6ab4b1005f4b 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -3,8 +3,6 @@ AUX metalog-0.9-metalog-conf.patch 269 BLAKE2B ed59aa36a7388b4f91be80731fcfda0c8
 AUX metalog.confd 393 BLAKE2B 326653a23ff4e6bc78a4ddebf8af7c517f7b67973063ce1ac642195c7566667c7a330a4113acdd451522c907aa0814195ed5124aa92184bfca08eddc670b2d3f SHA512 4fea6b7f48e55d5f69a9c9a69f54623bb9d515e2fd2eda6829f8b769eec85e3de448eb42feb6bf65645400480169b3d70d56dff090103cfc95a3810515c42b2e
 AUX metalog.initd-r1 651 BLAKE2B 7b7739ca48acd3ce646478b51639c14f7cf131a698570f7f67e6cd347ef3361fe7212ce1441ba4a582cb0e59f8b2c9d2e7832b4e8b4f019c87d268a2833639f0 SHA512 09d8ac585418c6a3dfccc9d0f1a050b5862924712d78dc44fce3cb497bb362afe0a556240b14cf957fcdf64d0d06f5b6a8df4372c69129b43dc3520ecd310344
 AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8
-DIST metalog-20200113.tar.gz 40276 BLAKE2B f2fcaccf610f3b7f1974aa97f2c7b5181f3c625c9e28d72832ba1570cfa369873887c83468bcea6a9f3d3080356bd1dd62849ec34a5d03c1272ada7f476946f6 SHA512 d399d86f988c69c9f74553cd682a5fe04886bca458e6f8bb3132fe1fb9f522510a428cfde8af0857c5ba22531b276b04fa05183e0006c2d28ef0f0aead488f93
 DIST metalog-20220214.tar.gz 40898 BLAKE2B 7ef04b9e0cd1ba878a11d988ec4b4bffa3d733f86c6b8cec57d32dcf837fe48a001a233a2b09378443b26f6e69869b8de7afeb25f11bb7729b66e1aa3a305f67 SHA512 44a1443e8f9e92460f128aa35125d50ae247ba4f2ce8fd8cc32b96a491e29963cdc27be12a6db28f286e2d5a2bc6243e126a77ae3eb642e7c969d58446a18fcd
-EBUILD metalog-20200113-r1.ebuild 1600 BLAKE2B 33d3eacc9e127c16c9397d43f83408738a357da739c5ba3fc7ba481c700c3e9fd0a720c20c1dc81b7f83371d93fd05c6dce7053b2fef989958ba53433de6bfb0 SHA512 b245200be3fdd4b92f97c15deb21d41789ac717deb430d6532f7eea0bf3158e1580b0a83d3d17fa66cc5ce174af991977856cd9ea657e17b7755e1c9f0bb4c70
-EBUILD metalog-20220214.ebuild 1616 BLAKE2B 8507ba9568e17e062cce50281013e6862599d2786efdcc3e073c2d2c04104ceb5dba67fea0aea027cfb7742a4c514242c17ad94ca0b46cedbee27acce5e2c47d SHA512 f9e5e818eae5deefc8a0e7b4e521d256ae987c4ba87fe1d21b0a2cc6978317a71040be395bca3f3a4a4d97676cee0b31f5b96d128a7f7d81ea26dd53d4fa4ed5
+EBUILD metalog-20220214.ebuild 1608 BLAKE2B ac154c3a01f80ecc0ebb64ce9bb37b69e5335a5f53d9531872faa82164700442299b9d172f16e975f5f27cc9e32b9a0f815b56e96008003d683413733cf10213 SHA512 7db94f90f6e6e2f43032d6b01a20e79f1749cb8c9eaed5ddf5795ec387f23c9cbff5503eb4f1d0993d905c90f0e03938ed5af71e0d3a61572e0870ce859129ba
 MISC metadata.xml 335 BLAKE2B 79615a8fc010da3c58df284f7c0490ca2a56bf0a31761090e4fdbde48f70f98660ab5e682f272a21cd820fb3b52a75b48d42f63d5b5debc5fa767f62eea8a938 SHA512 6ccfe49519ce8c5d9d76bf305993e09c76c2d095e0eea30c3de32947dbe80d6c99385a8bb743f4c78697324d9ae24bfb97b2f79385e5cca16dd753c448f517dd
diff --git a/app-admin/metalog/metalog-20200113-r1.ebuild b/app-admin/metalog/metalog-20200113-r1.ebuild
deleted file mode 100644
index e91e777b7487..000000000000
--- a/app-admin/metalog/metalog-20200113-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools systemd
-
-DESCRIPTION="A highly configurable replacement for syslogd/klogd"
-HOMEPAGE="https://github.com/hvisage/metalog"
-SRC_URI="https://github.com/hvisage/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin"
-IUSE="unicode"
-
-RDEPEND=">=dev-libs/libpcre-3.4"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9-metalog-conf.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with unicode)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README NEWS metalog.conf
-
-	into /
-	newsbin "${FILESDIR}"/consolelog.sh-r1 consolelog.sh
-
-	newinitd "${FILESDIR}"/metalog.initd-r1 metalog
-	newconfd "${FILESDIR}"/metalog.confd metalog
-	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
-}
-
-pkg_preinst() {
-	if [[ -d "${ROOT}"/etc/metalog && ! -e "${ROOT}"/etc/metalog.conf ]] ; then
-		mv -f "${ROOT}"/etc/metalog/metalog.conf "${ROOT}"/etc/metalog.conf
-		rmdir "${ROOT}"/etc/metalog
-		export MOVED_METALOG_CONF=true
-	else
-		export MOVED_METALOG_CONF=false
-	fi
-}
-
-pkg_postinst() {
-	if ${MOVED_METALOG_CONF} ; then
-		ewarn "The default metalog.conf file has been moved"
-		ewarn "from /etc/metalog/metalog.conf to just"
-		ewarn "/etc/metalog.conf.  If you had a standard"
-		ewarn "setup, the file has been moved for you."
-	fi
-}
diff --git a/app-admin/metalog/metalog-20220214.ebuild b/app-admin/metalog/metalog-20220214.ebuild
index a774d0a007e2..ef771039b142 100644
--- a/app-admin/metalog/metalog-20220214.ebuild
+++ b/app-admin/metalog/metalog-20220214.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}-${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin"
 IUSE="unicode"
 
 RDEPEND="dev-libs/libpcre2"