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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E8CFD1382C5 for ; Wed, 24 Jan 2018 21:40:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3B24E0897; Wed, 24 Jan 2018 21:40:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C6D64E0897 for ; Wed, 24 Jan 2018 21:40:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 680B4335C0B for ; Wed, 24 Jan 2018 21:40:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC3A11C9 for ; Wed, 24 Jan 2018 21:40:12 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1516829997.bab3d07d9e7e9a3d4abe6b71c56bc61d5547f077.nicolasbock@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/neomutt/neomutt-20171215-r1.ebuild mail-client/neomutt/neomutt-9999.ebuild X-VCS-Directories: mail-client/neomutt/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: bab3d07d9e7e9a3d4abe6b71c56bc61d5547f077 X-VCS-Branch: master Date: Wed, 24 Jan 2018 21:40:12 +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-Archives-Salt: 269acf91-a026-481e-a8b2-abf9278e824f X-Archives-Hash: d0de07fb1a9d751b7cbbf834359a5a3c commit: bab3d07d9e7e9a3d4abe6b71c56bc61d5547f077 Author: Nicolas Bock gentoo org> AuthorDate: Wed Jan 24 21:39:32 2018 +0000 Commit: Nicolas Bock gentoo org> CommitDate: Wed Jan 24 21:39:57 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bab3d07d mail-client/neomutt: Fix fake man pages This change restores and updates the old 'fake manpage' code when neomutt is built without the `doc` USE flag. Co-Authored-By: Floyd Anderson 31c0.net> Closes: https://bugs.gentoo.org/645520 Package-Manager: Portage-2.3.19, Repoman-2.3.6 ...omutt-9999.ebuild => neomutt-20171215-r1.ebuild} | 21 ++++++++++----------- mail-client/neomutt/neomutt-9999.ebuild | 21 ++++++++++----------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-20171215-r1.ebuild similarity index 86% copy from mail-client/neomutt/neomutt-9999.ebuild copy to mail-client/neomutt/neomutt-20171215-r1.ebuild index 7b36a57de36..e5725c95563 100644 --- a/mail-client/neomutt/neomutt-9999.ebuild +++ b/mail-client/neomutt/neomutt-20171215-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -99,17 +99,16 @@ src_configure() { src_install() { emake DESTDIR="${D}" install - # A man-page is always handy, so fake one + # A man-page is always handy, so fake one – here neomuttrc.5 + # (neomutt.1 already exists) if use !doc; then - emake -C doc neomuttrc.man - # make the fake slightly better, bug #413405 - sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \ - -e 's#in @docdir@,#at http://www.neomutt.org/,#' \ - -e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \ - -e "s#@bindir@#${EPREFIX}/usr/bin#" \ - doc/neomutt.man > neomutt.1 || die - cp doc/neomuttrc.man neomuttrc.5 || die - doman neomutt.1 neomuttrc.5 + sed -n '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \ + Makefile > doc/Makefile.fakedoc || die + sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \ + doc/Makefile.autosetup >> doc/Makefile.fakedoc || die + emake -f doc/Makefile.fakedoc doc/neomuttrc.man + cp doc/neomuttrc.man doc/neomuttrc.5 || die + doman doc/neomutt.1 doc/neomuttrc.5 fi dodoc COPYRIGHT LICENSE* ChangeLog* README* diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild index 7b36a57de36..e5725c95563 100644 --- a/mail-client/neomutt/neomutt-9999.ebuild +++ b/mail-client/neomutt/neomutt-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -99,17 +99,16 @@ src_configure() { src_install() { emake DESTDIR="${D}" install - # A man-page is always handy, so fake one + # A man-page is always handy, so fake one – here neomuttrc.5 + # (neomutt.1 already exists) if use !doc; then - emake -C doc neomuttrc.man - # make the fake slightly better, bug #413405 - sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \ - -e 's#in @docdir@,#at http://www.neomutt.org/,#' \ - -e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \ - -e "s#@bindir@#${EPREFIX}/usr/bin#" \ - doc/neomutt.man > neomutt.1 || die - cp doc/neomuttrc.man neomuttrc.5 || die - doman neomutt.1 neomuttrc.5 + sed -n '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \ + Makefile > doc/Makefile.fakedoc || die + sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \ + doc/Makefile.autosetup >> doc/Makefile.fakedoc || die + emake -f doc/Makefile.fakedoc doc/neomuttrc.man + cp doc/neomuttrc.man doc/neomuttrc.5 || die + doman doc/neomutt.1 doc/neomuttrc.5 fi dodoc COPYRIGHT LICENSE* ChangeLog* README*