diff options
Diffstat (limited to 'dev-util/plan9port')
| -rw-r--r-- | dev-util/plan9port/Manifest | 9 | ||||
| -rw-r--r-- | dev-util/plan9port/files/plan9port-noexecstack.patch | 35 | ||||
| -rw-r--r-- | dev-util/plan9port/metadata.xml | 3 | ||||
| -rw-r--r-- | dev-util/plan9port/plan9port-0_pre20210321.ebuild (renamed from dev-util/plan9port/plan9port-0_pre20200526.ebuild) | 32 | ||||
| -rw-r--r-- | dev-util/plan9port/plan9port-9999.ebuild | 126 |
5 files changed, 29 insertions, 176 deletions
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest index aacf1b464133..85364b4d742c 100644 --- a/dev-util/plan9port/Manifest +++ b/dev-util/plan9port/Manifest @@ -1,7 +1,6 @@ AUX plan9port-builderr.patch 882 BLAKE2B 1526bad2833a416cfb214f047f2f14bda89ca82293fa45c02e8165a4ee6050adccea91e2ac2e4d898b6c5b2005afddc82373f16939fe392b141bf664c5afea84 SHA512 38d071d37683f6408f948ee5dea2772ea988945da80c349cdf1731641010d7bff391468c9d4e65507a2a545d3d02a899ade4ea68ac476664e39bb68e587e4940 AUX plan9port-cflags.patch 312 BLAKE2B d09a4bb70451beb0cb6de05be37c6d68334d51f4db882debde4e3f3accf3aec25054ad5411a3c7289df6b556f59c1a729005f1c21247545158879c429462843d SHA512 29c4419bbc36330b322541b625bbe9131ed14d01008ba2ab2865a175918506de1e96a2b078246d1d6b6bc48537f90f74b1a72b223d74dc73d13cb7cf63d33c58 -AUX plan9port-noexecstack.patch 951 BLAKE2B 76df9fda4dc0124be25dd562ed804f6be75438c426a4e50b86e5806f34624f30a51ad30dd403a4a7ffd0829bc658cd307ed4c148de299016a1bf767011e6889e SHA512 1cb3defd59c3dd86474e23cc5b0ac397f645ab5a0b476a7f3532bee62bf5d2ffb1996945baed755e7cd61060bf8713b227c67472ca0f1a45ceab9aa82c524883 -DIST plan9port-a6ad39aaaa36b8aadc5c35bfc803afbde32918c0.tar.gz 23445647 BLAKE2B 4cb0f08fc404c5618c4be0d7e5710e6a8a32fbe010d28a879b1f9575118256492a3ed2b9b744c35dbbb6c6deae405c05fd7b6606254fb94fc2b40b3a8d14fa71 SHA512 4d9f6ce66d3eebb311cbbb0ec27c01d99cc0e19c6ac8a1c511ff00070c085a349b637048cd0066240af975e90f527388dbeba58f4591bf7dcaa673ee5564430f -EBUILD plan9port-0_pre20200526.ebuild 3497 BLAKE2B 572e4e4354f4caa1b8ee64defafbdb97e93904b03d4d902d8bc5bb3d7b7b814d998d32e95e3298f57156cdca770a35251f6c1706d035ac6393406e690f57c922 SHA512 317f1de1ec6e17cd084fe930e38d8fa84ee03a6fd5b73c3e4c5b81fa8c4b9de2fac525ff40da8050350d7719f74b34b01a943d86bd5bd338b25500af4ad51a86 -EBUILD plan9port-9999.ebuild 3347 BLAKE2B b26dd95b59ee9603a7506a25e15ac949c986c00c03b558832adcfff0365dfd32d2bccb54deb0e1bce1e1b779ee4535a36f450125e08181628cf2787606542527 SHA512 70f79b52d1d3ca4bcf665eb07e30c9d236167c67da51538c046e2474faea585fd48227b8ad57a875995e212913ed983444b28b0690521b4f0f693ea03e78dc31 -MISC metadata.xml 485 BLAKE2B 562cc265d88d43f48e39421d1ee8be547b74741a6ef9fa4ac6c46ae9fe19d8f1745b71439d21a95370eae39cd0ad5b87b710be375f4141510f6510fa5a721186 SHA512 655f45ad6e519ef7d350fd5df2ad4bb77e08730d80f3da2fc4572522d162279af23e82a79df55b2952135c8348565e1d706c38b1576ec2fd7e68a422deddf068 +AUX plan9port-noexecstack.patch 384 BLAKE2B 7f887894113677df743f64d7b1015aa65837818aff3c8d93bb553177da377a5975e7f8841addfff6b533771085490d306124adaf62a834615f0f5ca46f455bf4 SHA512 833a331d963e1f02ce497ffb293750cd6c535b6b2d6d26a2218264d3a7aa098b30f95cb3968fbaa3a734505286ff560e65f0390154af6a324078e3d7f80385be +DIST plan9port-88a87fadae6629932d9c160f53ad5d79775f8f94.tar.gz 23413373 BLAKE2B 6145dd77c9e4b33ebc6d68f42ed69e320e8bfcaae474a16afb3a62e30c13a39117d7013f3cc075eb48c95a5600c4fdb457e45f65f7b25ad2acc7b19dc9cf8e64 SHA512 f008969274e790238b58ebd0d0dcfaa730557daf974797f8c4014c36ac39995b330db9c6d658655358fdb2be64905b83c35e2287b7cd66b2d3249e1da1a3e119 +EBUILD plan9port-0_pre20210321.ebuild 3763 BLAKE2B 81ac6c9cbc85293a9ad357a14aa19aabb9434f1cba33797ff753cd01986a44780755e97653573239a9e7b9ac12b78899a1299823d62228935605da3f33e639b0 SHA512 045a58dbe28b113b405ca3dd4acc06d43f9bbf9d251efc39609adf882e45e02b2c3cd842df077c9d2088b0b5c81c6bf0fdeae8344ef9b3013a16810cc08d1ab4 +MISC metadata.xml 566 BLAKE2B 7a6e1aaf45f7c3e5c97a01912b519a88fe3e035208fe23d9938d9f458019a7459c5d8849371a46b9a0e5a055ed70d05d39e5792ff3a90b8613c041740666c6d8 SHA512 54656782266a9019847590221236cdd838b021c8645cec8a215007bf14e9347a6421effe916f59454de49254ce9e3393572ebd29ba01ced9ccec60b45f867595 diff --git a/dev-util/plan9port/files/plan9port-noexecstack.patch b/dev-util/plan9port/files/plan9port-noexecstack.patch index aff60d07a989..20aecce2515a 100644 --- a/dev-util/plan9port/files/plan9port-noexecstack.patch +++ b/dev-util/plan9port/files/plan9port-noexecstack.patch @@ -3,44 +3,9 @@ Remove unneeded executable stack Assembly routines in libthread and libmp use an executable stack by default. This is not needed and can be removed using --noexecstack. -The plan9port 9a wrapper wrapper needs to be modified to pass flags to the -underlying assembler first though.. - Patch by Andy Spencer http://code.swtch.com/plan9port/issue/76/ ---- a/bin/9a -+++ b/bin/9a -@@ -1,10 +1,5 @@ - #!/bin/sh - --if [ $# != 1 ]; then -- echo 'usage: 9a file.s' 1>&2 -- exit 1 --fi -- - test -f $PLAN9/config && . $PLAN9/config - - aflags="" -@@ -17,5 +12,16 @@ - ;; - esac - --out=`echo $1 | sed 's/\.s$//;s/$/.o/'` --exec as $aflags -o $out $1 -+for arg; do -+ case $arg in -+ -*) -+ opts="$opts $arg" -+ ;; -+ *.s) -+ src=$arg -+ dst=$(echo $arg | sed 's/\.s/\.o/') -+ ;; -+ esac -+done -+ -+exec as $aflags $opts -o $dst $src --- a/src/mkhdr +++ b/src/mkhdr @@ -13,7 +13,7 @@ diff --git a/dev-util/plan9port/metadata.xml b/dev-util/plan9port/metadata.xml index 522c313926ce..e87e52f30942 100644 --- a/dev-util/plan9port/metadata.xml +++ b/dev-util/plan9port/metadata.xml @@ -12,4 +12,7 @@ <upstream> <remote-id type="github">9fans/plan9port</remote-id> </upstream> + <use> + <flag name="freefonts">Don't install BigelowHolmes fonts</flag> + </use> </pkgmetadata> diff --git a/dev-util/plan9port/plan9port-0_pre20200526.ebuild b/dev-util/plan9port/plan9port-0_pre20210321.ebuild index dff9e3605a98..4b5f80a4b8b6 100644 --- a/dev-util/plan9port/plan9port-0_pre20200526.ebuild +++ b/dev-util/plan9port/plan9port-0_pre20210321.ebuild @@ -1,22 +1,25 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit multiprocessing toolchain-funcs readme.gentoo-r1 -MY_HASH="a6ad39aaaa36b8aadc5c35bfc803afbde32918c0" +MY_HASH="88a87fadae6629932d9c160f53ad5d79775f8f94" MY_P="${PN}-${MY_HASH}" DESCRIPTION="Port of many Plan 9 programs and libraries" HOMEPAGE="https://9fans.github.io/plan9port/ https://github.com/9fans/plan9port" SRC_URI="https://github.com/9fans/${PN}/archive/${MY_HASH}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes" +S="${WORKDIR}/${MY_P}" +LICENSE=" + MIT RSA Apache-2.0 public-domain BitstreamVera BZIP2 + !freefonts? ( BigelowHolmes ) +" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="X aqua truetype" +IUSE="X aqua freefonts truetype" REQUIRED_USE="?? ( X aqua )" DEPEND=" @@ -34,8 +37,6 @@ PATCHES=( "${FILESDIR}/${PN}-builderr.patch" ) -S="${WORKDIR}/${MY_P}" - PLAN9="/opt/plan9" EPLAN9="${EPREFIX}${PLAN9}" QA_MULTILIB_PATHS="${PLAN9}/.*/.*" @@ -56,10 +57,19 @@ DISABLE_AUTOFORMATTING="yes" src_prepare() { default + if use freefonts; then + pushd font || die + rm -r big5 fixed jis luc{,m,sans} misc naga10 pelm shinonome || die + popd || die + rm -r postscript/font/luxi || die + fi + case "${CHOST}" in - *apple*) - sed -i 's/--noexecstack/-noexecstack/' src/mkhdr || - die "Failed to sed AFLAGS" ;; + *apple*) + sed -i 's/--noexecstack/-noexecstack/' src/mkhdr || + die "Failed to sed AFLAGS" ;; + *) + rm -rf mac || die esac # don't hardcode /bin and /usr/bin in PATH @@ -114,6 +124,8 @@ src_compile() { src_install() { readme.gentoo_create_doc + rm -rf src || die + # do* plays with the executable bit, and we should not modify them dodir "${PLAN9}" cp -a * "${ED}${PLAN9}" || die "cp failed" diff --git a/dev-util/plan9port/plan9port-9999.ebuild b/dev-util/plan9port/plan9port-9999.ebuild deleted file mode 100644 index 4c1e286476b1..000000000000 --- a/dev-util/plan9port/plan9port-9999.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multiprocessing toolchain-funcs git-r3 readme.gentoo-r1 - -DESCRIPTION="Port of many Plan 9 programs and libraries" -HOMEPAGE="https://9fans.github.io/plan9port/ - https://github.com/9fans/plan9port" -EGIT_REPO_URI="https://github.com/9fans/${PN}.git" - -LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes" -SLOT="0" -IUSE="X aqua truetype" -REQUIRED_USE="?? ( X aqua )" - -DEPEND=" - X? ( x11-apps/xauth ) - truetype? ( - media-libs/freetype - media-libs/fontconfig - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-noexecstack.patch" - "${FILESDIR}/${PN}-cflags.patch" - "${FILESDIR}/${PN}-builderr.patch" -) - -PLAN9="/opt/plan9" -EPLAN9="${EPREFIX}${PLAN9}" -QA_MULTILIB_PATHS="${PLAN9}/.*/.*" - -DOC_CONTENTS="Plan 9 from User Space has been successfully installed into -${PLAN9}. Your PLAN9 and PATH environment variables have -also been appropriately set, please use env-update and -source /etc/profile to bring that into immediate effect. - -Please note that ${PLAN9}/bin has been appended to the -*end* or your PATH to prevent conflicts. To use the Plan9 -versions of common UNIX tools, use the absolute path: -${PLAN9}/bin or the 9 command (eg: 9 troff) - -Please report any bugs to bugs.gentoo.org, NOT Plan9Port." -DISABLE_AUTOFORMATTING="yes" - -src_prepare() { - default - - case "${CHOST}" in - *apple*) - sed -i 's/--noexecstack/-noexecstack/' src/mkhdr || - die "Failed to sed AFLAGS" ;; - esac - - # don't hardcode /bin and /usr/bin in PATH - sed -i '/PATH/s,/bin:/usr/bin:,,' INSTALL || die "sed on INSTALL failed" - - # don't hardcode /usr/{,local/}include and prefix /usr/include/* - sed -Ei -e 's,-I/usr(|/local)/include ,,g' \ - -e "s,-I/usr(|/local)/include,-I${EPREFIX}/usr\1/include,g" \ - src/cmd/fontsrv/freetyperules.sh INSTALL $(find -name makefile) || - die "sed failed" - - # Fix paths, done in place of ./INSTALL -c - einfo "Fixing hard-coded /usr/local/plan9 paths" - sed -i "s,/usr/local/plan9,${EPLAN9},g" $(grep -lr /usr/local/plan9) || - die "sed failed" -} - -src_configure() { - local -a myconf=( - CC9="$(tc-getCC)" - CC9FLAGS="'${CFLAGS} ${LDFLAGS}'" - ) - - if use X; then - myconf+=( WSYSTYPE=x11 ) - elif use aqua; then - local wsystype="$(awk '{if ($1 > 10.5) print "osx-cocoa"; else print "osx"}' \ - <<< "${MACOSX_DEPLOYMENT_TARGET}")" - myconf+=( WSYSTYPE="${wsystype}" ) - else - myconf+=( WSYSTYPE=nowsys ) - fi - - if use truetype; then - myconf+=( FONTSRV=fontsrv ) - else - myconf+=( FONTSRV= ) - fi - - printf '%s\n' "${myconf[@]}" >> LOCAL.config || - die "cannot create configuration" -} - -src_compile() { - # The INSTALL script builds mk then [re]builds everything using that - einfo "Compiling Plan 9 from User Space can take a very long time" - einfo "depending on the speed of your computer. Please be patient!" - NPROC="$(makeopts_jobs)" ./INSTALL -b || - die "Please report bugs to bugs.gentoo.org, NOT Plan9Port." -} - -src_install() { - readme.gentoo_create_doc - - # do* plays with the executable bit, and we should not modify them - dodir "${PLAN9}" - cp -a * "${ED}${PLAN9}" || die "cp failed" - - # build the environment variables and install them in env.d - newenvd - 60plan9 <<-EOF - PLAN9="${EPLAN9}" - PATH="${EPLAN9}/bin" - ROOTPATH="${EPLAN9}/bin" - MANPATH="${EPLAN9}/man" - EOF -} - -pkg_postinst() { - readme.gentoo_print_elog -} |