gentoo resync : 22.01.2021

5 files changed, 5 insertions, 151 deletions

diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index ed100977261d..c51034207228 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,14 +1,11 @@
-AUX gcc-fnocommon.patch 1045 BLAKE2B fd9311218388a2f650845b25c54ccfe9c7e4e377e8e483a849105c07d5185c8be38466f60c697ffb0b18b3d49e1b7f1571ee8842b396399cef593b9ccb462970 SHA512 432e174d2aaadac4373a704b1bebbd0c74b7e4286ddce8d65db835a28a6df334078dffac0b2643a2a77fb3b36d44e4ac44dcf678cf30ca622f1d1943b5fa4831
 AUX logrotate-3.14.0-ignore-hidden.patch 548 BLAKE2B 29a8efd36b000cc670a8a2db46cac3ad12ca49c5900409c3e1b456da88acc869e66a479481fcb24731d44d7d1815fce54068542afaa4737093a65a35ea7cd79e SHA512 2f08e4b1b483d301e2c6f9a5440957f43d336d44b3393c4408a02b5491826f887d53c782a6c7472bdb1ede9baacf2d1608d7385a576da0a8441a4b5a48ee5113
 AUX logrotate-3.15.0-ignore-hidden.patch 566 BLAKE2B 1739e0d175311eb2a3692826830bb101dc65b3966eb6dcd96fcbdb6bb1376eac5c0d0c78a26ff2ee6cfad57396d05dd3cae9ff4621a94b80d9a8b5877a52195d SHA512 ed572f12617812b44f7b79e9f3c7fb7aada1fed8f80244ee9e5e7c7f536e493c69790c7c62e0dc1951f979bc5a2cff581f439a8e1fb1a47722e6c0f1dcb4e65d
 AUX logrotate.conf 743 BLAKE2B d623d150d9959ae57e61af2c442434f81636521c133479aecbad8731662ee3743cb3db858ed8326ff87d61262d20893ab6141fe09d12979785e8c52c428f5964 SHA512 c0357a432a4619392895d8180db3c593239a96f62aba7cfd981c76e9d1dfd9d93d63860655025b1e9473374c2a51068028c3a3f316cb5cbb71562ca4a61d8d24
 AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe8d0bd1703e5075671dd1e13a030ec06fa269214bff9552670d3e0932e3dbde2e3673d59b7a50a2458b SHA512 f51852b1d5708a8fc48c6fcfd2fc4f34f3cd88d9119c607c0cb47f0cc0dc7370bd3399a9ebf781943cdd16a25bb4db0d81337140fc179faa72e18a848f3d8c36
 DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
-DIST logrotate-3.15.1.tar.gz 220263 BLAKE2B c164c542a0770965f5193f5816509f566b9afeb82ce8388a184d16c2b3e79aa0ef93be10d477c85f62037f01b3e626ea56d3173ca8cf017b8aa315f2e23b1a2b SHA512 72294607762751fb1aaaca1d62ebd87d109d837d50606176159a5e74782a993123321967b7a6185df6ca9c87a54febb832ac7537ceaa580a895901a995570cd5
-DIST logrotate-3.16.0.tar.gz 221904 BLAKE2B 38bfde57e9e055b86d6f25f0dd7c49b5d35865671926b1f8a2bd703ac8b8b2252d40cc29b0e1440309ecf224c747a99a2eab0ea99c86782559bef797f61fadb8 SHA512 2f2e8ebf9349424f529e4cf35e75036dadb00df84feac6b421b5a558ce015c9b1a22586463cba95a0265c104a559dd236764f7e37707975e626e69cc87e963e2
 DIST logrotate-3.17.0.tar.gz 224559 BLAKE2B 6d019bafad6986a0b6264893d36a515db75d746dd590afd26825c01c68e9ccf3c260502a29912d75c069ece8715ae14d3c13d4030f6222187be0e1ca05d60e49 SHA512 ada4415ef68ad97c1415fa0c1ba7bf108621777cd91599bf4f999dea1c1025596543aa00fd579cae4d39315b71c4d8f96a9c9d1178f78be7c523470588ab1d31
