gentoo auto-resync : 14:09:2023 - 22:48:30

5 files changed, 9 insertions, 2 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 7e32ab6728a4..08697d0a2ef7 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ccze/Manifest b/app-admin/ccze/Manifest
index 50d875c072f1..ff0cef163752 100644
--- a/app-admin/ccze/Manifest
+++ b/app-admin/ccze/Manifest
@@ -4,5 +4,5 @@ AUX ccze-ldflags.patch 424 BLAKE2B a769c1c617b7f421a0cac4cdb3141169eca8a0e23fd38
 AUX ccze-segfault.patch 660 BLAKE2B 863fa14c8ded2df423b0ff5cd9936ccb390b11d3b0dfa396d515e9a85e411c9f9f7f3ba76f04c4ba04ccc19cc43594f4d304b54cb2155ef44ef08c9c00d4b691 SHA512 e8ebdbc8293b4d765d683bbdd222c0af3aaf0668ea8376ed830efac3cdb4a99dfc75dda6e59b95e7a36b7ab4fc521a9a1937e4ab9a48218acc76d2b02844b900
 DIST ccze-0.2.1.tar.gz 139795 BLAKE2B 112e3968ca00bdb9ebda91b30a697f4422935755b3bf33d47c0a8800f3d05e371a4ca4db0ef52f10e5cba1c537ee3f666479103dc88a30f270c76268fece5cb6 SHA512 1704da8d4c97a3403a57d7841db8a6e4ba6116e401f91d9ecf1b1371cc18b40641e5665c9414740d6a523874be6b6527f5c0d4f3a3796c7b96ed83192146b2b7
 EBUILD ccze-0.2.1-r4.ebuild 912 BLAKE2B f9af8b72c1fc4dae22aa3c59d8e4a8f664277b30f66883dfa0e1716c29f517f2090e5b3a85c5e376d5e9f2df10c5e10cdd917b03426b54e84817197cda2038c5 SHA512 605ec72fc25c76bea925b9ef3ed3031d918cd071e36d9163e242dfc5bb8c2b03687695ba0864a9af5f0a766ba70721cce8850f27010aee6a9540773aaa219b41
-EBUILD ccze-0.2.1-r5.ebuild 898 BLAKE2B 8bcc0bf5073fdee22cd53d3b7521db108fdcf1d36dfd1966f73f3d99d573a206106d9d8678c4a8d1bd245d177b44e94139213134f6bf9872036e3fa2bf28da4c SHA512 ecccddf5859305a6da41141609e54b87c3e79818871b165473a30257e8bfc46b59832d822bd952d514a803e57dc7f75a94b1b3e1bdf57d5e892a5dcaa40eb72d
+EBUILD ccze-0.2.1-r5.ebuild 928 BLAKE2B 2606ed7aa7bf02946163a78421791417e44fcfe095e95ad08d0df14426d9be79604d1248a2ed7ea16caacead0adc9f0078bbd6db4b5a7d03a0aff3ff9f0e9500 SHA512 d72fd65b5894de4f5e3472af3af5275f31d60d62bcbbc475023ac12b97ef338ee14e679ad9cfbc606cffadd9db7fbc4e2b9e7db53e14e3d4abcd8eb9c3224f40
 MISC metadata.xml 502 BLAKE2B 24d091728901e59b3367f3bb2787b3bc61d424e5dfd3288b9baaf7355e468e5e03bcbc66f2b8c49dc3069c527438b4ae8723f1b9542de101532c3d788352e2a2 SHA512 02da4256cd16cadf57bd3bea7f1871fe03f3a673911efe80d7b46efd84a4388562f044219423468e52e8fe393447939136dbee76dbf7874da9238492fe24d4c7
diff --git a/app-admin/ccze/ccze-0.2.1-r5.ebuild b/app-admin/ccze/ccze-0.2.1-r5.ebuild
index 15290385eb75..defcc9bffb70 100644
--- a/app-admin/ccze/ccze-0.2.1-r5.ebuild
+++ b/app-admin/ccze/ccze-0.2.1-r5.ebuild
@@ -13,6 +13,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 
+RESTRICT="test" # bug 913965
+
 DEPEND="dev-libs/libpcre
 	sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
