gentoo resync : 12.05.2022

5 files changed, 59 insertions, 14 deletions

diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index f11de5dcd188..2eff8565862a 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -1,6 +1,8 @@
 DIST scdoc-1.11.0.tar.gz 12616 BLAKE2B 3aec60e51b949dc94e8339e400c366428a217c1bd44f79716cbd6993a7f8051a0796dc96163e071db4808c0edde071408e3eb1ee0ae3bb8ccd718479960ab8f3 SHA512 4c8248a12e69e53cc2182af5375912f7af64f3807163dbe3c52e85d817b1bfa7e461d02a627c73d93bdaa96e49668ff894d37817ceb70ee3186da9e3f8372d49
 DIST scdoc-1.11.1.tar.gz 12482 BLAKE2B 2632da654730a373f03955f0b3bb190c8d6beb2fd4e4b05c88a4c86d384b26c51a8f032e6b2ef8d4d795638c1981a4d5500384f3103411869c7097a2ba1466ff SHA512 28b676a2ba69a101034c47378c4b66c94bfb9903d680a1871020fd8772d0990a4c91678738f71d37bfca06e27991ef782047c6503d375ce69df744caf6b459de
+DIST scdoc-1.11.2.tar.gz 12746 BLAKE2B f4cb2c400103c1f2247a2bee79dca9ae5c50b8397c65edbdf4d70265a4596f85e0c47aab014699c4d63929b258db8ae3ff6728a9b95f212be9db1fa657e5b93a SHA512 3fbf1a74b222dd88410636124e4b6ca73f7e77f67d512cf430a878fefcaa5c6c13a1e9f6c0c9654de15353f94bb1bd528665acebc2293bebb325501d1eb6cda3
 EBUILD scdoc-1.11.0.ebuild 1182 BLAKE2B b52c95f0dbabac5b4eb7487cd48e59bd1b361a3a944d53c7b007bb52c7b3f0c68c6d80cd22be964b97d95f82474722a005745cf34c9d0ed0d36dac0887183e86 SHA512 a810dfca019775b6aa54e76dd8f2d411550360e86ac883498ba9e769224de6067c225eec31e93735a4f5fc6585507e780fd94c4ecf19b77677188d7118537a2a
