gentoo resync : 24.12.2018

3 files changed, 2 insertions, 53 deletions

diff --git a/sys-fs/reiserfsprogs/Manifest b/sys-fs/reiserfsprogs/Manifest
index 9c0086b8de92..2afb1f55fb0a 100644
--- a/sys-fs/reiserfsprogs/Manifest
+++ b/sys-fs/reiserfsprogs/Manifest
@@ -1,9 +1,7 @@
 AUX reiserfsprogs-3.6.25-no_acl.patch 274 BLAKE2B 1b49c0c98d935c1bfcb0191882a7e8e21aecd042dc8a8ba5d3a807dc59534b9b47e727ca668741fd8a82c811a744706348c3ea88c39837af891a2c711437f5c3 SHA512 29419b64f7749612ab2883da91ac97831a2ba8aee819b6e0e8b781b34594541e59b6b7a3841e9967e4623fb9772e4be81b13970c86d61497222789ffa8b4e20e
 AUX reiserfsprogs-3.6.27-loff_t.patch 504 BLAKE2B 6c38ac24d9d8e0bc665557303b5cc299fdd3a4529bc29370ffa8129499ac9d6e1f0a7ed66c93fefa1a647a304ae77309dc87deeeb8b29961398e509f30d0cb27 SHA512 74332f8acd84a3d0374d6ff9803e63bc78ceb18ec130fef213bf326a6b146b8e4951ac8aee5b7349239716627889febd1c832862ae058a822cc71b0a75333d2f
 DIST reiserfsprogs-3.6.25.tar.xz 448984 BLAKE2B d9f032e51f70497cf84f5877172b68e8acacf8fecb3fee7d7c3d82c98cbd5c70f870baa96471b02f092345a86bb02501bd53156cc8e7e3230660a7a6865c2421 SHA512 247ca392d227680fb24e94cd490319e77e82d00d7d357516690d2cab6f0bbe8b35879f8a25ed5046bd3a7a3e1f2b140a8a82404043aa0e7f6f60f57d069857ae
-DIST reiserfsprogs-3.6.26.tar.xz 357276 BLAKE2B 820ec1733c96c9f63a52622424856b5030eba3878d00fbd389781eeea824ef128789168c84e46b8242c1bd96cf3e68e61bc91010b16789c499a44e451c8c261b SHA512 366f326d25fc5940ebc37b2b340607d2234296dfa42795e584cda670597e8dd859633499e6ab87ae8d53cd31b293ddbb15113944a17bfd601baa494abb02a9fa
 DIST reiserfsprogs-3.6.27.tar.xz 449176 BLAKE2B cd22120faa4d6d11ab545349fde5304f41cf3ca88b2c988255b7ca0e87961c9ccaa3095cad086e479a2b50627ad9bf3e90b2af46ddda64abc119e2a6755b8341 SHA512 bc524aa1ad7f8502238761fd185bfb8473048947bd579e2803c73371928c6b245e0d90bd9d458f4bebcbf163892dbc9f4bae65aec68ebbaa436be7451c13f50c
 EBUILD reiserfsprogs-3.6.25.ebuild 1161 BLAKE2B 10e8fc09d0f8892e29d135438dbbe0e75ba6410e3d534c543ec6eb3f2d7536bca47089d443ed4f989a187742ebe5d34ed8c4f781c1d97b7b08aa4b52a2974942 SHA512 0f119c895f87c32d09d722dfbe1a8dd27fbece3ff6991ea83d01ac039a1450b981e017fe66225f7b545764d7fc2d69915079528ec6ac6d61dcfebeaf35a4a492
-EBUILD reiserfsprogs-3.6.26.ebuild 1190 BLAKE2B 550e1f3fd16a54c5853df647f69c38bfaf82972de06c57474c07b198f349a2ae1f56a3313af0c8b3c9179e535e36dc40020f0f7eb8876b5f12a99f43a535f29b SHA512 c3f2f7642d89b8b95a4ac6baaad9a6a5d6a5c40f5f1f662c21c08ab90f9d3976cb4f39f2e5675565603b76d41c958d3d60250dc28648df499abd4f8d0696c936
-EBUILD reiserfsprogs-3.6.27.ebuild 1211 BLAKE2B d90fb8c6cb47aed64387617120db1b4829c0f5df9721bbf7670cf5f5d0bc18fc1d70cb30c84ef15220413cacb4b87cbf33963db7fd4be4da67f101dab3167f46 SHA512 94a99dad70da403ecf4dd5ab49ae384a99b9195624ab4f72cc33d6085e91baf4af0c2d86c2ecd451171cc0bfba25e048e6e7f38d836e158793367f8f7c64f581
+EBUILD reiserfsprogs-3.6.27.ebuild 1206 BLAKE2B f64548827d731d264ba1d6fc90bec864428c5ad188b51132864d6ce1a71486dc61b036439e55111c9ca19e88a652e9fe7a6bbf8dcaed146b4749878a1621d8cf SHA512 a99b0f6149aa38a22941a64aa6d5ed391381a38c4e33a19372fa2974ba7a89ad0f337eed80173349818b3ac1202453c83a017806b9728d4dd43ba21b41c6fd92
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild
deleted file mode 100644
index d6725dee34ee..000000000000
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Reiserfs Utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/fs/reiserfs/"
-SRC_URI="mirror://kernel/linux/utils/fs/reiserfs/${P}.tar.xz
-	mirror://kernel/linux/kernel/people/jeffm/${PN}/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.6.25-no_acl.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -std=gnu89 #427300
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--libdir="${EPREFIX}/$(get_libdir)"
-		--sbindir="${EPREFIX}/sbin"
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodir /usr/$(get_libdir)
-	mv "${D}"/$(get_libdir)/pkgconfig "${D}"/usr/$(get_libdir) || die
-
-	if use static-libs ; then
-		mv "${D}"/$(get_libdir)/*a "${D}"/usr/$(get_libdir) || die
-		gen_usr_ldscript libreiserfscore.so
-	else
-		find "${D}" -type f \( -name "*.a" -o -name "*.la" \) -delete
-	fi
-}
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
index 04b0f4bf7daf..a5d28011df58 100644
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/utils/fs/reiserfs/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 PATCHES=(