From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Dec 2020 13:26:14 +0000 Subject: gentoo resync : 14.12.2020 --- app-text/mandoc/Manifest | 7 +- .../files/mandoc-1.14.5-r1-www-install.patch | 19 ++++ app-text/mandoc/files/mandoc.cron-r0 | 6 ++ app-text/mandoc/mandoc-1.14.4.ebuild | 60 ----------- app-text/mandoc/mandoc-1.14.5-r1.ebuild | 118 +++++++++++++++++++++ app-text/mandoc/metadata.xml | 4 + 6 files changed, 151 insertions(+), 63 deletions(-) create mode 100644 app-text/mandoc/files/mandoc-1.14.5-r1-www-install.patch create mode 100644 app-text/mandoc/files/mandoc.cron-r0 delete mode 100644 app-text/mandoc/mandoc-1.14.4.ebuild create mode 100644 app-text/mandoc/mandoc-1.14.5-r1.ebuild (limited to 'app-text/mandoc') diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest index dd825226dc4b..a55effec85b2 100644 --- a/app-text/mandoc/Manifest +++ b/app-text/mandoc/Manifest @@ -1,5 +1,6 @@ -DIST mandoc-1.14.4.tar.gz 627229 BLAKE2B 43a561d4254e8bcd090891937582d7ee40cda70dcafbbe456f24c539f17f452081f324a90eae69f1025dab3760581d564fef3365e82204350d535f4809c36283 SHA512 c68390711a739284ad9a61364f3fea76c0c48c02b4830d6326b07c4188d099e3720ae3b91fc3b083269381b417b7e3f3647d13a54ed2548f8c2f94122f8a7d97 +AUX mandoc-1.14.5-r1-www-install.patch 637 BLAKE2B 2550351e29db19b43de500f039f0563af8a720ef3bf7efa60ac715ca956d7dd0d13d0e092ae2749e3a76fc456eacf0260ca6fc03d324e08bf287bd8d4ac56dbf SHA512 5ed589e1322a2bbd261eb56aee8376526b80cf72eb5eafbc6e2772018c924913db0fb27eb7a50ec2509640e03e41d11e88401f76293d1d4230e777e39056c9fe +AUX mandoc.cron-r0 87 BLAKE2B 2fb4946dd2a9025f5bee78e61c11d77d6c6b9b32f9d17c11ea4f0d890e54b42817981e1cd4c568229927fd04bd0592e53ce18192f8359dded28be8c8690904f6 SHA512 74bdb16bc498d741128f1b6966afec8e21eb6899e26d20cf57cb0408ae6bdc63d75538dd355a21ae55593c359fbe707a56bbcdf6e78d557d4b53570db56fd6b3 DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52 -EBUILD mandoc-1.14.4.ebuild 1535 BLAKE2B 29f294139623d10225aab640399d224632535a6b39fadfe8d57101c6cc2e696a662c84a20cd619a761d8b52e2f590434303062e5599baca13d8c61e0f04a6268 SHA512 a3473a40521fd694315a7dca6d0aba171389ba39f8b92aaf24a103299ff664a97f8e984d27c2b7ffd86a294f0e027358b0686ec2093ecb02d1d6aa2dbfed845d +EBUILD mandoc-1.14.5-r1.ebuild 2785 BLAKE2B 5a18292e498215ecd218eab33b390055320d325ca26a0a661a2b8c30efed2bc611b774595f16565d9e312d08e1c3f96e347843bfdd87fcb960383f723ff16fbc SHA512 99635990cf6f06768b4345e462779c8606c5ac0f4bbd28d3c172f7bb2b8dc2bc873b8a4b62766d2b752d1777b73f65bb392c7b0b18252d4d59707381ba301731 EBUILD mandoc-1.14.5.ebuild 1727 BLAKE2B fbdad7247703bcea768dd034b2169f5183cf7ca644dad09335428356d83935d3ab4db2449d18e9c44d23b76c2d5fcfbdda4f6c09ec4bb5b81e8ca2732fdc65f6 SHA512 92be1ad119597580062788095aafb9fc951f8c55d1c368cc412b7afcff32476b01aa103f6f067c326d8a459b97e6071c8c79af8ef51482d5205fa27a743b1f42 -MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32 +MISC metadata.xml 375 BLAKE2B 6b3565c3419b306f33ce9ad867319cee386b20c92743fe1a6565a348aca03d13133906d07f5aa10ec145d84645fa11894ad8abd73a6f65d5d0680ce03ef339d5 SHA512 1814f8bf92ec3500aba2e6a194a8a1b0e7adf53de5ac5408ef22fa42845b9c7270a27eea0061d77b5b53ea7cf77e9bfc75c865dc1d6fb661a5bb8412fb9cda3e diff --git a/app-text/mandoc/files/mandoc-1.14.5-r1-www-install.patch b/app-text/mandoc/files/mandoc-1.14.5-r1-www-install.patch new file mode 100644 index 000000000000..2395f1ce66b7 --- /dev/null +++ b/app-text/mandoc/files/mandoc-1.14.5-r1-www-install.patch @@ -0,0 +1,19 @@ +diff --git a/Makefile b/Makefile +index f4e2954..191c7e2 100644 +--- a/Makefile ++++ b/Makefile +@@ -535,9 +535,11 @@ soelim: $(SOELIM_OBJS) + # --- maintainer targets --- + + www-install: www +- $(INSTALL_DATA) mandoc.css $(HTDOCDIR) +- $(INSTALL_DATA) $(WWW_MANS) $(HTDOCDIR)/man +- $(INSTALL_DATA) $(WWW_INCS) $(HTDOCDIR)/includes ++ mkdir -p $(DESTDIR)$(HTDOCDIR)/man ++ mkdir -p $(DESTDIR)$(HTDOCDIR)/includes ++ $(INSTALL_DATA) mandoc.css $(DESTDIR)$(HTDOCDIR) ++ $(INSTALL_DATA) $(WWW_MANS) $(DESTDIR)$(HTDOCDIR)/man ++ $(INSTALL_DATA) $(WWW_INCS) $(DESTDIR)$(HTDOCDIR)/includes + + depend: config.h + mkdep -f Makefile.depend $(CFLAGS) $(SRCS) diff --git a/app-text/mandoc/files/mandoc.cron-r0 b/app-text/mandoc/files/mandoc.cron-r0 new file mode 100644 index 000000000000..785564901765 --- /dev/null +++ b/app-text/mandoc/files/mandoc.cron-r0 @@ -0,0 +1,6 @@ +#!/bin/sh + +# need MANPATH +. /etc/profile.env + +exec nice makewhatis -T utf8 2>/dev/null diff --git a/app-text/mandoc/mandoc-1.14.4.ebuild b/app-text/mandoc/mandoc-1.14.4.ebuild deleted file mode 100644 index b42f184fedde..000000000000 --- a/app-text/mandoc/mandoc-1.14.4.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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="https://mdocml.bsd.lv/" -SRC_URI="https://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 -} diff --git a/app-text/mandoc/mandoc-1.14.5-r1.ebuild b/app-text/mandoc/mandoc-1.14.5-r1.ebuild new file mode 100644 index 000000000000..e775602af4b0 --- /dev/null +++ b/app-text/mandoc/mandoc-1.14.5-r1.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Suite of tools compiling mdoc and man" +HOMEPAGE="https://mdocml.bsd.lv/" +SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86" +IUSE="cgi system-man" + +RDEPEND="sys-libs/zlib + system-man? ( !sys-apps/man-db ) +" +DEPEND="${RDEPEND} + cgi? ( sys-libs/zlib[static-libs] ) +" +BDEPEND=" + cgi? ( app-text/highlight ) +" + +PATCHES=( "${FILESDIR}"/${PN}-1.14.5-r1-www-install.patch ) + +pkg_pretend() { + if use system-man ; then + # only support uncompressed and gzip + [[ -n ${PORTAGE_COMPRESS+unset} ]] && \ + [[ "${PORTAGE_COMPRESS}" == "gzip" || "${PORTAGE_COMPRESS}" == "" ]] || \ + ewarn "only PORTAGE_COMPRESS=gzip or '' is supported, man pages will not be indexed" + fi +} + +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 + + # make-4.3 doesn't like the CC line (bug #706024) + # and "echo -n" is not portable + sed \ + -e "s@^\(CC=\).*\$@\1\"$(tc-getCC)\"@" \ + -e 's@echo -n@printf@g' \ + -i configure || 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" + + CFLAGS="${CFLAGS} ${CPPFLAGS}" + LDFLAGS="${LDFLAGS}" + AR="$(tc-getAR)" + CC="$(tc-getCC)" + # The STATIC variable is only used by man.cgi. + STATIC= + + # conflicts with sys-apps/groff + BINM_SOELIM=msoelim + MANM_ROFF=mandoc_roff + # conflicts with sys-apps/man-pages + MANM_MAN=mandoc_man + + # fix utf-8 locale on musl + $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '') + EOF + use system-man || cat <<-EOF >> "configure.local" + BINM_MAN=mman + BINM_APROPOS=mapropos + BINM_WHATIS=mwhatis + BINM_MAKEWHATIS=mmakewhatis + MANM_MDOC=mandoc_mdoc + MANM_EQN=mandoc_eqn + MANM_TBL=mandoc_tbl + MANM_MANCONF=mman.conf + EOF + if use cgi; then + cp cgi.h{.example,} || die + fi + if [[ -n "${MANDOC_CGI_H}" ]]; then + cp "${MANDOC_CGI_H}" cgi.h || die + fi +} + +src_compile() { + default + use cgi && emake man.cgi +} + +src_install() { + emake DESTDIR="${D}" install + use cgi && emake DESTDIR="${D}" cgi-install www-install + + if use system-man ; then + exeinto /etc/cron.daily + newexe "${FILESDIR}"/mandoc.cron-r0 mandoc + fi +} + +pkg_postinst() { + if use system-man ; then + elog "Generating mandoc database" + makewhatis || die + fi +} diff --git a/app-text/mandoc/metadata.xml b/app-text/mandoc/metadata.xml index aebca33be179..814b35c62403 100644 --- a/app-text/mandoc/metadata.xml +++ b/app-text/mandoc/metadata.xml @@ -4,4 +4,8 @@ base-system@gentoo.org + + build man.cgi web plugin for viewing man pages + set as the default man provider + -- cgit v1.2.3