-EBUILD scdoc-1.11.1.ebuild 1197 BLAKE2B fe17671505392413faef92b5bcdb3f44b487064b19e522486fbe65dd1b7adde2c8e3fcf7e0807428891447214631ca066e3754e6e90b4cc79c292781ff5621e7 SHA512 842b99af5aec1a9166cb83330a9a789bf2329cbcff0eaf23488a908f860dd4949fd391fc26bbfba0a652ffc23761eb819a10693edb025957a2d38213e94592d6
-EBUILD scdoc-9999.ebuild 1173 BLAKE2B 873f1def0a103e8c431fad6ffbf902a9e97ed543d29f738e0ff4799be7f5d49449f50b30e4f37ae5310f7ede07e15f76a395f553756f1d048b3f36ee8aff0b4c SHA512 4ac9391cd7564179179a1951469c73e798c12a6ad3b82c72019d64e6364c943c02251b43344d5e7a1f4e9f1115c941b2e5b89065be25d00002cf5b6dc8fe3af1
-MISC metadata.xml 320 BLAKE2B b51cd1a5d791144917631d54e5db482c1476d2e0a8261a58fe08ddc8e607c598b685709ad5a58d731f4001226a3ca9b3f8b210811cf91b608e574d3423a2141d SHA512 1ebee9d9288054cf6016b9cafe91124b9482647f5cbaf1c9608ea602a86eb172fe014f52a33f2f8fdd018ffb52cbf1a1b54ef17aa4986e4011f57ee115959f92
+EBUILD scdoc-1.11.1.ebuild 1192 BLAKE2B 8021b8570d9004ba4960f5770d0582a339ec49f9ed83f75ba66698c9d524031946aecd9f22f952264456b26e85cc6f3482fc75193f806f0a61174dd87ad9d020 SHA512 56f2c2a50b62b138e7b9f1c6b48e8abbd849a5a34061f0b7b9079d54efbdbfd002808c7ab56fd12ce528ba2ce6f68243bb31c8ddb918c90d8995d938c9870b0d
+EBUILD scdoc-1.11.2-r1.ebuild 1195 BLAKE2B d7a01cda165f90306aa09b3f5ca6e679b77e91c75536f9d8f8414fd543a7f2ae3b9c02ccafea06d6999b085da89f96d6f2ea9504c7b73f0c971edd350c10da21 SHA512 fa30b220458077b4b62223b193f6e89a0ab03fc1885c56a18a3161cdc70ca4320814e74bfbd09cb9a176a92afc603cea44198093ad7da414da6749e71082b4c4
+EBUILD scdoc-9999.ebuild 1195 BLAKE2B d7a01cda165f90306aa09b3f5ca6e679b77e91c75536f9d8f8414fd543a7f2ae3b9c02ccafea06d6999b085da89f96d6f2ea9504c7b73f0c971edd350c10da21 SHA512 fa30b220458077b4b62223b193f6e89a0ab03fc1885c56a18a3161cdc70ca4320814e74bfbd09cb9a176a92afc603cea44198093ad7da414da6749e71082b4c4
+MISC metadata.xml 244 BLAKE2B 84f30692e3204f2cc9c6fb00681686fc46a46a1d2a21ecaeebbe835a23c500b20595b801bb77a7fbaadc68388be6d00ece46451f7d9acf4106c3ac3d6eda37da SHA512 6400b858fd8736ed5c2d5966968a0da9bbf4498c6b2c839587d928b523847a633418882b8e950f22be960580da05eb70337c9a3ee407e0e47c131982c502c54d
diff --git a/app-text/scdoc/metadata.xml b/app-text/scdoc/metadata.xml
index f185a00aa221..5ee60cd0b383 100644
--- a/app-text/scdoc/metadata.xml
+++ b/app-text/scdoc/metadata.xml
@@ -5,7 +5,4 @@
 		<email>bman@gentoo.org</email>
 		<name>Aaron Bauman</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">swaywm/sway</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/app-text/scdoc/scdoc-1.11.1.ebuild b/app-text/scdoc/scdoc-1.11.1.ebuild
index edae9c69b757..22b84e1fade9 100644
--- a/app-text/scdoc/scdoc-1.11.1.ebuild
+++ b/app-text/scdoc/scdoc-1.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-text/scdoc/scdoc-1.11.2-r1.ebuild b/app-text/scdoc/scdoc-1.11.2-r1.ebuild
new file mode 100644
index 000000000000..c40dcd50d0fa
--- /dev/null
+++ b/app-text/scdoc/scdoc-1.11.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc"
+	inherit git-r3
+else
+	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_prepare() {
+	default
+
+	sed -e 's/-Werror//' \
+		-i Makefile || die 'Failed to patch Makefile'
+}
+
+src_compile() {
+	local MY_HS="./scdoc"
+	if tc-is-cross-compiler; then
+		tc-export_build_env
+		MY_HS="./hostscdoc"
+		emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
+			CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
+		mv scdoc hostscdoc || die 'Failed to rename host scdoc'
+	fi
+
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
+		PCDIR="/usr/$(get_libdir)/pkgconfig" install
+}
diff --git a/app-text/scdoc/scdoc-9999.ebuild b/app-text/scdoc/scdoc-9999.ebuild
index d162fe258aaf..c40dcd50d0fa 100644
--- a/app-text/scdoc/scdoc-9999.ebuild
+++ b/app-text/scdoc/scdoc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
@@ -35,10 +35,11 @@ src_compile() {
 			CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
 		mv scdoc hostscdoc || die 'Failed to rename host scdoc'
 	fi
-	emake LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
+
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
-	PCDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" install
+	emake DESTDIR="${ED}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
+		PCDIR="/usr/$(get_libdir)/pkgconfig" install
 }