Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/files/, dev-util/plan9port/
Date: Thu, 09 Sep 2021 13:26:52
Message-Id: 1631194000.a8bdd5209a2d2c03b4d20ee84f3568856071b0d6.blueness@gentoo
1 commit: a8bdd5209a2d2c03b4d20ee84f3568856071b0d6
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Tue May 25 16:52:51 2021 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 9 13:26:40 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8bdd520
7
8 dev-util/plan9port: new snapshot
9
10 non-free fonts under useflag
11 remove live ebuild
12 remove old snapshot
13
14 Bug: https://bugs.gentoo.org/791742
15 Closes: https://bugs.gentoo.org/779214
16 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
17 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
18
19 dev-util/plan9port/Manifest | 2 +-
20 .../plan9port/files/plan9port-noexecstack.patch | 35 ------
21 dev-util/plan9port/metadata.xml | 3 +
22 ...00526.ebuild => plan9port-0_pre20210321.ebuild} | 32 ++++--
23 dev-util/plan9port/plan9port-9999.ebuild | 126 ---------------------
24 5 files changed, 26 insertions(+), 172 deletions(-)
25
26 diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
27 index 09b8c7cbe5f..26110d5f298 100644
28 --- a/dev-util/plan9port/Manifest
29 +++ b/dev-util/plan9port/Manifest
30 @@ -1 +1 @@
31 -DIST plan9port-a6ad39aaaa36b8aadc5c35bfc803afbde32918c0.tar.gz 23445647 BLAKE2B 4cb0f08fc404c5618c4be0d7e5710e6a8a32fbe010d28a879b1f9575118256492a3ed2b9b744c35dbbb6c6deae405c05fd7b6606254fb94fc2b40b3a8d14fa71 SHA512 4d9f6ce66d3eebb311cbbb0ec27c01d99cc0e19c6ac8a1c511ff00070c085a349b637048cd0066240af975e90f527388dbeba58f4591bf7dcaa673ee5564430f
32 +DIST plan9port-88a87fadae6629932d9c160f53ad5d79775f8f94.tar.gz 23413373 BLAKE2B 6145dd77c9e4b33ebc6d68f42ed69e320e8bfcaae474a16afb3a62e30c13a39117d7013f3cc075eb48c95a5600c4fdb457e45f65f7b25ad2acc7b19dc9cf8e64 SHA512 f008969274e790238b58ebd0d0dcfaa730557daf974797f8c4014c36ac39995b330db9c6d658655358fdb2be64905b83c35e2287b7cd66b2d3249e1da1a3e119
33
34 diff --git a/dev-util/plan9port/files/plan9port-noexecstack.patch b/dev-util/plan9port/files/plan9port-noexecstack.patch
35 index aff60d07a98..20aecce2515 100644
36 --- a/dev-util/plan9port/files/plan9port-noexecstack.patch
37 +++ b/dev-util/plan9port/files/plan9port-noexecstack.patch
38 @@ -3,44 +3,9 @@ Remove unneeded executable stack
39 Assembly routines in libthread and libmp use an executable stack by
40 default. This is not needed and can be removed using --noexecstack.
41
42 -The plan9port 9a wrapper wrapper needs to be modified to pass flags to the
43 -underlying assembler first though..
44 -
45 Patch by Andy Spencer
46
47 http://code.swtch.com/plan9port/issue/76/
48 ---- a/bin/9a
49 -+++ b/bin/9a
50 -@@ -1,10 +1,5 @@
51 - #!/bin/sh
52 -
53 --if [ $# != 1 ]; then
54 -- echo 'usage: 9a file.s' 1>&2
55 -- exit 1
56 --fi
57 --
58 - test -f $PLAN9/config && . $PLAN9/config
59 -
60 - aflags=""
61 -@@ -17,5 +12,16 @@
62 - ;;
63 - esac
64 -
65 --out=`echo $1 | sed 's/\.s$//;s/$/.o/'`
66 --exec as $aflags -o $out $1
67 -+for arg; do
68 -+ case $arg in
69 -+ -*)
70 -+ opts="$opts $arg"
71 -+ ;;
72 -+ *.s)
73 -+ src=$arg
74 -+ dst=$(echo $arg | sed 's/\.s/\.o/')
75 -+ ;;
76 -+ esac
77 -+done
78 -+
79 -+exec as $aflags $opts -o $dst $src
80 --- a/src/mkhdr
81 +++ b/src/mkhdr
82 @@ -13,7 +13,7 @@
83
84 diff --git a/dev-util/plan9port/metadata.xml b/dev-util/plan9port/metadata.xml
85 index 522c313926c..e87e52f3094 100644
86 --- a/dev-util/plan9port/metadata.xml
87 +++ b/dev-util/plan9port/metadata.xml
88 @@ -12,4 +12,7 @@
89 <upstream>
90 <remote-id type="github">9fans/plan9port</remote-id>
91 </upstream>
92 + <use>
93 + <flag name="freefonts">Don't install BigelowHolmes fonts</flag>
94 + </use>
95 </pkgmetadata>
96
97 diff --git a/dev-util/plan9port/plan9port-0_pre20200526.ebuild b/dev-util/plan9port/plan9port-0_pre20210321.ebuild
98 similarity index 86%
99 rename from dev-util/plan9port/plan9port-0_pre20200526.ebuild
100 rename to dev-util/plan9port/plan9port-0_pre20210321.ebuild
101 index dff9e3605a9..4b5f80a4b8b 100644
102 --- a/dev-util/plan9port/plan9port-0_pre20200526.ebuild
103 +++ b/dev-util/plan9port/plan9port-0_pre20210321.ebuild
104 @@ -1,22 +1,25 @@
105 -# Copyright 1999-2020 Gentoo Authors
106 +# Copyright 1999-2021 Gentoo Authors
107 # Distributed under the terms of the GNU General Public License v2
108
109 EAPI=7
110
111 inherit multiprocessing toolchain-funcs readme.gentoo-r1
112
113 -MY_HASH="a6ad39aaaa36b8aadc5c35bfc803afbde32918c0"
114 +MY_HASH="88a87fadae6629932d9c160f53ad5d79775f8f94"
115 MY_P="${PN}-${MY_HASH}"
116
117 DESCRIPTION="Port of many Plan 9 programs and libraries"
118 HOMEPAGE="https://9fans.github.io/plan9port/
119 https://github.com/9fans/plan9port"
120 SRC_URI="https://github.com/9fans/${PN}/archive/${MY_HASH}.tar.gz -> ${MY_P}.tar.gz"
121 -
122 -LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
123 +S="${WORKDIR}/${MY_P}"
124 +LICENSE="
125 + MIT RSA Apache-2.0 public-domain BitstreamVera BZIP2
126 + !freefonts? ( BigelowHolmes )
127 +"
128 SLOT="0"
129 KEYWORDS="~amd64 ~x86"
130 -IUSE="X aqua truetype"
131 +IUSE="X aqua freefonts truetype"
132 REQUIRED_USE="?? ( X aqua )"
133
134 DEPEND="
135 @@ -34,8 +37,6 @@ PATCHES=(
136 "${FILESDIR}/${PN}-builderr.patch"
137 )
138
139 -S="${WORKDIR}/${MY_P}"
140 -
141 PLAN9="/opt/plan9"
142 EPLAN9="${EPREFIX}${PLAN9}"
143 QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
144 @@ -56,10 +57,19 @@ DISABLE_AUTOFORMATTING="yes"
145 src_prepare() {
146 default
147
148 + if use freefonts; then
149 + pushd font || die
150 + rm -r big5 fixed jis luc{,m,sans} misc naga10 pelm shinonome || die
151 + popd || die
152 + rm -r postscript/font/luxi || die
153 + fi
154 +
155 case "${CHOST}" in
156 - *apple*)
157 - sed -i 's/--noexecstack/-noexecstack/' src/mkhdr ||
158 - die "Failed to sed AFLAGS" ;;
159 + *apple*)
160 + sed -i 's/--noexecstack/-noexecstack/' src/mkhdr ||
161 + die "Failed to sed AFLAGS" ;;
162 + *)
163 + rm -rf mac || die
164 esac
165
166 # don't hardcode /bin and /usr/bin in PATH
167 @@ -114,6 +124,8 @@ src_compile() {
168 src_install() {
169 readme.gentoo_create_doc
170
171 + rm -rf src || die
172 +
173 # do* plays with the executable bit, and we should not modify them
174 dodir "${PLAN9}"
175 cp -a * "${ED}${PLAN9}" || die "cp failed"
176
177 diff --git a/dev-util/plan9port/plan9port-9999.ebuild b/dev-util/plan9port/plan9port-9999.ebuild
178 deleted file mode 100644
179 index 4c1e286476b..00000000000
180 --- a/dev-util/plan9port/plan9port-9999.ebuild
181 +++ /dev/null
182 @@ -1,126 +0,0 @@
183 -# Copyright 1999-2020 Gentoo Authors
184 -# Distributed under the terms of the GNU General Public License v2
185 -
186 -EAPI=7
187 -
188 -inherit multiprocessing toolchain-funcs git-r3 readme.gentoo-r1
189 -
190 -DESCRIPTION="Port of many Plan 9 programs and libraries"
191 -HOMEPAGE="https://9fans.github.io/plan9port/
192 - https://github.com/9fans/plan9port"
193 -EGIT_REPO_URI="https://github.com/9fans/${PN}.git"
194 -
195 -LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
196 -SLOT="0"
197 -IUSE="X aqua truetype"
198 -REQUIRED_USE="?? ( X aqua )"
199 -
200 -DEPEND="
201 - X? ( x11-apps/xauth )
202 - truetype? (
203 - media-libs/freetype
204 - media-libs/fontconfig
205 - )
206 -"
207 -RDEPEND="${DEPEND}"
208 -
209 -PATCHES=(
210 - "${FILESDIR}/${PN}-noexecstack.patch"
211 - "${FILESDIR}/${PN}-cflags.patch"
212 - "${FILESDIR}/${PN}-builderr.patch"
213 -)
214 -
215 -PLAN9="/opt/plan9"
216 -EPLAN9="${EPREFIX}${PLAN9}"
217 -QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
218 -
219 -DOC_CONTENTS="Plan 9 from User Space has been successfully installed into
220 -${PLAN9}. Your PLAN9 and PATH environment variables have
221 -also been appropriately set, please use env-update and
222 -source /etc/profile to bring that into immediate effect.
223 -
224 -Please note that ${PLAN9}/bin has been appended to the
225 -*end* or your PATH to prevent conflicts. To use the Plan9
226 -versions of common UNIX tools, use the absolute path:
227 -${PLAN9}/bin or the 9 command (eg: 9 troff)
228 -
229 -Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
230 -DISABLE_AUTOFORMATTING="yes"
231 -
232 -src_prepare() {
233 - default
234 -
235 - case "${CHOST}" in
236 - *apple*)
237 - sed -i 's/--noexecstack/-noexecstack/' src/mkhdr ||
238 - die "Failed to sed AFLAGS" ;;
239 - esac
240 -
241 - # don't hardcode /bin and /usr/bin in PATH
242 - sed -i '/PATH/s,/bin:/usr/bin:,,' INSTALL || die "sed on INSTALL failed"
243 -
244 - # don't hardcode /usr/{,local/}include and prefix /usr/include/*
245 - sed -Ei -e 's,-I/usr(|/local)/include ,,g' \
246 - -e "s,-I/usr(|/local)/include,-I${EPREFIX}/usr\1/include,g" \
247 - src/cmd/fontsrv/freetyperules.sh INSTALL $(find -name makefile) ||
248 - die "sed failed"
249 -
250 - # Fix paths, done in place of ./INSTALL -c
251 - einfo "Fixing hard-coded /usr/local/plan9 paths"
252 - sed -i "s,/usr/local/plan9,${EPLAN9},g" $(grep -lr /usr/local/plan9) ||
253 - die "sed failed"
254 -}
255 -
256 -src_configure() {
257 - local -a myconf=(
258 - CC9="$(tc-getCC)"
259 - CC9FLAGS="'${CFLAGS} ${LDFLAGS}'"
260 - )
261 -
262 - if use X; then
263 - myconf+=( WSYSTYPE=x11 )
264 - elif use aqua; then
265 - local wsystype="$(awk '{if ($1 > 10.5) print "osx-cocoa"; else print "osx"}' \
266 - <<< "${MACOSX_DEPLOYMENT_TARGET}")"
267 - myconf+=( WSYSTYPE="${wsystype}" )
268 - else
269 - myconf+=( WSYSTYPE=nowsys )
270 - fi
271 -
272 - if use truetype; then
273 - myconf+=( FONTSRV=fontsrv )
274 - else
275 - myconf+=( FONTSRV= )
276 - fi
277 -
278 - printf '%s\n' "${myconf[@]}" >> LOCAL.config ||
279 - die "cannot create configuration"
280 -}
281 -
282 -src_compile() {
283 - # The INSTALL script builds mk then [re]builds everything using that
284 - einfo "Compiling Plan 9 from User Space can take a very long time"
285 - einfo "depending on the speed of your computer. Please be patient!"
286 - NPROC="$(makeopts_jobs)" ./INSTALL -b ||
287 - die "Please report bugs to bugs.gentoo.org, NOT Plan9Port."
288 -}
289 -
290 -src_install() {
291 - readme.gentoo_create_doc
292 -
293 - # do* plays with the executable bit, and we should not modify them
294 - dodir "${PLAN9}"
295 - cp -a * "${ED}${PLAN9}" || die "cp failed"
296 -
297 - # build the environment variables and install them in env.d
298 - newenvd - 60plan9 <<-EOF
299 - PLAN9="${EPLAN9}"
300 - PATH="${EPLAN9}/bin"
301 - ROOTPATH="${EPLAN9}/bin"
302 - MANPATH="${EPLAN9}/man"
303 - EOF
304 -}
305 -
306 -pkg_postinst() {
307 - readme.gentoo_print_elog
308 -}