gentoo resync : 05.04.2019

4 files changed, 38 insertions, 7 deletions

diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index d8709e6312c5..87ee32246000 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,6 +1,8 @@
-AUX eclass-to-manpage.awk 10909 BLAKE2B e41b792f8316c612609da17c16ba41f01a4fc27c847bc380a26a570abef030d6e11a74673d703da77e17bb3db796ed3207d95cd9d8e7604551a6d0b10c6a3e07 SHA512 c37d502f66c31b2e5be8c27071ade6bfe7617d84bbca57ab3ac9d0f2d3403281d50fd8c6bada2c3dbe29041bcef4c0dafc76506a1ddca82fc26aa83d4785bae2
+AUX eclass-to-manpage.awk 11006 BLAKE2B 85303c11796b743fbffdc34004984c1f2278a106730d76400fc333d7fec7c57a676eda2ff4684edfd324ccc2b6b4d759df896c88a3a095fb678f5dd24bba5da1 SHA512 a17ce9bd1233363e5d7899bcc627bdc680a149663d7fc014f5ea989bf1e5da3997d01c55ba42dfaa84e0905e07038168660075b7f5d79973edfc4e964dc2fe9a
 AUX eclass-to-manpage.sh 738 BLAKE2B 719f9ac6a4283e6795f0463073a460f35b65b6d5c020eeb3823527cb559774c2273c374ea1fbf196e4528b55de9feedce6d024c4495e76cc7c4b7cd4079da202 SHA512 9d50ca11215fc69cc6b4ed67891039f24a93d9843103ab0bb8b13f0596fbca7541da0feaa31ab236279a7047cd9fcdd4a8f9d8a249de725d69e45e6c276d49d1
 DIST eclass-manpages-20190314.tar.xz 419576 BLAKE2B baad0d5f9c67b7e4b9646e69e90583a8238590a02bb6bcc200b08f17f56b2ae50a56080526d3398623949ffc91857d944a1035d6b44fba07b17024c2c224b802 SHA512 22f4b32654f459afa8e5057f02c92628cc529f236e48a69f9b346e7bdcf60d12a4cdd71debf96e8d4b3e69b0e497feb9143b385a11d835b43d13c32fa1751d51
+DIST eclass-manpages-20190329.tar.xz 428068 BLAKE2B 630f6ba06bef6e4aed7713776b8a0ce737dcba4441309ed326b6eb87a5515f5fbd2f95db4a12385788a1dbf1ff6bc3c09620f4564c0bba201f48f6aa31520b41 SHA512 8088078334c2b7f35301bd75dc2505a366d030cb1d28bf47c387ba0c727cf5a58e1f279708d4a32ecf47ceec543c287ea5ad8c76ce4bbd9c45f039be2924d7ee
 EBUILD eclass-manpages-20190314.ebuild 1084 BLAKE2B c5ba9cd688ec3c21f734e36feb32e5651a06f09f42e7886627dd92d122ff99a797f55a734a00d79c7ca3464f61f473cd003ad5961a37d50e23cc2908cf623362 SHA512 93fae7b743267e0c32b1bc3317d1f2cda10e2b64d22d01986730ccc2d648c848be970c57f319dcd58265a450a68b120a58943e18c01201a9b866a76911b56982