+DIST logrotate-3.18.0.tar.gz 224873 BLAKE2B f73ffa2d58a5125393e6c96e158e39e0b4cadef01e6eebd172220227a7e1363e6731bc2ac511fa028078054b55d42b131cdc30232ac5762ce4c6cbff79c19681 SHA512 d1bca267fbec4acbb83ffba4d3ac4c864f4269d8513e5614e7dbe6f3b1f176685218bffdb5d62f559ee73f84cf9a8a257c9f63e30af058d12d0034240f247586
 EBUILD logrotate-3.14.0.ebuild 2504 BLAKE2B c95b9546ebaa6175bfc8bfaf7cfe553d8859b2f4cd45148fab16c8f84dc50806d01fd27f9c851f077224e0b040e024aeb2fad5429d50ba77b6bf073b9574c32a SHA512 a1a3398e9895aa1884cbaee490fb21973826a258b30a2f12631c98c1c5848ecaaccd4696eea5480ed578e519bac79d19282f7590d32205408f6d1438963d28bd
-EBUILD logrotate-3.15.1.ebuild 2527 BLAKE2B 8bb89e3b8bfa250ac9d394d1291fee1e86540e34bf439fb020a5a98f849deb0658bcf56b6ed89222f2743d9b0bf333e202d0442387dd99b89823a3b25516e158 SHA512 7150d851233a645b918b333676113503f58a60451016a22b8c8500ec4630f5ad6c55b86cc4b64f2fe440947cc52040b43b4c924f3510725fb4c00912118146c7
-EBUILD logrotate-3.16.0.ebuild 2492 BLAKE2B 38e1d4f4fa13982c16375e66c014bd6e1b16c8cb589fc177aa38a9ddb52443ff9161e2255167b99d7b5631d51efb1d85861f62d881db96bce0893f2564d7a83c SHA512 26193d71af7b9a8f52770af0d9de85dd18fbfb525eb71bb231d69eb51a276d66dd7a3e5b6b77a65f2c71fa1cadf4c3732e1e03297ef8447a163153d28db480de
-EBUILD logrotate-3.17.0.ebuild 2486 BLAKE2B f52d8f5a6159345c29eb35e9a8706d1fb35335862d71e4f27d405f2ea634ffee26d19cb32a067631e42b4378876cc19460f0027be4fa13df043d431e6da2056c SHA512 0a0627a7226be397140f6badc430a7a0b0e982957deac8827b196cad5fe07944061819aa278b565d23a03db186b165716ed168166a1f633a36b9ff04f4f16d90
+EBUILD logrotate-3.17.0.ebuild 2485 BLAKE2B 3e244a1b935f0807c86cdd57e7f2cc42a22b8681a2a10f634d76e44f3d5058c761d732fd5d0e501f7a5374b1ba436a0f6ccf199c4158f6911805c0882d89a443 SHA512 c569c598b0671da82df47bf45e145b215662bac936c63b6751d681939b693707dce5aa4434433c91894bc0434662e1aa0ac73ce5b27450c734b3213917563bbd
+EBUILD logrotate-3.18.0.ebuild 2492 BLAKE2B e1a272d0faf0a73bd07f86d1167859adea17d59299a712c6dcee669dff0bc46d83e9839a0639a6f2932990124d74b515ffbd89ae63a590e82729d74acd38f3ff SHA512 2e8abdec38a8881817f2413ed2b87dfbc222e5565fdfabcb0eeea61e55bb83f17048282eb95fb2e87306bd772067cc1098dac8700e5e3b42b50096d6ea17ae68
 MISC metadata.xml 1207 BLAKE2B 59294176103f15343e415ada4c4e073cae53322114bf39b43376c6eec8206fd3cce19da99cf609b1e72340f15a272b94a5a956703c93659709f4d83605ab6152 SHA512 29acdfddf935cf1c3bd7e61cbecb19f9f5b4acac31d01aa89ea2f6395a7f59bc2501d3f751f5e8680fc71336cd56cc5abedd9850d44664ddbb12b140efa86645