diff --git a/app-admin/logcheck/Manifest b/app-admin/logcheck/Manifest
index 63b1424577bc..530bee2f965b 100644
--- a/app-admin/logcheck/Manifest
+++ b/app-admin/logcheck/Manifest
@@ -3,5 +3,5 @@ AUX logcheck.service 210 BLAKE2B 9a523099c54580b141b17933bb833f386ed49ed5534374d
 AUX logcheck.timer 140 BLAKE2B eef8f5fb279b417c4ecbbd849a4e01aabf77744deab5fdd574cab6728b8d09046f38f269486e2119bc151b5ace042fce9917f216d30960df92aeee5fb875b48d SHA512 3b1eb31ea97c12021c562813ae94d595f56699ca26d47b04cd0b4ccd67afd17fe977d34958e66a21da69416d24900c4be292a175a66f68f65bba134e7bec21d7
 AUX logcheck.tmpfiles 72 BLAKE2B 025613bfed9705108c89566cb298ea4ae9754bc8c3d34d5aded2fad7fb74c20d437bb1e83cc4aa6f816a8e0035fab26ec6a307922cd1852b6f45af3c2d6c0b21 SHA512 738ae50af504709931fe7e4bdbf4024f095e489bd674d83a63565a07eea4f13945ff8d303d432eb891a1af74ed3711e88e0fce06d846de49e8c1eb7f4911f31d
 DIST logcheck-1.4.3.tar.gz 168176 BLAKE2B f319a644afa0de5533e37b288456f35bdc47daa6c76c413dc916d05f162b24467f70d73bba97eb9cdbc162973e9495daa48263d9f04a2f0151f7ddc5b66a6a37 SHA512 c853493d693dd44f477561596be4de1ad74c4b4380f83f86d6204e0de59c7edccdc4c8d6ec53a96f6eefa4d1995910e9e395c7573b0e2ee8f75d632abb104e09
-EBUILD logcheck-1.4.3.ebuild 2185 BLAKE2B 1e046dec5ac21b1a34e2c67ca2d66bd6ccae9817bf6610083044372c38eb928cb76fb1ee5fd89d692779662f3139d87aa64d966d267bc211b506b13314a9fcc4 SHA512 ee6f53005b09154a61ccb8e4a65eea7232d8b04ec444aa45172059c93cb3c1bcc98ce12ec2ff04df6f2dc3b047a69f05a228942e1ec5b5657ded2312d505abbc
+EBUILD logcheck-1.4.3-r1.ebuild 2383 BLAKE2B ec54fa47f7b3140a60bb18208e7672d57670a06ee5c1ef0850c01463df0b3690f393fa15adbd3271087b46592ed63f4656adceb5df098fd58c354a65d645dbed SHA512 f5c5ba709404d455385b6d8e7ab96799642e9c8c63f6a4a7d54d896b18132e807757281a12ca9b29d8054d75bf64b605ebbfe20aed2a05a5a5d5a8dde15cad92
 MISC metadata.xml 1473 BLAKE2B 2604b73278294910db47dbf0731553125548286e2dd82bc3d733564a67f6fef6d522d2ad0be50104778d09fc20751dcc1532fd929157e23d409b999df376084e SHA512 b25aaaf6aedddf70c9d3c098f72f50b5beca2d7e1044627b76d762df69c4b0494b2e72c8a5647323afcbc0abbac8478331004808841d5d42590bb0657d1d732b
diff --git a/app-admin/logcheck/logcheck-1.4.3.ebuild b/app-admin/logcheck/logcheck-1.4.3-r1.ebuild
index b9657a685030..76743bb9b220 100644
--- a/app-admin/logcheck/logcheck-1.4.3.ebuild
+++ b/app-admin/logcheck/logcheck-1.4.3-r1.ebuild
@@ -49,6 +49,11 @@ src_prepare() {
 
 	# QA-fix Remove install of empty dirs to be created at runtime
 	sed -i "/install -d \$(DESTDIR)\/var\/lock\/logcheck/d" "${S}/Makefile" || die
+
+	# Comment systemd journal check if systemd use flag is not set | Bug: #913857
+	if ! use systemd; then
+		sed -i -e "s/^journal/#journal/" "${S}/etc/logcheck.logfiles.d/journal.logfiles" || die
+	fi
 }
 
 src_install() {