-EBUILD eclass-manpages-99999999.ebuild 565 BLAKE2B cf44fffbbb4350569de1d1fceec7a98753625c61876e370a11d3aeeac5d659b32aa182ef62ddebbcb1d2b1eb187722493a66750960820b04fc2d877e50f8692f SHA512 4f21ba6eb7f08778339262db1336b3a9bf5fa9c2323f3f5144ff7e72ea9654f2679c11642e3d1073a10d074603407e3bcf9f4c2581973c9da8e2f9309928f2e4
+EBUILD eclass-manpages-20190329.ebuild 605 BLAKE2B ceef27f3e43fa279fa6e380ecc4254257f2a64cd643eb3f0da5f0985bc9aa98caa2939e8bd37247c65a01d959439667f9b931f6e1c845bcd9173df1980c06949 SHA512 95e1e5b5c09bc281dc0bdc09bdbd1facc548e4a7c5062ce9ff18725ecc489946e486c883235d570011bf69d792a33a3a45175e15f94a56317f167d2817c69236
+EBUILD eclass-manpages-99999999.ebuild 729 BLAKE2B 79cbaab27b22289c66c053232bf900a7ce8afacf48f0d5e750d324732e5c74918403cc271286da0eb005d15deb6f5579e04f6ff2eb5e9dd7372ef842d6ec31ce SHA512 64d4c7078873ac0814c68a02596ef6890949dbca960a452c867d2c7cc16b098b8922e5a915360fec4fee47c922e9bab81f84a04b3a71c92a96e47b6b02cc25e7
 MISC metadata.xml 374 BLAKE2B 3f87ce1d875199a067b945d6c9f3b80bde36ec25714d7dd802a55b37895d6c1e9360e003c4e6066ffcf6338a7f04b46a181a8c49f7144866fd9547626a0378bb SHA512 3caedcecef2f388c833b9f7db0af743a71227288bb145ec8a56c2862c7f56571a860f7f961d0ab1565cc98a0d178e87e24a7321cf0b7d4c4d3ab95c120fb0cf9
diff --git a/app-doc/eclass-manpages/eclass-manpages-20190329.ebuild b/app-doc/eclass-manpages/eclass-manpages-20190329.ebuild
new file mode 100644
index 000000000000..c567d7c5fc37
--- /dev/null
+++ b/app-doc/eclass-manpages/eclass-manpages-20190329.ebuild
@@ -0,0 +1,20 @@
+# 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/${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 ~x86-fbsd ~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-99999999.ebuild b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
index 7dfb0d7e0d2a..7ca1b88d6483 100644
--- a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 inherit git-r3
 
 DESCRIPTION="Collection of Gentoo eclass manpages"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
 SRC_URI=""
 EGIT_REPO_URI="https://anongit.gentoo.org/git/repo/gentoo.git
 	https://github.com/gentoo/gentoo.git"
@@ -16,15 +16,20 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
+DEPEND="sys-apps/gawk"
+
 src_unpack() {
 	git-r3_fetch
+	git-r3_fetch "https://github.com/mgorny/eclass-to-manpage"
+
 	git-r3_checkout '' '' '' eclass
+	git-r3_checkout "https://github.com/mgorny/eclass-to-manpage"
 }
 
 src_compile() {
-	env ECLASSDIR="${S}/eclass" bash "${FILESDIR}"/eclass-to-manpage.sh || die
+	emake ECLASSDIR=eclass
 }
 
 src_install() {
-	doman *.5
+	emake install ECLASSDIR=eclass DESTDIR="${D}" PREFIX=/usr
 }
diff --git a/app-doc/eclass-manpages/files/eclass-to-manpage.awk b/app-doc/eclass-manpages/files/eclass-to-manpage.awk
index b40eaf112091..53e05973e16d 100644
--- a/app-doc/eclass-manpages/files/eclass-to-manpage.awk
+++ b/app-doc/eclass-manpages/files/eclass-to-manpage.awk
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This awk converts the comment documentation found in eclasses
@@ -93,7 +93,7 @@ function xfail(text) {
 
 function eat_line() {
 	ret = $0
-	sub(/^# @[A-Z]*:[[:space:]]*/,"",ret)
+	sub(/^# @[^:]+:[[:space:]]*/,"",ret)
 	getline
 	return ret
 }
@@ -201,6 +201,10 @@ function handle_eclass() {
 		print ".SH \"DESCRIPTION\""
 		print man_text(desc)
 	}
+	if (supported_eapis != "") {
+		print ".SH \"SUPPORTED EAPIS\""
+		print man_text(supported_eapis)
+	}
 	if (example != "") {
 		print ".SH \"EXAMPLE\""
 		print man_text(example)