[gentoo-commits] repo/gentoo:master commit in: sys-apps/groff/files/, sys-apps/groff/

[Lars Wendler]

commit:     37267a0171bfbc04b8abf2334bd7d203bbc301fc
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 27 13:51:35 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 13:51:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37267a01

sys-apps/groff: Bump to version 1.22.4_rc2

Package-Manager: Portage-2.3.50, Repoman-2.3.11

 sys-apps/groff/Manifest                            |  1 +
 .../files/groff-1.19.2-man-unicode-dashes.patch    |  8 +-
 sys-apps/groff/groff-1.22.4_rc2.ebuild             | 97 ++++++++++++++++++++++
 3 files changed, 102 insertions(+), 4 deletions(-)

diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index bd92f6278b4..f650e00c674 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,3 +1,4 @@
 DIST groff-1.22.1-japanese.patch.bz2 52968 BLAKE2B 8064ff973c9507536c4e6edb6146c33c6c3a994598f0bb925bd23307a5ed407af9fe744990735d640ea69def4a6aed69ee87b7abbacca401c0059cf63e6eb147 SHA512 883d15dd2f1420a067d35737c45431f33f05bbe3c7e7edab0e119416117b5d096972d71452eae94bfd3df23aa7d6595fc6e65208bd4fba86815162bdf9af8bef
 DIST groff-1.22.2.tar.gz 4019913 BLAKE2B 904a2a6064cc70cf088224d6f608389eb56842142802636b94fef30f5e20b5c62db03087878d0e04e22c65754e0fd253aa7cfd23c1354057862f70e17db43366 SHA512 ea34db53f075b6816827b07ac3d6a19ed50529c939044337eb3124575ac3b41363e1d81bbd5bf552a7a10f6b1dd233d6e7acaf646e18cfe94464c59dc20ffe80
 DIST groff-1.22.3.tar.gz 4188772 BLAKE2B 28c380d33719f4eb0c91a9761e76beb9a2f1f6fb632c731bb6b26f76fee1857e7340d62a2239b360e049351e2e291c420db18a4f6bf8f50221bf249457872693 SHA512 c526ab203d13a9c9d110bcd3149fe50d1cd0d309437e9e2731a7ce90d890507ebc0a2331899ecf4dba2938daa756b6094cf76fd347a0ded59797c70ccfd0c95c
+DIST groff-1.22.4.rc2.tar.gz 4118558 BLAKE2B db7b9a667a85eeea34bfa4cf53de77f3ca6bbc541c8130701b011c66b93df4d4f16e23d5e0dae18470daeb0393c980f0e0fc22fd3bb9d00ebf77b2c3ba9a1dd7 SHA512 831a3ab55e8f37626b3f51d0cd5f461449b977a4ec64a93f2485aff5ab97947781dfbdd7830439d139c5f2c46455534d733d722047290f76eedf2d29d4f70138

diff --git a/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch b/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch
index d85a8330d27..276460f10b6 100644
--- a/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch
+++ b/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch
@@ -4,8 +4,8 @@ http://bugs.gentoo.org/16108
 http://bugs.gentoo.org/17580
 http://bugs.gentoo.org/121502
 
---- tmac/man.local
-+++ tmac/man.local
+--- a/tmac/man.local
++++ b/tmac/man.local
 @@ -1,2 +1,6 @@
  .\" This file is loaded after an-old.tmac.
  .\" Put any local modifications to an-old.tmac here.
@@ -13,8 +13,8 @@ http://bugs.gentoo.org/121502
 +.  char \- \N'45'
 +.  char  - \N'45'
 +.\}
---- tmac/mdoc.local
-+++ tmac/mdoc.local
+--- a/tmac/mdoc.local
++++ b/tmac/mdoc.local
 @@ -1,2 +1,6 @@
  .\" This file is loaded after doc.tmac.
  .\" Put any local modifications to doc.tmac here.

diff --git a/sys-apps/groff/groff-1.22.4_rc2.ebuild b/sys-apps/groff/groff-1.22.4_rc2.ebuild
new file mode 100644
index 00000000000..ad57e91b4b4
--- /dev/null
+++ b/sys-apps/groff/groff-1.22.4_rc2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_P="${P/_/.}"
+
+DESCRIPTION="Text formatter used for man pages"
+HOMEPAGE="https://www.gnu.org/software/groff/groff.html"
+SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz
+	mirror://gnu-alpha/groff/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples X"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXmu
+		x11-libs/libXaw
+		x11-libs/libSM
+		x11-libs/libICE
+	)"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+DOCS=( BUG-REPORT ChangeLog MORE.STUFF NEWS PROBLEMS PROJECTS README TODO )
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch #16108 #17580 #121502
+)
+
+src_prepare() {
+	default
+
+	# Make sure we can cross-compile this puppy
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e '/^GROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/groff:' \
+			-e '/^TROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/troff:' \
+			-e '/^GROFF_BIN_PATH=/s:=.*:=:' \
+			-e '/^GROFF_BIN_DIR=/s:=.*:=:' \
+			contrib/*/Makefile.sub \
+			doc/Makefile.in \
+			doc/Makefile.sub || die "cross-compile sed failed"
+	fi
+
+	local pfx=$(usex prefix ' Prefix' '')
+	cat <<-EOF >> tmac/mdoc.local
+	.ds volume-operating-system Gentoo${pfx}
+	.ds operating-system Gentoo${pfx}/${KERNEL}
+	.ds default-operating-system Gentoo${pfx}/${KERNEL}
+	EOF
+
+	# make sure we don't get a crappy `g' nameprefix on UNIX systems with real
+	# troff (GROFF_G macro runs some test to see, its own troff doesn't satisfy)
+	sed -i -e 's/^[ \t]\+g=g$/g=/' configure || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-appresdir="${EPREFIX}"/usr/share/X11/app-defaults
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	# The following links are required for man #123674
+	dosym eqn /usr/bin/geqn
+	dosym tbl /usr/bin/gtbl
+
+	if ! use examples ; then
+		# The pdf files might not be generated if ghostscript is unavailable. #602020
+		local pdf="${ED%/}/usr/share/doc/${PF}/examples/mom/mom-pdf.pdf"
+		if [[ -e ${pdf} ]] ; then
+			# Keep mom-pdf.pdf since it's more of a manual than an example. #454196 #516732
+			mv "${pdf}" "${ED%/}"/usr/share/doc/${PF}/pdf/ || die
+		fi
+		rm -rf "${ED%/}"/usr/share/doc/${PF}/examples
+	fi
+}