gentoo resync : 28.04.2021

5 files changed, 31 insertions, 26 deletions

diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest
index 97b5a53a8f17..d0889ebb4b76 100644
--- a/app-misc/realpath/Manifest
+++ b/app-misc/realpath/Manifest
@@ -1,8 +1,8 @@
-AUX realpath-1.14-no-po4a.patch 288 BLAKE2B cafe4fc0db905b3f9af36b256e392196bc37f1ec01150007590e022a231e38bbe89439419ccbbcb04c23154a2d43159bbe1e81d229d41fa0a8f24365f5849158 SHA512 db19ebcab412ee5b4229657e9745a76b8ad83bff70e3f8f6b939edfbff3aa389436d10fd7d8641bf6a0747630c2d1afcc3ff0d6fe2faeec55e8d4f4a79596cc6
-AUX realpath-1.15-prefix.patch 1443 BLAKE2B 3c62720d908dcb7ab29291e4029dd1923c2114649cc1c115e097e72193a4e9c1734a596434383b67b186796e605323f579e47c5f80ef9138f7556c9b9b965f70 SHA512 0e4980d60a4fff42823443ee9b8e9ef49a4f34ed031a3b01849f2d87b893f7205a4b7de2d6e090770aa2a3f7a31aab8f47d4f99c79d02d03fd5105001fdbcc5a
-AUX realpath-1.16-nonls.patch 685 BLAKE2B 84e67f77ef5263e860dd74b665377279b81853b9a9bff7266e2902673f6d86344ad79b3cbfcb42454a536879d696d32c86b3b895a478f13f8385900c1f931a47 SHA512 b27e44c1313e2c0dd0dfed719c373a3fc6f907a44cd1a9457c03bf1d83ce55b2aafefae84d2053f358e7dfe99dd7e4274137082c64c748e34680f324fe676719
+AUX realpath-1.14-no-po4a.patch 187 BLAKE2B db92ae9baeeb76245f34653277b0ba9cc315e0d02512296bcdd3aadbaafccf3096f1aaefe52d856e6f9d17b44af8cb7701bc548731e21243f032c540739d4fbe SHA512 5e8068b6d88c63bd5b39d36e786f69d4ee2b9575568f09835baf9b2ac7c8006d42d240042317a966e3355a4b2c3df84f413db0573d467e1d637bf91e3e5fd71c
+AUX realpath-1.15-prefix.patch 1378 BLAKE2B b4a60485715366a9b8077d4662ea2fa34149e1809d256b2cef21aa6cb71cbcf79088e14552cfbeceb19d2fb91587c83eb8e5a1e6a50e2be995048fb4d1a1ddf8 SHA512 64841163f0fb281c679b62268289ab81b86e96120d17a4bc01e1ccef1eb7fe01fd7326cfb0891b48ab820e11e8a4277dbe8caa8089427011706062929653cd68
+AUX realpath-1.16-nonls.patch 529 BLAKE2B 0ae255f9011e4b3e493bbb34e0bc7ea3b7139d42b9cc71fcc9d0c88b9014f8b572093e3b81db876c3ab86b559e7b41956954f1fa53cacb34090f4b91647e6309 SHA512 aae8f78398398ac3f6e93757ef6682ff3d31998dad165093098b32735e4bf3b506a4d3661dcc6049cf6ef4bad5d0e77f4e96ddfc2568ce4905afb389114a6e69
 AUX realpath-1.17-build.patch 1161 BLAKE2B cd5821e86f048bae80b224b8db2322170e40638fcbe2d4582a2f21ef6a5218a576528446422d8363ca2e6b4a7cf209de9ff355ab229a683382d095436a22845a SHA512 507df6759deaf43c7973c8d9bb1faeffc22003308cd2fc4f73270eac9ba347e605093f55110b5c86170597eba4f2c80ea7d15b5ccab4b3d0b75dcef09203c09f
 DIST realpath_1.18.tar.gz 17618 BLAKE2B c42cbade8022a0aaafbf012c5f4db899bdadac6d06743a64fa0cf58c0533e9574fe1389939d296986fc1307362399753f58650d9029bf240fc6dc980c17a59f4 SHA512 98daa53b7a6d4b40ea3ff9ea89b7cb97782dd53f031e41a228a5aa8d2a41ae7920cbc1e2213f568098496e5c25da1381f08fb939f8668733a3c391f744fd16ed
 DIST realpath_1.18_i386.deb 16426 BLAKE2B 934d4d61bda3ce069959f3cf818b8d0b206c95ef458487f12c8afa59014dc141dcdf0ebd18a9540dd3104358139ce7f9317aabd8027dca6883f55905cc198d83 SHA512 fb2062041f8089a5ff07f76a9833e9d8bbe9560d72d4d5803c9524aeb782f9f4a135921b9984432ccfa361edc785a0f33785377ddf031a07ed316861a00a6f37
