gentoo resync : 27.10.2018

4 files changed, 98 insertions, 11 deletions

diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index 4a07350a15aa..9b168eff6e17 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -1,3 +1,6 @@
-DIST scdoc-1.3.1.tar.xz 8776 BLAKE2B 1d11423abde7ec3e7b03ddc4f9698b7b78cac6972066c57886160974bd885225dc42793d19942c11ffd215f5dddd6453f66cbd083be03132b437b6f6f8a93c8a SHA512 a404df2e2eef76cc02c69f32eb131eaa4d4ed51e96dc6ea39400662f767648538fc27c618cf34c064004918a92940ae5400e91b7b628e431132cb9619d3e94eb
-EBUILD scdoc-1.3.1.ebuild 986 BLAKE2B 109e6dba273fe028e2965a23b995acaa3fa20ef3d528add4f0149d83f6ca18e2bf9c2b9f2686b34b6cdc056a8dea34ebfe616592d7513bbb7e7bdf3a43b24c86 SHA512 4d4b3162fec5e7b07adbd2fc712e3c8c324c771cf4bd7a9d78d064477e39ef64a71f56b4ab2253bc4c186aa50ad8563e7c91228b5970398df86e69308819691c
+DIST scdoc-1.3.1.tar.gz 9392 BLAKE2B 609f25252f0ee864ba3500961aa1048c6490278f4861fb4494ca62365a20d0cb128e53a6397bd089bd5a37f25f7f3c080f6921f1c4f4ca7e4af729c87e1994fc SHA512 6064de8c76eb959708b32e93634223565e5d4b390069d4fcd2d87d27bb472a333c60b21de87d676eb57ff5f8ed6445d3c3bd92dfe7dd611f9886abc38e8d21d2
+DIST scdoc-1.5.2.tar.gz 10542 BLAKE2B 07ceb1b3b57026a4e67e575f02042c2c882cdbd29712a4d3726ff39b4356bb63a35a99b21dd68fee31aad6fb2df14b1886bb2694098bc9096c5ff9e41600e7c4 SHA512 755c1c7fbae6cbeb75ca2aa2498cb3b2cf644e5118188c3e4a4636d74764b475b1818dcb5bd08ff70e017af9c1f8cb2e351db36a2cc98885724731e4247201eb
+EBUILD scdoc-1.3.1.ebuild 1031 BLAKE2B 3da18d09700584dc4c3365ea66c06bdcc5e8363e5dd3ca44a0c36a2237abe6ec444a760ed0ee288e522d6c4ea1994f8c9dc0db09a6b3bb07005f8cc9c379915d SHA512 2a943adf9b0ecac43499c55f74ab56fb0f5cc59d74bb43862726ff4da4aa9a765c09cc8b4ff1de28cae3de0d7856634de65027c83577a61c91c2b222fa6f14cc
+EBUILD scdoc-1.5.2.ebuild 1109 BLAKE2B b4846000a1dfa6d9d5295b8a68286c89374012740bc89fd50003e23ee71ee2e5c580afe8258f5cd2c5d1bd174de778796be606ff420200917304a26c88757243 SHA512 808c5938b686455d4d53d3b430feeee569d90b4c81c6979851d60b2c24a378c2acf20253dad18fd3889367cdf5ea1d9a6a1a4dcbbd9a996ce43d4c915d78291e
+EBUILD scdoc-9999.ebuild 1109 BLAKE2B b4846000a1dfa6d9d5295b8a68286c89374012740bc89fd50003e23ee71ee2e5c580afe8258f5cd2c5d1bd174de778796be606ff420200917304a26c88757243 SHA512 808c5938b686455d4d53d3b430feeee569d90b4c81c6979851d60b2c24a378c2acf20253dad18fd3889367cdf5ea1d9a6a1a4dcbbd9a996ce43d4c915d78291e
 MISC metadata.xml 444 BLAKE2B fe48dd13d534bacc09205bd073b4052e2f5afca50eedea53236f7d2d2f31f4f876fe0b4dcb57eb8a87b4090fffb5f924ed57b9a636453be7c2bb586cc4d1a142 SHA512 3a172b03f1768baf0bb940bd842f7e6c05762e79bb1d8632bdbf86276e79cda7f1b334750a3650cc86106154a8b2e2e426c7ab99d41cc5bf5119ac1e81e7b5fc
diff --git a/app-text/scdoc/scdoc-1.3.1.ebuild b/app-text/scdoc/scdoc-1.3.1.ebuild
index b1e8b927020a..c8999bc80532 100644
--- a/app-text/scdoc/scdoc-1.3.1.ebuild
+++ b/app-text/scdoc/scdoc-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
 HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
-SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/snapshot/${P}.tar.xz"
+SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -18,23 +18,21 @@ src_prepare() {
 
 	sed -e 's/-Werror//' \
 		-e 's/CFLAGS=/CFLAGS+=/' \
-		-e '/^PREFIX/s@=.*$@=/usr@' \
 		-i Makefile || die 'Failed to patch Makefile'
 }
 
 src_compile() {
-	MY_HS="./scdoc"
+	local MY_HS="./scdoc"
 	if tc-is-cross-compiler; then
 		tc-export_build_env
 		MY_HS="./hostscdoc"
-		MAKEOPTS+=" HOST_SCDOC=./hostscdoc"
-		emake scdoc OUTDIR="${S}/.build.host" CC=$(tc-getBUILD_CC) \
-			CFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}"
+		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 LDFLAGS="${LDFLAGS}" HOST_SCDOC="${MY_HS}"
+	emake LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" HOST_SCDOC="${MY_HS}" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" install
 }
diff --git a/app-text/scdoc/scdoc-1.5.2.ebuild b/app-text/scdoc/scdoc-1.5.2.ebuild
new file mode 100644
index 000000000000..3c018008f000
--- /dev/null
+++ b/app-text/scdoc/scdoc-1.5.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~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 LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" install
+}
diff --git a/app-text/scdoc/scdoc-9999.ebuild b/app-text/scdoc/scdoc-9999.ebuild
new file mode 100644
index 000000000000..3c018008f000
--- /dev/null
+++ b/app-text/scdoc/scdoc-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~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 LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" install
+}