From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C9E715808B for ; Sun, 17 Apr 2022 17:06:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B555BE0A8E; Sun, 17 Apr 2022 17:06:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 850BFE0A8E for ; Sun, 17 Apr 2022 17:06:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AAD453412A4 for ; Sun, 17 Apr 2022 17:06:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 160393AF for ; Sun, 17 Apr 2022 17:06:29 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1650215148.03301500197ceaa629438401d02b373a1298d03b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/mandoc/, app-text/mandoc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/mandoc/Manifest app-text/mandoc/files/mandoc-1.14.5-gcc10.patch app-text/mandoc/mandoc-1.14.5-r1.ebuild X-VCS-Directories: app-text/mandoc/ app-text/mandoc/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 03301500197ceaa629438401d02b373a1298d03b X-VCS-Branch: master Date: Sun, 17 Apr 2022 17:06:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e48baea1-4743-467d-9cd5-205c02ac3314 X-Archives-Hash: 5a56cc95c60a577372fee488f6cc8582 commit: 03301500197ceaa629438401d02b373a1298d03b Author: Sam James gentoo org> AuthorDate: Sun Apr 17 16:57:17 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Apr 17 17:05:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03301500 app-text/mandoc: drop 1.14.5-r1 Signed-off-by: Sam James gentoo.org> app-text/mandoc/Manifest | 1 - app-text/mandoc/files/mandoc-1.14.5-gcc10.patch | 54 ---------- app-text/mandoc/mandoc-1.14.5-r1.ebuild | 125 ------------------------ 3 files changed, 180 deletions(-) diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest index a8738ed240ba..fbfe6541cf5b 100644 --- a/app-text/mandoc/Manifest +++ b/app-text/mandoc/Manifest @@ -1,2 +1 @@ -DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52 DIST mandoc-1.14.6.tar.gz 697150 BLAKE2B e9f6087e9df977901815b1231f68e381502c7392b0ac65a060ce0ef270da3b76540a17931a076b700865a02f9ca1a8ca044a54dbf6318756931c29e6b1deb228 SHA512 54286070812a47b629f68757046d3c9a1bdd2b5d1c3b84a5c8e4cb92f1331afa745443f7238175835d8cfbe5b8dd442e00c75c3a5b5b8f8efd8d2ec8f636dad4 diff --git a/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch b/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch deleted file mode 100644 index 6d976683772c..000000000000 --- a/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://cvsweb.bsd.lv/mandoc/compat_reallocarray.c.diff?r1=1.4&r2=1.5 -https://cvsweb.bsd.lv/mandoc/compat_getline.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2 - -https://bugs.gentoo.org/707254 ---- mandoc/compat_reallocarray.c 2014/12/11 09:05:01 1.4 -+++ mandoc/compat_reallocarray.c 2020/06/15 01:37:15 1.5 -@@ -1,8 +1,0 @@ --#include "config.h" -- --#if HAVE_REALLOCARRAY -- --int dummy; -- --#else -- -@@ -23,6 +15,7 @@ int dummy; - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -+#include "config.h" - - #include - #include -@@ -45,5 +38,3 @@ reallocarray(void *optr, size_t nmemb, size_t size) - } - return realloc(optr, size * nmemb); - } -- --#endif /*!HAVE_REALLOCARRAY*/ ---- mandoc/compat_getline.c 2015/11/07 20:52:52 1.1 -+++ mandoc/compat_getline.c 2020/06/15 01:37:14 1.2 -@@ -1,8 +1,0 @@ --#include "config.h" -- --#if HAVE_GETLINE -- --int dummy; -- --#else -- -@@ -22,6 +14,7 @@ int dummy; - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -+#include "config.h" - - #include - #include -@@ -64,5 +57,3 @@ getline(char **buf, size_t *bufsz, FILE *fp) - return pos; - } - } -- --#endif diff --git a/app-text/mandoc/mandoc-1.14.5-r1.ebuild b/app-text/mandoc/mandoc-1.14.5-r1.ebuild deleted file mode 100644 index e23baa856a58..000000000000 --- a/app-text/mandoc/mandoc-1.14.5-r1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2021 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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~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 - "${FILESDIR}"/${PN}-1.14.5-gcc10.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 - - # ./configure does not propagate all configure.local - # settings to Makefile.local settings. - tc-export AR -} - -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 -}