[gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/
commit: b3713507aa127da8d7a6b498fec2a7753b85f334
Author: Eli Schwartz gmail com>
AuthorDate: Tue Mar 5 23:41:16 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Mar 6 03:36:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3713507
dev-util/plan9port: mark as LTO-unsafe
Closes: https://bugs.gentoo.org/858452
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
dev-util/plan9port/plan9port-0_pre20230331-r1.ebuild | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/dev-util/plan9port/plan9port-0_pre20230331-r1.ebuild
b/dev-util/plan9port/plan9port-0_pre20230331-r1.ebuild
index 4373389cdfc5..2b558154c3ee 100644
--- a/dev-util/plan9port/plan9port-0_pre20230331-r1.ebuild
+++ b/dev-util/plan9port/plan9port-0_pre20230331-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit multiprocessing toolchain-funcs readme.gentoo-r1
+inherit flag-o-matic multiprocessing toolchain-funcs readme.gentoo-r1
MY_HASH="cc4571fec67407652b03d6603ada6580de2194dc"
MY_P="${PN}-${MY_HASH}"
@@ -88,6 +88,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/858452
+ # https://github.com/9fans/plan9port/issues/646
+ filter-lto
+
local -a myconf=(
CC9="$(tc-getCC)"
CC9FLAGS="'${CFLAGS} ${LDFLAGS}'"
[gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/
commit: e8076c08482bae16dc99c53a7590603de560f29d
Author: Sam James gentoo org>
AuthorDate: Tue Jun 6 07:09:27 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 6 07:09:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8076c08
dev-util/plan9port: X always needs fontconfig/freetype now
Closes: https://bugs.gentoo.org/907941
Signed-off-by: Sam James gentoo.org>
...0230331.ebuild => plan9port-0_pre20230331-r1.ebuild} | 17 +++--
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/dev-util/plan9port/plan9port-0_pre20230331.ebuild
b/dev-util/plan9port/plan9port-0_pre20230331-r1.ebuild
similarity index 95%
rename from dev-util/plan9port/plan9port-0_pre20230331.ebuild
rename to dev-util/plan9port/plan9port-0_pre20230331-r1.ebuild
index a5172d77bb8d..4373389cdfc5 100644
--- a/dev-util/plan9port/plan9port-0_pre20230331.ebuild
+++ b/dev-util/plan9port/plan9port-0_pre20230331-r1.ebuild
@@ -19,14 +19,14 @@ LICENSE="
"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="X aqua freefonts truetype"
+IUSE="X aqua freefonts"
REQUIRED_USE="?? ( X aqua )"
DEPEND="
- X? ( x11-apps/xauth )
- truetype? (
+ X? (
media-libs/freetype
media-libs/fontconfig
+ x11-apps/xauth
)
"
RDEPEND="${DEPEND}"
@@ -94,7 +94,10 @@ src_configure() {
)
if use X; then
- myconf+=( WSYSTYPE=x11 )
+ myconf+=(
+ WSYSTYPE=x11
+ FONTSRV=fontsrv
+ )
elif use aqua; then
local wsystype="$(awk '{if ($1 > 10.5) print "osx-cocoa"; else
print "osx"}' \
<<< "${MACOSX_DEPLOYMENT_TARGET}")"
@@ -103,12 +106,6 @@ src_configure() {
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"
}
[gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/
commit: c310685670753b51acf5af6c3a8207a3c0fdf931
Author: Sam James gentoo org>
AuthorDate: Tue Jun 6 05:57:31 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 6 05:59:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3106856
dev-util/plan9port: add 0_pre20230331
Closes: https://bugs.gentoo.org/818676
Signed-off-by: Sam James gentoo.org>
dev-util/plan9port/Manifest | 1 +
dev-util/plan9port/plan9port-0_pre20230331.ebuild | 144 ++
2 files changed, 145 insertions(+)
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
index 26110d5f298a..0659551716d1 100644
--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@@ -1 +1,2 @@
DIST plan9port-88a87fadae6629932d9c160f53ad5d79775f8f94.tar.gz 23413373
BLAKE2B
6145dd77c9e4b33ebc6d68f42ed69e320e8bfcaae474a16afb3a62e30c13a39117d7013f3cc075eb48c95a5600c4fdb457e45f65f7b25ad2acc7b19dc9cf8e64
SHA512
f008969274e790238b58ebd0d0dcfaa730557daf974797f8c4014c36ac39995b330db9c6d658655358fdb2be64905b83c35e2287b7cd66b2d3249e1da1a3e119
+DIST plan9port-cc4571fec67407652b03d6603ada6580de2194dc.tar.gz 23411459
BLAKE2B
439ea7dcddfc466a7fe8bea8b75a7e73558e5cdbd7f0adf9b3367d6eab9eaab8afa8e9fb60bcf83a4a614abbd52a85ddfa65b5dd757fdd2b725f554bf66f3c90
SHA512
e347ffd04c92508b3bc324d93837c831af40b5eb11583f6c61e15c0e861067c76945a1a65929c1e725f18760035a1a14a6cd16a7b8b6a14fd2422750cef1e4d4
diff --git a/dev-util/plan9port/plan9port-0_pre20230331.ebuild
b/dev-util/plan9port/plan9port-0_pre20230331.ebuild
new file mode 100644
index ..a5172d77bb8d
--- /dev/null
+++ b/dev-util/plan9port/plan9port-0_pre20230331.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing toolchain-funcs readme.gentoo-r1
+
+MY_HASH="cc4571fec67407652b03d6603ada6580de2194dc"
+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"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="
+ MIT RSA Apache-2.0 public-domain BitstreamVera BZIP2
+ !freefonts? ( BigelowHolmes )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="X aqua freefonts 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
+
+ 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" ;;
+ *)
+ rm -rf mac || die
+ 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}")"
+
[gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/
commit: ff7b8409ed31caa142dc8e43dc60258b58222a26 Author: Sam James gentoo org> AuthorDate: Thu Nov 4 17:08:48 2021 + Commit: Sam James gentoo org> CommitDate: Thu Nov 4 17:08:48 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff7b8409 dev-util/plan9port: Keyword 0_pre20210321 arm64, #817011 Signed-off-by: Sam James gentoo.org> dev-util/plan9port/plan9port-0_pre20210321.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/plan9port/plan9port-0_pre20210321.ebuild b/dev-util/plan9port/plan9port-0_pre20210321.ebuild index 4b5f80a4b8b..05d59ffcfd7 100644 --- a/dev-util/plan9port/plan9port-0_pre20210321.ebuild +++ b/dev-util/plan9port/plan9port-0_pre20210321.ebuild @@ -18,7 +18,7 @@ LICENSE=" !freefonts? ( BigelowHolmes ) " SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="X aqua freefonts truetype" REQUIRED_USE="?? ( X aqua )"
[gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/files/, dev-util/plan9port/
commit: a8bdd5209a2d2c03b4d20ee84f3568856071b0d6
Author: Alessandro Barbieri gmail com>
AuthorDate: Tue May 25 16:52:51 2021 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Thu Sep 9 13:26:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8bdd520
dev-util/plan9port: new snapshot
non-free fonts under useflag
remove live ebuild
remove old snapshot
Bug: https://bugs.gentoo.org/791742
Closes: https://bugs.gentoo.org/779214
Signed-off-by: Alessandro Barbieri gmail.com>
Signed-off-by: Anthony G. Basile gentoo.org>
dev-util/plan9port/Manifest| 2 +-
.../plan9port/files/plan9port-noexecstack.patch| 35 --
dev-util/plan9port/metadata.xml| 3 +
...00526.ebuild => plan9port-0_pre20210321.ebuild} | 32 --
dev-util/plan9port/plan9port-.ebuild | 126 -
5 files changed, 26 insertions(+), 172 deletions(-)
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
index 09b8c7cbe5f..26110d5f298 100644
--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@@ -1 +1 @@
-DIST plan9port-a6ad3936b8aadc5c35bfc803afbde32918c0.tar.gz 23445647
BLAKE2B
4cb0f08fc404c5618c4be0d7e5710e6a8a32fbe010d28a879b1f9575118256492a3ed2b9b744c35dbbb6c6deae405c05fd7b6606254fb94fc2b40b3a8d14fa71
SHA512
4d9f6ce66d3eebb311cbbb0ec27c01d99cc0e19c6ac8a1c511ff00070c085a349b637048cd0066240af975e90f527388dbeba58f4591bf7dcaa673ee5564430f
+DIST plan9port-88a87fadae6629932d9c160f53ad5d79775f8f94.tar.gz 23413373
BLAKE2B
6145dd77c9e4b33ebc6d68f42ed69e320e8bfcaae474a16afb3a62e30c13a39117d7013f3cc075eb48c95a5600c4fdb457e45f65f7b25ad2acc7b19dc9cf8e64
SHA512
f008969274e790238b58ebd0d0dcfaa730557daf974797f8c4014c36ac39995b330db9c6d658655358fdb2be64905b83c35e2287b7cd66b2d3249e1da1a3e119
diff --git a/dev-util/plan9port/files/plan9port-noexecstack.patch
b/dev-util/plan9port/files/plan9port-noexecstack.patch
index aff60d07a98..20aecce2515 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 522c313926c..e87e52f3094 100644
--- a/dev-util/plan9port/metadata.xml
+++ b/dev-util/plan9port/metadata.xml
@@ -12,4 +12,7 @@
9fans/plan9port
+
+ Don't install BigelowHolmes fonts
+
diff --git a/dev-util/plan9port/plan9port-0_pre20200526.ebuild
b/dev-util/plan9port/plan9port-0_pre20210321.ebuild
similarity index 86%
rename from dev-util/plan9port/plan9port-0_pre20200526.ebuild
rename to dev-util/plan9port/plan9port-0_pre20210321.ebuild
index dff9e3605a9..4b5f80a4b8b 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="a6ad3936b8aadc5c35bfc803afbde32918c0"
+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}/.*/.*"
@@
[gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/
commit: c01bddeb5c48a993a8e906e9f34f4849458dbd02
Author: neeshy tfwno gf>
AuthorDate: Tue Jun 2 11:10:22 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Jun 2 11:13:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c01bddeb
dev-util/plan9port: drop old
Signed-off-by: Nima Sadeghi tfwno.gf>
Signed-off-by: Joonas Niilola gentoo.org>
dev-util/plan9port/Manifest | 1 -
dev-util/plan9port/plan9port-20140306-r4.ebuild | 120
2 files changed, 121 deletions(-)
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
index 60d4aeb16d1..09b8c7cbe5f 100644
--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@@ -1,2 +1 @@
DIST plan9port-a6ad3936b8aadc5c35bfc803afbde32918c0.tar.gz 23445647
BLAKE2B
4cb0f08fc404c5618c4be0d7e5710e6a8a32fbe010d28a879b1f9575118256492a3ed2b9b744c35dbbb6c6deae405c05fd7b6606254fb94fc2b40b3a8d14fa71
SHA512
4d9f6ce66d3eebb311cbbb0ec27c01d99cc0e19c6ac8a1c511ff00070c085a349b637048cd0066240af975e90f527388dbeba58f4591bf7dcaa673ee5564430f
-DIST plan9port-e78ed7a67bbaa37dc57dfb37219f505c48755e14.tar.gz 23442851
BLAKE2B
89e2a8dcdf650cc3640ef0ba496f1c22e74831fda2e4a51cf8419c496da5a480a10324eb295369e9192defbd3c6411ea351bba1c6bdec5d72bc4ee397da58114
SHA512
3cb126eb0f8c58c76c4da5aaca6b3956b9cc30b1955c1b9db4727a01a46cae696f01b538a47f6f009e955f6ed8f308b60b6519d4184e10b255636ea32a1e9099
diff --git a/dev-util/plan9port/plan9port-20140306-r4.ebuild
b/dev-util/plan9port/plan9port-20140306-r4.ebuild
deleted file mode 100644
index 68a51b267f4..000
--- a/dev-util/plan9port/plan9port-20140306-r4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multiprocessing toolchain-funcs
-
-MY_HASH="e78ed7a67bbaa37dc57dfb37219f505c48755e14"
-MY_P="${PN}-${MY_HASH}"
-
-DESCRIPTION="Port of many Plan 9 programs and libraries"
-HOMEPAGE="http://swtch.com/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"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X aqua truetype"
-REQUIRED_USE="?? ( X aqua )"
-
-DEPEND="X? ( x11-apps/xauth )
- truetype? ( media-libs/freetype
- media-libs/fontconfig )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PLAN9=/usr/lib/plan9
-EPLAN9="${EPREFIX}"${PLAN9}
-QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-"{noexecstack,cflags,builderr}".patch"
- case ${CHOST} in
- *freebsd10.*) # patch 9l to use -pthread also on FreeBSD-10
- epatch "${FILESDIR}/${PN}-freebsd-10.patch" ;;
- *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/*
- for f in src/cmd/fontsrv/freetyperules.sh INSTALL \
- $(find -name makefile); do
- sed -r -i -e 's,-I/usr(|/local)/include ,,g' \
- -e "s,-I/usr(|/local)/include,-I${EPREFIX}/usr\1/include,g"
${f} \
- || die "sed on ${f} failed"
- done
-
- # Fix paths, done in place of ./INSTALL -c
- einfo "Fixing hard-coded /usr/local/plan9 paths"
- grep --null -l -r '/usr/local/plan9' |
- xargs --null sed -i "s,/usr/local/plan9,${EPLAN9},g"
-}
-
-src_configure() {
- local myconf=()
- if use X; then
- myconf+=("X11=${EPREFIX}/usr" WSYSTYPE=x11)
- elif use aqua; then
- local wsystype=$(echo ${MACOSX_DEPLOYMENT_TARGET} |
- awk '{if ($1 > 10.5) print "osx-cocoa"; else print "osx"}')
- 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
-}
-
-src_compile() {
- export NPROC=$(makeopts_jobs)
- export CC9=$(tc-getCC)
-
- # 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!"
- ./INSTALL -b || die "Please report bugs to bugs.gentoo.org, NOT
Plan9Port."
-}
-
-src_install() {
- dodir "${PLAN9}"
-
- # P9P's man does not handle compression
- docompress -x $PLAN9/man
-
- # do* plays with the executable bit, and we should not modify them
- cp -a * "${ED}/${PLAN9}"
-
- # build the
[gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/
commit: 8ca155177cde6bd796fb6db7aeed3e75799acfc8
Author: neeshy tfwno gf>
AuthorDate: Tue Jun 2 11:11:16 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Jun 2 11:13:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ca15517
dev-util/plan9port: add version
Closes: https://github.com/gentoo/gentoo/pull/15073
Signed-off-by: Nima Sadeghi tfwno.gf>
Signed-off-by: Joonas Niilola gentoo.org>
dev-util/plan9port/plan9port-.ebuild | 126 +++
1 file changed, 126 insertions(+)
diff --git a/dev-util/plan9port/plan9port-.ebuild
b/dev-util/plan9port/plan9port-.ebuild
new file mode 100644
index 000..4c1e286476b
--- /dev/null
+++ b/dev-util/plan9port/plan9port-.ebuild
@@ -0,0 +1,126 @@
+# 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
+}
[gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/, dev-util/plan9port/files/
commit: 2758e2b15c592747ea4f65172aac35146b190aa7 Author: neeshy tfwno gf> AuthorDate: Tue Jun 2 11:09:23 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Tue Jun 2 11:13:44 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2758e2b1 dev-util/plan9port: bump version to 0_pre20200526 Signed-off-by: Nima Sadeghi tfwno.gf> Signed-off-by: Joonas Niilola gentoo.org> dev-util/plan9port/Manifest| 1 + dev-util/plan9port/files/plan9port-builderr.patch | 16 +-- dev-util/plan9port/files/plan9port-cflags.patch| 4 +- .../plan9port/files/plan9port-freebsd-10.patch | 11 -- .../plan9port/files/plan9port-noexecstack.patch| 6 +- dev-util/plan9port/plan9port-0_pre20200526.ebuild | 132 + 6 files changed, 146 insertions(+), 24 deletions(-) diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest index 30bb3ea6606..60d4aeb16d1 100644 --- a/dev-util/plan9port/Manifest +++ b/dev-util/plan9port/Manifest @@ -1 +1,2 @@ +DIST plan9port-a6ad3936b8aadc5c35bfc803afbde32918c0.tar.gz 23445647 BLAKE2B 4cb0f08fc404c5618c4be0d7e5710e6a8a32fbe010d28a879b1f9575118256492a3ed2b9b744c35dbbb6c6deae405c05fd7b6606254fb94fc2b40b3a8d14fa71 SHA512 4d9f6ce66d3eebb311cbbb0ec27c01d99cc0e19c6ac8a1c511ff00070c085a349b637048cd0066240af975e90f527388dbeba58f4591bf7dcaa673ee5564430f DIST plan9port-e78ed7a67bbaa37dc57dfb37219f505c48755e14.tar.gz 23442851 BLAKE2B 89e2a8dcdf650cc3640ef0ba496f1c22e74831fda2e4a51cf8419c496da5a480a10324eb295369e9192defbd3c6411ea351bba1c6bdec5d72bc4ee397da58114 SHA512 3cb126eb0f8c58c76c4da5aaca6b3956b9cc30b1955c1b9db4727a01a46cae696f01b538a47f6f009e955f6ed8f308b60b6519d4184e10b255636ea32a1e9099 diff --git a/dev-util/plan9port/files/plan9port-builderr.patch b/dev-util/plan9port/files/plan9port-builderr.patch index 266f10c4b9d..b1f3d1275ce 100644 --- a/dev-util/plan9port/files/plan9port-builderr.patch +++ b/dev-util/plan9port/files/plan9port-builderr.patch @@ -4,15 +4,15 @@ By default, the plan9port INSTALL script doesn't report build error, which can result in a mostly broken build begin installed. --- a/INSTALL +++ b/INSTALL -@@ -41,7 +41,6 @@ echo " " - echo "* Resetting $PLAN9/config" - rm -f config +@@ -65,7 +65,6 @@ + ;; + esac -( - echo "* Compiler version:" - 9c -v 2>&1 | grep -v 'Configured with:' | grep -i version | sed 's/^/ /' - -@@ -134,7 +133,7 @@ if $dobuild; then + if [ `uname` = SunOS ]; then + # On Solaris x86, uname -p cannot be trusted. + echo "* Running on Solaris: checking architecture..." +@@ -159,7 +158,7 @@ echo "* Warning: not all binaries built successfully." fi echo "* Installing everything in $PLAN9/bin..." @@ -21,7 +21,7 @@ which can result in a mostly broken build begin installed. if [ ! -x $PLAN9/bin/cleanname -o ! -x $PLAN9/bin/acme -o ! -x $PLAN9/bin/sam ]; then echo " " echo "* Warning: not all binaries built successfully." -@@ -182,5 +181,4 @@ if $doinstall; then +@@ -211,5 +210,4 @@ echo " PLAN9=$PLAN9 export PLAN9" echo ' PATH=$PATH:$PLAN9/bin export PATH' fi diff --git a/dev-util/plan9port/files/plan9port-cflags.patch b/dev-util/plan9port/files/plan9port-cflags.patch index c2d2ed6defe..74bd60518d0 100644 --- a/dev-util/plan9port/files/plan9port-cflags.patch +++ b/dev-util/plan9port/files/plan9port-cflags.patch @@ -5,10 +5,10 @@ This allows the plan9port build to inherit cflags from the environment. (This patch must be applied after plan9port-noexecstack.patch) --- a/src/mkhdr +++ b/src/mkhdr -@@ -28,8 +28,6 @@ LD=9l +@@ -11,8 +11,6 @@ + LD=9l AS=9a AR=9ar - INSTALL=install -CFLAGS= -LDFLAGS= AFLAGS=--noexecstack diff --git a/dev-util/plan9port/files/plan9port-freebsd-10.patch b/dev-util/plan9port/files/plan9port-freebsd-10.patch deleted file mode 100644 index cc46dc6f450..000 --- a/dev-util/plan9port/files/plan9port-freebsd-10.patch +++ /dev/null @@ -1,11 +0,0 @@ a/bin/9l 2015-12-09 19:12:50.0 + -+++ b/bin/9l 2015-12-09 19:13:00.0 + -@@ -19,7 +19,7 @@ case "$tag" in - 5.2.*) - extralibs="$extralibs -lkse" - ;; -- [5-9].*) -+ [5-9].*|10.*) - extralibs="$extralibs -lpthread" - ;; - esac diff --git a/dev-util/plan9port/files/plan9port-noexecstack.patch b/dev-util/plan9port/files/plan9port-noexecstack.patch index fb4f19f21fc..aff60d07a98 100644 --- a/dev-util/plan9port/files/plan9port-noexecstack.patch +++ b/dev-util/plan9port/files/plan9port-noexecstack.patch @@ -22,7 +22,7 @@ Patch by Andy Spencer test -f $PLAN9/config && . $PLAN9/config aflags="" -@@ -17,5 +12,16 @@ Darwin-*x86_64*) +@@ -17,5 +12,16 @@ ;; esac @@ -43,8 +43,8 @@ Patch by Andy Spencer +exec as $aflags $opts -o $dst $src --- a/src/mkhdr +++ b/src/mkhdr -@@ -30,7 +30,7 @@ AR=9ar - INSTALL=install +@@
[gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/
commit: f708d9928a75b59664005cf6b709a14b897c0b07 Author: Jonas Stein gentoo org> AuthorDate: Sat Jun 1 13:07:47 2019 + Commit: Jonas Stein gentoo org> CommitDate: Sat Jun 1 13:07:47 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f708d992 dev-util/plan9port: Maintainer retired Proxied maintainer retired due to inactivity. Closes: https://bugs.gentoo.org/632758 Package-Manager: Portage-2.3.67, Repoman-2.3.12 Signed-off-by: Jonas Stein gentoo.org> dev-util/plan9port/metadata.xml | 9 + 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dev-util/plan9port/metadata.xml b/dev-util/plan9port/metadata.xml index 1ddb5cc0124..522c313926c 100644 --- a/dev-util/plan9port/metadata.xml +++ b/dev-util/plan9port/metadata.xml @@ -1,17 +1,10 @@ - + http://www.gentoo.org/dtd/metadata.dtd;> - - andy753...@gmail.com - bluen...@gentoo.org Anthony G. Basile - - proxy-ma...@gentoo.org - Proxy Maintainers - Plan9Port is a set of Plan 9 utilities ported to the POSIX environment - also know as Plan 9 from User Space.
[gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/
commit: ca738a2d7fe02ff12353b933acaf56b31f05ae18
Author: Benda Xu gentoo org>
AuthorDate: Mon Sep 4 06:39:36 2017 +
Commit: Benda XU gentoo org>
CommitDate: Mon Sep 4 06:39:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca738a2d
dev-util/plan9port: move env.d/30plan9 to 60plan9.
Bug: 629846
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../{plan9port-20140306-r3.ebuild => plan9port-20140306-r4.ebuild} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-util/plan9port/plan9port-20140306-r3.ebuild
b/dev-util/plan9port/plan9port-20140306-r4.ebuild
similarity index 97%
rename from dev-util/plan9port/plan9port-20140306-r3.ebuild
rename to dev-util/plan9port/plan9port-20140306-r4.ebuild
index 7941d8ace30..68a51b267f4 100644
--- a/dev-util/plan9port/plan9port-20140306-r3.ebuild
+++ b/dev-util/plan9port/plan9port-20140306-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -96,13 +96,13 @@ src_install() {
cp -a * "${ED}/${PLAN9}"
# build the environment variables and install them in env.d
- cat > "${T}/30plan9" <<-EOF
+ cat > "${T}/60plan9" <<-EOF
PLAN9="${EPLAN9}"
PATH="${EPLAN9}/bin"
ROOTPATH="${EPLAN9}/bin"
MANPATH="${EPLAN9}/man"
EOF
- doenvd "${T}/30plan9"
+ doenvd "${T}/60plan9"
}
pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/
commit: c1d1c941932d6606f25baf10737b2686ed292c7b
Author: Anthony G. Basile gentoo org>
AuthorDate: Mon Nov 28 01:49:44 2016 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Mon Nov 28 01:51:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d1c941
dev-util/plan9port: switch SRC_URI to github
Package-Manager: portage-2.3.0
dev-util/plan9port/Manifest | 1 +
dev-util/plan9port/plan9port-20140306-r3.ebuild | 121
2 files changed, 122 insertions(+)
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
index 0b191f5..95648e5 100644
--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@@ -1 +1,2 @@
DIST plan9port-20140306.tgz 54512505 SHA256
cbb826cde693abdaa2051c49e7ebf75119bf2a4791fe3b3229f1ac36a408eaeb SHA512
a0671163940186fd3d8cf37f06824f0d5a4b9734c1e70eb3174cd7f6b9a1ae769cf78e067dcf4e963192a26a2420b4bb1ce79ed788314ed1783c3bd793fe2aef
WHIRLPOOL
c19977ef310ac34efcb294e9f7f73f6095e9db0ab52ef359956a05e5a5252a0f9d03f88dd29d21d01bfc82d2e0bdd8ac77bc6a8bb80ef81ce3c773b2dfee0677
+DIST plan9port-e78ed7a67bbaa37dc57dfb37219f505c48755e14.tar.gz 23442851 SHA256
29628d315c3f26f73157076717684f8ee642083f2213e78c739c79fdf703e458 SHA512
3cb126eb0f8c58c76c4da5aaca6b3956b9cc30b1955c1b9db4727a01a46cae696f01b538a47f6f009e955f6ed8f308b60b6519d4184e10b255636ea32a1e9099
WHIRLPOOL
3ac4474ae9df9fcc032e24ef065a1a9ccd20f3a8fa416ee9d0ec51faad9c883581500c5827ec2a3b2c56bd1779e5a59fc07a84dcd78ce8acbf5f48450635106c
diff --git a/dev-util/plan9port/plan9port-20140306-r3.ebuild
b/dev-util/plan9port/plan9port-20140306-r3.ebuild
new file mode 100644
index ..50a2ce4
--- /dev/null
+++ b/dev-util/plan9port/plan9port-20140306-r3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multiprocessing toolchain-funcs
+
+MY_HASH="e78ed7a67bbaa37dc57dfb37219f505c48755e14"
+MY_P="${PN}-${MY_HASH}"
+
+DESCRIPTION="Port of many Plan 9 programs and libraries"
+HOMEPAGE="http://swtch.com/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"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X aqua truetype"
+REQUIRED_USE="?? ( X aqua )"
+
+DEPEND="X? ( x11-apps/xauth )
+ truetype? ( media-libs/freetype
+ media-libs/fontconfig )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PLAN9=/usr/lib/plan9
+EPLAN9="${EPREFIX}"${PLAN9}
+QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-"{noexecstack,cflags,builderr}".patch"
+ case ${CHOST} in
+ *freebsd10.*) # patch 9l to use -pthread also on FreeBSD-10
+ epatch "${FILESDIR}/${PN}-freebsd-10.patch" ;;
+ *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/*
+ for f in src/cmd/fontsrv/freetyperules.sh INSTALL \
+ $(find -name makefile); do
+ sed -r -i -e 's,-I/usr(|/local)/include ,,g' \
+ -e "s,-I/usr(|/local)/include,-I${EPREFIX}/usr\1/include,g"
${f} \
+ || die "sed on ${f} failed"
+ done
+
+ # Fix paths, done in place of ./INSTALL -c
+ einfo "Fixing hard-coded /usr/local/plan9 paths"
+ grep --null -l -r '/usr/local/plan9' |
+ xargs --null sed -i "s,/usr/local/plan9,${EPLAN9},g"
+}
+
+src_configure() {
+ local myconf=()
+ if use X; then
+ myconf+=("X11=${EPREFIX}/usr" WSYSTYPE=x11)
+ elif use aqua; then
+ local wsystype=$(echo ${MACOSX_DEPLOYMENT_TARGET} |
+ awk '{if ($1 > 10.5) print "osx-cocoa"; else print "osx"}')
+ 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
+}
+
+src_compile() {
+ export NPROC=$(makeopts_jobs)
+ export CC9=$(tc-getCC)
+
+ # 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!"
+ ./INSTALL -b || die "Please report bugs to bugs.gentoo.org, NOT
Plan9Port."
+}
+
+src_install() {
+ dodir "${PLAN9}"
+
+ # P9P's man does not handle compression
+ docompress -x $PLAN9/man
+
+ # do* plays with the executable bit, and we
[gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/
commit: 8756b0d7c8538738162f345d4968f03930422085
Author: Anthony G. Basile gentoo org>
AuthorDate: Mon Nov 28 01:50:47 2016 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Mon Nov 28 01:51:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8756b0d7
dev-util/plan9port: remove older versions
Package-Manager: portage-2.3.0
dev-util/plan9port/Manifest | 1 -
dev-util/plan9port/plan9port-20140306-r1.ebuild | 95 ---
dev-util/plan9port/plan9port-20140306-r2.ebuild | 118
dev-util/plan9port/plan9port-20140306.ebuild| 81
4 files changed, 295 deletions(-)
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
index 95648e5..79ae603 100644
--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@@ -1,2 +1 @@
-DIST plan9port-20140306.tgz 54512505 SHA256
cbb826cde693abdaa2051c49e7ebf75119bf2a4791fe3b3229f1ac36a408eaeb SHA512
a0671163940186fd3d8cf37f06824f0d5a4b9734c1e70eb3174cd7f6b9a1ae769cf78e067dcf4e963192a26a2420b4bb1ce79ed788314ed1783c3bd793fe2aef
WHIRLPOOL
c19977ef310ac34efcb294e9f7f73f6095e9db0ab52ef359956a05e5a5252a0f9d03f88dd29d21d01bfc82d2e0bdd8ac77bc6a8bb80ef81ce3c773b2dfee0677
DIST plan9port-e78ed7a67bbaa37dc57dfb37219f505c48755e14.tar.gz 23442851 SHA256
29628d315c3f26f73157076717684f8ee642083f2213e78c739c79fdf703e458 SHA512
3cb126eb0f8c58c76c4da5aaca6b3956b9cc30b1955c1b9db4727a01a46cae696f01b538a47f6f009e955f6ed8f308b60b6519d4184e10b255636ea32a1e9099
WHIRLPOOL
3ac4474ae9df9fcc032e24ef065a1a9ccd20f3a8fa416ee9d0ec51faad9c883581500c5827ec2a3b2c56bd1779e5a59fc07a84dcd78ce8acbf5f48450635106c
diff --git a/dev-util/plan9port/plan9port-20140306-r1.ebuild
b/dev-util/plan9port/plan9port-20140306-r1.ebuild
deleted file mode 100644
index d53a617..
--- a/dev-util/plan9port/plan9port-20140306-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multiprocessing
-
-DESCRIPTION="Port of many Plan 9 programs and libraries"
-HOMEPAGE="http://swtch.com/plan9port/;
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz;
-
-LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="X? ( x11-apps/xauth )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-PLAN9=/usr/lib/plan9
-EPLAN9="${EPREFIX}"${PLAN9}
-QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-"{noexecstack,cflags,builderr}".patch"
-
- # 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/*
- for f in src/cmd/fontsrv/freetyperules.sh INSTALL \
- $(find -name makefile); do
- sed -r -i -e 's,-I/usr(|/local)/include ,,g' \
- -e "s,-I/usr(|/local)/include,-I${EPREFIX}/usr\1/include,g"
${f} \
- || die "sed on ${f} failed"
- done
-
- # Fix paths, done in place of ./INSTALL -c
- einfo "Fixing hard-coded /usr/local/plan9 paths"
- grep --null -l -r '/usr/local/plan9' |
- xargs --null sed -i "s,/usr/local/plan9,${EPLAN9},g"
-}
-
-src_configure() {
- if use X; then
- echo "X11=${EPREFIX}/usr" >> LOCAL.config
- else
- echo "WSYSTYPE=nowsys" >> LOCAL.config
- fi
-}
-
-src_compile() {
- export NPROC=$(makeopts_jobs)
-
- # 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!"
- ./INSTALL -b || die "Please report bugs to bugs.gentoo.org, NOT
Plan9Port."
-}
-
-src_install() {
- dodir "${PLAN9}"
-
- # P9P's man does not handle compression
- docompress -x $PLAN9/man
-
- # do* plays with the executable bit, and we should not modify them
- cp -a * "${ED}/${PLAN9}"
-
- # build the environment variables and install them in env.d
- cat > "${T}/30plan9" <<-EOF
- PLAN9="${EPLAN9}"
- PATH="${EPLAN9}/bin"
- ROOTPATH="${EPLAN9}/bin"
- MANPATH="${EPLAN9}/man"
- EOF
- doenvd "${T}/30plan9"
-}
-
-pkg_postinst() {
- elog "Plan 9 from User Space has been successfully installed into"
- elog "${PLAN9}. Your PLAN9 and PATH environment variables have"
- elog "also been appropriately set, please use env-update and"
- elog "source /etc/profile to bring that into immediate effect."
- elog
- elog "Please note that ${PLAN9}/bin has been appended to the"
- elog "*end* or your PATH to prevent conflicts. To use the Plan9"
- elog "versions of common UNIX tools, use the absolute path:"
- elog
[gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/files/
commit: 03d9b1939d583576ddcbfad3f3d3ec1dde46b6c0 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Fri Oct 7 16:17:44 2016 + Commit: Anthony G. Basile gentoo org> CommitDate: Thu Oct 13 08:58:41 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03d9b193 dev-util/plan9port: remove unused patch Signed-off-by: Anthony G. Basile gentoo.org> .../plan9port/files/plan9port-9660srv-errno.patch | 19 --- 1 file changed, 19 deletions(-) diff --git a/dev-util/plan9port/files/plan9port-9660srv-errno.patch b/dev-util/plan9port/files/plan9port-9660srv-errno.patch deleted file mode 100644 index a596321.. --- a/dev-util/plan9port/files/plan9port-9660srv-errno.patch +++ /dev/null @@ -1,19 +0,0 @@ -Defining int errno; resuls in the following error on amd64: - - ld: errno: TLS definition in /lib64/libc.so.6 section .tbss mismatches - non-TLS reference in main.o - -Patch by Alex Efros: - - http://code.swtch.com/plan9port/issue/39/ plan9/src/cmd/9660srv/main.c -+++ plan9.new/src/cmd/9660srv/main.c -@@ -38,7 +38,7 @@ - uchar mdata[Maxiosize]; - char fdata[Maxfdata]; - uchar statbuf[STATMAX]; --int errno; -+#include - - - extern Xfsub *xsublist[];
[gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/files/, dev-util/plan9port/
commit: 367d47d9414005bea0e6a7fc749fa19032fd89d6
Author: Anthony G. Basile gentoo org>
AuthorDate: Sun Dec 27 22:57:30 2015 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Sun Dec 27 22:58:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=367d47d9
dev-util/plan9port: add prefix support, bug #567260
Thanks Jeremi Piotrowski gmail.com>
Package-Manager: portage-2.2.24
.../plan9port/files/plan9port-freebsd-10.patch | 11 ++
dev-util/plan9port/plan9port-20140306-r2.ebuild| 118 +
2 files changed, 129 insertions(+)
diff --git a/dev-util/plan9port/files/plan9port-freebsd-10.patch
b/dev-util/plan9port/files/plan9port-freebsd-10.patch
new file mode 100644
index 000..cc46dc6
--- /dev/null
+++ b/dev-util/plan9port/files/plan9port-freebsd-10.patch
@@ -0,0 +1,11 @@
+--- a/bin/9l 2015-12-09 19:12:50.0 +
b/bin/9l 2015-12-09 19:13:00.0 +
+@@ -19,7 +19,7 @@ case "$tag" in
+ 5.2.*)
+ extralibs="$extralibs -lkse"
+ ;;
+- [5-9].*)
++ [5-9].*|10.*)
+ extralibs="$extralibs -lpthread"
+ ;;
+ esac
diff --git a/dev-util/plan9port/plan9port-20140306-r2.ebuild
b/dev-util/plan9port/plan9port-20140306-r2.ebuild
new file mode 100644
index 000..05fdf5f
--- /dev/null
+++ b/dev-util/plan9port/plan9port-20140306-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multiprocessing toolchain-funcs
+
+DESCRIPTION="Port of many Plan 9 programs and libraries"
+HOMEPAGE="http://swtch.com/plan9port/;
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz;
+
+LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X aqua truetype"
+REQUIRED_USE="?? ( X aqua )"
+
+DEPEND="X? ( x11-apps/xauth )
+ truetype? ( media-libs/freetype
+ media-libs/fontconfig )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PLAN9=/usr/lib/plan9
+EPLAN9="${EPREFIX}"${PLAN9}
+QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-"{noexecstack,cflags,builderr}".patch"
+ case ${CHOST} in
+ *freebsd10.*) # patch 9l to use -pthread also on FreeBSD-10
+ epatch "${FILESDIR}/${PN}-freebsd-10.patch" ;;
+ *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/*
+ for f in src/cmd/fontsrv/freetyperules.sh INSTALL \
+ $(find -name makefile); do
+ sed -r -i -e 's,-I/usr(|/local)/include ,,g' \
+ -e "s,-I/usr(|/local)/include,-I${EPREFIX}/usr\1/include,g"
${f} \
+ || die "sed on ${f} failed"
+ done
+
+ # Fix paths, done in place of ./INSTALL -c
+ einfo "Fixing hard-coded /usr/local/plan9 paths"
+ grep --null -l -r '/usr/local/plan9' |
+ xargs --null sed -i "s,/usr/local/plan9,${EPLAN9},g"
+}
+
+src_configure() {
+ local myconf=()
+ if use X; then
+ myconf+=("X11=${EPREFIX}/usr" WSYSTYPE=x11)
+ elif use aqua; then
+ local wsystype=$(echo ${MACOSX_DEPLOYMENT_TARGET} |
+ awk '{if ($1 > 10.5) print "osx-cocoa"; else print "osx"}')
+ 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
+}
+
+src_compile() {
+ export NPROC=$(makeopts_jobs)
+ export CC9=$(tc-getCC)
+
+ # 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!"
+ ./INSTALL -b || die "Please report bugs to bugs.gentoo.org, NOT
Plan9Port."
+}
+
+src_install() {
+ dodir "${PLAN9}"
+
+ # P9P's man does not handle compression
+ docompress -x $PLAN9/man
+
+ # do* plays with the executable bit, and we should not modify them
+ cp -a * "${ED}/${PLAN9}"
+
+ # build the environment variables and install them in env.d
+ cat > "${T}/30plan9" <<-EOF
+ PLAN9="${EPLAN9}"
+ PATH="${EPLAN9}/bin"
+ ROOTPATH="${EPLAN9}/bin"
+ MANPATH="${EPLAN9}/man"
+ EOF
+ doenvd "${T}/30plan9"
+}
+
+pkg_postinst() {
+ elog "Plan 9 from User Space has been successfully installed into"
+ elog
[gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/
commit: a5a8c87fcbe7f0a48ac4f029e987ce44b31467f0
Author: Anthony G. Basile gentoo org>
AuthorDate: Wed Dec 2 07:09:19 2015 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Wed Dec 2 07:09:47 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5a8c87f
dev-util/plan9port: remove older unstable version.
Package-Manager: portage-2.2.20.1
dev-util/plan9port/Manifest | 2 -
dev-util/plan9port/plan9port-20130320.ebuild | 75 --
dev-util/plan9port/plan9port-20140304.ebuild | 81
dev-util/plan9port/plan9port-20140306.ebuild | 4 +-
4 files changed, 2 insertions(+), 160 deletions(-)
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
index 94a1c25..0b191f5 100644
--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@@ -1,3 +1 @@
-DIST plan9port-20130320.tgz 54184719 SHA256
d08fd032edc9c27bc549ee9076963812f210476d0d1f21f5300e9d867699ff55 SHA512
fae40eae76a0f3121f47a3895809f2433beed91fc9e879c8cde25e493ec91dfdfc89fe59e3fe3a8aab7c33a2537a02b30857edb3af7f202df4a98e02cee8ecb7
WHIRLPOOL
5b707c8d18c8f1fa8e3d36e8f14a20213cad9ab3344f088f18942034dce3356ba88675c5817a7d50b66275d71d95e6d5fd3fdefbd18bcca9089790e258dbb60f
-DIST plan9port-20140304.tgz 54512040 SHA256
926f6531603ce5112108cdeec1fa808103c92045ba374b986672f28a40004817 SHA512
3727cb8d135005b0b4af1621c14a341904fdcaacd45df4e8c60c2998d372f57a7444ab296d35bc60dbc49b47e5f075e2c5d6a96f513395225eb996833ee87c83
WHIRLPOOL
d2b76ea9be4e365a63bab2b24bfc3d5a6fdc402f44529ca8774c6f7c346de94b635c235d38707fee4c2fa7c6f522ad971036836f8bdb71890e61a4988cf2073f
DIST plan9port-20140306.tgz 54512505 SHA256
cbb826cde693abdaa2051c49e7ebf75119bf2a4791fe3b3229f1ac36a408eaeb SHA512
a0671163940186fd3d8cf37f06824f0d5a4b9734c1e70eb3174cd7f6b9a1ae769cf78e067dcf4e963192a26a2420b4bb1ce79ed788314ed1783c3bd793fe2aef
WHIRLPOOL
c19977ef310ac34efcb294e9f7f73f6095e9db0ab52ef359956a05e5a5252a0f9d03f88dd29d21d01bfc82d2e0bdd8ac77bc6a8bb80ef81ce3c773b2dfee0677
diff --git a/dev-util/plan9port/plan9port-20130320.ebuild
b/dev-util/plan9port/plan9port-20130320.ebuild
deleted file mode 100644
index 5a5f146..000
--- a/dev-util/plan9port/plan9port-20130320.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils multiprocessing
-
-DESCRIPTION="Port of many Plan 9 programs and libraries"
-HOMEPAGE="http://swtch.com/plan9port/;
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz;
-
-LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-apps/xauth"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-PLAN9=/usr/lib/plan9
-QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-"{9660srv-errno,noexecstack,cflags}".patch"
-
- # Fix paths, done in place of ./INSTALL -c
- einfo "Fixing hard-coded /usr/local/plan9 paths"
- grep --null -l -r '/usr/local/plan9' |
- xargs --null sed -i "s!/usr/local/plan9!${PLAN9}!g"
-}
-
-src_compile() {
- export NPROC=$(makeopts_jobs)
-
- # 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!"
- ./INSTALL -b
-}
-
-src_install() {
- dodir "${PLAN9}"
-
- # P9P's man does not handle compression
- docompress -x $PLAN9/man
-
- # do* plays with the executable bit, and we should not modify them
- cp -a * "${D}/${PLAN9}"
-
- # build the environment variables and install them in env.d
- cat > "${T}/30plan9" <<-EOF
- PLAN9="${PLAN9}"
- PATH="${PLAN9}/bin"
- ROOTPATH="${PLAN9}/bin"
- MANPATH="${PLAN9}/man"
- EOF
- doenvd "${T}/30plan9"
-}
-
-pkg_postinst() {
- elog "Plan 9 from User Space has been successfully installed into"
- elog "${PLAN9}. Your PLAN9 and PATH environment variables have"
- elog "also been appropriately set, please use env-update and"
- elog "source /etc/profile to bring that into immediate effect."
- elog
- elog "Please note that ${PLAN9}/bin has been appended to the"
- elog "*end* or your PATH to prevent conflicts. To use the Plan9"
- elog "versions of common UNIX tools, use the absolute path:"
- elog "${PLAN9}/bin or the 9 command (eg: 9 troff)"
- elog
- elog "Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
-}
diff --git a/dev-util/plan9port/plan9port-20140304.ebuild
b/dev-util/plan9port/plan9port-20140304.ebuild
deleted file mode 100644
index 5b3ebeb..000
--- a/dev-util/plan9port/plan9port-20140304.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of
[gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/
commit: 5e67c2bba2e8e68765f6602bcc71485297ad19a9
Author: Anthony G. Basile gentoo org>
AuthorDate: Wed Dec 2 07:07:50 2015 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Wed Dec 2 07:09:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e67c2bb
dev-util/plan9port: add prefix support, bug #567260.
Package-Manager: portage-2.2.20.1
dev-util/plan9port/plan9port-20140306-r1.ebuild | 95 +
1 file changed, 95 insertions(+)
diff --git a/dev-util/plan9port/plan9port-20140306-r1.ebuild
b/dev-util/plan9port/plan9port-20140306-r1.ebuild
new file mode 100644
index 000..d53a617
--- /dev/null
+++ b/dev-util/plan9port/plan9port-20140306-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multiprocessing
+
+DESCRIPTION="Port of many Plan 9 programs and libraries"
+HOMEPAGE="http://swtch.com/plan9port/;
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz;
+
+LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="X? ( x11-apps/xauth )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PLAN9=/usr/lib/plan9
+EPLAN9="${EPREFIX}"${PLAN9}
+QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-"{noexecstack,cflags,builderr}".patch"
+
+ # 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/*
+ for f in src/cmd/fontsrv/freetyperules.sh INSTALL \
+ $(find -name makefile); do
+ sed -r -i -e 's,-I/usr(|/local)/include ,,g' \
+ -e "s,-I/usr(|/local)/include,-I${EPREFIX}/usr\1/include,g"
${f} \
+ || die "sed on ${f} failed"
+ done
+
+ # Fix paths, done in place of ./INSTALL -c
+ einfo "Fixing hard-coded /usr/local/plan9 paths"
+ grep --null -l -r '/usr/local/plan9' |
+ xargs --null sed -i "s,/usr/local/plan9,${EPLAN9},g"
+}
+
+src_configure() {
+ if use X; then
+ echo "X11=${EPREFIX}/usr" >> LOCAL.config
+ else
+ echo "WSYSTYPE=nowsys" >> LOCAL.config
+ fi
+}
+
+src_compile() {
+ export NPROC=$(makeopts_jobs)
+
+ # 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!"
+ ./INSTALL -b || die "Please report bugs to bugs.gentoo.org, NOT
Plan9Port."
+}
+
+src_install() {
+ dodir "${PLAN9}"
+
+ # P9P's man does not handle compression
+ docompress -x $PLAN9/man
+
+ # do* plays with the executable bit, and we should not modify them
+ cp -a * "${ED}/${PLAN9}"
+
+ # build the environment variables and install them in env.d
+ cat > "${T}/30plan9" <<-EOF
+ PLAN9="${EPLAN9}"
+ PATH="${EPLAN9}/bin"
+ ROOTPATH="${EPLAN9}/bin"
+ MANPATH="${EPLAN9}/man"
+ EOF
+ doenvd "${T}/30plan9"
+}
+
+pkg_postinst() {
+ elog "Plan 9 from User Space has been successfully installed into"
+ elog "${PLAN9}. Your PLAN9 and PATH environment variables have"
+ elog "also been appropriately set, please use env-update and"
+ elog "source /etc/profile to bring that into immediate effect."
+ elog
+ elog "Please note that ${PLAN9}/bin has been appended to the"
+ elog "*end* or your PATH to prevent conflicts. To use the Plan9"
+ elog "versions of common UNIX tools, use the absolute path:"
+ elog "${PLAN9}/bin or the 9 command (eg: 9 troff)"
+ elog
+ elog "Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
+}
