gentoo resync : 12.05.2022

3 files changed, 3 insertions, 59 deletions

diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index a0ed97cd74a4..f3b50834376d 100644
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -1,8 +1,6 @@
 AUX reiser4progs-1.0.7-readline-6.3.patch 472 BLAKE2B 88f0489b88691e72a8813145428e949b0ace21b15dc01f18da4292524e3601adfbe30e3b6cb3d1f12174bc5241fa7732bf36856025c7af5c678f3ca53d24497e SHA512 0162505148699f8e5270314be586d8db7d42f9ea5fc8517b5475aa59f54b47eb626349c36820cc34c0490e0c3df1597a230c27abf316226cc7d261e986963788
 DIST reiser4progs-1.2.1.tar.gz 980203 BLAKE2B 8c9cb77458c083c50f34c17bddf4747b755b52b911a63835152ad584494c2738a5317c28e5b3f1e6bfdc49416f3715ca4fbbd9c8a428b5b484b54f8f4a861a58 SHA512 2caac5a98d672d68910c6df3e694a42365fa6273ae367c26126778c1fbe956aa502dac236d36c3302a5bf109468ad3447e645a6eab89c83f122dd1afe2aeda21
-DIST reiser4progs-2.0.4.tar.gz 997361 BLAKE2B 3d083c2c702f6c469403447bd2bb59257c22a6f87e062b83227c97147c37e69f93f1ffb6a1ea2c9f23f94a5ac8fcb834da475893c9bd268fc8902e6af2af4c10 SHA512 222eaa69f89fa1cfad2b5791af028560fb6e57e44fbb5e025122c25b50dd4aea28a8fd362818a884fa6b3d6164e5b0c78ab63f0649e2e65780f1aee2c0d26375
 DIST reiser4progs-2.0.5.tar.gz 997516 BLAKE2B 38799bd2161ac3ad631b3f11f4f01f647fa8210786fa4aeb290a84dac95080cdf979be1cb4526abf08567e88f25aad54a3d776be85900e702a7325e674ddd0e1 SHA512 1e1f263828bd5f44837bcbdde072a94b2cc5a099dbf52d3e0f7f6851812fb2e8b77a3edcf5448f678304e23240c63919547a9671d36b816f97f989b17b494d27
 EBUILD reiser4progs-1.2.1.ebuild 1288 BLAKE2B 0b7ca382987ce89c562872041157c2cd3eeffee56efb8fb7ee0cb1ba895caeb0e9421e4e071f10dd46f453fefe0a1be21661bc13ea3e5e28d9d26d87b1e8b575 SHA512 425f5935fae4b159a56717e611df6bb2abcab657058ed96326d7858370554aafe37bc1c4b0744e7dd368aaa6423b1e2f481917d6bf5735b5a7adabb1cd7d4975
-EBUILD reiser4progs-2.0.4.ebuild 1348 BLAKE2B 309eb37179f526c8eb55d848c5da2de5288ea3df88dcdb09e3155151eb6b0e2a1efd5190886b58a910c912b4e992a08b035264dccc12ca0ef5692a7d9928e77b SHA512 1a9f042cdb874e0a207774d62a7b804ae8980d7b09920cb05b6ed1439583d8aff4164e51b511b2cbbb172df6f9800435aa9a65570ca8348d617d1793e0af3246
-EBUILD reiser4progs-2.0.5.ebuild 1343 BLAKE2B 096b9fb491117f98c6e4026b00f1e29037c526913d0c24ed8c6fcb8b45f532652b6338bf0f0e6440c3e4be9d869812c985be6956381228fad8140ac468010340 SHA512 5069c930aadb2de9cbe4e59c4905c876f1bfc9d1114f1dfd3150b9decedb58d6a75326317a56da292a381c04b33adb8fe9dfbf68e88a9ae4f7048fd13f978497
+EBUILD reiser4progs-2.0.5.ebuild 1350 BLAKE2B f4925fdf9a48e9d9c1dc671182cf05475ea25836db6b6f92548ce7c16dba647f01bad0ac3a9bc869fdc2e5876a18f934d05479bd27f475fbe40dfb42808c0264 SHA512 ff0b38999e892643afed5afe80f72297d808d15bb5715d77dd6925b84fffa0fedcfeb346167f3b5710e199952ca1a3629e3b42297558799c5041edb2d5aa99a5
 MISC metadata.xml 241 BLAKE2B 69c2c526450c3fac8db61a9c83fa92e17f984bccdba1aab9c459dbe33a73482285305799efc2a544d5abee60e89f837bc5ebe431c39fd4acf4864bd5c0803f2d SHA512 11398472089e202d23a52ed08057c7f896a18818ded02333969613b3d6733377b1b5062b690518af2924f1e9c4347522da66994f8de72f0ca9192d0f90ebda16
diff --git a/sys-fs/reiser4progs/reiser4progs-2.0.4.ebuild b/sys-fs/reiser4progs/reiser4progs-2.0.4.ebuild
deleted file mode 100644
index 45ddbfaabf1c..000000000000
--- a/sys-fs/reiser4progs/reiser4progs-2.0.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs usr-ldscript
-
-DESCRIPTION="reiser4progs: mkfs, fsck, etc..."
-HOMEPAGE="https://sourceforge.net/projects/reiser4/"
-SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
-IUSE="debug readline static static-libs"
-
-LIB_DEPEND=">=sys-libs/libaal-1.0.7:=[static-libs(+)]
-	readline? ( sys-libs/readline:0=[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-libs? ( >=sys-libs/libaal-1.0.7:=[static-libs(+)] )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.7-readline-6.3.patch )
-
-src_prepare() {
-	printf '#!/bin/sh\ntrue\n' > run-ldconfig
-	# Delete hardcoded link/compile flags.
-	sed -i -r \
-		-e '/CFLAGS=/s: -static":":' \
-		-e '/CFLAGS/s: (-O[123s]|-g)\>::g' \
-		configure || die
-
-	default
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static full-static)
-		$(use_enable static-libs static)
-		$(use_enable debug)
-		$(use_with readline)
-		--disable-Werror
-		--enable-libminimal
-		--sbindir=/sbin
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	gen_usr_ldscript -a reiser4{,-minimal} repair
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild b/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild
index bc2336496e29..88d7ce5023c9 100644
--- a/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 -sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 -sparc x86"
 IUSE="debug readline static static-libs"
 
 LIB_DEPEND=">=sys-libs/libaal-1.0.7:=[static-libs(+)]