Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: sys-apps/groff/, sys-apps/groff/files/
Date: Mon, 30 Aug 2021 02:06:20
Message-Id: 1630289143.117bc03336b9512438a02e324c34d55dc41d9271.sam@gentoo
1 commit: 117bc03336b9512438a02e324c34d55dc41d9271
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 30 02:05:40 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 30 02:05:43 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=117bc033
7
8 sys-apps/groff: treeclean
9
10 See: 3d9ac4116142cf74cd8a37906d70a778bdd82569 in ::gentoo.
11 Bug: https://bugs.gentoo.org/678026
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 sys-apps/groff/Manifest | 1 -
15 .../files/groff-1.19.2-man-unicode-dashes.patch | 24 -----
16 sys-apps/groff/files/groff-1.22.4-musl.patch | 52 ----------
17 sys-apps/groff/groff-1.22.4.ebuild | 105 ---------------------
18 sys-apps/groff/metadata.xml | 11 ---
19 5 files changed, 193 deletions(-)
20
21 diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
22 deleted file mode 100644
23 index 67a1953..0000000
24 --- a/sys-apps/groff/Manifest
25 +++ /dev/null
26 @@ -1 +0,0 @@
27 -DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
28
29 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
30 deleted file mode 100644
31 index 276460f..0000000
32 --- a/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch
33 +++ /dev/null
34 @@ -1,24 +0,0 @@
35 -format dashes as dashes so as to not confuse people
36 -
37 -http://bugs.gentoo.org/16108
38 -http://bugs.gentoo.org/17580
39 -http://bugs.gentoo.org/121502
40 -
41 ---- a/tmac/man.local
42 -+++ b/tmac/man.local
43 -@@ -1,2 +1,6 @@
44 - .\" This file is loaded after an-old.tmac.
45 - .\" Put any local modifications to an-old.tmac here.
46 -+.if '\*[.T]'utf8' \{\
47 -+. char \- \N'45'
48 -+. char - \N'45'
49 -+.\}
50 ---- a/tmac/mdoc.local
51 -+++ b/tmac/mdoc.local
52 -@@ -1,2 +1,6 @@
53 - .\" This file is loaded after doc.tmac.
54 - .\" Put any local modifications to doc.tmac here.
55 -+.if '\*[.T]'utf8' \{\
56 -+. char \- \N'45'
57 -+. char - \N'45'
58 -+.\}
59
60 diff --git a/sys-apps/groff/files/groff-1.22.4-musl.patch b/sys-apps/groff/files/groff-1.22.4-musl.patch
61 deleted file mode 100644
62 index 0ed0e09..0000000
63 --- a/sys-apps/groff/files/groff-1.22.4-musl.patch
64 +++ /dev/null
65 @@ -1,52 +0,0 @@
66 -diff --git a/gnulib_m4/signbit.m4 b/gnulib_m4/signbit.m4
67 -index 9e7884d..ef1ed6f 100644
68 ---- a/gnulib_m4/signbit.m4
69 -+++ b/gnulib_m4/signbit.m4
70 -@@ -29,12 +29,12 @@ AC_DEFUN([gl_SIGNBIT],
71 - [gl_cv_func_signbit=yes],
72 - [gl_cv_func_signbit=no],
73 - [case "$host_os" in
74 -- # Guess yes on glibc systems.
75 -- *-gnu* | gnu*) gl_cv_func_signbit="guessing yes" ;;
76 -- # Guess yes on native Windows.
77 -- mingw*) gl_cv_func_signbit="guessing yes" ;;
78 -- # If we don't know, assume the worst.
79 -- *) gl_cv_func_signbit="guessing no" ;;
80 -+ # Guess yes on glibc systems.
81 -+ *-gnu* | gnu* | *musl*) gl_cv_func_signbit="guessing yes" ;;
82 -+ # Guess yes on native Windows.
83 -+ mingw*) gl_cv_func_signbit="guessing yes" ;;
84 -+ # If we don't know, assume the worst.
85 -+ *) gl_cv_func_signbit="guessing no" ;;
86 - esac
87 - ])
88 - ])
89 -@@ -60,17 +60,17 @@ AC_DEFUN([gl_SIGNBIT],
90 - [gl_cv_func_signbit_gcc=yes],
91 - [gl_cv_func_signbit_gcc=no],
92 - [case "$host_os" in
93 -- # Guess yes on glibc systems.
94 -- *-gnu* | gnu*) gl_cv_func_signbit_gcc="guessing yes" ;;
95 -- # Guess yes on mingw, no on MSVC.
96 -- mingw*) if test -n "$GCC"; then
97 -- gl_cv_func_signbit_gcc="guessing yes"
98 -- else
99 -- gl_cv_func_signbit_gcc="guessing no"
100 -- fi
101 -- ;;
102 -- # If we don't know, assume the worst.
103 -- *) gl_cv_func_signbit_gcc="guessing no" ;;
104 -+ # Guess yes on glibc systems.
105 -+ *-gnu* | gnu* | *musl*) gl_cv_func_signbit_gcc="guessing yes" ;;
106 -+ # Guess yes on mingw, no on MSVC.
107 -+ mingw*) if test -n "$GCC"; then
108 -+ gl_cv_func_signbit_gcc="guessing yes"
109 -+ else
110 -+ gl_cv_func_signbit_gcc="guessing no"
111 -+ fi
112 -+ ;;
113 -+ # If we don't know, assume the worst.
114 -+ *) gl_cv_func_signbit_gcc="guessing no" ;;
115 - esac
116 - ])
117 - ])
118
119 diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
120 deleted file mode 100644
121 index 195f215..0000000
122 --- a/sys-apps/groff/groff-1.22.4.ebuild
123 +++ /dev/null
124 @@ -1,105 +0,0 @@
125 -# Copyright 1999-2021 Gentoo Authors
126 -# Distributed under the terms of the GNU General Public License v2
127 -
128 -EAPI=7
129 -
130 -inherit toolchain-funcs
131 -
132 -MY_P="${P/_/.}"
133 -
134 -DESCRIPTION="Text formatter used for man pages"
135 -HOMEPAGE="https://www.gnu.org/software/groff/groff.html"
136 -SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz
137 - https://alpha.gnu.org/gnu/groff/${MY_P}.tar.gz"
138 -
139 -LICENSE="GPL-2"
140 -SLOT="0"
141 -[[ "${PV}" == *_rc* ]] || \
142 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
143 -IUSE="examples uchardet X"
144 -
145 -RDEPEND="
146 - uchardet? ( app-i18n/uchardet )
147 - X? (
148 - x11-libs/libICE
149 - x11-libs/libSM
150 - x11-libs/libX11
151 - x11-libs/libXaw
152 - x11-libs/libXmu
153 - x11-libs/libXt
154 - )"
155 -DEPEND="${RDEPEND}"
156 -BDEPEND="
157 - dev-lang/perl
158 - sys-apps/texinfo"
159 -
160 -DOCS=( BUG-REPORT ChangeLog MORE.STUFF NEWS PROBLEMS PROJECTS README TODO )
161 -
162 -S="${WORKDIR}/${MY_P}"
163 -
164 -PATCHES=(
165 - "${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch #16108 #17580 #121502
166 -)
167 -
168 -src_prepare() {
169 - default
170 -
171 - if use elibc_musl ; then
172 - eapply "${FILESDIR}"/${PN}-1.22.4-musl.patch
173 - fi
174 -
175 - # honor Gentoo's docdir
176 - sed -i -e "s|^docdir =.*|docdir = \"${EPREFIX}/usr/share/doc/${PF}\"|g" \
177 - Makefile.in \
178 - || die "failed to modify Makefile.in"
179 -
180 - local pfx=$(usex prefix ' Prefix' '')
181 - cat <<-EOF >> tmac/mdoc.local
182 - .ds volume-operating-system Gentoo${pfx}
183 - .ds operating-system Gentoo${pfx}/${KERNEL}
184 - .ds default-operating-system Gentoo${pfx}/${KERNEL}
185 - EOF
186 -
187 - # make sure we don't get a crappy `g' nameprefix on UNIX systems with real
188 - # troff (GROFF_G macro runs some test to see, its own troff doesn't satisfy)
189 - sed -i -e 's/^[ \t]\+g=g$/g=/' configure || die
190 -}
191 -
192 -src_configure() {
193 - local myeconfargs=(
194 - --with-appresdir="${EPREFIX}"/usr/share/X11/app-defaults
195 - $(use_with uchardet)
196 - $(use_with X x)
197 - )
198 - econf "${myeconfargs[@]}"
199 -}
200 -
201 -src_compile() {
202 - local -a CROSS_ARGS
203 - tc-is-cross-compiler && CROSS_ARGS+=(
204 - GROFFBIN="$(type -P groff)"
205 - TROFFBIN="$(type -P troff)"
206 - GROFF_BIN_DIR=
207 - GROFF_BIN_PATH=
208 - )
209 -
210 - emake AR="$(tc-getAR)" "${CROSS_ARGS[@]}"
211 -}
212 -
213 -src_install() {
214 - default
215 -
216 - # The following links are required for man #123674
217 - dosym eqn /usr/bin/geqn
218 - dosym tbl /usr/bin/gtbl
219 -
220 - if ! use examples ; then
221 - # The pdf files might not be generated if ghostscript is unavailable. #602020
222 - local pdf="${ED}/usr/share/doc/${PF}/examples/mom/mom-pdf.pdf"
223 - if [[ -e ${pdf} ]] ; then
224 - # Keep mom-pdf.pdf since it's more of a manual than an example. #454196 #516732
225 - mv "${pdf}" "${ED}/usr/share/doc/${PF}/pdf/" || die
226 - fi
227 - rm -rf "${ED}/usr/share/doc/${PF}/examples"
228 - fi
229 -}
230
231 diff --git a/sys-apps/groff/metadata.xml b/sys-apps/groff/metadata.xml
232 deleted file mode 100644
233 index b96055e..0000000
234 --- a/sys-apps/groff/metadata.xml
235 +++ /dev/null
236 @@ -1,11 +0,0 @@
237 -<?xml version="1.0" encoding="UTF-8"?>
238 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
239 -<pkgmetadata>
240 -<maintainer type="project">
241 - <email>base-system@g.o</email>
242 - <name>Gentoo Base System</name>
243 -</maintainer>
244 -<use>
245 - <flag name="uchardet">Enable automatic encoding detection via <pkg>app-i18n/uchardet</pkg></flag>
246 -</use>
247 -</pkgmetadata>