commit: e7e8587c5a0305c19ff6284dbb8e64ee8a8faa22
parent 7ba08a67ac2c9af2966215efed5b65157d371175
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Fri, 21 May 2021 18:24:54 +0200
app-text/mandoc: Superseeded-by USE=system-man in gentoo
Diffstat:
6 files changed, 1 insertion(+), 115 deletions(-)
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
@@ -1 +0,0 @@
-DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52
diff --git a/app-text/mandoc/files/mandoc-1.14.5-fix-tbl-null-pointer.patch b/app-text/mandoc/files/mandoc-1.14.5-fix-tbl-null-pointer.patch
@@ -1,27 +0,0 @@
-===================================================================
-RCS file: /cvs/mandoc/tbl_term.c,v
-retrieving revision 1.69
-retrieving revision 1.70
-diff -u -p -r1.69 -r1.70
---- a/tbl_term.c 2019/03/16 21:35:48 1.69
-+++ b/tbl_term.c 2019/03/18 08:00:34 1.70
-@@ -629,7 +629,8 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp
-
- lw = cpp == NULL || cpn == NULL ||
- (cpn->pos != TBL_CELL_DOWN &&
-- (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
-+ (dpn == NULL || dpn->string == NULL ||
-+ strcmp(dpn->string, "\\^") != 0))
- ? hw : 0;
- tbl_direct_border(tp, BHORIZ * lw,
- col->width + col->spacing / 2);
-@@ -675,7 +676,8 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp
-
- rw = cpp == NULL || cpn == NULL ||
- (cpn->pos != TBL_CELL_DOWN &&
-- (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
-+ (dpn == NULL || dpn->string == NULL ||
-+ strcmp(dpn->string, "\\^") != 0))
- ? hw : 0;
-
- /* The line crossing at the end of this column. */
diff --git a/app-text/mandoc/files/mandoc_configure.patch b/app-text/mandoc/files/mandoc_configure.patch
@@ -1,12 +0,0 @@
-diff -Naur a/configure b/configure
---- a/configure
-+++ b/configure
-@@ -41,7 +41,7 @@
- OSNAME=
- UTF8_LOCALE=
-
--CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -`
-+CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i PATH="${PATH}" make -sf -`
- CFLAGS=
- LDADD=
- LDFLAGS=
diff --git a/app-text/mandoc/mandoc-1.14.5-r1.ebuild b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 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://mandoc.bsd.lv/"
-SRC_URI="https://mandoc.bsd.lv/snapshots/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="static"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
-RDEPEND="
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- !sys-apps/man-db
- !sys-apps/man
-"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-PATCHES=(
- "$FILESDIR"/mandoc-1.14.5-fix-tbl-null-pointer.patch
- "$FILESDIR"/mandoc_configure.patch
-)
-
-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
-
- # Bump Note: Remove -fcommon, fixed in [1] but doesn't applies cleanly
- # and it looks like no one did the rebasing work.
- # 1: https://inbox.vuxu.org/mandoc-source/490dd254e5b643b9@mandoc.bsd.lv/
-
- 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"
-
- MANM_MAN=mandoc_man
- MANM_MDOC=mandoc_mdoc
- MANM_ROFF=mandoc_roff
- MANM_EQN=mandoc_eqn
- MANM_TBL=mandoc_tbl
- BINM_SOELIM=msoelim
- CFLAGS="${CFLAGS} ${CPPFLAGS} -fcommon"
- 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/metadata.xml b/app-text/mandoc/metadata.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>contact@hacktivis.me</email>
- <name>Haelwenn (lanodan) Monnier</name>
- </maintainer>
-</pkgmetadata>
diff --git a/profiles/base/package.use b/profiles/base/package.use
@@ -19,3 +19,4 @@ sys-boot/grub -fonts -nls
sys-fs/lvm2 -thin
sys-kernel/genkernel cryptsetup
sys-kernel/gentoo-sources -symlink
+app-text/mandoc system-man
