gentoo auto-resync : 26:12:2022 - 14:07:48

5 files changed, 3 insertions, 88 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 17828d0788ec..687d173e0333 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/coreboot-utils/Manifest b/app-admin/coreboot-utils/Manifest
index d6e2f9f8d96b..132e3b50e694 100644
--- a/app-admin/coreboot-utils/Manifest
+++ b/app-admin/coreboot-utils/Manifest
@@ -1,5 +1,5 @@
 AUX coreboot-utils-4.18-flags.patch 1264 BLAKE2B 001658e09f1a580d2523c8cd09d1dfdbe6771b787e7e7af9b1f80ae6491a969536d54fb80af8914394ac6193744be2cd23068e2a577b2cd31208e3dd10b9e11d SHA512 5325b7f639f5d010fd8fed565a123f6e9688642c0834bfda2c7b9dbb49b157427f34292069785fe8f8b6d2e6b4d60fa45187d91a79a66db7f6a041fd0a9da562
 AUX coreboot-utils-4.18-musl.patch 2033 BLAKE2B 27bb15016ff4642134c9f01037ba84ae9be2c0e02ad37b5d32b30f7f5186d7411eaa35352017e12db40fbab9d020415b26fc5a602db676eba79ee7456dbf2f8c SHA512 7d74537d36fdb322c4b6182ab1cb5f39a2cb3d2ac8c92e38c5443fd4391a8ceaceed9a93b09a327482912efa96e09fef4dcc5e2587c74c3da503983db754ffd9
 DIST coreboot-4.18.tar.xz 57868424 BLAKE2B 981d8c1cf007be15a85d5860dcfcfa6fa637f66438ff4ef6619491aaf0192e622bfbe9608deb13a975d899c94430bc3d1f0eb3a5a3dc6598f49a726b8ff641e1 SHA512 b363850d31074950bc710bd0a47a896a6c6ef23c53d720ae90ec2257697a3eeeb211e163199064b5e532e5b1e86cdecf997276d742435deeaaacfb19b83f4e6d
-EBUILD coreboot-utils-4.18.ebuild 1495 BLAKE2B a78199ea40f9ba74de386091d5538cefd5d63fb82820b5acc6e9fd073584af2b4fac9fbb095b74e9a82f91085dd140a1af2ea529173446f394939b7f44a9f6a4 SHA512 7c4aade0345eee617360386eaf40be619dfe5b8f6a5906099177012711753a29ff3f68f73af4266dff29957405093b12022434991d6b1a7c34b380971ba30b38
+EBUILD coreboot-utils-4.18-r1.ebuild 1508 BLAKE2B 6c064d97ed7a1802ab0927beee970151c3b5e5769f03be1d7e6b0403ba61a6b12b84d494ef62cf2c096c20082906b5ad5b93c49f471467902322c304a78a4d7e SHA512 e05ff2b230bb975b6d5070ac840efcba942daf2748b20d4443d445ed095c08ba9e7b35f7f1e5900eea636e3a7f50a6177cc2232164ee59ab27434d94c06cbebc
 MISC metadata.xml 223 BLAKE2B 3ade38574009f425c0670f7c377386f6263f08ab222c58e1f433bc81159209e56e52a6709d1858760529606c21c55ec68d24c45358d6f525a9ef6ac1474f80c9 SHA512 4cd7de2eb60e5be6f2eebb7169ffdb9e5255362755527921ba60781640766b58e4ce47da81134ded62746a2f95b7b5591933e4510cec7e94a69f16377bd2bae4
diff --git a/app-admin/coreboot-utils/coreboot-utils-4.18.ebuild b/app-admin/coreboot-utils/coreboot-utils-4.18-r1.ebuild
index a9115a5fe9d9..f50dd5d15b0a 100644
--- a/app-admin/coreboot-utils/coreboot-utils-4.18.ebuild
+++ b/app-admin/coreboot-utils/coreboot-utils-4.18-r1.ebuild
@@ -42,7 +42,8 @@ src_prepare() {
 	# force optimisation
 	# can't do this in one sed, because it all happens back-to-back
 	for e in '-O[01234567s]' '-g' '-Werror' '-ansi' '-pendantic' ; do
-		sed -i -e 's/ '"${e}"'\( \|$\)/ /g' util/*/Makefile{.inc,} || die
+		sed -i -e 's/\( \|=\)'"${e}"'\( \|$\)/\1/g' util/*/Makefile{.inc,} \
+			|| die
 	done
 }
 
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index daf686afd287..3f6ec85cb03c 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -1,9 +1,7 @@
 AUX sysklogd.confd3 71 BLAKE2B 26e34fc5bd8fe936cb5cbe1ad7b3dc9ae47e153d731ecde62a354470448f91950a5ffe76104e80307543922bbb5777b9e3d096af8740d66a4dd637f4aa3adac5 SHA512 80a2159d24b343a5b14da054bd073015ffc8f81c6e5b47114429b6c069b81a3331392c88baafd9a5ac1e0d778119fa7ca10def17eeb9b88c7f5cca1c0d31c6b2
 AUX sysklogd.logrotate 402 BLAKE2B 2aba98bcef0516602268132507248ea44097541ac5659427f24a286661c500e6ff92b387f184bba84d0f10669ff9c917d7c8ee613c7fdb3a472434485b5f8c78 SHA512 655b25bc92c6d73807b11b0d64f97d619c067efb9fc16ee9c2aba5ba349b13991a22c83e7adaafb95e17578b17992992cab16d18b7bdb2be7d4fc876df5824f7
 AUX sysklogd.rc10 443 BLAKE2B 04d5d645a6e79582ce4532fdf5eb4453c61e66017596c641b6ebc087963f7667dc3dcef6d2d90c0602da753fb77fdd063a1bae5907798c47e7c0e92feb9a884c SHA512 274642e7555badc2395e4a08684b07e4b5be91cfe92f5f2e47903263dde1ccb67c9a5932864eb623d11d97a3ad429b28a8ab7a8d93177e949a2f8dec9a1aaea4