diff --git a/app-admin/logrotate/files/gcc-fnocommon.patch b/app-admin/logrotate/files/gcc-fnocommon.patch
deleted file mode 100644
index d490c20ce0a9..000000000000
--- a/app-admin/logrotate/files/gcc-fnocommon.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 908e86191bf062711ea44c922e66d27203e90214 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
-Date: Wed, 8 Jan 2020 10:54:53 +0100
-Subject: [PATCH] split declaration and definition of queue variable
-
-Support compilation with -fno-common flag, which is the default for GCC 10.
-
-Fixes: #288
-Closes #289
----
- config.c    | 2 ++
- logrotate.h | 3 ++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/config.c b/config.c
-index 0e9a828..f027c7e 100644
---- a/config.c
-+++ b/config.c
-@@ -28,6 +28,8 @@
- #include "log.h"
- #include "logrotate.h"
- 
-+struct logInfoHead logs;
-+
- #if !defined(GLOB_ABORTED) && defined(GLOB_ABEND)
- #define GLOB_ABORTED GLOB_ABEND
- #endif
-diff --git a/logrotate.h b/logrotate.h
-index 1c178da..6c1c2e7 100644
---- a/logrotate.h
-+++ b/logrotate.h
-@@ -89,7 +89,8 @@ struct logInfo {
-     TAILQ_ENTRY(logInfo) list;
- };
- 
--TAILQ_HEAD(logInfoHead, logInfo) logs;
-+TAILQ_HEAD(logInfoHead, logInfo);
-+extern struct logInfoHead logs;
- 
- extern int numLogs;
- extern int debug;
diff --git a/app-admin/logrotate/logrotate-3.15.1.ebuild b/app-admin/logrotate/logrotate-3.15.1.ebuild
deleted file mode 100644
index 7222c9aa2024..000000000000
--- a/app-admin/logrotate/logrotate-3.15.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="acl +cron selinux"
-
-COMMON_DEPEND="
-	>=dev-libs/popt-1.5
-	selinux? ( sys-libs/libselinux )
-	acl? ( virtual/acl )"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-apps/sed-4"
-
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-logrotate )
-	cron? ( virtual/cron )"
-
-STATEFILE="/var/lib/misc/logrotate.status"
-OLDSTATEFILE="/var/lib/logrotate.status"
-
-move_old_state_file() {
-	elog "logrotate state file is now located at ${STATEFILE}"
-	elog "See bug #357275"
-	if [[ -e "${OLDSTATEFILE}" ]] ; then
-		elog "Moving your current state file to new location: ${STATEFILE}"
-		mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
-	fi
-}
-
-install_cron_file() {
-	exeinto /etc/cron.daily
-	newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-ignore-hidden.patch"
-	"${FILESDIR}/gcc-fnocommon.patch"
-)
-
-src_prepare() {
-	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
-	default
-}
-
-src_configure() {
-	econf \
-	$(use_with acl) \
-	$(use_with selinux) \
-	--with-state-file-path="${STATEFILE}"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	insinto /usr
-	dobin logrotate
-	doman logrotate.8
-	dodoc ChangeLog.md
-
-	insinto /etc
-	doins "${FILESDIR}"/logrotate.conf
-
-	use cron && install_cron_file
-
-	systemd_dounit examples/logrotate.{service,timer}
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
-
-	keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
-	elog
-	elog "The ${PN} binary is now installed under /usr/bin. Please"
-	elog "update your links"
-	elog
-	move_old_state_file
-	elog "If you are running systemd you might need to run:"
-	elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
-	elog "in order to create the new location of the logrotate state file"
-	elog
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "If you wish to have logrotate e-mail you updates, please"
-		elog "emerge virtual/mailx and configure logrotate in"
-		elog "/etc/logrotate.conf appropriately"
-		elog
-		elog "Additionally, /etc/logrotate.conf may need to be modified"
-		elog "for your particular needs. See man logrotate for details."
-	fi
-}
diff --git a/app-admin/logrotate/logrotate-3.17.0.ebuild b/app-admin/logrotate/logrotate-3.17.0.ebuild
index 98a69f1ad414..33eb0d103ce0 100644
--- a/app-admin/logrotate/logrotate-3.17.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.17.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="acl +cron selinux"
 
 COMMON_DEPEND="
diff --git a/app-admin/logrotate/logrotate-3.16.0.ebuild b/app-admin/logrotate/logrotate-3.18.0.ebuild
index b63b513c2ef8..8d3aed775a33 100644
--- a/app-admin/logrotate/logrotate-3.16.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7