-EBUILD realpath-1.18.ebuild 1883 BLAKE2B 53260f09ac8392ab74561d7c1db34cb1e19d594cd028f18e42f3b909c6979a5417d551ab4096704f40d398787b630757e81a0b291e3c91c8f35d4e5a1a4225d9 SHA512 722d6cd29f29c382521755f3ae6be5d0a022ee557004e094ab8a6ac0fe7d4fb4953fbc1f0dae2f884ed43b717d1b3f4abcec66baa75f7d84727d2ced3234aa2b
+EBUILD realpath-1.18.ebuild 1869 BLAKE2B 47716013172ba06f710a9fb37fd1ca65b2a8904ffc92081a013305f6b46a434affc4d557da0b17ffb7ba7249050650c2217e76fcd53750e5f7ea164364a8ce19 SHA512 16d2b4035f35dce524e1a139b571582d9ae3a517c3e35d3d50734e3bbc878df583d0bae983ec92970cdfd1654ea4125d865245de2de8cfbe38fa6a912b3db2bb
 MISC metadata.xml 437 BLAKE2B 57ad5c49f2a37e30ac6d2f4e4a169f3fca789aa45169d0b9acfb16ab2bdf714c0b2c32cc2c609dc96e6ba516991b667884714d4bb7fb74b9fb519ae3d4b32c23 SHA512 db21930053e4af656fc8043dd5f60b8a78010aacb019435076db21c201fe0bafb4e742e347c430026991ff32819cb30c9e17819a302dc927c2b513301b5d06a1
diff --git a/app-misc/realpath/files/realpath-1.14-no-po4a.patch b/app-misc/realpath/files/realpath-1.14-no-po4a.patch
index cfa780553646..44e13286bfac 100644
--- a/app-misc/realpath/files/realpath-1.14-no-po4a.patch
+++ b/app-misc/realpath/files/realpath-1.14-no-po4a.patch
@@ -1,8 +1,8 @@
 Don't require po4a at build time.
 http://bugs.gentoo.org/269905
 
---- realpath-1.14-orig/po/Makefile	2009-02-22 12:56:47.000000000 +0100
-+++ realpath-1.14/po/Makefile	2009-05-19 23:45:26.000000000 +0200
+--- a/po/Makefile
++++ b/po/Makefile
 @@ -4,5 +4,5 @@
  #
  
diff --git a/app-misc/realpath/files/realpath-1.15-prefix.patch b/app-misc/realpath/files/realpath-1.15-prefix.patch
index f9534641382f..3e0837a8bf38 100644
--- a/app-misc/realpath/files/realpath-1.15-prefix.patch
+++ b/app-misc/realpath/files/realpath-1.15-prefix.patch
@@ -1,5 +1,3 @@
-diff --git a/common.mk b/common.mk
-index 2443a40..0a342ee 100644
 --- a/common.mk
 +++ b/common.mk
 @@ -8,17 +8,19 @@ override TOPDIR   := $(dir $(call getCurrentMakefileName))
diff --git a/app-misc/realpath/files/realpath-1.16-nonls.patch b/app-misc/realpath/files/realpath-1.16-nonls.patch
index d758d03ff89b..c1963ae46014 100644
--- a/app-misc/realpath/files/realpath-1.16-nonls.patch
+++ b/app-misc/realpath/files/realpath-1.16-nonls.patch
@@ -1,8 +1,3 @@
- src/realpath.c |    6 +-----
- 1 files changed, 1 insertions(+), 5 deletions(-)
-
-diff --git a/src/realpath.c b/src/realpath.c
-index 76fc909..e2cf86f 100644
 --- a/src/realpath.c
 +++ b/src/realpath.c
 @@ -23,10 +23,9 @@
diff --git a/app-misc/realpath/realpath-1.18.ebuild b/app-misc/realpath/realpath-1.18.ebuild
index dcaeab4fe8b0..c982935ecdbd 100644
--- a/app-misc/realpath/realpath-1.18.ebuild
+++ b/app-misc/realpath/realpath-1.18.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils flag-o-matic multilib prefix toolchain-funcs
+inherit flag-o-matic prefix
 
 DESCRIPTION="Return the canonicalized absolute pathname"
 HOMEPAGE="http://packages.debian.org/unstable/utils/realpath"
@@ -13,14 +13,21 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	nls? ( sys-devel/gettext )
-	elibc_mintlib? ( virtual/libiconv )"
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.17-build.patch
+	"${FILESDIR}"/${PN}-1.14-no-po4a.patch
+	"${FILESDIR}"/${PN}-1.15-prefix.patch
+)
 
 src_unpack() {
 	unpack ${PN}_${PV}.tar.gz
@@ -36,18 +43,22 @@ src_unpack() {
 }
 
 src_prepare() {
-	use nls || epatch "${FILESDIR}"/${PN}-1.16-nonls.patch
-	epatch \
-		"${FILESDIR}"/${PN}-1.17-build.patch \
-		"${FILESDIR}"/${PN}-1.14-no-po4a.patch \
-		"${FILESDIR}"/${PN}-1.15-prefix.patch
+	if ! use nls ; then
+		eapply "${FILESDIR}"/${PN}-1.16-nonls.patch
+	fi
+
+	default
+
+	# Don't compress man pages
+	sed -i -e 's:gzip -9f:true:' common.mk || die
+
 	eprefixify common.mk
 }
 
 src_compile() {
 	tc-export CC
-	use nls && use !elibc_glibc && append-libs -lintl
-	[[ ${CHOST} == *-mint* ]] && append-libs "-liconv"
+
+	use nls && ! use elibc_glibc && append-libs -lintl
 
 	local subdir
 	for subdir in src man $(usex nls po ''); do
@@ -61,12 +72,13 @@ src_install() {
 		SUBDIRS="src man $(usex nls po '')" \
 		DESTDIR="${D}" \
 		install
+
 	newdoc debian/changelog ChangeLog.debian
 
 	if use nls; then
 		local dir
 		for dir in "${WORKDIR}"/deb/usr/share/man/*; do
-			[ -f "${dir}"/man1/realpath.1 ] || continue
+			[[ -f "${dir}"/man1/realpath.1 ]] || continue
 			newman "${dir}"/man1/realpath.1 realpath.${dir##*/}.1
 		done
 	fi