-DIST sysklogd-2.3.0.tar.gz 441168 BLAKE2B fa2ec9975d51bcb26d7acc88ab02e211453fc7e6d722ec6d38543a20833ae9c49b9a274d323e7a32deb82ca9c38025947e25b15424084a0ce345410a2e686a4d SHA512 7a16dd3f45a71015ad055e64aa62f4f94b0a8aa739f407c03376241cbc16ff764a768a698362cb428d150b169934798b774622b330903b287f9af5dd846775fc
 DIST sysklogd-2.4.4.tar.gz 451938 BLAKE2B 218d9487440ab3fa395f596e5e4a9fa95df9dfa416470da658a9ac742437050c81a6e62b42763b038b8dc5d8cfab2ba30d049e269b08a66882f6d3f99863ee7b SHA512 434609dd11951b37d62b5371a2aef66424bb15ae4c98cba44762e8338ac135b37a453e5a4f40492ab80bce9b72faefc9a0ad065753f4cc5f7595911477b26e4a
-EBUILD sysklogd-2.3.0.ebuild 2112 BLAKE2B 1f8cb90a6f5ab144eaebc6625b6ab1bffe003a1e3a1ce8e182da214f9bb77ddcfd2a59b95192f8b68230a2315003792bafd68aa9470b7e8412d3e735de32fd55 SHA512 0c2ab19307e93aee1773fd759c734de47869b555b2abe968e3db5ebfb6ad9bbc01c94d2be128fe7e1553a584bd69bbdb59919cd495a6d272022f49ddb486c39b
 EBUILD sysklogd-2.4.4.ebuild 2100 BLAKE2B 9445ba98080898d1423312f377c871742a2d3c1cc14555418743cbe567d2e165dd1aca21ec8ce713e679a343140b914e140ea95c4d3eb58e7c704511d1a4ce9b SHA512 6098d606062db317788d64b74d0acdc5425c7dae3180c4a08bdca4c182482d3a02c05511604f00adb09175a10a6a99456c482f2aea1dc11921eaa98045902f39
 EBUILD sysklogd-9999.ebuild 2106 BLAKE2B a8385ac39db7d3a9b2b92d338f4aab266f2773d6f53ef8fe479417477172fa25330cc61e95a51d7e640edf2488f5c3229161cfc8f5067c4cfa2d8034cef3da37 SHA512 b7e2e4f7b55e9d55ee01d4bc6541f87a8f9e4ab5c57d9a7686a9cfd4ec4591b6183e7f8b6a4574586c88e65c2abea60292d284ca44086fbe57ae0f1a70aacab6
 MISC metadata.xml 527 BLAKE2B c425ac629ecb84dc5e6df9d943d5366594bcfc95eac4f529720c97825f4192d4ecba8d3f5174110e654775faf368a73ef91117eb63123d09f5f6ae9880d6ddb6 SHA512 9a4deed01fed81180553cdac43d0a03967fea0aa2a1ce1747faf592abee998c8fde4744b5cd90adc3dbc324e62df7479c686297364010aeeafc09128981fee27
diff --git a/app-admin/sysklogd/sysklogd-2.3.0.ebuild b/app-admin/sysklogd/sysklogd-2.3.0.ebuild
deleted file mode 100644
index 001fbc1e0c86..000000000000
--- a/app-admin/sysklogd/sysklogd-2.3.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Standard log daemons"
-HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
-else
-	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="logger logrotate systemd"
-RESTRICT="test"
-
-DEPEND="
-	logger? (
-		!<sys-apps/util-linux-2.34-r3
-		!>=sys-apps/util-linux-2.34-r3[logger]
-	)
-"
-RDEPEND="${DEPEND}
-	logrotate? ( app-admin/logrotate )"
-
-DOCS=( ChangeLog.md README.md )
-
-pkg_setup() {
-	append-lfs-flags
-	tc-export CC
-}
-
-src_prepare() {
-	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--runstatedir="${EPREFIX}"/run
-		$(use_with logger)
-		$(use_with systemd systemd $(systemd_get_systemunitdir))
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins syslog.conf
-	keepdir /etc/syslog.d
-
-	newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
-	newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd
-
-	if use logrotate ; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/sysklogd.logrotate sysklogd
-		sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-	if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then
-		elog "Starting with version 2.0 syslogd has built in log rotation"
-		elog "functionality that does no longer require a running cron daemon."
-		elog "So we no longer install any log rotation cron files for sysklogd."
-	fi
-	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
-		elog "Starting with version 2.1 sysklogd no longer provides klogd."
-		elog "syslogd now also logs kernel messages."
-	fi
-}