gentoo resync : 25.08.2018

3 files changed, 62 insertions, 67 deletions

diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
index fcf1e23a1276..6c568cce0883 100644
--- a/app-text/mandoc/Manifest
+++ b/app-text/mandoc/Manifest
@@ -1,5 +1,5 @@
 DIST mandoc-1.14.3.tar.gz 617202 BLAKE2B f534c200d450ad526946afe3ffd0a6c21831080312220452aba400f97d11a01ec2e7e31ae64cd9f4e40c00487769b2ad4a9fe132adbe1419b96e7a5995ef746b SHA512 cd638fbacb068fcd6191f2a4e941effc010e3ebf06a3e32847b892c2e561771d03d5bca8fbdf8434d6491f4b68df3f443e2568b79193b7342044fba476fcd30b
-DIST mdocml-1.14.1.tar.gz 549302 BLAKE2B 160d75b187223dde21bf861487f6aeef7b48b39432a6c8c3ab8cb7b3a1d48c4757ccadd3261cca74df47c52df0c6eab2393f65512874f43ff554315762069ffe SHA512 90f00297d162faa404fe4e530f95422c210b8d23a0be5a115c2c8c17255d366e224444901842affb06ed8aaf8febd3e5c79966ff713fa7daf00e8c48b7a857c6
-EBUILD mandoc-1.14.1-r1.ebuild 1549 BLAKE2B f5f18a11aae7375dff00e43ebf93d647e435c88f715e92880b0fcd775eca285dd479878dd5d5239764c01ed59ad30ed532fee4a9f33f583d4befab4a1dea260d SHA512 10a594d1da10cd7e55bf0aad3ee788b46a533c8b0c0b47f75f1143ac349371c337ab57fabf6166aa6e3a26d6dd2f382cdca6aeb60f0390f40cf6e25e66302758
+DIST mandoc-1.14.4.tar.gz 627229 BLAKE2B 43a561d4254e8bcd090891937582d7ee40cda70dcafbbe456f24c539f17f452081f324a90eae69f1025dab3760581d564fef3365e82204350d535f4809c36283 SHA512 c68390711a739284ad9a61364f3fea76c0c48c02b4830d6326b07c4188d099e3720ae3b91fc3b083269381b417b7e3f3647d13a54ed2548f8c2f94122f8a7d97
 EBUILD mandoc-1.14.3.ebuild 1536 BLAKE2B 96d5d1977bdf98a28d26053cd162a050ba8450014ab828486e2621378e8fb2e5b467acb22f93d52be87f7537cb3e9bdee44bb3e6892aae7c851c2e5463db020b SHA512 ba3e9775ce7566f2a7ba9cfd6d8f5e2b86aa3197a9bee35749323b55385d88d7ed8bd29126bca3061e7dc569411483e39952bcca713324e675b0f67f72d09551
+EBUILD mandoc-1.14.4.ebuild 1536 BLAKE2B 3ecc4853da9d231ab86f340bea39032ad230f2aced26987efe9ec14fb6fa86bac3bdddcb366428d9c539d611538991103e810908f898db7e11d93f70efd971d4 SHA512 ec236f12331d2564a28e9d8c7b2cd369984cbe3a1a5931cd18805c5c48ab58f99d91b004759428241d4bc7e8bab59ca6bfd9aa5317932d4403035bbeacbcfd99
 MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32
diff --git a/app-text/mandoc/mandoc-1.14.1-r1.ebuild b/app-text/mandoc/mandoc-1.14.1-r1.ebuild
deleted file mode 100644
index 1f7bd01b6fab..000000000000
--- a/app-text/mandoc/mandoc-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_PN="mdocml"
-MY_P="${MY_PN}-${PV}"
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Suite of tools compiling mdoc and man"
-HOMEPAGE="http://mdocml.bsd.lv/"
-SRC_URI="http://mdocml.bsd.lv/snapshots/${MY_P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# The db-install change is to support parallel installs.
-	sed -i \
-		-e '/ar rs/s:ar:$(AR):' \
-		-e '/^db-install:/s:$: base-install:' \
-		Makefile || die
-
-	cat <<EOF > "configure.local"
-PREFIX="${EPREFIX}/usr"
-BINDIR="${EPREFIX}/usr/bin"
-SBINDIR="${EPREFIX}/usr/sbin"
-LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-MANDIR="${EPREFIX}/usr/share/man"
-INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
-EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
-MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
-
-BINM_MAN=mman
-BINM_SOELIM=msoelim
-BINM_APROPOS=mapropos
-BINM_WHATIS=mwhatis
-BINM_MAKEWHATIS=mmakewhatis
-MANM_MAN=mandoc_man
-MANM_MDOC=mandoc_mdoc
-MANM_ROFF=mandoc_roff
-MANM_EQN=mandoc_eqn
-MANM_TBL=mandoc_tbl
-MANM_MANCONF=mman.conf
-
-CFLAGS="${CFLAGS} ${CPPFLAGS}"
-LDFLAGS="${LDFLAGS} $(usex static -static '')"
-AR="$(tc-getAR)"
-CC="$(tc-getCC)"
-# The STATIC variable is only used by man.cgi.
-STATIC=
-EOF
-}
diff --git a/app-text/mandoc/mandoc-1.14.4.ebuild b/app-text/mandoc/mandoc-1.14.4.ebuild
new file mode 100644
index 000000000000..8c8b1bec615d
--- /dev/null
+++ b/app-text/mandoc/mandoc-1.14.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Suite of tools compiling mdoc and man"
+HOMEPAGE="http://mdocml.bsd.lv/"
+SRC_URI="http://mdocml.bsd.lv/snapshots/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+src_prepare() {
+	default
+
+	# The db-install change is to support parallel installs.
+	sed -i \
+		-e '/ar rs/s:ar:$(AR):' \
+		-e '/^db-install:/s:$: base-install:' \
+		Makefile || die
+
+	cat <<-EOF > "configure.local"
+		PREFIX="${EPREFIX}/usr"
+		BINDIR="${EPREFIX}/usr/bin"
+		SBINDIR="${EPREFIX}/usr/sbin"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		MANDIR="${EPREFIX}/usr/share/man"
+		INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
+		EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
+		MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
+
+		BINM_MAN=mman
+		BINM_SOELIM=msoelim
+		BINM_APROPOS=mapropos
+		BINM_WHATIS=mwhatis
+		BINM_MAKEWHATIS=mmakewhatis
+		MANM_MAN=mandoc_man
+		MANM_MDOC=mandoc_mdoc
+		MANM_ROFF=mandoc_roff
+		MANM_EQN=mandoc_eqn
+		MANM_TBL=mandoc_tbl
+		MANM_MANCONF=mman.conf
+
+		CFLAGS="${CFLAGS} ${CPPFLAGS}"
+		LDFLAGS="${LDFLAGS} $(usex static -static '')"
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		# The STATIC variable is only used by man.cgi.
+		STATIC=
+	EOF
+}