gentoo auto-resync : 25:07:2022 - 14:56:29

3 files changed, 21 insertions, 37 deletions

diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index 53cbfc3f5db1..bc81f4994d5f 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,8 +1,8 @@
-DIST eclass-manpages-20220316.tar.xz 402108 BLAKE2B 6730248793ccb479da966fd20212ee60b9ca75a8eb4bcf9872517fef10821c2fe0232e17707411d2b66366813fc31a5917157239a79002820376d397899ea6b1 SHA512 0d89f02de5812854c75987e1b9718de58f642585ef4a6dea9b907549ff5d52b13d62cbe70fbbfe4339fc5f15f6114505d20f715f7a583c2cebfab4dd27a7ac1d
 DIST eclass-manpages-20220417.tar.xz 403944 BLAKE2B db0607e65f5e87d566bd632b4fa6e48522593907f8fb76f598a552fb23bf53ced466b467b45fc07154edc0e757dc92b9387484003dd847bdd63ea3a6f6635459 SHA512 ad9bcc55f9b7df7565d4d309d37e59553871a7116b3f00b87f6e29648bf4b235ec64a036348f76167ca1ce4d2b899b70176d1844d6e8bb325154e1d1a1dc951f
 DIST eclass-manpages-20220716.tar.xz 409748 BLAKE2B 8e9c9ffc2d7d72647578cb876f0cb4e4a6c72cfe2236c435a7c232dc14638bd3ff98d085d06faec3c353e7d3263ee057736e6f8b5dff53d9890fa82d43d26002 SHA512 b4a45356a7441c258524c18a916df4b06d9317bc6ecb8e521d2cc43bcd7938e94ef266724c570456692e9f089332e0fb23e6d2d625a72424cfb479497b34f78d
-EBUILD eclass-manpages-20220316.ebuild 651 BLAKE2B 37ff24066bc4c9040a853c80a724a000cc168be6941308776b3a7bb25dee7e4f568334df6ee40052ad54b0bf8cf58c590eebf4d470c36b7514729dbd34d9bcd6 SHA512 8692cd5478d21637f9afeec0e82085d1dc98c5fc62b800dc8122099b867e48e552ed25cd065ac0f0b7931c2ae7cda5c863cadd99e94b2027d12c2e473f5dce8d
+DIST eclass-manpages-20220725.tar.xz 409300 BLAKE2B 740890c627577baa218f92edd4d3f4ee53232fc01fae3b42246ce1c14b9a382e009ebebd9ed692b480e47106b104f7cd4f4d7c0dd5a51f104365399ae64b2485 SHA512 e753cebde92c7f2d11cd548780e8f0d900cc1946b71c538805511296f8c754fb4bac49ae31bfce3e58ac581b975c29704fe4b98295b466dd35b020b42a89484e
 EBUILD eclass-manpages-20220417.ebuild 633 BLAKE2B ccf30c2f024773a88d9a97aa9de9c47137490c62e06433221f0751e1b2db94c3dea740e799d385f4d695c4eb65161faf8861a6a0f1d4fc0fd759b63f3b48f467 SHA512 38cb7e3a6692e5114375aebdf8c3193f84a6976412779ec4c56286f1c8bdb83b92dae42d344234b9d69cf778f347ba9bb3d8a4ab466131c65fabf2728728cacf
 EBUILD eclass-manpages-20220716.ebuild 1316 BLAKE2B 366e8c00bad697ebbd2939161cacf75e65cf2391ecf8d5ca21ae8c20241871153abd1082c50df923afb0c9a267cc7e82c0480cccceb17e58d10056d333123ac5 SHA512 ad4c3fba297d4285b9f520489f4b8ec1003079feb0abf98cd91a13d324bbf4d1dc06fe2af3bd3b0e16841da17a9c7622cbf01ece8fd63259abf4a98580f14193
