From 908778078736bd36f7a60a2d576d415cb8e000fa Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 22 May 2021 07:31:18 +0100
Subject: gentoo resync : 22.05.2021

---
 sys-fs/progsreiserfs/Manifest                      |  4 ++--
 .../files/progsreiserfs-0.3.1_rc8-autotools.patch  |  4 ++--
 .../progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild   | 23 ++++++++++++++--------
 3 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'sys-fs/progsreiserfs')

diff --git a/sys-fs/progsreiserfs/Manifest b/sys-fs/progsreiserfs/Manifest
index dc82dffa6a50..e2110f6527b9 100644
--- a/sys-fs/progsreiserfs/Manifest
+++ b/sys-fs/progsreiserfs/Manifest
@@ -1,4 +1,4 @@
-AUX progsreiserfs-0.3.1_rc8-autotools.patch 271 BLAKE2B 5c07213defa727f9e588615483961aa5db5a533ea035d4d1dd898d2316531f357e2129daa2398449d3d4d2355b8b654295e37e470b66766c55f5413c86763af5 SHA512 5db538c3bdcd4463879fc267288f76e50603d8693fa8009ef33247be7d1b89f9cd526a73e47e717f92e1217795a215690263400755ae13de2f636111f67d075f
+AUX progsreiserfs-0.3.1_rc8-autotools.patch 275 BLAKE2B 74893b9f8bb59af8cc6dc38580fea353de69390210b29a01d31a6f17c1b03cc3ac1b4a05f7d99a69cf88ffcc98738cbdbc722a7d8810cbcbd560f663520e2005 SHA512 f1729ab9f61c29da2d94c4d4f8613153e28894e494a58c473ef66697820e0ff0e55b4915c9c8afef36d77dbb17501dcb6606c92ddbf2e7ecdb7c11d735e7a5d4
 DIST progsreiserfs-0.3.1-rc8.tar.gz 399279 BLAKE2B 536d18ce186c9a3b796c01cdad5f622befdffcc975a82ad24d0f2dbbc3b3bac8530231bd51d460033f9ab0bf1577d533faf17f4ea5548b175a708ddc924c50f0 SHA512 65266ab5a598b2073e6893da6554bdfe43796be3bd608eb7c4f687c3ef6ed395ce67def49b62d2b3705dfdeb38bd5f5d1c91fec6ad7323788d490058b015c26d
-EBUILD progsreiserfs-0.3.1_rc8.ebuild 1292 BLAKE2B 7493fbfc4bc00298fa24311fda7ea0373a1fe8b8fbb0a4954d1214a96ca3257aae655f2f9db21a5aea00fed2932f446c7039989be696de716089db8796296a72 SHA512 22a0de9390ff0eef0431d236c765203e699f1a0bf21516776eb07862b22233fc039bcee6f6ee19ece88df4fdc59014a08104e251439963ec63ef7878a934a8c8
+EBUILD progsreiserfs-0.3.1_rc8.ebuild 1316 BLAKE2B 6f128baef61c13e8270979262393350df40e6b1be9f73744ec8397449111fd4e9b17a8d5879ea97191a60f1b9bdd3cd2e114b535de830a2594f7d121a96f0059 SHA512 ee08b0aa9d3cc7e48cd80fb16c0be8b415cd1b8b1909dc0f722ea7b4bf3ca4556cfd10d1dd0d95edadf60823de30ea2abe4f80ba4fc0e4bb34c6e24b269d2b5c
 MISC metadata.xml 425 BLAKE2B b96ad015f772cf4af772ccbf06e6db5b4ded3c7b5ddc7ac7c8446eabf9325422c649f49ae94fd95f33252aee4f64e1502afb4d5bd16d0591be1624169f9cf6fd SHA512 55c54a7c00dc1440503494b4f5332d2c82e9775ad652f3d3f5a950368fcfb55dc2e00cc6a5a999e8bcdf5ddd2c1c30567934f74be0b82533caed15ccb87ca017
diff --git a/sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-autotools.patch b/sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-autotools.patch
index 4a0753f4f09b..dfb1b27af787 100644
--- a/sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-autotools.patch
+++ b/sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-autotools.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/442226
 
---- progsreiserfs.m4
-+++ progsreiserfs.m4
+--- a/progsreiserfs.m4
++++ b/progsreiserfs.m4
 @@ -10,7 +10,7 @@
  dnl Adds the required libraries to $REISERFS_LIBS and does an
  dnl AC_SUBST(REISERFS_LIBS)
diff --git a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild
index 86acd4a58411..08d304b3eede 100644
--- a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild
+++ b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild
@@ -1,30 +1,36 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch flag-o-matic libtool ltprune
+inherit flag-o-matic libtool
 
 MY_P=${PN}-${PV/_/-}
 
 DESCRIPTION="Library for accessing and manipulating reiserfs partitions"
 HOMEPAGE="http://reiserfs.linux.kiev.ua/"
 SRC_URI="http://reiserfs.linux.kiev.ua/snapshots/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
 IUSE="debug examples nls static-libs"
 
-RDEPEND=""
-DEPEND="${RDEPEND}
+DEPEND="
 	sys-apps/util-linux
-	nls? ( sys-devel/gettext )"
+	nls? (
+		sys-devel/gettext
+		virtual/libintl
+	)
+"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}"/${P}-autotools.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-autotools.patch
+	default
 
 	elibtoolize
 }
@@ -47,8 +53,9 @@ src_install() {
 		dodoc demos/*.c
 	fi
 
+	find "${ED}" -name '*.la' -delete || die
+
 	rm -r "${ED}"/usr/{sbin,share/man} || die
-	prune_libtool_files
 }
 
 pkg_postinst() {
-- 
cgit v1.2.3