gentoo resync : 10.11.2019

5 files changed, 4 insertions, 26 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index ed1b19e869a3..f5bbba6f8275 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index 30709c48abc5..922c9a82f084 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,6 +1,4 @@
-DIST eclass-manpages-20190728.tar.xz 415612 BLAKE2B b3225bf2ea8036f4714f6cd07ebd00092095f39970855d1847c3bd5e0cfc23baa6328d21788972ae430026b32172d43ef44fd9a9d243711885061cc2c209b475 SHA512 9d7c493808477bab22ecff8d832bdc082f55c39e886c3551c9e75c612de2f94d54d686f4c81ee77e06465eeb0d8004aac6c9fdc530f2c6c325832452242676df
 DIST eclass-manpages-20190908.tar.xz 416412 BLAKE2B 12d2b8c90349993510b3b0b462c3158090751e31abba013557595688136519a83bacc58ab4a26e3ed398aa0cb1647e4fa4fec412cce02f48007c4cf2a7c91121 SHA512 6d99114fd754bc9f84c90fcd485cde38772b506e960c2db61025ce3ceb3258c37f6d0e1be13bcc198b875969551c98e19da3f2c09b04efda0be5f4509b006089
-EBUILD eclass-manpages-20190728.ebuild 611 BLAKE2B bafbe222fe727aa2b23633ca6204c9f8e85a4212469de64bba74266f12a54baa9e785bdecada034d38f973d6ce34fa442a4f4591b60985b31865a79630d2fdb6 SHA512 5ca5c6d8334ec13f3e58f4817801396a52ff733880c42ca424f8c16be842d10677bc5170a90e7dbd50780ac691a926a2871cf09ab878665a861a8afda5da3f36
-EBUILD eclass-manpages-20190908.ebuild 611 BLAKE2B bafbe222fe727aa2b23633ca6204c9f8e85a4212469de64bba74266f12a54baa9e785bdecada034d38f973d6ce34fa442a4f4591b60985b31865a79630d2fdb6 SHA512 5ca5c6d8334ec13f3e58f4817801396a52ff733880c42ca424f8c16be842d10677bc5170a90e7dbd50780ac691a926a2871cf09ab878665a861a8afda5da3f36
-EBUILD eclass-manpages-99999999.ebuild 729 BLAKE2B 79cbaab27b22289c66c053232bf900a7ce8afacf48f0d5e750d324732e5c74918403cc271286da0eb005d15deb6f5579e04f6ff2eb5e9dd7372ef842d6ec31ce SHA512 64d4c7078873ac0814c68a02596ef6890949dbca960a452c867d2c7cc16b098b8922e5a915360fec4fee47c922e9bab81f84a04b3a71c92a96e47b6b02cc25e7
+EBUILD eclass-manpages-20190908.ebuild 623 BLAKE2B 660313f5ce0bb957736d4e1c3724af8dbd023ef033c3090b84d30e1400bf5908dde4b4654da86e26fd002aa1fd7442a5d17571927d1831728e64446b5e8a5b56 SHA512 538e4a951965b395d6d8e26d855758dfc74fd5728fd55c1a4302df1471fee63058c712e45abcbdab5879cb49e0f17ea19c04854a970c8a0e08b83f2ca07eaf36
+EBUILD eclass-manpages-99999999.ebuild 741 BLAKE2B fa5b83c9ca6f95e93d20bbf09a867125de252cb28ffc3c3ccdd9e751c8c445cc889a2cfd668602c034835b754c14de2a2fc008d2409654431ccd6ba54dd68f09 SHA512 1e25d06a5ea9273515ba04b7e2f0a27c69143b7b63e97bc9edd8c51707e9794adf668a4b7339628885ceb6d44934ba11e7e9d017a000e53d70b4755a1c793b56
 MISC metadata.xml 374 BLAKE2B 3f87ce1d875199a067b945d6c9f3b80bde36ec25714d7dd802a55b37895d6c1e9360e003c4e6066ffcf6338a7f04b46a181a8c49f7144866fd9547626a0378bb SHA512 3caedcecef2f388c833b9f7db0af743a71227288bb145ec8a56c2862c7f56571a860f7f961d0ab1565cc98a0d178e87e24a7321cf0b7d4c4d3ab95c120fb0cf9
diff --git a/app-doc/eclass-manpages/eclass-manpages-20190728.ebuild b/app-doc/eclass-manpages/eclass-manpages-20190728.ebuild
deleted file mode 100644
index ca459885e06c..000000000000
--- a/app-doc/eclass-manpages/eclass-manpages-20190728.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Collection of Gentoo eclass manpages"
-HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/eclass-manpages/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# Keep the keywords stable. No need to change to ~arch.
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-
-DEPEND="app-arch/xz-utils
-	sys-apps/gawk"
-
-src_install() {
-	emake install DESTDIR="${D}" PREFIX=/usr
-}
diff --git a/app-doc/eclass-manpages/eclass-manpages-20190908.ebuild b/app-doc/eclass-manpages/eclass-manpages-20190908.ebuild
index ca459885e06c..58f19de074cd 100644
--- a/app-doc/eclass-manpages/eclass-manpages-20190908.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-20190908.ebuild
@@ -16,5 +16,5 @@ DEPEND="app-arch/xz-utils
 	sys-apps/gawk"
 
 src_install() {
-	emake install DESTDIR="${D}" PREFIX=/usr
+	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
 }
diff --git a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
index 7ca1b88d6483..a810a8713bcd 100644
--- a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
@@ -31,5 +31,5 @@ src_compile() {
 }
 
 src_install() {
-	emake install ECLASSDIR=eclass DESTDIR="${D}" PREFIX=/usr
+	emake install ECLASSDIR=eclass DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
 }