-EBUILD eclass-manpages-99999999.ebuild 1316 BLAKE2B 366e8c00bad697ebbd2939161cacf75e65cf2391ecf8d5ca21ae8c20241871153abd1082c50df923afb0c9a267cc7e82c0480cccceb17e58d10056d333123ac5 SHA512 ad4c3fba297d4285b9f520489f4b8ec1003079feb0abf98cd91a13d324bbf4d1dc06fe2af3bd3b0e16841da17a9c7622cbf01ece8fd63259abf4a98580f14193
+EBUILD eclass-manpages-20220725.ebuild 755 BLAKE2B bb25cdbfc8204240def4f2e53c56f0fc737f3c2ec40abcd48cd8b93065444d2b4030806447bda9a9e3349b98b62c51f367327d565a80a0ad349e27c0def53c95 SHA512 caefbf3ca97e57b27f17ff28aa08d7c5fefed95d6284033f7851ac23b819016362c0b8d301b1fa5a938bb8bd6b32e333aca6703c7971140fb55a35d2fecfe6a8
+EBUILD eclass-manpages-99999999.ebuild 717 BLAKE2B 1d9700bd6322b953647e55141b9418c941a6ed523fd791684d797a9d2362e9e6ad60de57111648c7bdf90aaa7b653c914b25f50ba296223c5b3c7526809e5ab6 SHA512 0e26de5b3ccb0797fc01a61e73dac71fff9dc4f8bc79ffd8cbcec5d006a94ab1dd7f0abe33421ebd4697b780380e9e2683fbf32130eb5196259cb33f8adb32c1
 MISC metadata.xml 457 BLAKE2B c9db5f0a28c7362c8e659468eaa3c7e0f248ecab7cff3377c2a17a96361a29fbbf2bea81b847f518696bf54b84bfae9814bed90e5a8722d3662af06e558cd376 SHA512 66269ed186bbf2267f5ecd088e27ed5bdec7c5584a088ac94ba30fb283ea4a460fd58dce3083192e8873c340bd95d7b4377017e7489e0594852380cdbfa66ab3
diff --git a/app-doc/eclass-manpages/eclass-manpages-20220316.ebuild b/app-doc/eclass-manpages/eclass-manpages-20220725.ebuild
index 3f301df02e67..71c7f5dafe82 100644
--- a/app-doc/eclass-manpages/eclass-manpages-20220316.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-20220725.ebuild
@@ -3,18 +3,21 @@
 
 EAPI=8
 
+# Instructions to make a dist tarball:
+# git clone https://github.com/mgorny/eclass-to-manpage.git
+# cd eclass-to-manpage
+# make dist ECLASSDIR=~/g/eclass/
+
 DESCRIPTION="Collection of Gentoo eclass manpages"
 HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
-SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 
-BDEPEND="app-arch/xz-utils
-	sys-apps/gawk
-	sys-apps/groff"
+BDEPEND="sys-apps/gawk"
 
 src_install() {
 	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 4bbfc72582a4..d8ff66c9b36b 100644
--- a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
@@ -3,49 +3,30 @@
 
 EAPI=8
 
-# Instructions to make a dist tarball:
-# git clone https://github.com/mgorny/eclass-to-manpage && cd eclass-to-manpage
-# make dist ECLASSDIR=~/g/eclass/
+inherit git-r3
 
 DESCRIPTION="Collection of Gentoo eclass manpages"
 HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/repo/gentoo.git
-		https://github.com/gentoo/gentoo.git"
-	inherit git-r3
-
-	MY_ECLASSDIR="eclass"
-else
-	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-
-	# Keep the keywords stable. No need to change to ~arch.
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-
-	MY_ECLASSDIR="."
-fi
+EGIT_REPO_URI="https://anongit.gentoo.org/git/repo/gentoo.git
+	https://github.com/gentoo/gentoo.git"
 
 LICENSE="GPL-2"
 SLOT="0"
 
-BDEPEND="sys-apps/gawk
-	sys-apps/groff"
+BDEPEND="sys-apps/gawk"
 
 src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		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"
-	else
-		default
-	fi
+	git-r3_fetch
+	git-r3_fetch "https://github.com/mgorny/eclass-to-manpage.git"
+
+	git-r3_checkout "" "" "" eclass
+	git-r3_checkout "https://github.com/mgorny/eclass-to-manpage.git"
 }
 
 src_compile() {
-	emake ECLASSDIR=${MY_ECLASSDIR}
+	emake ECLASSDIR=eclass
 }
 
 src_install() {
-	emake install ECLASSDIR=${MY_ECLASSDIR} DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+	emake install ECLASSDIR=eclass DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
 }