gentoo resync : 23.09.2020

3 files changed, 2 insertions, 73 deletions

diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest
index a849f4ffa3ab..8791e52d7763 100644
--- a/app-misc/realpath/Manifest
+++ b/app-misc/realpath/Manifest
@@ -2,10 +2,7 @@ AUX realpath-1.14-no-po4a.patch 288 BLAKE2B cafe4fc0db905b3f9af36b256e392196bc37
 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.17-build.patch 1161 BLAKE2B cd5821e86f048bae80b224b8db2322170e40638fcbe2d4582a2f21ef6a5218a576528446422d8363ca2e6b4a7cf209de9ff355ab229a683382d095436a22845a SHA512 507df6759deaf43c7973c8d9bb1faeffc22003308cd2fc4f73270eac9ba347e605093f55110b5c86170597eba4f2c80ea7d15b5ccab4b3d0b75dcef09203c09f
-DIST realpath_1.17.tar.gz 17800 BLAKE2B f2df9d9f3c73aaf6b4240518cc8ff361b97fa60c9493fa0148de6f14ad18dfa2ef05557932dec95a8b734b5d78881f0e239be41cba7bdaf4e353c092093ada3d SHA512 d4f8105e9256b140918dfa400eaac07bec9c29bced7284ab2a3a96282b13b59dca32ab0af38836dfe89dd4e3bf8b038ef4cf61a96d19951f46ac13264ceeec96
-DIST realpath_1.17_i386.deb 16372 BLAKE2B c8d7c2eb410c8c8129d6847d7cfe13265136fedcb51eb4bdaf62dda0dace1b9c0383445c1f407b404085306d6deff1a196b26cb7bb68b225710054b6bea582fe SHA512 15704a27f3f140c4d69411bfd9c319e3205e7b70cccefdc5bec94ad10d6b6c6ad948c2fa51cf2ed69c8884928ba6dcb83a865185f3b010dc6eb343c2125c2118
 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.17.ebuild 1895 BLAKE2B cb908eb328e6dec2d6c6ef972b1af4f4dcbcfcf62e8d57ccf5c3eb145940a45b339bddae384562af8be7dc41c7e59d16fc6a39c54b32a3ea1303695c6a324bc1 SHA512 9df8b4c9b5d1083aca8430e6ca880eded53c7459d1731a51c1382e8b672541e1bd711754b6755c45725a173487ec4fd67321537401e00c01aba752e4592a16d4
-EBUILD realpath-1.18.ebuild 1909 BLAKE2B 49f98f4653823a9449beec14330445f6cfa3a98b8931139317eef07ecd708eec63b8cf6fc37c32c5d82fb11c67d07bd2771142560b1748b5294f20d5079fbffb SHA512 016d1820804a37d839f3965f8b4323dc682c59ea68a4826d4179e18c162321793211fcd73078c2bc42eb5439df3fee1b44961079f856033b5f77b607d1a31e36
+EBUILD realpath-1.18.ebuild 1905 BLAKE2B 9a1d6b65995913e45d4f4849f96b6022597529369c38184c710a1fe83f4eec0934fb5258b97dad2fdf994a9c89115a8f91a4f66743c0abb4d4e4b9fd16f03efd SHA512 2ebc0618b179a707f7eff362d29f362e9610c5f1beac2f7235cab5e457585057053ae59f11405314da112238d7ae054423060e0ee22e477036e9e29d40793ec0
 MISC metadata.xml 437 BLAKE2B 57ad5c49f2a37e30ac6d2f4e4a169f3fca789aa45169d0b9acfb16ab2bdf714c0b2c32cc2c609dc96e6ba516991b667884714d4bb7fb74b9fb519ae3d4b32c23 SHA512 db21930053e4af656fc8043dd5f60b8a78010aacb019435076db21c201fe0bafb4e742e347c430026991ff32819cb30c9e17819a302dc927c2b513301b5d06a1
diff --git a/app-misc/realpath/realpath-1.17.ebuild b/app-misc/realpath/realpath-1.17.ebuild
deleted file mode 100644
index 1e56a2e82dd2..000000000000
--- a/app-misc/realpath/realpath-1.17.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs flag-o-matic multilib prefix
-
-DESCRIPTION="Return the canonicalized absolute pathname"
-HOMEPAGE="http://packages.debian.org/unstable/utils/realpath"
-SRC_URI="
-	mirror://debian/pool/main/r/${PN}/${PN}_${PV}.tar.gz
-	nls? ( mirror://debian/pool/main/r/${PN}/${PN}_${PV}_i386.deb )"
-
-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 ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	elibc_mintlib? ( virtual/libiconv )"
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-
-	if use nls; then
-		# Unpack the .deb file, in order to get the preprocessed man page
-		# translations. This way we avoid a dependency on app-text/po4a.
-		mkdir deb
-		cd deb
-		unpack ${PN}_${PV}_i386.deb
-		unpack ./data.tar.gz
-	fi
-}
-
-src_prepare() {
-	use nls || epatch "${FILESDIR}"/${PN}-1.16-nonls.patch
-	epatch "${FILESDIR}"/${PN}-1.17-build.patch
-	epatch "${FILESDIR}"/${PN}-1.14-no-po4a.patch
-	epatch "${FILESDIR}"/${PN}-1.15-prefix.patch
-	eprefixify common.mk
-}
-
-src_compile() {
-	tc-export CC
-	use nls && use !elibc_glibc && append-libs -lintl
-	[[ ${CHOST} == *-mint* ]] && append-libs "-liconv"
-
-	local subdir
-	for subdir in src man $(usex nls po ''); do
-		emake MAKE_VERBOSE=yes VERSION="${PV}" -C ${subdir}
-	done
-}
-
-src_install() {
-	emake VERSION="${PV}" 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
-			newman "${dir}"/man1/realpath.1 realpath.${dir##*/}.1
-		done
-	fi
-}
diff --git a/app-misc/realpath/realpath-1.18.ebuild b/app-misc/realpath/realpath-1.18.ebuild
index a97a044428ec..8710e8c8fb4d 100644
--- a/app-misc/realpath/realpath-1.18.ebuild
+++ b/app-misc/realpath/realpath-1.18.ebuild
@@ -13,7 +13,7 @@ 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 ~x86-macos ~m68k-mint ~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 ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="