[gentoo-commits] repo/proj/prefix:master commit in: eclass/

2020-11-29 Thread Fabian Groffen
commit: 10f753d0678eced907b182c0b15b1dde6901f676
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Nov 29 14:23:40 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sun Nov 29 14:23:40 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=10f753d0

eclass/toolchain: sync with gx86

this should in particular fix the dangling symlinks for the versioned
tooling variants and the numerous warnings about use_if_iuse

Signed-off-by: Fabian Groffen  gentoo.org>

 eclass/toolchain.eclass | 306 +++-
 1 file changed, 97 insertions(+), 209 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 293158b91e..e5d4dd6ca9 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -7,7 +7,7 @@
 DESCRIPTION="The GNU Compiler Collection"
 HOMEPAGE="https://gcc.gnu.org/;
 
-inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils 
toolchain-funcs prefix
+inherit eutils flag-o-matic gnuconfig libtool multilib pax-utils 
toolchain-funcs prefix
 
 tc_is_live() {
[[ ${PV} == ** ]]
@@ -102,11 +102,7 @@ fi
 
 PREFIX=${TOOLCHAIN_PREFIX:-${EPREFIX}/usr}
 
-if tc_version_is_at_least 3.4.0 ; then
-   
LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc/${CTARGET}/${GCC_CONFIG_VER}}
-else
-   
LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc-lib/${CTARGET}/${GCC_CONFIG_VER}}
-fi
+LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc/${CTARGET}/${GCC_CONFIG_VER}}
 INCLUDEPATH=${TOOLCHAIN_INCLUDEPATH:-${LIBPATH}/include}
 
 if is_crosscompile ; then
@@ -124,20 +120,7 @@ 
STDCXX_INCDIR=${TOOLCHAIN_STDCXX_INCDIR:-${LIBPATH}/include/g++-v${GCC_BRANCH_VE
 
 #>> LICENSE+SLOT+IUSE logic <<
 
-if tc_version_is_at_least 4.6 ; then
-   LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ 
gcc-runtime-library-exception-3.1 ) FDL-1.3+"
-elif tc_version_is_at_least 4.4 ; then
-   LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ 
gcc-runtime-library-exception-3.1 ) FDL-1.2+"
-elif tc_version_is_at_least 4.3 ; then
-   LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+"
-elif tc_version_is_at_least 4.2 ; then
-   LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+"
-elif tc_version_is_at_least 3.3 ; then
-   LICENSE="GPL-2+ LGPL-2.1+ FDL-1.2+"
-else
-   LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-fi
-
+LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ 
gcc-runtime-library-exception-3.1 ) FDL-1.3+"
 IUSE="test vanilla +nls"
 RESTRICT="!test? ( test )"
 
@@ -166,8 +149,6 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
fi
IUSE+=" debug +cxx +nptl" TC_FEATURES+=(nptl)
[[ -n ${PIE_VER} ]] && IUSE+=" nopie"
-   [[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
-   [[ -n ${D_VER}   ]] && IUSE+=" d"
[[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
# fortran support appeared in 4.1, but 4.1 needs outdated mpfr
tc_version_is_at_least 4.2 && IUSE+=" +fortran" TC_FEATURES+=(fortran)
@@ -176,7 +157,6 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
tc_version_is_at_least 3.3 && IUSE+=" pgo"
tc_version_is_at_least 4.0 &&
IUSE+=" objc-gc" TC_FEATURES+=(objc-gc)
-   tc_version_is_between 4.0 4.9 && IUSE+=" mudflap"
tc_version_is_at_least 4.1 && IUSE+=" libssp objc++"
tc_version_is_at_least 4.2 && IUSE+=" +openmp"
tc_version_is_at_least 4.3 && IUSE+=" fixed-point"
@@ -203,6 +183,8 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
tc_version_is_at_least 9.0 && IUSE+=" d"
tc_version_is_at_least 9.1 && IUSE+=" lto"
tc_version_is_at_least 10 && IUSE+=" zstd" TC_FEATURES+=(zstd)
+   tc_version_is_at_least 11 && IUSE+=" valgrind" TC_FEATURES+=(valgrind)
+   tc_version_is_at_least 11 && IUSE+=" custom-cflags"
 fi
 
 if tc_version_is_at_least 10; then
@@ -275,10 +257,15 @@ if tc_has_feature zstd ; then
DEPEND+=" zstd? ( app-arch/zstd )"
 fi
 
+if tc_has_feature valgrind; then
+   BDEPEND+=" valgrind? ( dev-util/valgrind )"
+fi
+
 case ${EAPI:-0} in
5*|6) DEPEND+=" ${BDEPEND}" ;;
 esac
 
+# Prefix: our version is 1.9, so can't go with gx86's 2.3
 PDEPEND=">=sys-devel/gcc-config-1.7"
 
 #>> S + SRC_URI essentials <<
@@ -351,13 +338,6 @@ gentoo_urls() {
 #  The resulting filename of this tarball will be:
 #  
gcc-${SPECS_GC

[gentoo-commits] repo/proj/prefix:master commit in: eclass/

2020-11-29 Thread Fabian Groffen
commit: 22340228f5dbbfcbb63f05b3b848616d6892f245
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Nov 29 13:41:04 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sun Nov 29 13:41:04 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=22340228

eclass/flag-o-matic: sync with gx86, bug #757258

Closes: https://bugs.gentoo.org/757258
Signed-off-by: Fabian Groffen  gentoo.org>

 eclass/flag-o-matic.eclass | 129 ++---
 1 file changed, 99 insertions(+), 30 deletions(-)

diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 1a5d1e8099..f75a975a08 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: flag-o-matic.eclass
@@ -27,7 +27,14 @@ setup-allowed-flags() {
'-fstack-protector*' '-fsanitize*' '-fstack-check*' 
-fno-stack-check
-fbounds-check -fbounds-checking -fno-strict-overflow
-fno-PIE -fno-pie -nopie -no-pie -fno-unit-at-a-time
-   -g '-g[0-9]' -ggdb '-ggdb[0-9]' '-gdwarf-*' gstabs -gstabs+ -gz
+
+   # debugging symbols should generally be very safe to add
+   -g '-g[0-9]'
+   -ggdb '-ggdb[0-9]'
+   -gdwarf '-gdwarf-*'
+   -gstabs -gstabs+
+   -gz
+
-fno-ident -fpermissive -frecord-gcc-switches
'-fdiagnostics*' '-fplugin*'
'-W*' -w
@@ -56,7 +63,9 @@ setup-allowed-flags() {
-mno-faster-structs -mfaster-structs -m32 -m64 -mx32 -mabi
-mlittle-endian -mbig-endian -EL -EB -fPIC -mlive-g0 -mcmodel
-mstack-bias -mno-stack-bias -msecure-plt '-m*-toc' -mfloat-abi
-   -mfix-r1 -mno-fix-r1 -mthumb -marm
+   -mfix-r4000 -mno-fix-r4000 -mfix-r4400 -mno-fix-r4400
+   -mfix-rm7000 -mno-fix-rm7000 -mfix-r1 -mno-fix-r1
+   -mr10k-cache-barrier -mthumb -marm
 
# gcc 4.5
-mno-fma4 -mno-movbe -mno-xop -mno-lwp
@@ -395,6 +404,7 @@ filter-mfpmath() {
 # Strip *FLAGS of everything except known good/safe flags.  This runs over all
 # flags returned by all_flag_vars().
 strip-flags() {
+   [[ $# -ne 0 ]] && die "strip-flags takes no arguments"
local x y var
 
local ALLOWED_FLAGS
@@ -436,25 +446,81 @@ test-flag-PROG() {
local lang=$2
shift 2
 
-   [[ -z ${comp} || -z $1 ]] && return 1
+   if [[ -z ${comp} ]]; then
+   return 1
+   fi
+   if [[ -z $1 ]]; then
+   return 1
+   fi
 
-   local src=${T}/tf-${comp}-${SECONDS}.${lang}
+   # verify selected compiler exists before using it
+   comp=($(tc-get${comp}))
+   # 'comp' can already contain compiler options.
+   # 'type' needs a binary name
+   if ! type -p ${comp[0]} >/dev/null; then
+   return 1
+   fi
+
+   # Set up test file.
+   local in_src in_ext cmdline_extra=()
+   case "${lang}" in
+   # compiler/assembler only
+   c)
+   in_ext='c'
+   in_src='int main(void) { return 0; }'
+   cmdline_extra+=(-xc -c)
+   ;;
+   c++)
+   in_ext='cc'
+   in_src='int main(void) { return 0; }'
+   cmdline_extra+=(-xc++ -c)
+   ;;
+   f77)
+   in_ext='f'
+   # fixed source form
+   in_src='  end'
+   cmdline_extra+=(-xf77 -c)
+   ;;
+   f95)
+   in_ext='f90'
+   in_src='end'
+   cmdline_extra+=(-xf95 -c)
+   ;;
+
+   # C compiler/assembler/linker
+   c+ld)
+   in_ext='c'
+   in_src='int main(void) { return 0; }'
+   cmdline_extra+=(-xc)
+   ;;
+   esac
+   local test_in=${T}/test-flag.${in_ext}
+   local test_out=${T}/test-flag.exe
+
+   printf "%s\n" "${in_src}" > "${test_in}" || die "Failed to create 
'${test_in}'"
+
+   # Currently we rely on warning-free output of a compiler
+   # before the flag to see if a flag prduces any warnings.
+   # This has a few drawbacks:
+   # - if compiler already generates warnings we filter out
+   #   every single flag: bug #712488
+   # - if user actually wants to see warnings we just strip
+   #   them regardless of warnings type.
+   #
+   # We can add m

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-29 Thread Fabian Groffen
commit: 74d2d6f731bfec531a2effefb10aabe842238078
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Nov 29 10:26:20 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sun Nov 29 10:26:20 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=74d2d6f7

scripts/bootstrap-prefix: bump tree and portage snapshot

- bump tree snapshot for assorted Big Sur fixes
- bump portage snapshot for symbols check fix on Big Sur

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 759e06e172..595a0019f3 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -595,7 +595,7 @@ do_tree() {
 bootstrap_tree() {
# RAP uses the latest gentoo main repo snapshot to bootstrap.
is-rap && LATEST_TREE_YES=1
-   local PV="20201126"
+   local PV="20201128"
if [[ -n ${LATEST_TREE_YES} ]]; then
do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
else
@@ -661,8 +661,8 @@ bootstrap_portage() {
# STABLE_PV that is known to work. Intended for power users only.
## It is critical that STABLE_PV is the lastest (non-masked) version 
that is
## included in the snapshot for bootstrap_tree.
-   STABLE_PV="3.0.10.1"
-   [[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.10.1"
+   STABLE_PV="3.0.10.2"
+   [[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.10.2"
PV="${TESTING_PV:-${STABLE_PV}}"
A=prefix-portage-${PV}.tar.bz2
einfo "Bootstrapping ${A%-*}"



[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/

2020-11-29 Thread Fabian Groffen
commit: c0220bd1c32e17136dc9efc956da3c276d4e9d2b
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Nov 29 10:11:24 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sun Nov 29 10:11:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0220bd1

dev-vcs/git-2.29.2: don't build osxkeychain module with gcc

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 dev-vcs/git/git-2.29.2.ebuild  | 4 ++--
 dev-vcs/git/git--r3.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-vcs/git/git-2.29.2.ebuild b/dev-vcs/git/git-2.29.2.ebuild
index 6e5c5a74a12..ca7a5942fda 100644
--- a/dev-vcs/git/git-2.29.2.ebuild
+++ b/dev-vcs/git/git-2.29.2.ebuild
@@ -341,7 +341,7 @@ src_compile() {
|| die "emake gitweb (cgi) failed"
fi
 
-   if [[ ${CHOST} == *-darwin* ]]; then
+   if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
pushd contrib/credential/osxkeychain &>/dev/null || die
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|| die "emake credential-osxkeychain"
@@ -391,7 +391,7 @@ src_compile() {
 src_install() {
git_emake install || die "make install failed"
 
-   if [[ ${CHOST} == *-darwin* ]]; then
+   if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
fi
 

diff --git a/dev-vcs/git/git--r3.ebuild b/dev-vcs/git/git--r3.ebuild
index 6e5c5a74a12..ca7a5942fda 100644
--- a/dev-vcs/git/git--r3.ebuild
+++ b/dev-vcs/git/git--r3.ebuild
@@ -341,7 +341,7 @@ src_compile() {
|| die "emake gitweb (cgi) failed"
fi
 
-   if [[ ${CHOST} == *-darwin* ]]; then
+   if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
pushd contrib/credential/osxkeychain &>/dev/null || die
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|| die "emake credential-osxkeychain"
@@ -391,7 +391,7 @@ src_compile() {
 src_install() {
git_emake install || die "make install failed"
 
-   if [[ ${CHOST} == *-darwin* ]]; then
+   if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
fi
 



[gentoo-commits] proj/portage-utils:master commit in: man/

2020-11-29 Thread Fabian Groffen
commit: 5fd373fadbdf3f0bc2733f4c6fee4fab71f76e69
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Nov 29 09:28:40 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sun Nov 29 09:28:40 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=5fd373fa

man: regenerate after alignment fix

Signed-off-by: Fabian Groffen  gentoo.org>

 man/q.1 | 36 ++--
 man/qatom.1 |  2 +-
 man/qcheck.1|  2 +-
 man/qdepends.1  |  2 +-
 man/qfile.1 |  2 +-
 man/qgrep.1 |  2 +-
 man/qkeyword.1  |  2 +-
 man/qlist.1 |  2 +-
 man/qlop.1  | 15 +--
 man/qmanifest.1 |  2 +-
 man/qmerge.1|  2 +-
 man/qpkg.1  |  2 +-
 man/qsearch.1   |  2 +-
 man/qsize.1 |  2 +-
 man/qtbz2.1 |  2 +-
 man/qtegrity.1  |  2 +-
 man/quse.1  |  2 +-
 man/qxpak.1 |  2 +-
 18 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/man/q.1 b/man/q.1
index 21a09b3..d98c3c3 100644
--- a/man/q.1
+++ b/man/q.1
@@ -1,5 +1,5 @@
 .\" generated by mkman.py, please do NOT edit!
-.TH q "1" "Dec 2019" "Gentoo Foundation" "q"
+.TH q "1" "Nov 2020" "Gentoo Foundation" "q"
 .SH NAME
 q \- invoke a portage utility applet
 .SH SYNOPSIS
@@ -58,24 +58,24 @@ Print version and exit.
 .SH APPLETS
 .nf
 .B This applet also has sub applets:
-q   : virtual applet
-qatom: split atom strings
-   qcheck: verify integrity of installed packages
- qdepends: show dependency info
-qfile   : list all pkgs owning files
-qgrep  [pkg ...]: grep in ebuilds
- qkeyword   : list packages based on keywords
-qlist: list files owned by pkgname
- qlop: emerge log analyzer
+ q   : virtual applet
+ qatom: split atom strings
+qcheck: verify integrity of installed packages
+  qdepends: show dependency info
+ qfile   : list all pkgs owning files
+ qgrep  [pkg ...]: grep in ebuilds
+  qkeyword   : list packages based on keywords
+ qlist: list files owned by pkgname
+  qlop: emerge log analyzer
  qmanifest  : verify or generate thick Manifest files
-   qmerge   : fetch and merge binary package
- qpkg  : create or manipulate Gentoo binpkgs
-  qsearch  : search pkgname/desc
-qsize: calculate size usage
-qtbz2  : manipulate tbz2 packages
- qtegrity  : verify files with IMA
- quse: find pkgs using useflags
-qxpak  : manipulate xpak archives
+qmerge   : fetch and merge binary package
+  qpkg  : create or manipulate Gentoo binpkgs
+   qsearch  : search pkgname/desc
+ qsize: calculate size usage
+ qtbz2  : manipulate tbz2 packages
+  qtegrity  : verify files with IMA
+  quse: find pkgs using useflags
+ qxpak  : manipulate xpak archives
 .fi
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/

diff --git a/man/qatom.1 b/man/qatom.1
index 9ebb9a0..d8c7cd6 100644
--- a/man/qatom.1
+++ b/man/qatom.1
@@ -1,5 +1,5 @@
 .\" generated by mkman.py, please do NOT edit!
-.TH qatom "1" "May 2020" "Gentoo Foundation" "qatom"
+.TH qatom "1" "Nov 2020" "Gentoo Foundation" "qatom"
 .SH NAME
 qatom \- split atom strings
 .SH SYNOPSIS

diff --git a/man/qcheck.1 b/man/qcheck.1
index a48c7f3..2473513 100644
--- a/man/qcheck.1
+++ b/man/qcheck.1
@@ -1,5 +1,5 @@
 .\" generated by mkman.py, please do NOT edit!
-.TH qcheck "1" "Nov 2019" "Gentoo Foundation" "qcheck"
+.TH qcheck "1" "Nov 2020" "Gentoo Foundation" "qcheck"
 .SH NAME
 qcheck \- verify integrity of installed packages
 .SH SYNOPSIS

diff --git a/man/qdepends.1 b/man/qdepends.1
index e8d1648..0eb7ba3 100644
--- a/man/qdepends.1
+++ b/man/qdepends.1
@@ -1,5 +1,5 @@
 .\" generated by mkman.py, please do NOT edit!
-.TH qdepends "1" "Nov 2019" "Gentoo Foundation" "qdepends"
+.TH qdepends "1" "Nov 2020" "Gentoo Foundation" "qdepends"
 .SH NAME
 qdepends \- show dependency info
 .SH SYNOPSIS

diff --git a/man/qfile.1 b/man/qfile.1
index 7caa459..ffe0968 100644
--- a/man/qfile.1
+++ b/man/qfile.1
@@ -1,5 +1,5 @@
 .\" generated by mkman.py, please do NOT edit!
-.TH qfile "1" "May 2020" "Gentoo Foundation" "qfile"
+.TH qfile "1" "Nov 2020" "Gentoo Foundation" "qfile"
 .SH NAME
 qfile \- list all pkgs owning files
 .SH SYNOPSIS

diff --git a/man/qgrep.1 b/man/qgrep.1
index 2d73f4c..70d7eba 100644
--- a/man/qgrep.1
+++ b/man/qgrep.1
@@ -1,5 +1,5 @@
 .\" generated by mkman.py, please 

[gentoo-commits] proj/portage-utils:master commit in: /

2020-11-29 Thread Fabian Groffen
commit: b377edf73ec277e2d85d102a325f789663720142
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Nov 29 09:12:41 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sun Nov 29 09:12:41 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=b377edf7

main: fix alignment wrt qmanifest applet, bug #757540

Bug: https://bugs.gentoo.org/757540
Signed-off-by: Fabian Groffen  gentoo.org>

 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index c8b0429..816cd6c 100644
--- a/main.c
+++ b/main.c
@@ -109,7 +109,7 @@ usage(int status, const char *flags, struct option const 
opts[],
fprintf(fp, "%scurrently defined applets:%s\n", GREEN, NORM);
for (i = 0; applets[i].desc; ++i)
if (applets[i].func)
-   fprintf(fp, " %s%8s%s %s%-16s%s%s:%s %s\n",
+   fprintf(fp, " %s%9s%s %s%-16s%s%s:%s %s\n",
YELLOW, applets[i].name, NORM,
DKBLUE, applets[i].opts, NORM,
RED, NORM, _(applets[i].desc));



[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/

2020-11-28 Thread Fabian Groffen
commit: 80d619334821e50f62f8ba7433687caafbef75df
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 28 20:06:30 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 28 20:06:30 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=80d61933

sys-apps/portage-3.0.10.2: bump to fix library resolution on macOS

Closes: https://bugs.gentoo.org/757240
Package-Manager: Portage-3.0.10-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest | 2 +-
 sys-apps/portage/{portage-3.0.10.1.ebuild => portage-3.0.10.2.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7ce942d939..18b009f14a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
-DIST prefix-portage-3.0.10.1.tar.bz2 1316537 BLAKE2B 
a844265ed7ff74f5effa5827205fd87547351675045dc5e9a565eb210af88f50c9f1b77065db250bbfb4866ae4b271599158ee1b2e271bafd4627dd42887
 SHA512 
5e6b95fa1ecf3591360dac42866421f5d574e8402acd2c804347ecfc8a234bb484f3e756bb62297e0cd12f6dbc953b6f14238a098d60332cd41308737e2ee9b3
+DIST prefix-portage-3.0.10.2.tar.bz2 1332430 BLAKE2B 
cade8c882fa67abf1f1cd3f8589dc7976ac4d555aa92733cc4d360b1669467c81b18a27140f6255d34f7efbca0e92103e791144e6fec6a7de8285958c7491fc5
 SHA512 
ce13c8b93aec5bad9febdfd7911b2169c6418ddf351cbe6fb5226f01236c51607b7ad2cc0bf0b31bf3ba8aa78c3eaa05fbcffb81da59820d4040e98f79f50e6f
 DIST prefix-portage-3.0.8.tar.bz2 1360204 BLAKE2B 
b4d3046e4a2ac7ae611a54b1a669d3d13b337aa29a9adb540f6da5104b47ca8d41798cc268bc4ab464f553bb280173a598127b5b290871ba0bf57f2fbd15bf58
 SHA512 
fb532b4145952f9467e1a86349e753e80d20b8b35d17d2d99ede590ff5aa6d367f16be41f2335738ed01c82238e2f93179e9b35d588ad92859f4b1f135539a00

diff --git a/sys-apps/portage/portage-3.0.10.1.ebuild 
b/sys-apps/portage/portage-3.0.10.2.ebuild
similarity index 100%
rename from sys-apps/portage/portage-3.0.10.1.ebuild
rename to sys-apps/portage/portage-3.0.10.2.ebuild



[gentoo-commits] proj/portage:prefix commit in: bin/

2020-11-28 Thread Fabian Groffen
commit: 126b9931af386e5fe185f281595bf2da0156201c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 28 19:45:00 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 28 19:45:00 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=126b9931

bin/misc-functions: also resolve Frameworks from macOS SDK

Signed-off-by: Fabian Groffen  gentoo.org>

 bin/misc-functions.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 8f62cb7f1..c75c478ee 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -372,8 +372,10 @@ install_qa_check_macho() {
# by looking at the SDK metacaches, 
TAPI-files, .tbd
# text versions of libraries, so just 
look there
local tbd=${lib%.*}.tbd
-   if [[ -e ${EROOT}/MacOSX.sdk/${tbd} ]] 
; then
+   if [[ -e 
${EROOT}/MacOSX.sdk/${lib%.*}.tbd ]] ; then
isok=yes  # it's in the SDK, so 
ok
+   elif [[ -e 
${EROOT}/MacOSX.sdk/${lib}.tbd ]] ; then
+   isok=yes  # this happens in 
case of Framework refs
fi
fi
if [[ ${isok} == no ]] ; then



[gentoo-commits] proj/portage:prefix commit in: bin/

2020-11-28 Thread Fabian Groffen
commit: c3a69ee41aa0dd40342e05c7e275f82f31744ae1
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 28 19:36:08 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 28 19:36:08 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c3a69ee4

bin/misc-functions: resolve libraries from macOS SDK if configured

Bug: https://bugs.gentoo.org/757240
Signed-off-by: Fabian Groffen  gentoo.org>

 bin/misc-functions.sh | 24 +---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index d01a8edb1..8f62cb7f1 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -360,9 +360,27 @@ install_qa_check_macho() {
elif [[ ${lib} == ${S}* ]] ; then
eqawarn "QA Notice: install_name references 
\${S}: ${lib} in ${obj}"
[[ -z ${ignore} ]] && touch 
"${T}"/.install_name_check_failed
-   elif ! install_name_is_relative ${lib} && [[ ! -e 
${lib} && ! -e ${D}${lib} ]] ; then
-   eqawarn "QA Notice: invalid reference to ${lib} 
in ${obj}"
-   [[ -z ${ignore} ]] && touch 
"${T}"/.install_name_check_failed
+   elif ! install_name_is_relative ${lib} ; then
+   local isok=no
+   if [[ -e ${lib} || -e ${D}${lib} ]] ; then
+   isok=yes  # yay, we're ok
+   elif [[ -e "${EROOT}"/MacOSX.sdk ]] ; then
+   # trigger SDK mode, at least since Big 
Sur (11.0)
+   # there are no libraries in /usr/lib 
any more, but
+   # there are references too it (some 
library cache is
+   # in place), yet we can validate it 
sort of is sane
+   # by looking at the SDK metacaches, 
TAPI-files, .tbd
+   # text versions of libraries, so just 
look there
+   local tbd=${lib%.*}.tbd
+   if [[ -e ${EROOT}/MacOSX.sdk/${tbd} ]] 
; then
+   isok=yes  # it's in the SDK, so 
ok
+   fi
+   fi
+   if [[ ${isok} == no ]] ; then
+   eqawarn "QA Notice: invalid reference 
to ${lib} in ${obj}"
+   [[ -z ${ignore} ]] && \
+   touch 
"${T}"/.install_name_check_failed
+   fi
fi
done
 



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/features/fsf-gcc-nold/

2020-11-28 Thread Fabian Groffen
commit: 36aa2929b74411b3fcfc4e6167844f31d885c172
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 28 15:47:22 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 28 15:47:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36aa2929

profiles/prefix/darwin/macos: mask aqua USE-flag for cairo with GCC

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.use.mask | 6 ++
 1 file changed, 6 insertions(+)

diff --git 
a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.use.mask 
b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.use.mask
new file mode 100644
index 000..a6f14621678
--- /dev/null
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Cocoa integration requires frameworks, and this is a bridge too far
+# for current FSF GCC
+x11-libs/cairo aqua



[gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/

2020-11-28 Thread Fabian Groffen
commit: 6433ca52701e39e6576702ad37321689ca31eb19
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 28 15:41:00 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 28 15:41:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6433ca52

media-libs/libjpeg-turbo-2.0.6: fix compilation on Prefix

when the host provides nasm, but we installed yasm, the latter won't be
used, so force the usage of yasm when that package is the only installed
asm implementation

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild 
b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
index 47751e0823a..ef462071586 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
@@ -85,6 +85,11 @@ multilib_src_configure() {
 
[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
 
+   # mostly for Prefix, ensure that we use our yasm if installed and
+   # not pick up host-provided nasm
+   has_version dev-lang/yasm && ! has_version dev-lang/nasm && \
+   mycmakeargs+=( -DCMAKE_ASM_NASM_COMPILER=$(type -P yasm) )
+
if use ppc ; then
# Workaround recommended by upstream:
# https://bugs.gentoo.org/715406#c9



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/features/fsf-gcc-nold/

2020-11-28 Thread Fabian Groffen
commit: bf17e7fec8c6e2cde0784c82157e1548ca068b23
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 28 15:23:57 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 28 15:23:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf17e7fe

profiles/prefix/darwin/macos: unmask cmake in gcc profiles

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask 
b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
index e1ce7a0144a..90c1048e402 100644
--- a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
@@ -10,3 +10,6 @@ sys-devel/binutils-apple
 
 # packages which link to framework and therefore fail (blocks)
 dev-util/pkgconfig
+
+# cmake-3.19.1 works for us
+->=dev-util/cmake-3.14



[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/files/, dev-util/cmake/

2020-11-28 Thread Fabian Groffen
commit: 88ae28941466e41fff5dbb2c2a8a35e7625a681c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 28 15:22:11 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 28 15:22:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88ae2894

dev-util/cmake-3.19.1: fix compilation for Darwin GCC

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 dev-util/cmake/cmake-3.19.1.ebuild |  7 +--
 dev-util/cmake/files/cmake-3.19.1-darwin-gcc.patch | 14 ++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/dev-util/cmake/cmake-3.19.1.ebuild 
b/dev-util/cmake/cmake-3.19.1.ebuild
index 5dc94575a14..09d448bde37 100644
--- a/dev-util/cmake/cmake-3.19.1.ebuild
+++ b/dev-util/cmake/cmake-3.19.1.ebuild
@@ -54,8 +54,7 @@ PATCHES=(
# prefix
"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-   # Next patch requires new work from prefix people
-   #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+   "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
 
# handle gentoo packaging in find modules
"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
@@ -134,6 +133,10 @@ src_prepare() {
if [[ ${CHOST} == *-darwin* ]] ; then
sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
Source/cmGlobalXCodeGenerator.cxx || die
+   # disable isysroot usage with GCC, we've properly instructed
+   # where things are via GCC configuration and ldwrapper
+   sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+   Modules/Platform/Apple-GNU-C{,XX}.cmake || die
fi
 
# Add gcc libs to the default link paths

diff --git a/dev-util/cmake/files/cmake-3.19.1-darwin-gcc.patch 
b/dev-util/cmake/files/cmake-3.19.1-darwin-gcc.patch
new file mode 100644
index 000..0f0a6b681bc
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.19.1-darwin-gcc.patch
@@ -0,0 +1,14 @@
+grob...@gentoo.org: fix compilation on macOS using GCC
+
+compiler says it all: include memory if you use unique_ptr
+
+--- a/Source/cmMachO.h.orig2020-11-24 14:50:26.0 +0100
 b/Source/cmMachO.h 2020-11-28 16:05:11.509620124 +0100
+@@ -6,6 +6,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ #if !defined(CMAKE_USE_MACH_PARSER)
+ #  error "This file may be included only if CMAKE_USE_MACH_PARSER is enabled."



[gentoo-commits] repo/gentoo:master commit in: dev-libs/jsoncpp/

2020-11-28 Thread Fabian Groffen
commit: e11054d2fdae40b9d1520ac94c57579ab4e657a6
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 28 13:42:23 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 28 13:42:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e11054d2

dev-libs/jsoncpp-1.9.4: marked ~x64-macos

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild 
b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
index e06032f66c7..eec6b6bd968 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/24"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc 
x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc 
x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/proj/prefix:master commit in: dev-libs/glib/

2020-11-28 Thread Fabian Groffen
commit: 7cb5959940da8564a30e3cfd9d579ef87bdb35fd
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 28 13:40:36 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 28 13:40:36 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7cb59599

dev-libs/glib-2.56.2: fix macOS compilation using GCC

Package-Manager: Portage-3.0.10-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen  gentoo.org>

 dev-libs/glib/glib-2.56.2.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/dev-libs/glib/glib-2.56.2.ebuild b/dev-libs/glib/glib-2.56.2.ebuild
index a15483a56d..791f5bf75b 100644
--- a/dev-libs/glib/glib-2.56.2.ebuild
+++ b/dev-libs/glib/glib-2.56.2.ebuild
@@ -156,6 +156,10 @@ src_prepare() {
glib/giounix.c || die
fi
 
+   # disable native macOS integrations
+   sed -i -e '/glib_have_\(carbon\|cocoa\)=yes/s/yes/no/' \
+   configure{.ac,} || die
+
gnome2_src_prepare
 }
 



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/10.15/

2020-11-28 Thread Fabian Groffen
commit: 17a528ccae5ccd270db398f84918a40e3144b7e0
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 28 12:12:35 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 28 12:14:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17a528cc

profiles/prefix/darwin/macos/10.15: unmask bash-5.1 and dep here too

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/10.15/package.accept_keywords | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/profiles/prefix/darwin/macos/10.15/package.accept_keywords 
b/profiles/prefix/darwin/macos/10.15/package.accept_keywords
new file mode 100644
index 000..268e7873bb5
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/package.accept_keywords
@@ -0,0 +1,6 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# this is the only version known to compile on macOS Catalina
+=app-shells/bash-5.1_rc3 **
+=sys-libs/readline-8.1_rc3 **



[gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/

2020-11-28 Thread Fabian Groffen
commit: 161e039974fc1de7a1d097983837b62974c9d1f8
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 28 10:03:33 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 28 10:03:33 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=161e0399

scripts/auto-bootstraps/analyse_result: report features before snapshot

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/auto-bootstraps/analyse_result.py | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/auto-bootstraps/analyse_result.py 
b/scripts/auto-bootstraps/analyse_result.py
index 53dd2a677b..4420c3ff7c 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -179,6 +179,11 @@ def gentags(infos):
 tags = tags + '''
 libressl
+'''
+
+if infos.get('darwingcc', False):
+tags = tags + '''
+GCC
 '''
 
 snap = infos.get('snapshot', None)
@@ -186,11 +191,6 @@ display: inline-block; font-size: x-small; padding: 3px 
4px; text-transform: upp
 tags = tags + '''
 ''' + snap + '''
-'''
-
-if infos.get('darwingcc', False):
-tags = tags + '''
-GCC
 '''
 
 return tags



[gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/

2020-11-28 Thread Fabian Groffen
commit: 9e4d616274d106532fa3838aaaf202f3b1c1e944
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 28 10:01:50 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 28 10:01:50 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9e4d6162

scripts/auto-bootstraps/analyse_result: fix green background colour

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/auto-bootstraps/analyse_result.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/auto-bootstraps/analyse_result.py 
b/scripts/auto-bootstraps/analyse_result.py
index e7486e3226..53dd2a677b 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -190,7 +190,7 @@ display: inline-block; font-size: x-small; padding: 3px 
4px; text-transform: upp
 
 if infos.get('darwingcc', False):
 tags = tags + '''
-GCC
+GCC
 '''
 
 return tags



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/11.0/

2020-11-27 Thread Fabian Groffen
commit: d7cd628cdd89c0d48b0dba6c5d23ab3e24447c3c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Nov 27 16:53:20 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Fri Nov 27 16:53:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7cd628c

profiles/prefix/darwin/macos/11.0: add readline-8.1_rc3 for Big Sur

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/11.0/package.accept_keywords | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/prefix/darwin/macos/11.0/package.accept_keywords 
b/profiles/prefix/darwin/macos/11.0/package.accept_keywords
index b1959522693..625d924768f 100644
--- a/profiles/prefix/darwin/macos/11.0/package.accept_keywords
+++ b/profiles/prefix/darwin/macos/11.0/package.accept_keywords
@@ -3,3 +3,4 @@
 
 # this is the only version known to compile on macOS Big Sur
 =app-shells/bash-5.1_rc3 **
+=sys-libs/readline-8.1_rc3 **



[gentoo-commits] repo/proj/prefix:master commit in: sys-libs/readline/

2020-11-27 Thread Fabian Groffen
commit: 43373dc244268c58d9d4efccb1d7314ec3c81558
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Nov 27 16:53:16 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Fri Nov 27 16:53:16 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=43373dc2

sys-libs/readline-8.1_rc3: add version for macOS Big Sur

Package-Manager: Portage-3.0.10-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-libs/readline/Manifest|   1 +
 sys-libs/readline/readline-8.1_rc3.ebuild | 219 ++
 2 files changed, 220 insertions(+)

diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index fcd874fecb..6b483d42e2 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,6 +1,7 @@
 DIST host-libtool-0.1.0.tar.gz 388867 BLAKE2B 
e8bfd1212f39d6262721c4a12535799f4e3428b83f3174bac373c15813462950218dd689380ab8caaf84186b60c29a1fafadfa1c2d0e5cb7f76f6d1699bdcabc
 SHA512 
d8764d7814abf06556fb6eb19c12c2de1d1dc9f2f325deae55606ddfcf88963d65713d6fbd1fae0ab1a0668d90f84204e1cdcbd557944660ab01ecfe3a824ca5
 DIST readline-7.0.tar.gz 2910016 BLAKE2B 
679b8aa7ce003017b729e6d8d4cb69d0f991578441a3e69005090079e61f6aa48b7ad4d0b1f34b6041528cf33254a1bf3ddb05b60db53a06e443d7922d49d0d4
 SHA512 
18243189d39bf0d4c8a76cddcce75243c1bae8824c686e9b6ba352667607e5b10c5feb79372a1093c1c388d821841670702e940df12eae94bcebdeed90047870
 DIST readline-8.0.tar.gz 2975937 BLAKE2B 
95e08b28cc46582f036379413810ca40c97d4d3bc59a9e03e04e57d531573abfbe955f6f1cb86e39c208bf6c3f4c618cff70a87bec596d0b9120909d6c5a2f69
 SHA512 
41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f
+DIST readline-8.1-rc3.tar.gz 2992934 BLAKE2B 
9da55275f3e3534713c0c2f409022166e1fddc26278bdc92064ed9462687f0614bd99bc31f1f2d0027e21c36e4030af1a1eeffe9d9ac1ac431c1928c73dd18a9
 SHA512 
88301670c8da5ffb5aeb662c453f22a598c3d2cd3319f428c001986ad021ec1005c491a4e96d764f133d078842af87e74c6dfb09612f469396b814991164db7e
 DIST readline70-001 1777 BLAKE2B 
ab217bd9d27f30351397db2b745cb33ac7e0ce18bbc00112bb87570da0f62ee0e8d182395c97e4ecc21af51e7e1e580ba48076de1095c556f0744475e4019821
 SHA512 
4402186905af8cd42c609d640c2e13b9ad61c7778e5a3fd2c2d9da301f0deab05b04d7836f31527262f44f406517823dbb18cb07f2c73931186c806b494699ec
 DIST readline70-002 2953 BLAKE2B 
47d729b1babe904855fe5d4f780a5b2153a743def527479c3cb82759cdee5bb4260be722e1050be680f5c0dd6dec8ca25c4c1ff557415abae6b3fac2bd481f0b
 SHA512 
13d1489578508d4d2c3a1618024198a709dbce74a6bbf0f6d7ec67d2419c55bfec9f0ca9de0ed93f129d21d5c3a94307ccdc49408455bbb301c5e3a772b03185
 DIST readline70-003 1294 BLAKE2B 
9473e18b582fba69cea83e3f5b9fa278dd8b0544325439307d2b4053cbeca8d2f008104bee181ae5d9405d702e6d3bcf26379c4d46e269906474c8544367b780
 SHA512 
eaf962a1480eb3870519017b81ecc5cef171e4c41fcf8c17da61ccbfd0379ed6bca85c17b03e2207ae4d51509f33fd010294c75f4bd0433a52118015d4160385

diff --git a/sys-libs/readline/readline-8.1_rc3.ebuild 
b/sys-libs/readline/readline-8.1_rc3.ebuild
new file mode 100644
index 00..4a3b743d26
--- /dev/null
+++ b/sys-libs/readline/readline-8.1_rc3.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs 
usr-ldscript libtool
+
+# Official patches
+# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+   [[ ${PLEVEL} -eq 0 ]] && return 1
+   local opt=$1
+   eval set -- {1..${PLEVEL}}
+   set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
+   if [[ ${opt} == -s ]] ; then
+   echo "${@/#/${DISTDIR}/}"
+   else
+   local u
+   for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
+   printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
+   done
+   fi
+}
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html;
+
+case ${PV} in
+   *_alpha*|*_beta*|*_rc*)
+   SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
+   ;;
+   *)
+   SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
+   ;;
+esac
+
+HOSTLTV="0.1.0"
+HOSTLT="host-libtool-${HOSTLTV}"
+HOSTLT_URI="https://github.com/haubi/host-libtool/releases/download/v${HOSTLTV}/${HOSTLT}.tar.gz;
+SRC_URI+=" ${HOSTLT_URI}"
+HOSTLT_S=${WORKDIR}/${HOSTLT}
+
+LICENSE="GPL-3"
+SLOT="0/8"  # subslot matches SONAME major
+[[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~ppc-aix ~x64-cygwin 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils-apple/

2020-11-27 Thread Fabian Groffen
commit: 6f3826c28e296d98a50d7423c80041c3df0c86cd
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Nov 27 15:33:15 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Fri Nov 27 15:33:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f3826c2

sys-devel/binutils-apple-11.3.1: version bump by Jacob Floyd, #693444

Closes: https://bugs.gentoo.org/693444
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/binutils-apple/Manifest  |   4 +
 .../binutils-apple/binutils-apple-11.3.1.ebuild| 374 +
 2 files changed, 378 insertions(+)

diff --git a/sys-devel/binutils-apple/Manifest 
b/sys-devel/binutils-apple/Manifest
index 530d344b9cc..6466da784e5 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -1,4 +1,5 @@
 DIST binutils-apple-LP64-patches-1.tar.bz2 10235 BLAKE2B 
3352170bcfe73c574217597233ca58c7d6ebeedf9dfe9da1399953dfe1a0c87fc26e9ba8864620ddd67c6f38e48aeb6950737637605f0b860eb4a0d246f3aff7
 SHA512 
5632d4033c39e47de3ec275d02100ed53408a63122fe722c26dda1b02275c397524b113e51e1334d3235fc7f0a3bb8e53d4ccc1c2e40f24c6129282846da22e1
+DIST binutils-apple-patches-11.3.tar.bz2 7871 BLAKE2B 
de4e909a084da79d139b7f07d98c55ebe8aac3fc5ba5accb365e0eb003b726a619369e7695f43faaeb6acabc1db5eba9195e8e22aeed0e864446ade48d13a826
 SHA512 
ae73528bd0fa47413caef0f65b0077011123ae2bcf366a09da8fcd5cb79ef76495f9c11560f039fc2f35405430d5ff0295913ba44dce1a8677bd347db179ecdf
 DIST binutils-apple-patches-3.2-r0.tar.bz2 4137 BLAKE2B 
9cd7afbba5337cb9c395556b2691e4acd73ee323d643da4335f6465ccc29b06f889d01fb42c7778576607bfdb859e2df38d3ebf82d4bf7f0971079da6985f237
 SHA512 
5381a93d61c39993cdb294ecb238016e26cdfe283fae553f75ddc6662812709301d5208c770ac0992d1dfab92e4802c660e6fb4336ad891335ab716d3b042805
 DIST binutils-apple-patches-3.2.6-r0.tar.bz2 3500 BLAKE2B 
f10dcf71400ea5d4bf7efb8ad906240765cfb56743274b3e1684eeb4273a35171aa4202d475920cff2c5c39e89f9bd1d7e5b0d38ba6c2b4705b0a592ba47e063
 SHA512 
4ccb8ebd49ac8eac4dbd0c1f24ee1836f216efd2e9e15b13072cbc76d8f83fbf4f1f6b3b60736bf5d5482af3e49ec1eaedfce8dd0ce1e949f915faf9c92ee0ea
 DIST binutils-apple-patches-4.3-r1.tar.bz2 37363 BLAKE2B 
a5ad04d4bf746a864f03a25d052197ed9a6ecada1f34460f4e38bea8cd87dfe2cb6c7f99f2096acac2231cd1e0c13c53757854b07f729a7a0c5a162a908fbe83
 SHA512 
f5d64ad182891c3af971e6aabd3c0c1b717b6a1cb471632339cba61b41a998d15880d18de09aafa1c3d059e528c888d6e8b914025c79bc21897d90a6d0e2ebf5
@@ -20,6 +21,7 @@ DIST cctools-877.7.tar.gz 1720523 BLAKE2B 
78e4d387b34504a001a5dac2db5f791fcbeae7
 DIST cctools-877.8.tar.gz 1720708 BLAKE2B 
97bce69d7c88a917ad1351635b4bd0ebd3273f7a62b10dd3d58a0df7e1de2e05dc3fa04b014dff6966e77b85e264d1be181ac4d5dafc069c72c79d803393176a
 SHA512 
3f75fbe4eacd89f2e6372a3167ed197e2b8bda9faa10fe6bce0cf9d3d3eca536f0af5fc4ce1e4bc6a24eb68db36f5d0b1d0bc3f9807e285e67cfaa2d336d81ef
 DIST cctools-886.tar.gz 1731850 BLAKE2B 
c206ad8c94fa3d132726db8cbc60ed09b6f1f7aa8118a99b1e7ed350323c11b729d68c912ba7648cf900cc2a26cbff12a03072afe92efe09c8974be280448731
 SHA512 
49f14e165da3a9fcf16614a810b8a2a68907348bd27a60b268b330e416a0bc070fb6445e1e6b80d849026bd6ce7de4459623ab86168e2d63bb492d1ba6680c5b
 DIST cctools-895.tar.gz 1716126 BLAKE2B 
9706a6b243518693888e5e21dfe8d83b217380b47db621a7f1b35105eb72fb8997353ff85133224b0856f6b6ec710f54a4fe79076d9e228f89c98b6f517de309
 SHA512 
4ef9db870385cc2c4263bcbe42ff0de80386771f5acbc7082a1818ecd6b8d7bb1bfa02a7fcfecd3e7281481aeaaac4c331359aca3564bfe7a4c7dea1e0d06126
+DIST cctools-949.0.1.tar.gz 1968671 BLAKE2B 
b38fbae5d2ec011a94c2e4ec299c1ecd173f2c2516664cf925b06aaa078e234b59068158ea29dfcbf763ca98c73bc1806a507fbbe49a8d4d0a2fd4e602f401ce
 SHA512 
13c493a48852c980d2829d28616c18640ad5ebfe6acd55143c4c948665e0b65377a459560667074fdac5e69bb6360fea13d988303c49fd3dd4a58e9b5c54ebcb
 DIST dyld-132.13.tar.gz 342690 BLAKE2B 
011418ba5b91a28bb7c5f8188af2fac5478bad53581396b7c1c4623a854a8f0d5ecb92d023246157830ed2db83bbf28e23225a255188e2d07eeb6c933814bda6
 SHA512 
2c9d50fc32868b696d88730eb6ea6afa9bb9f56883cc2ea4f1d41f370f311b7487a29ce0eff6761e1eeb086a18e2513953989d8d5d3ef1043bb662e86baadd3f
 DIST dyld-195.6.tar.gz 412518 BLAKE2B 
f525aac0020baa69c5d7c42a7027b0d2fdef9fa3c2e5d3831101989eab20f2eb7932c99355ca34e6e0b988b9808013739d452592e0b8832e1306cc6027cc5d0f
 SHA512 
58a9ea27efc02e66f9d99bfa250af1d90326385385431e5279386bbd9ab53366bf7e8236543296908b7214c33523c8f60098a6298a7393b3180e2a6bce18e7c5
 DIST dyld-353.2.1.tar.gz 510036 BLAKE2B 
6f355bcb87d6136d3c29b2766146303ecf092fb407296a0a93412598276ea88c4f826da75d20cc5d3e2bfac750a62c413b117ee95dd710eac83b647786fb109b
 SHA512 
a9488620499f682e245b55b7e0e4ec02fc0bcf03bd8a70d4a4ee0ba762067ade2f41c188990c101727476d41c19368b4cc89cccf2df40231da1c42c7391f
@@ -27,6 +29,7 @@ DIST dyld-360.14.tar.gz 518873 BLAKE2B 
ebf651a8880ef337ed5ee7d5d7b9d2da77fed481f
 DIST dyld-360.17.tar.gz 51887

[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/binutils-config/files/

2020-11-27 Thread Fabian Groffen
commit: 40f8991efebfd3ddfe46336f0f3019904dcaece7
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Nov 27 13:56:56 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Fri Nov 27 13:56:56 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=40f8991e

sys-devel/binutils-config-5.1-r3: fix embarrasing syntax error

Package-Manager: Portage-3.0.8-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/binutils-config/files/ldwrapper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/binutils-config/files/ldwrapper.c 
b/sys-devel/binutils-config/files/ldwrapper.c
index 75575f31f6..3ff5a0bc3e 100644
--- a/sys-devel/binutils-config/files/ldwrapper.c
+++ b/sys-devel/binutils-config/files/ldwrapper.c
@@ -388,7 +388,7 @@ main(int argc, char *argv[])
/* inject this first to make the intention clear */
 #ifdef DARWIN_LD_SYSLIBROOT
newargv[j++] = "-syslibroot";
-   newargv[j++] = EPREFIX "/MacOSX.sdk"
+   newargv[j++] = EPREFIX "/MacOSX.sdk";
 #endif
newargv[j++] = "-search_paths_first";
}



[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/binutils-config/files/

2020-11-27 Thread Fabian Groffen
commit: acc649995abf68f60667fd91dce2c47704f4130f
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Nov 27 13:12:17 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Fri Nov 27 13:38:56 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=acc64999

sys-devel/binutils-config: drop libmissing support

libmissing is masked and soon to be removed, it never really worked in
the way it was hoped it could

Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/binutils-config/files/ldwrapper.c | 25 -
 1 file changed, 25 deletions(-)

diff --git a/sys-devel/binutils-config/files/ldwrapper.c 
b/sys-devel/binutils-config/files/ldwrapper.c
index 07dc6ebf2a..216747da5c 100644
--- a/sys-devel/binutils-config/files/ldwrapper.c
+++ b/sys-devel/binutils-config/files/ldwrapper.c
@@ -210,7 +210,6 @@ main(int argc, char *argv[])
char is_darwin = 0;
char darwin_use_rpath = 1;
char is_aix = 0;
-   char has_missing = getenv("BINUTILS_CONFIG_DISABLE_MISSING") == NULL;
char *p;
size_t len;
int i;
@@ -349,14 +348,6 @@ main(int argc, char *argv[])
/* AIX ld accepts -R only with -bsvr4 */
newargc++; /* -bsvr4 */
}
-
-   /* BINUTILS_CONFIG_DISABLE_MISSING overrides this such that we
-* can disable this behaviour */
-   if (has_missing && stat(EPREFIX "/usr/lib/libmissing.a", ) 
== 0) {
-   newargc++; /* -lmissing */
-   } else {
-   has_missing = 0;
-   }
}
 
/* account the original arguments */
@@ -408,20 +399,6 @@ main(int argc, char *argv[])
}
}
 
-   if (!is_cross && is_darwin && has_missing) {
-   if (argv[i][0] == '-' && argv[i][1] == 'l' &&
-   (strcmp([i][2], "System") == 0 ||
-strcmp([i][2], "SystemStubs") == 
0))
-   {
-   /* inject -lmissing before -lSystem or 
-lSystemStubs */
-   memmove([j + 1], [j],
-   sizeof(newargv[j]) * (k - j));
-   newargv[j++] = "-lmissing";
-   k++;
-   has_missing = 0;  /* avoid duplicate insertion 
*/
-   }
-   }
-
newargv[j] = argv[i];
 
if (is_cross || (is_darwin && !darwin_use_rpath))
@@ -498,8 +475,6 @@ main(int argc, char *argv[])
newargv[k++] = "-R" EPREFIX "/lib";
}
 
-   if (has_missing)
-   newargv[k++] = "-lmissing";
if (is_aix)
newargv[k++] = "-bsvr4"; /* last one, see above */
}



[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/binutils-config/files/, sys-devel/binutils-config/

2020-11-27 Thread Fabian Groffen
commit: 4b52e188057a6b59d3e48983f351bf44ae080081
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Nov 27 13:29:28 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Fri Nov 27 13:38:59 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4b52e188

sys-devel/binutils-config-5.1-r3: revbump for libsysroot support

Big Sur (11.0) needs libsysroot support from the linker, so allow
activating it.

Package-Manager: Portage-3.0.8-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 ...-config-5.1-r2.ebuild => binutils-config-5.1-r3.ebuild} | 10 +-
 sys-devel/binutils-config/files/ldwrapper.c| 14 --
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/sys-devel/binutils-config/binutils-config-5.1-r2.ebuild 
b/sys-devel/binutils-config/binutils-config-5.1-r3.ebuild
similarity index 84%
rename from sys-devel/binutils-config/binutils-config-5.1-r2.ebuild
rename to sys-devel/binutils-config/binutils-config-5.1-r3.ebuild
index d104bf4fb7..fd26184271 100644
--- a/sys-devel/binutils-config/binutils-config-5.1-r2.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,6 +39,13 @@ src_configure() {
 
 src_compile() {
use prefix-guest || return
+   local extraargs=( )
+   if [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -ge 20 ]] ; then
+   # macOS Big Sur has an empty /usr/lib, so the linker really has
+   # to look into the SDK, for which it needs to be told where it
+   # is (symlinked right into our EPREFIX root as MacOSX.sdk)
+   extraargs+=( -DDARWIN_LD_SYSLIBROOT=1 )
+   fi
local args=(
$(tc-getCC)
${CPPFLAGS}
@@ -46,6 +53,7 @@ src_compile() {
-o ldwrapper ${PN}-ldwrapper-${WRAPPER_REV}.c
-DEPREFIX=\"${EPREFIX}\"
-DCHOST=\"${CHOST}\"
+   "${extraargs[@]}"
${LDFLAGS}
)
echo ${args[*]}

diff --git a/sys-devel/binutils-config/files/ldwrapper.c 
b/sys-devel/binutils-config/files/ldwrapper.c
index 216747da5c..75575f31f6 100644
--- a/sys-devel/binutils-config/files/ldwrapper.c
+++ b/sys-devel/binutils-config/files/ldwrapper.c
@@ -20,8 +20,9 @@
  * ldwrapper: Prefix helper to inject -L and -R flags to the invocation
  * of ld.
  *
- * On Darwin it adds -search_path_first to make sure the given paths are
- * searched before the default search path.
+ * On Darwin it adds -search_paths_first to make sure the given paths are
+ * searched before the default search path, and sets -syslibroot
+ * starting from Big Sur 11.0.
  * On AIX it ensures -bsvr4 is the last argument.
  * The wrapper will inject -L entries for:
  *   - EPREFIX/usr/CHOST/lib/gcc (when gcc)
@@ -339,6 +340,11 @@ main(int argc, char *argv[])
 
/* add the 2 prefix paths (-L) and -search_paths_first 
*/
newargc += 2 + 1;
+
+#ifdef DARWIN_LD_SYSLIBROOT
+   /* add -syslibroot  */
+   newargc += 2;
+#endif
} else {
/* add the 4 paths we want (-L + -R) */
newargc += 8;
@@ -380,6 +386,10 @@ main(int argc, char *argv[])
 
if (!is_cross && is_darwin) {
/* inject this first to make the intention clear */
+#ifdef DARWIN_LD_SYSLIBROOT
+   newargv[j++] = "-syslibroot";
+   newargv[j++] = EPREFIX "/MacOSX.sdk"
+#endif
newargv[j++] = "-search_paths_first";
}
 



[gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/

2020-11-27 Thread Fabian Groffen
commit: d3c736c968d330bbd886e9a7b6134e7db6ae2f06
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Nov 27 10:58:38 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Fri Nov 27 10:58:55 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d3c736c9

scripts/auto-bootstraps/dobootstrap: allow EPREFIX override with resume

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/auto-bootstraps/dobootstrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/auto-bootstraps/dobootstrap 
b/scripts/auto-bootstraps/dobootstrap
index 1273f9a2da..e8e47f3ef7 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -28,7 +28,7 @@ do_prepare() {
local bootstrap
 
if [[ -n ${RESUME} && -n ${bitw} && -n ${dte} ]] ; then
-   bootstrap=bootstrap${bitw}-${dte}/bootstrap-prefix.sh
+   
bootstrap=${OVERRIDE_EPREFIX:-bootstrap${bitw}-${dte}}/bootstrap-prefix.sh
elif [[ -n ${DOLOCAL} ]] ; then
bootstrap=${BOOTSTRAP}
else



[gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/

2020-11-27 Thread Fabian Groffen
commit: 120396407992ebdf3365e8e792d15a34d283a805
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Nov 27 10:58:05 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Fri Nov 27 10:58:55 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=12039640

scripts/auto-bootstraps/analyse_result: add GCC tag for macOS

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/auto-bootstraps/analyse_result.py | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/auto-bootstraps/analyse_result.py 
b/scripts/auto-bootstraps/analyse_result.py
index 871692d2e3..e7486e3226 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -121,6 +121,7 @@ with os.scandir(resultsdir) as it:
 elapsedtime = None
 haslssl = False
 snapshot = None
+darwingcc = False
 
 elapsedf = os.path.join(resultsdir, arch, "%s" % d, "elapsedtime")
 if os.path.exists(elapsedf):
@@ -150,11 +151,14 @@ with os.scandir(resultsdir) as it:
 snapshot = re.split('[-.]', x)[2]
 elif 'total size is' in x:
 snapshot = 'rsync'
+elif 'Darwin with GCC toolchain' in x:
+darwingcc = True
 
 infos[d] = {
 'elapsedtime': elapsedtime,
 'libressl': haslssl,
-'snapshot': snapshot
+'snapshot': snapshot,
+'darwingcc': darwingcc
 }
 
 archs[arch] = (fail, state, suc, infos)
@@ -182,6 +186,11 @@ display: inline-block; font-size: x-small; padding: 3px 
4px; text-transform: upp
 tags = tags + '''
 ''' + snap + '''
+'''
+
+if infos.get('darwingcc', False):
+tags = tags + '''
+GCC
 '''
 
 return tags



[gentoo-commits] repo/gentoo:master commit in: net-libs/gnutls/

2020-11-27 Thread Fabian Groffen
commit: 68b4cf5165984f54c02e6bcec103cd3c3a3eb9bd
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Nov 27 10:41:48 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Fri Nov 27 10:47:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68b4cf51

net-libs/gnutls-3.6.15: add compilation fix for macOS

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 net-libs/gnutls/gnutls-3.6.15.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/net-libs/gnutls/gnutls-3.6.15.ebuild 
b/net-libs/gnutls/gnutls-3.6.15.ebuild
index 5fabb1a30dc..b0da1cec679 100644
--- a/net-libs/gnutls/gnutls-3.6.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.15.ebuild
@@ -74,6 +74,11 @@ src_prepare() {
rm src/$(basename ${file} .c).{c,h} || die
done
 
+   # don't try to use system certificate store on macOS, it is
+   # confusingly ignoring our ca-certificates and more importantly
+   # fails to compile in certain configurations
+   sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
+
# Use sane .so versioning on FreeBSD.
elibtoolize
 }



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-27 Thread Fabian Groffen
commit: 2fda1225f366f1ec1ce4d0ec4f15e5376dc9a572
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Nov 27 10:32:47 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Fri Nov 27 10:32:47 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2fda1225

scripts/bootstrap-prefix: refresh snapshot for latest fixes

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 02ae37585d..759e06e172 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -595,7 +595,7 @@ do_tree() {
 bootstrap_tree() {
# RAP uses the latest gentoo main repo snapshot to bootstrap.
is-rap && LATEST_TREE_YES=1
-   local PV="20201124"
+   local PV="20201126"
if [[ -n ${LATEST_TREE_YES} ]]; then
do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
else



[gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/, mail-client/mutt/files/

2020-11-27 Thread Fabian Groffen
commit: 485d5cdad8ecfbfafb6dbfa54a9e059211a2e747
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Nov 27 08:00:26 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Fri Nov 27 08:00:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=485d5cda

mail-client/mutt: cleanup old

Bug: https://bugs.gentoo.org/755866
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-client/mutt/Manifest  |   6 -
 .../mutt-1.14.4-no-imap-preauth-with-tunnel.patch  |  30 ---
 mail-client/mutt/mutt-1.14.4-r1.ebuild | 273 -
 mail-client/mutt/mutt-1.14.5.ebuild| 265 
 mail-client/mutt/mutt-1.14.7.ebuild| 265 
 5 files changed, 839 deletions(-)

diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 1a31a0f8b3f..ed06d02dd06 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,8 +1,2 @@
-DIST mutt-1.14.4.tar.gz 5007437 BLAKE2B 
89d4327ddd86ec320c63db6ee9d3c07b7540a74aba7efdcb9605e5c5c242dec99fb5137d1cfc62fd4401e2af7589f03ebce78dfa2deae262aef408b804544656
 SHA512 
86484f009ca8bd1e26206694e03609a16f8a4e8c83620a07a4376fe160535a838e8c918a8a30799fb3d9cf46c059d67124f7425c42093fb5e5bf8ea4ac310daa
-DIST mutt-1.14.5.tar.gz 5008208 BLAKE2B 
a7c2f7f63d2ee23e743114315cbb40903db720de7f2836f551739edb0b78857c525c40ebde083064dd2430b89b21d7a17745dfc1185672f86b15a9a082c3778e
 SHA512 
950c8df3bdc552b41ba6209aed8d5ade6fff80fe4018a75856d0fdbcd6389bd995a6dee69e7badd05a9b40d2e2293ada9a9f9a96632e88af36b61162f226e2b9
-DIST mutt-1.14.7.tar.gz 5009968 BLAKE2B 
f729412d3da97fe9bd76733705317660edfa3858a9eb1012179fb289b03da58d79b6e261dbdc4ab8b001e89ca455e9972bab8f270bac28e887afc7e0bd9fc8c1
 SHA512 
dc9739b5f0a99ca70fcbd495c71fbead23e3481f9c9e426feb827997c9c42e5f28355084f54788820c96a079dedb649fcc20e69436fb3c4df7e46f372b533e7c
 DIST mutt-2.0.2.tar.gz 5293613 BLAKE2B 
215a4d54e6dd202ebced91d0536a7f70e774b3c41c129ef87a55ea75a298e485b72145e5dd3c654d9b28138800c4b3e87a3815ab789d952b6b58cfc068fd397b
 SHA512 
5dea02edf60b33e4873806481aa4256f91d90b05de99a9eccc620c459bd924197b656f85eb5a31757a61675389e6c4d76571128a757cfda255240934e82eec29
-DIST mutt-gentoo-1.14.4-patches-r0.tar.xz 31124 BLAKE2B 
a9774a5bb5af18a275f7ea171cb08a12a98d63cbff57320d5d3fb4f995aac16f409689ac0015f3b5d37cfc20004c9fca72a3f63663aaa679a129d5f3886bc5cc
 SHA512 
05506399a471c262479db88ef11d2a95d79598fd696fe50de5f5c1c3cae5adf30a2806a1500ba94a62bcbf7deed99acc59a8afb903f50169e41b77010e0ad8cc
-DIST mutt-gentoo-1.14.5-patches-r0.tar.xz 31100 BLAKE2B 
14525b54afa1414667ebe2dc0c58b9b5d5ad4dcc5dbae3c5db13cc23d33dbd9434fa929ad297625c891b2d690e34729a4f61c526fb94857e271ac85f5a07488e
 SHA512 
fd8e473efa02e412aeaba258afee6dc02f9ca24f9edff643e4ef53c759a091e54c6a544e39cd7faa94cd680546bfcf845e282638045ae65a88d140ebb03a4631
-DIST mutt-gentoo-1.14.7-patches-r0.tar.xz 31144 BLAKE2B 
5a9806dec79f8a991e39464afde1faf2ba988e67ffd85ec16943432a83ee1d05ddcb839095a475ab56aa80a4bbe25de58835d6bde84c0c95e4487df139e16e82
 SHA512 
ca57af137bc5a2663724cb97a7ea04e4d62b2fe8a3864489f15552ef361c1fb8c881ebc783a4f3a6d82c5e9bb45e83fbe6cad59158c831c54361729ada24b458
 DIST mutt-gentoo-2.0.2-patches-r0.tar.xz 26380 BLAKE2B 
3ce2dbe07f9340adbaeb0489fe88564b6cc44ef330d298915d42617357799a26f277cc0dcab2b78a5620f20a2533f2fe43287bab76eeb9529013e9f9c7659ffb
 SHA512 
79fb00ccf6084da805c75eedbdb1631b12e616318e91a4c246d0194a478b803e3dc5d2815f757fecc91316c010058c2d0e9ecaf3fe40d5664ac25af63a0d7e13

diff --git 
a/mail-client/mutt/files/mutt-1.14.4-no-imap-preauth-with-tunnel.patch 
b/mail-client/mutt/files/mutt-1.14.4-no-imap-preauth-with-tunnel.patch
deleted file mode 100644
index d4d2104db08..000
--- a/mail-client/mutt/files/mutt-1.14.4-no-imap-preauth-with-tunnel.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From dc909119b3433a84290f0095c0f43a23b98b3748 Mon Sep 17 00:00:00 2001
-From: Kevin McCarthy 
-Date: Sat, 20 Jun 2020 06:35:35 -0700
-Subject: [PATCH] Don't check IMAP PREAUTH encryption if $tunnel is in use.
-
-$tunnel is used to create an external encrypted connection.  The
-default of $ssl_starttls is yes, meaning those kinds of connections
-will be broken by the CVE-2020-14093 fix.

- imap/imap.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/imap/imap.c b/imap/imap.c
-index 3ca10df4..78d75b07 100644
 a/imap/imap.c
-+++ b/imap/imap.c
-@@ -532,8 +532,8 @@ int imap_open_connection (IMAP_DATA* idata)
-   {
- #if defined(USE_SSL)
- /* An unencrypted PREAUTH response is most likely a MITM attack.
-- * Require a confirmation. */
--if (!idata->conn->ssf)
-+ * Require a confirmation unless using $tunnel. */
-+if (!idata->conn->ssf && !Tunnel)
- {
-   if (option(OPTSSLFORCETLS) ||
-   (query_quadoption (OPT_SSLSTARTTLS,
--- 
-GitLab
-

diff --git a/mail-client/mutt/mutt-1.14.4-r1.ebuild 
b/mail-clie

[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/

2020-11-26 Thread Fabian Groffen
commit: 51f9736209cc2077ba957becf2523f22329d5aa7
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Nov 26 20:49:24 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Thu Nov 26 20:49:24 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=51f97362

sys-devel/gcc-10.1.0-r1: next attempt at linkage on Big Sur

Bug: https://bugs.gentoo.org/756160
Package-Manager: Portage-3.0.10-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/gcc/gcc-10.1.0-r1.ebuild | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sys-devel/gcc/gcc-10.1.0-r1.ebuild 
b/sys-devel/gcc/gcc-10.1.0-r1.ebuild
index 99d7996d72..e4e696251a 100644
--- a/sys-devel/gcc/gcc-10.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-10.1.0-r1.ebuild
@@ -50,11 +50,6 @@ src_prepare() {
find .  -name "configure" | xargs \
sed -i -e '/^\s*10\.\*)/N' \
-e '/^\s*10\.\*)\s*_lt_dar_allow_undefined/s/10\.\*/10.*|11.*/' 
|| die
-   if [[ ${CHOST} == *-darwin20 ]] ; then
-   # drop -lc, it isn't there (any more?)
-   sed -i -e '/^SHLIB_LC =/s/=.*$/=/' \
-   libgcc/config/t-slibgcc-darwin || die
-   fi
 
# fix complaint about Authorization Framework
eapply -p1 "${FILESDIR}"/${PN}-10.1.0-darwin-auth-fixincludes.patch
@@ -80,6 +75,10 @@ src_configure() {
export gcc_cv_c_no_fpie=no
export gcc_cv_no_pie=no
;;
+   *-darwin20)
+   # use sysroot with the linker, #756160
+   export gcc_cv_ld_sysroot=yes
+   ;;
*-solaris*)
# todo: some magic for native vs. GNU linking?
myconf+=( --with-gnu-ld --with-gnu-as 
--enable-largefile )



[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/

2020-11-26 Thread Fabian Groffen
commit: 4e754e319d2f3feb553e50ff74a2dda81abf03f0
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Nov 26 20:03:11 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Thu Nov 26 20:03:11 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4e754e31

sys-devel/gcc-10.1.0-r1: avoid -lc linkage on Big Sur

Bug: https://bugs.gentoo.org/756160
Package-Manager: Portage-3.0.10-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/gcc/gcc-10.1.0-r1.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys-devel/gcc/gcc-10.1.0-r1.ebuild 
b/sys-devel/gcc/gcc-10.1.0-r1.ebuild
index 5199c4b836..99d7996d72 100644
--- a/sys-devel/gcc/gcc-10.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-10.1.0-r1.ebuild
@@ -49,7 +49,12 @@ src_prepare() {
eapply -p1 "${FILESDIR}"/${PN}-10.1.0-macos-bigsur.patch
find .  -name "configure" | xargs \
sed -i -e '/^\s*10\.\*)/N' \
-   -e '/^\s*10\.\*)\s*_lt_dar_allow_undefined/s/10\.\*/10.*|11.*/'
+   -e '/^\s*10\.\*)\s*_lt_dar_allow_undefined/s/10\.\*/10.*|11.*/' 
|| die
+   if [[ ${CHOST} == *-darwin20 ]] ; then
+   # drop -lc, it isn't there (any more?)
+   sed -i -e '/^SHLIB_LC =/s/=.*$/=/' \
+   libgcc/config/t-slibgcc-darwin || die
+   fi
 
# fix complaint about Authorization Framework
eapply -p1 "${FILESDIR}"/${PN}-10.1.0-darwin-auth-fixincludes.patch



[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/

2020-11-26 Thread Fabian Groffen
commit: 2095595a4b7842988400f550b10622ecdc3f7ef5
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Nov 26 18:58:21 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Thu Nov 26 18:58:21 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2095595a

sys-devel/gcc-10.1.0-r1: add fix undefined symbols

Bug: https://bugs.gentoo.org/756160
Package-Manager: Portage-3.0.10-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/gcc/gcc-10.1.0-r1.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-devel/gcc/gcc-10.1.0-r1.ebuild 
b/sys-devel/gcc/gcc-10.1.0-r1.ebuild
index 58dd0971ca..5199c4b836 100644
--- a/sys-devel/gcc/gcc-10.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-10.1.0-r1.ebuild
@@ -47,6 +47,9 @@ src_prepare() {
 
# fix for Big Sur versioning, remove with 11
eapply -p1 "${FILESDIR}"/${PN}-10.1.0-macos-bigsur.patch
+   find .  -name "configure" | xargs \
+   sed -i -e '/^\s*10\.\*)/N' \
+   -e '/^\s*10\.\*)\s*_lt_dar_allow_undefined/s/10\.\*/10.*|11.*/'
 
# fix complaint about Authorization Framework
eapply -p1 "${FILESDIR}"/${PN}-10.1.0-darwin-auth-fixincludes.patch



[gentoo-commits] repo/gentoo:master commit in: sys-devel/native-cctools/

2020-11-26 Thread Fabian Groffen
commit: ddd1c8bdca710a247562f2a25c82f61f14733054
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Nov 26 16:46:40 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Thu Nov 26 16:46:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddd1c8bd

sys-devel/native-cctools-5: version bump for macOS Big Sur

Closes: https://bugs.gentoo.org/756157
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/native-cctools/native-cctools-5.ebuild | 119 +++
 1 file changed, 119 insertions(+)

diff --git a/sys-devel/native-cctools/native-cctools-5.ebuild 
b/sys-devel/native-cctools/native-cctools-5.ebuild
new file mode 100644
index 000..d548ec568b4
--- /dev/null
+++ b/sys-devel/native-cctools/native-cctools-5.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils
+
+DESCRIPTION="Host OS native assembler as and static linker ld"
+HOMEPAGE="https://prefix.gentoo.org/;
+SRC_URI=""
+
+LICENSE="GPL-2" # actually, we don't know, the wrapper is
+SLOT="0"
+
+AIX_V='aix-2'
+
+KEYWORDS="~ppc-aix ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE=""
+
+DEPEND="sys-devel/binutils-config"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+   mkdir -p "${S}"
+}
+
+src_install() {
+   LIBPATH=/usr/$(get_libdir)/binutils/${CHOST}/native-${PV}
+   BINPATH=/usr/${CHOST}/binutils-bin/native-${PV}
+
+   keepdir ${LIBPATH} || die
+   dodir ${BINPATH}
+
+   # allow for future hosts with different paths
+   nativepath=""
+   wrappers=()
+   case ${CHOST} in
+   *-solaris*)
+   nativepath=/usr/sfw/bin
+   ;;
+   *-aix*)
+   nativepath=/usr/ccs/bin
+   wrappers=("${wrappers[@]}" "ld=${FILESDIR}/${AIX_V}/ld")
+   wrappers=("${wrappers[@]}" "nm=${FILESDIR}/${AIX_V}/nm")
+   wrappers=("${wrappers[@]}" 
"mkexpfile=${FILESDIR}/${AIX_V}/mkexpfile")
+   ;;
+   *-apple-darwin*|*-netbsd*|*-openbsd*)
+   nativepath=/usr/bin
+   ;;
+   *-interix*)
+   nativepath=/opt/gcc.3.3/bin
+   ;;
+   *)
+   die "Don't know where the native linker for your 
platform is"
+   ;;
+   esac
+
+   what="addr2line as ar c++filt gprof ld nm objcopy objdump \
+   ranlib readelf elfdump size strings strip"
+   # Darwin things
+   what="${what} install_name_tool ld64 libtool lipo nmedit \
+   otool otool64 pagestuff redo_prebinding segedit"
+
+   # copy from the host os
+   cd "${ED}${BINPATH}"
+   for b in ${what} ; do
+   if [[ ${CHOST} == *-darwin* && ${b} == libtool ]] ; then
+   echo "linking darwin libtool ${nativepath}/${b}"
+   ln -s "${nativepath}/${b}" "${b}"
+   elif [[ -x ${nativepath}/g${b} ]] ; then
+   einfo "linking ${nativepath}/g${b}"
+   ln -s "${nativepath}/g${b}" "${b}"
+   elif [[ -x ${nativepath}/${b} ]] ; then
+   einfo "linking ${nativepath}/${b}"
+   ln -s "${nativepath}/${b}" "${b}"
+   else
+   ewarn "skipping ${b} (not in ${nativepath})"
+   fi
+   done
+
+   # post fix for Darwin's ranlib (doesn't like it when its called other 
than
+   # that, as libtool and ranlib are one tool)
+   # on macOS Big Sur, all tools except ld require to be called plainly as 
well
+   if [[ ${CHOST} == *-darwin* ]] ; then
+   [[ ${CHOST##*-darwin} -lt 20 ]] && what="ranlib"
+   for b in ${what} ; do
+   [[ ${what} == ld ]] && continue
+   rm -f ${b}
+   cat <<-EOF > ${b}
+   #!/usr/bin/env bash
+   exec ${nativepath}/${b} "\$@"
+   EOF
+   chmod 755 ${b}
+   done
+   fi
+
+   exeinto ${BINPATH}
+   local wrapper source target
+   for wrapper in "${wrappers[@]}" ; do
+   source=${wrapper#*=}
+   target=${wrapper%%=*}
+   rm -f "${target}"
+   newexe "${source}" "${target}" || die
+   done
+   # Generate an env.d entry for this binutils
+   insinto /etc/env.d/binutils
+   cat <<-EOF > "${T}"/env.d
+   TARGET="${CHOST}"
+   VER="native-${PV}"
+   LIBPATH="${EPREFIX}/${LIBPATH}"
+   FAKE_TARGETS="${CHOST}"
+   EOF
+   newins "${T}"/env.d ${CHOST}-native-${PV}
+}
+
+pkg_postinst() {
+   binutils-config ${CHOST}-native-${PV}
+}



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/11.0/

2020-11-26 Thread Fabian Groffen
commit: b6047c12249a4a3e3fee8e1e67a2550596e443df
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Nov 26 16:01:38 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Thu Nov 26 16:01:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6047c12

profiles/prefix/darwin/macos/11.0: keyword the only compiling bash version

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/11.0/package.accept_keywords | 5 +
 1 file changed, 5 insertions(+)

diff --git a/profiles/prefix/darwin/macos/11.0/package.accept_keywords 
b/profiles/prefix/darwin/macos/11.0/package.accept_keywords
new file mode 100644
index 000..b1959522693
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/package.accept_keywords
@@ -0,0 +1,5 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# this is the only version known to compile on macOS Big Sur
+=app-shells/bash-5.1_rc3 **



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-25 Thread Fabian Groffen
commit: b269169a760e2967016791fb185613d33c2a7acf
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Nov 25 20:26:40 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Wed Nov 25 20:26:40 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b269169a

scripts/bootstrap-prefix: misc fixes for Big Sur profile setting

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c5b3f7ef2c..02ae37585d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -426,6 +426,7 @@ bootstrap_setup() {
;;
x86_64-apple-darwin2[0123456789])
# Big Sur is 11.0
+   rev=${CHOST##*darwin}
profile="prefix/darwin/macos/11.$((rev - 20))/x64"
;;
i*86-pc-linux-gnu)
@@ -505,9 +506,10 @@ bootstrap_setup() {
if [[ ${DARWIN_USE_GCC} == 1 ]] ; then
# setup MacOSX.sdk symlink for GCC, this should probably be
# managed using an eselect module in the future
-   ( cd ${ROOT} && ln -s $(xcrun --show-sdk-path --sdk macosx) 
MacOSX.sdk )
-   einfo "using system sources from $(\
-   xcrun --show-sdk-version --sdk macosx)"
+   rm -f "${ROOT}"/MacOSX.sdk
+   local SDKPATH=$(xcrun --show-sdk-path --sdk macosx)
+   ( cd "${ROOT}" && ln -s "${SDKPATH}" MacOSX.sdk )
+   einfo "using system sources from ${SDKPATH}"
 
# amend profile, to use gcc one
profile="${profile}/gcc"



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-25 Thread Fabian Groffen
commit: 95d867733fb20a3bb533ce97250497127bfcc048
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Nov 25 20:19:22 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Wed Nov 25 20:19:22 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=95d86773

scripts/bootstrap-python: update versions of bash and Python for Big Sur

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d821b14394..c5b3f7ef2c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -965,7 +965,7 @@ bootstrap_gnu() {
 
 PYTHONMAJMIN=3.7   # keep this number in line with PV below for stage1,2
 bootstrap_python() {
-   PV=3.7.7
+   PV=3.7.8
A=Python-${PV}.tar.xz
patch=true
 
@@ -1296,6 +1296,7 @@ bootstrap_texinfo() {
 }
 
 bootstrap_bash() {
+   bootstrap_gnu bash 5.1-rc3 ||
bootstrap_gnu bash 4.3 ||
bootstrap_gnu bash 4.2
 }



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-25 Thread Fabian Groffen
commit: 765789c5afa47e76f747c16556b6066e12899cd0
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Nov 25 19:53:09 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Wed Nov 25 19:53:09 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=765789c5

scripts/bootstrap-prefix: bootstrap gawk 5.0.1 for macOS Big Sur

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 34dba4f491..d821b14394 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1283,7 +1283,7 @@ bootstrap_patch() {
 }
 
 bootstrap_gawk() {
-   bootstrap_gnu gawk 4.0.1 || bootstrap_gnu gawk 4.0.0 || \
+   bootstrap_gnu gawk 5.0.1 || bootstrap_gnu gawk 4.0.1 || \
bootstrap_gnu gawk 3.1.8
 }
 



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-25 Thread Fabian Groffen
commit: d5b81976c9ddbb692245cdfaa591fd61e7ca0558
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Nov 25 19:10:10 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Wed Nov 25 19:10:10 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d5b81976

scripts/bootstrap-prefix: bump bootstrap snapshot

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 63840ce431..34dba4f491 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -593,7 +593,7 @@ do_tree() {
 bootstrap_tree() {
# RAP uses the latest gentoo main repo snapshot to bootstrap.
is-rap && LATEST_TREE_YES=1
-   local PV="20201123"
+   local PV="20201124"
if [[ -n ${LATEST_TREE_YES} ]]; then
do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
else



[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/debianutils/

2020-11-25 Thread Fabian Groffen
commit: 2c692d8cf1226304093214b21d14e726fa6aad01
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Nov 25 16:05:07 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Wed Nov 25 16:05:07 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2c692d8c

sys-apps/debianutils-4.11.2: sync with gx86, our versions are no longer on the 
mirrors

Package-Manager: Portage-3.0.10-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/debianutils/Manifest  |  3 +-
 ...utils-4.11.ebuild => debianutils-4.11.2.ebuild} |  2 +
 sys-apps/debianutils/debianutils-4.4.ebuild| 46 --
 3 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index c9282a3d29..05cf701556 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,2 +1 @@
-DIST debianutils_4.11.tar.xz 157440 BLAKE2B 
a0238a97b2700119570ee80e4fb85c36a44ac6fa700fc927bda85bd5358ff364f19389160e4a01685c7263e8b3855b63197590dc65825002e532bfea98ef9f5c
 SHA512 
87f6b7d9fecbaff615a5529328d384d8adf4ed69c8cc00acc54681d91fc146f4241a761dde2c9b092cb279b63d30dcaa6c2d0309ef4d29d6a2b09600c53c0ac6
-DIST debianutils_4.4.tar.gz 272098 BLAKE2B 
496c7cedf9aa19fc33becfa9f9e16b81aefb4090d928a7890da7f86b26e1d18f6dd38a19bac166e4943c3ce79cb69cb397265fb7f22b9d64e7828633e8c2945e
 SHA512 
78c51a7da586c6f23bf40810fd9bcaedc90648e6043c199f347cf5772f9c83ab646f22c2746ba6eddd7df8d6a31b01dc25f5bcb21a53a173aa5549138d14a9ca
+DIST debianutils_4.11.2.tar.xz 158132 BLAKE2B 
c2a95c90b4267e3b1d61c21db562f960b4666982c488e69a757fb0a7a42e8e739d44f553edd8cf532df30c492e20ab63ec3580479de7de5d901d75de76fc
 SHA512 
0bd9098beee78b3c8dae839f0c29e9f142cbb22f2ced473cf7ae47a14d9493ba882c1829eba213780392a87a3223b3689729754c8ded80a091efaef3f6f903fd

diff --git a/sys-apps/debianutils/debianutils-4.11.ebuild 
b/sys-apps/debianutils/debianutils-4.11.2.ebuild
similarity index 97%
rename from sys-apps/debianutils/debianutils-4.11.ebuild
rename to sys-apps/debianutils/debianutils-4.11.2.ebuild
index baedfc04df..f3697a3a7b 100644
--- a/sys-apps/debianutils/debianutils-4.11.ebuild
+++ b/sys-apps/debianutils/debianutils-4.11.2.ebuild
@@ -22,6 +22,8 @@ PDEPEND="
)
)"
 
+S="${WORKDIR}/${PN}"
+
 PATCHES=(
"${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch
"${FILESDIR}"/${PN}-4-nongnu.patch

diff --git a/sys-apps/debianutils/debianutils-4.4.ebuild 
b/sys-apps/debianutils/debianutils-4.4.ebuild
deleted file mode 100644
index 237a8c6529..00
--- a/sys-apps/debianutils/debianutils-4.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-4.4.ebuild,v 1.12 
2014/01/26 12:18:12 ago Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="A selection of tools from Debian"
-HOMEPAGE="http://packages.qa.debian.org/d/debianutils.html;
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD GPL-2 SMAIL"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="kernel_linux static"
-
-PDEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch
-   epatch "${FILESDIR}"/${PN}-4-nongnu.patch
-   eautoreconf || die
-}
-
-src_configure() {
-   use static && append-ldflags -static
-   default
-}
-
-src_install() {
-   into /
-   dobin tempfile run-parts
-   if use kernel_linux ; then
-   dosbin installkernel
-   fi
-
-   into /usr
-   dosbin savelog
-
-   doman tempfile.1 run-parts.8 savelog.8
-   use kernel_linux && doman installkernel.8
-   cd debian
-   dodoc changelog control
-   keepdir /etc/kernel/postinst.d
-}



[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/files/

2020-11-24 Thread Fabian Groffen
commit: 981437103b13af8bce24296d59a99af56a238678
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Nov 24 12:36:46 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Tue Nov 24 12:36:46 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=98143710

sys-devel/gcc-10.1.0: ensure fixincludes addition is compiled

Package-Manager: Portage-3.0.10-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen  gentoo.org>

 .../files/gcc-10.1.0-darwin-auth-fixincludes.patch | 78 ++
 1 file changed, 78 insertions(+)

diff --git a/sys-devel/gcc/files/gcc-10.1.0-darwin-auth-fixincludes.patch 
b/sys-devel/gcc/files/gcc-10.1.0-darwin-auth-fixincludes.patch
index d5e100f6c2..84d5ea3632 100644
--- a/sys-devel/gcc/files/gcc-10.1.0-darwin-auth-fixincludes.patch
+++ b/sys-devel/gcc/files/gcc-10.1.0-darwin-auth-fixincludes.patch
@@ -20,3 +20,81 @@
   *  For the AAB_darwin7_9_long_double_funcs fix (and later fixes for long 
long)
   *  to be useful, the main math.h must use <> and not "" includes.
   */
+--- a/fixincludes/fixincl.x
 b/fixincludes/fixincl.x
+@@ -2686,6 +2686,43 @@
+ 
+ /* * * * * * * * * * * * * * * * * * * * * * * * * *
+  *
++ *  Description of Darwin_Authorization fix
++ */
++tSCC zDarwin_AuthorizationName[] =
++ "darwin_authorization";
++
++/*
++ *  File name selection pattern
++ */
++tSCC zDarwin_AuthorizationList[] =
++  "Frameworks/Security.framework/Headers/Authorization.h\0";
++/*
++ *  Machine/OS name selection pattern
++ */
++tSCC* apzDarwin_AuthorizationMachs[] = {
++"*-*-darwin*",
++(const char*)NULL };
++
++/*
++ *  content selection pattern - do fix if pattern found
++ */
++tSCC zDarwin_AuthorizationSelect0[] =
++   "static const size_t kAuthorizationExternalFormLength = 32;\n";
++
++#defineDARWIN_AUTHORIZATION_TEST_CT  1
++static tTestDesc aDarwin_AuthorizationTests[] = {
++  { TT_EGREP,zDarwin_AuthorizationSelect0, (regex_t*)NULL }, };
++
++/*
++ *  Fix Command Arguments for Darwin_Authorization
++ */
++static const char* apzDarwin_AuthorizationPatch[] = {
++"format",
++"enum { kAuthorizationExternalFormLength = 32 };\n",
++(char*)NULL };
++
++/* * * * * * * * * * * * * * * * * * * * * * * * * *
++ *
+  *  Description of Darwin_9_Long_Double_Funcs_2 fix
+  */
+ tSCC zDarwin_9_Long_Double_Funcs_2Name[] =
+@@ -10476,9 +10513,9 @@
+  *
+  *  List of all fixes
+  */
+-#define REGEX_COUNT  296
++#define REGEX_COUNT  297
+ #define MACH_LIST_SIZE_LIMIT 187
+-#define FIX_COUNT258
++#define FIX_COUNT259
+ 
+ /*
+  *  Enumerate the fixes
+@@ -10547,6 +10584,7 @@
+ CTRL_QUOTES_USE_FIXIDX,
+ CXX_UNREADY_FIXIDX,
+ DARWIN_AVAILABILITYINTERNAL_FIXIDX,
++DARWIN_AUTHORIZATION_FIXIDX,
+ DARWIN_9_LONG_DOUBLE_FUNCS_2_FIXIDX,
+ DARWIN_EXTERNC_FIXIDX,
+ DARWIN_GCC4_BREAKAGE_FIXIDX,
+@@ -11060,6 +11098,11 @@
+  DARWIN_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+  aDarwin_AvailabilityinternalTests,   
apzDarwin_AvailabilityinternalPatch, 0 },
+ 
++  {  zDarwin_AuthorizationName,zDarwin_AuthorizationList,
++ apzDarwin_AuthorizationMachs,
++ DARWIN_AUTHORIZATION_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
++ aDarwin_AuthorizationTests,   apzDarwin_AuthorizationPatch, 0 },
++
+   {  zDarwin_9_Long_Double_Funcs_2Name,zDarwin_9_Long_Double_Funcs_2List,
+  apzDarwin_9_Long_Double_Funcs_2Machs,
+  DARWIN_9_LONG_DOUBLE_FUNCS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-24 Thread Fabian Groffen
commit: 790893167b44f6acc7677bebb2301809093320b6
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Nov 24 11:24:43 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Tue Nov 24 11:24:43 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=79089316

scripts/bootstrap-prefix: give macOS SDK with predictable name

it appears sometimes the SDK in use is called MacOSX.sdk, sometimes it's
something like MacOSX10.14.sdk, ensure it's always the same name

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 3224bb47b5..63840ce431 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -505,7 +505,7 @@ bootstrap_setup() {
if [[ ${DARWIN_USE_GCC} == 1 ]] ; then
# setup MacOSX.sdk symlink for GCC, this should probably be
# managed using an eselect module in the future
-   ( cd ${ROOT} && ln -s $(xcrun --show-sdk-path --sdk macosx) )
+   ( cd ${ROOT} && ln -s $(xcrun --show-sdk-path --sdk macosx) 
MacOSX.sdk )
einfo "using system sources from $(\
xcrun --show-sdk-version --sdk macosx)"
 



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-24 Thread Fabian Groffen
commit: 7a3cc78493b205c0ea11e8f6fe64d4e91ecbb55d
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Nov 24 09:44:13 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Tue Nov 24 09:47:48 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7a3cc784

scripts/bootstrap-prefix: rework Xcode checks

- don't require /usr/include (recent systems don't have it)
- don't require CommandLineTools (any MacOSX.sdk will do)

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 497e35eadb..3224bb47b5 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2472,20 +2472,17 @@ EOF
fi
 
if type -P xcode-select > /dev/null ; then
-   if [[ ! -d /usr/include ]] ; then
-   # bug #512032
-   cat << EOF
+   if [[ -d /usr/include ]] ; then
+   # if we have /usr/include we're on an older system
+   if [[ ${CHOST} == powerpc* ]]; then
+   # ancient Xcode (3.0/3.1)
+   cat << EOF
 
-You don't have /usr/include, this thwarts me to build stuff.
-Please execute:
-  xcode-select --install
-or install /usr/include in another way and try running me again.
+Ok, this is an old system, let's just try and see what happens.
 EOF
-   exit 1
-   fi
-   if [[ $(xcode-select -p) != */CommandLineTools ]] ; then
-   # to an extent, bug #564814 and bug #562800
-   cat << EOF
+   elif [[ $(xcode-select -p) != */CommandLineTools ]] ; 
then
+   # to an extent, bug #564814 and bug #562800
+   cat << EOF
 
 Your xcode-select is not set to CommandLineTools.  This prevents builds
 from succeeding.  Switch to command line tools for the bootstrap to
@@ -2493,14 +2490,17 @@ continue.  Please execute:
   xcode-select -s /Library/Developer/CommandLineTools
 and try running me again.
 EOF
-   if ! xcode-select -p > /dev/null && [[ ${CHOST} == 
powerpc* ]]; then
-   # ancient Xcode (3.0/3.1)
+   fi
+   else
+   # let's see if we have an xcode install
+   if [[ ! -e $(xcrun -f gcc 2>/dev/null) ]] ; then
cat << EOF
 
-Ok, this is an old system, let's just try and see what happens.
+You don't have Xcode installed, or xcode-select isn't pointing to a
+valid install.  Try resetting it using:
+  sudo xcode-select -r
+and try running me again.
 EOF
-   else
-   exit 1
fi
fi
fi



[gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/

2020-11-24 Thread Fabian Groffen
commit: a3e46532298f425d4e879d70be3e48de72461bb0
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Nov 24 09:27:13 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Tue Nov 24 09:27:24 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a3e46532

scripts/auto-bootstraps/dobootstrap: pass through DARWIN_USE_GCC

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/auto-bootstraps/dobootstrap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/auto-bootstraps/dobootstrap 
b/scripts/auto-bootstraps/dobootstrap
index 4cd5f94c71..1273f9a2da 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -124,6 +124,7 @@ do_prepare() {
${RESUME+RESUME=1} \
${LATEST_TREE_YES+LATEST_TREE_YES=1} \
${TREE_FROM_SRC+TREE_FROM_SRC=}${TREE_FROM_SRC} \
+   ${DARWIN_USE_GCC+DARWIN_USE_GCC=}${DARWIN_USE_GCC} \
${keepalive} ${BASH} ${bootstrapscript} bootstrap
endtime=${SECONDS}
 



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-24 Thread Fabian Groffen
commit: 41a349e4c2d23aee41ae0cf8c30a9412bf1e1039
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Nov 24 08:46:08 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Tue Nov 24 08:46:08 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=41a349e4

scripts/bootstrap-prefix: bump bootstrap tree

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e37683b0f7..497e35eadb 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -593,7 +593,7 @@ do_tree() {
 bootstrap_tree() {
# RAP uses the latest gentoo main repo snapshot to bootstrap.
is-rap && LATEST_TREE_YES=1
-   local PV="20201120"
+   local PV="20201123"
if [[ -n ${LATEST_TREE_YES} ]]; then
do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
else



[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/, sys-devel/gcc/files/

2020-11-24 Thread Fabian Groffen
commit: ae2fe55112b538d23327e62ef28dfe5e0063b4de
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Nov 24 08:42:49 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Tue Nov 24 08:42:49 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ae2fe551

sys-devel/gcc-10.1.0: add patch for macOS Big Sur

Package-Manager: Portage-3.0.10-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen  gentoo.org>

 .../files/gcc-10.1.0-darwin-auth-fixincludes.patch |  22 
 sys-devel/gcc/files/gcc-10.1.0-macos-bigsur.patch  | 140 +
 sys-devel/gcc/gcc-10.1.0-r1.ebuild |  19 +--
 3 files changed, 167 insertions(+), 14 deletions(-)

diff --git a/sys-devel/gcc/files/gcc-10.1.0-darwin-auth-fixincludes.patch 
b/sys-devel/gcc/files/gcc-10.1.0-darwin-auth-fixincludes.patch
new file mode 100644
index 00..d5e100f6c2
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-10.1.0-darwin-auth-fixincludes.patch
@@ -0,0 +1,22 @@
+--- a/fixincludes/inclhack.def
 b/fixincludes/inclhack.def
+@@ -1325,6 +1325,19 @@
+ };
+ 
+ /*
++ * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93082
++ */
++fix = {
++hackname  = darwin_authorization;
++mach  = "*-*-darwin*";
++files = Frameworks/Security.framework/Headers/Authorization.h;
++select= "static const size_t kAuthorizationExternalFormLength = 
32;\n";
++c_fix = format;
++c_fix_arg = "enum { kAuthorizationExternalFormLength = 32 };\n";
++test_text = "static const size_t kAuthorizationExternalFormLength = 
32;\n";
++};
++
++/*
+  *  For the AAB_darwin7_9_long_double_funcs fix (and later fixes for long 
long)
+  *  to be useful, the main math.h must use <> and not "" includes.
+  */

diff --git a/sys-devel/gcc/files/gcc-10.1.0-macos-bigsur.patch 
b/sys-devel/gcc/files/gcc-10.1.0-macos-bigsur.patch
new file mode 100644
index 00..d2bf6a932a
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-10.1.0-macos-bigsur.patch
@@ -0,0 +1,140 @@
+From 556ab5125912fa2233986eb19d6cd995cf7de1d2 Mon Sep 17 00:00:00 2001
+From: Iain Sandoe 
+Date: Fri, 31 Jul 2020 21:05:28 +0100
+Subject: [PATCH] Darwin: Darwin 20 is to be macOS 11 (Big Sur).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+As per Nigel Tufnel's assertion "... this one goes to 11".
+
+The various parts of the code that deal with mapping Darwin versions
+to macOS (X) versions need updating to deal with  a major version of
+11.
+
+So now we have, for example:
+
+Darwin  4 => macOS (X) 10.0
+…
+Darwin 14 => macOS (X) 10.10
+...
+Darwin 19 => macOS (X) 10.15
+
+Darwin 20 => macOS  11.0
+
+Because of the historical duplication of the "10" in macOSX 10.xx and
+the number of tools that expect this, it is likely that system tools will
+allow macos11.0 and/or macosx11.0 (despite that the latter makes little
+sense).
+
+Update the link test to cover Catalina (Darwin19/10.15) and
+Big Sur (Darwin20/11.0).
+
+gcc/ChangeLog:
+
+   * config/darwin-c.c: Allow for Darwin20 to correspond to macOS 11.
+   * config/darwin-driver.c: Likewise.
+
+gcc/testsuite/ChangeLog:
+
+   * gcc.dg/darwin-minversion-link.c: Allow for Darwin19 (macOS 10.15)
+   and Darwin20 (macOS 11.0).
+---
+ gcc/config/darwin-c.c |  4 ++--
+ gcc/config/darwin-driver.c| 21 ---
+ gcc/testsuite/gcc.dg/darwin-minversion-link.c |  5 +++--
+ 3 files changed, 18 insertions(+), 12 deletions(-)
+
+diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c
+index e3b999e166b..9034f49908e 100644
+--- a/gcc/config/darwin-c.c
 b/gcc/config/darwin-c.c
+@@ -692,10 +692,10 @@ macosx_version_as_macro (void)
+   if (!version_array)
+ goto fail;
+ 
+-  if (version_array[MAJOR] != 10)
++  if (version_array[MAJOR] < 10 || version_array[MAJOR] > 11)
+ goto fail;
+ 
+-  if (version_array[MINOR] < 10)
++  if (version_array[MAJOR] == 10 && version_array[MINOR] < 10)
+ version_macro = version_as_legacy_macro (version_array);
+   else
+ version_macro = version_as_modern_macro (version_array);
+diff --git a/gcc/config/darwin-driver.c b/gcc/config/darwin-driver.c
+index 8fdd32e2858..8ae300057fd 100644
+--- a/gcc/config/darwin-driver.c
 b/gcc/config/darwin-driver.c
+@@ -65,7 +65,7 @@ validate_macosx_version_min (const char *version_str)
+   major = strtoul (version_str, , 10);
+   version_str = end + ((*end == '.') ? 1 : 0);
+ 
+-  if (major != 10) /* So far .. all MacOS 10 ... */
++  if (major < 10 || major > 11 ) /* MacOS 10 and 11 are known. */
+ return NULL;
+ 
+   /* Version string components must be present and numeric.  */
+@@ -104,7 +104,7 @@ validate_macosx_version_min (const char *version_str)
+   if (need_rewrite)
+ {
+   char *new_version;
+-  asprintf (_versi

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-23 Thread Fabian Groffen
commit: eaf9a9adf47f7cbfee387c9055373dc7a6c76b92
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 21:06:20 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 21:06:20 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=eaf9a9ad

scripts/bootstrap-prefix: use profiles for later macOS releases

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9ad307e1cd..e37683b0f7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -420,15 +420,13 @@ bootstrap_setup() {
rev=${CHOST##*darwin}
profile="prefix/darwin/macos/10.$((rev - 4))/x86"
;;
-   x86_64-apple-darwin9|x86_64-apple-darwin1[012345678])
+   x86_64-apple-darwin9|x86_64-apple-darwin1[0123456789])
rev=${CHOST##*darwin}
profile="prefix/darwin/macos/10.$((rev - 4))/x64"
;;
-   x86_64-apple-darwin19|x86_64-apple-darwin2[0123456789])
-   # TODO: add profiles for these
-   # handle newer releases on the last profile we have 
headers
-   # and stuff for (https://opensource.apple.com/)
-   profile="prefix/darwin/macos/10.14/x64"
+   x86_64-apple-darwin2[0123456789])
+   # Big Sur is 11.0
+   profile="prefix/darwin/macos/11.$((rev - 20))/x64"
;;
i*86-pc-linux-gnu)
profile=${profile_linux/ARCH/x86}



[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/

2020-11-23 Thread Fabian Groffen
commit: 1705044f972d682f24cc6dd80707f844f2e32f16
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 20:55:33 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 20:55:33 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1705044f

sys-devel/gcc-10.1.0-r1: add fixincludes addition for darwin

Package-Manager: Portage-3.0.10-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/gcc/gcc-10.1.0-r1.ebuild | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/sys-devel/gcc/gcc-10.1.0-r1.ebuild 
b/sys-devel/gcc/gcc-10.1.0-r1.ebuild
index 6709c606d0..4acd295e38 100644
--- a/sys-devel/gcc/gcc-10.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-10.1.0-r1.ebuild
@@ -12,7 +12,9 @@ KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solar
 RDEPEND=""
 BDEPEND="
kernel_linux? ( ${CATEGORY}/binutils )
-   kernel_Darwin? || ( ${CATEGORY}/binutils-apple 
${CATEGORY}/native-cctools )
+   kernel_Darwin? (
+   || ( ${CATEGORY}/binutils-apple ${CATEGORY}/native-cctools )
+   )
kernel_AIX? ( ${CATEGORY}/native-cctools )"
 
 src_prepare() {
@@ -43,6 +45,21 @@ src_prepare() {
libgcc/config/t-slibgcc-darwin || die
fi
 
+   # for Darwin, allow compilation of anything using Authorization
+   # Framework (e.g. gnutls)
+   cat >> fixincludes/inclhack.def <<- EOF
+   /* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93082 */
+   fix = {
+   hackname  = darwin_authorization;
+   mach  = "*-*-darwin*";
+   files = 
Frameworks/Security.framework/Headers/Authorization.h;
+   select= "static const size_t 
kAuthorizationExternalFormLength = 32;\n";
+   c_fix = format;
+   c_fix_arg = "enum { kAuthorizationExternalFormLength = 
32 };\n";
+   test_text = "static const size_t 
kAuthorizationExternalFormLength = 32;\n";
+   };
+   EOF
+
eapply_user
 }
 



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/10.14/x64/gcc/, ...

2020-11-23 Thread Fabian Groffen
commit: 7f2865b328e998e2bcf4a5551700feaef9e1f0ac
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 20:37:03 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 20:37:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f2865b3

profiles: add new prefix macOS profiles for 10.15 and 11.0

In addition, add gcc sub-profiles for 10.{13,14,15} and 11.0.

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/10.14/x64/gcc/eapi|  1 +
 profiles/prefix/darwin/macos/10.14/x64/gcc/parent  |  2 ++
 profiles/prefix/darwin/macos/10.15/eapi|  1 +
 profiles/prefix/darwin/macos/10.15/make.defaults   |  4 +++
 .../prefix/darwin/macos/10.15/package.use.mask |  7 +
 profiles/prefix/darwin/macos/10.15/parent  |  1 +
 profiles/prefix/darwin/macos/10.15/profile.bashrc  |  4 +++
 profiles/prefix/darwin/macos/10.15/x64/eapi|  1 +
 profiles/prefix/darwin/macos/10.15/x64/gcc/eapi|  1 +
 profiles/prefix/darwin/macos/10.15/x64/gcc/parent  |  2 ++
 .../prefix/darwin/macos/10.15/x64/make.defaults|  5 
 profiles/prefix/darwin/macos/10.15/x64/parent  |  2 ++
 profiles/prefix/darwin/macos/10.15/x64/use.mask| 30 ++
 profiles/prefix/darwin/macos/11.0/eapi |  1 +
 profiles/prefix/darwin/macos/11.0/make.defaults|  4 +++
 profiles/prefix/darwin/macos/11.0/package.use.mask |  7 +
 profiles/prefix/darwin/macos/11.0/parent   |  1 +
 profiles/prefix/darwin/macos/11.0/profile.bashrc   |  4 +++
 profiles/prefix/darwin/macos/11.0/x64/eapi |  1 +
 profiles/prefix/darwin/macos/11.0/x64/gcc/eapi |  1 +
 profiles/prefix/darwin/macos/11.0/x64/gcc/parent   |  2 ++
 .../prefix/darwin/macos/11.0/x64/make.defaults |  5 
 profiles/prefix/darwin/macos/11.0/x64/parent   |  2 ++
 profiles/prefix/darwin/macos/11.0/x64/use.mask | 30 ++
 profiles/profiles.desc |  6 +
 25 files changed, 125 insertions(+)

diff --git a/profiles/prefix/darwin/macos/10.14/x64/gcc/eapi 
b/profiles/prefix/darwin/macos/10.14/x64/gcc/eapi
new file mode 100644
index 000..7ed6ff82de6
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.14/x64/gcc/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/prefix/darwin/macos/10.14/x64/gcc/parent 
b/profiles/prefix/darwin/macos/10.14/x64/gcc/parent
new file mode 100644
index 000..5ebbfd24d62
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.14/x64/gcc/parent
@@ -0,0 +1,2 @@
+..
+../../../features/fsf-gcc-nold

diff --git a/profiles/prefix/darwin/macos/10.15/eapi 
b/profiles/prefix/darwin/macos/10.15/eapi
new file mode 100644
index 000..7ed6ff82de6
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/prefix/darwin/macos/10.15/make.defaults 
b/profiles/prefix/darwin/macos/10.15/make.defaults
new file mode 100644
index 000..8e27d1a1519
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/make.defaults
@@ -0,0 +1,4 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+MACOSX_DEPLOYMENT_TARGET="10.15"

diff --git a/profiles/prefix/darwin/macos/10.15/package.use.mask 
b/profiles/prefix/darwin/macos/10.15/package.use.mask
new file mode 100644
index 000..bdb92368698
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/package.use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen  (2011-04-10)
+# as long as util-linux installs uuid.h which breaks the system headers
+# (hence we don't) we can't do uuid support here
+x11-libs/libSM -uuid

diff --git a/profiles/prefix/darwin/macos/10.15/parent 
b/profiles/prefix/darwin/macos/10.15/parent
new file mode 100644
index 000..f3229c5b987
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/parent
@@ -0,0 +1 @@
+..

diff --git a/profiles/prefix/darwin/macos/10.15/profile.bashrc 
b/profiles/prefix/darwin/macos/10.15/profile.bashrc
new file mode 100644
index 000..04d127514c2
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/profile.bashrc
@@ -0,0 +1,4 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+export MACOSX_DEPLOYMENT_TARGET=10.15

diff --git a/profiles/prefix/darwin/macos/10.15/x64/eapi 
b/profiles/prefix/darwin/macos/10.15/x64/eapi
new file mode 100644
index 000..7ed6ff82de6
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/x64/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/prefix/darwin/macos/10.15/x64/gcc/eapi 
b/profiles/prefix/darwin/macos/10.15/x64/gcc/eapi
new file mode 100644
index 000..7ed6ff82de6
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/x64/gcc/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/prefix/darwin/macos/10.15/x64/gcc/parent 
b/profiles/prefix/darwin/macos/10.15

[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/

2020-11-23 Thread Fabian Groffen
commit: dd2fc30a9307ba85a8274295c5d05936a034a385
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 20:25:37 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 20:25:37 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dd2fc30a

sys-devel/gcc-10.1.0-r1: allow native-cctools on Darwin

Package-Manager: Portage-3.0.10-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/gcc/gcc-10.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/gcc/gcc-10.1.0-r1.ebuild 
b/sys-devel/gcc/gcc-10.1.0-r1.ebuild
index 9e0664ca00..6709c606d0 100644
--- a/sys-devel/gcc/gcc-10.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-10.1.0-r1.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solar
 RDEPEND=""
 BDEPEND="
kernel_linux? ( ${CATEGORY}/binutils )
-   kernel_Darwin? ( ${CATEGORY}/binutils-apple || 
${CATEGORY}/native-cctools )
+   kernel_Darwin? || ( ${CATEGORY}/binutils-apple 
${CATEGORY}/native-cctools )
kernel_AIX? ( ${CATEGORY}/native-cctools )"
 
 src_prepare() {



[gentoo-commits] repo/proj/prefix:master commit in: scripts/, sys-devel/gcc/

2020-11-23 Thread Fabian Groffen
commit: 56f43886482ca23b91b6fd4f8738dd4e035f003b
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 20:22:18 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 20:22:18 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=56f43886

scripts/bootstrap-prefix: normalise DARWIN_USE_GCC codepath somewhat

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh| 68 +-
 sys-devel/gcc/gcc-10.1.0-r1.ebuild |  2 +-
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 458d18cc55..9ad307e1cd 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -180,8 +180,8 @@ configure_toolchain() {
CXX=g++
 
case ${CHOST}:${DARWIN_USE_GCC} in
-   powerpc-*darwin*|*:yes|*:1|*:true)
-   einfo "Triggering Darwin with GCC toolchain path"
+   powerpc-*darwin*|*:1)
+   einfo "Triggering Darwin with GCC toolchain"
compiler_stage1+=" sys-apps/darwin-miscutils 
sys-libs/csu"
local ccvers="$( (unset CHOST; gcc --version 
2>/dev/null) )"
case "${ccvers}" in
@@ -197,7 +197,9 @@ configure_toolchain() {
;;
*"(Gentoo "*)
# probably the result of a bootstrap in 
progress
-   linker=sys-devel/binutils-apple
+   [[ ${DARWIN_USE_GCC} == 1 ]] \
+   && 
linker=sys-devel/native-cctools \
+   || 
linker=sys-devel/binutils-apple
;;
*"Apple clang version "*|*"Apple LLVM version 
"*)
# gcc cannot build (recent) 
binutils-apple due to
@@ -213,7 +215,7 @@ configure_toolchain() {
compiler_stage1+=" sys-devel/gcc"
;;
*-darwin*)
-   einfo "Triggering Darwin with Clang toolchain path"
+   einfo "Triggering Darwin with LLVM/Clang toolchain"
# for compilers choice, see bug:
# https://bugs.gentoo.org/show_bug.cgi?id=538366
compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu"
@@ -418,15 +420,16 @@ bootstrap_setup() {
rev=${CHOST##*darwin}
profile="prefix/darwin/macos/10.$((rev - 4))/x86"
;;
+   x86_64-apple-darwin9|x86_64-apple-darwin1[012345678])
+   rev=${CHOST##*darwin}
+   profile="prefix/darwin/macos/10.$((rev - 4))/x64"
+   ;;
x86_64-apple-darwin19|x86_64-apple-darwin2[0123456789])
+   # TODO: add profiles for these
# handle newer releases on the last profile we have 
headers
# and stuff for (https://opensource.apple.com/)
profile="prefix/darwin/macos/10.14/x64"
;;
-   x86_64-apple-darwin9|x86_64-apple-darwin1[012345678])
-   rev=${CHOST##*darwin}
-   profile="prefix/darwin/macos/10.$((rev - 4))/x64"
-   ;;
i*86-pc-linux-gnu)
profile=${profile_linux/ARCH/x86}
;;
@@ -500,6 +503,18 @@ bootstrap_setup() {
exit 1
;;
esac
+
+   if [[ ${DARWIN_USE_GCC} == 1 ]] ; then
+   # setup MacOSX.sdk symlink for GCC, this should probably be
+   # managed using an eselect module in the future
+   ( cd ${ROOT} && ln -s $(xcrun --show-sdk-path --sdk macosx) )
+   einfo "using system sources from $(\
+   xcrun --show-sdk-version --sdk macosx)"
+
+   # amend profile, to use gcc one
+   profile="${profile}/gcc"
+   fi
+
[[ -n ${PROFILE_BASE}${PROFILE_VARIANT} ]] &&

profile=${PROFILE_BASE:-prefix}/${profile#prefix/}${PROFILE_VARIANT:+/${PROFILE_VARIANT}}
if [[ -n ${profile} && ! -e ${ROOT}/etc/portage/make.profile ]] ; then
@@ -509,16 +524,6 @@ bootstrap_setup() {
einfo "Your profile is set to ${fullprofile}."
fi
 
-   case ${DARWIN_USE_GCC} in
-   yes|1|true)
-   # setup MacOSX.

[gentoo-commits] repo/proj/prefix:master commit in: dev-lang/python/

2020-11-23 Thread Fabian Groffen
commit: d488453d99b00f15cbaa41793b227bacb489f869
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 20:08:06 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 20:08:06 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d488453d

dev-lang/python: fix urllib on Darwin platforms

Package-Manager: Portage-3.0.8-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 dev-lang/python/python-3.7.8-r2.ebuild | 5 +
 dev-lang/python/python-3.8.5.ebuild| 5 +
 2 files changed, 10 insertions(+)

diff --git a/dev-lang/python/python-3.7.8-r2.ebuild 
b/dev-lang/python/python-3.7.8-r2.ebuild
index fc085055b7..178495ae2b 100644
--- a/dev-lang/python/python-3.7.8-r2.ebuild
+++ b/dev-lang/python/python-3.7.8-r2.ebuild
@@ -132,6 +132,11 @@ src_prepare() {
configure.ac configure || die
fi
 
+   # side-effect of disabling scproxy (see below), make sure we don't
+   # try to use it on Darwin either
+   sed -i -e '/sys.platform/s/darwin/disabled-darwin/' \
+   Lib/urllib/request.py || die
+
eautoreconf
 }
 

diff --git a/dev-lang/python/python-3.8.5.ebuild 
b/dev-lang/python/python-3.8.5.ebuild
index 4b87c91b40..32c823df81 100644
--- a/dev-lang/python/python-3.8.5.ebuild
+++ b/dev-lang/python/python-3.8.5.ebuild
@@ -109,6 +109,11 @@ src_prepare() {
configure.ac configure || die
fi
 
+   # side-effect of disabling scproxy (see below), make sure we don't
+   # try to use it on Darwin either
+   sed -i -e '/sys.platform/s/darwin/disabled-darwin/' \
+   Lib/urllib/request.py || die
+
eautoreconf
 }
 



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/features/fsf-gcc-nold/

2020-11-23 Thread Fabian Groffen
commit: ba7b5d96decbd804face587bb16fb60914900a4b
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 16:41:26 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 16:42:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7b5d96

profiles/prefix/macos: mask binutils-apple on gcc profile

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask 
b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
index f86a094ace0..e1ce7a0144a 100644
--- a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # unmask ld symlink package, due to missing blocks support we are not
-# able to compile this
+# able to compile binutils-apple
+sys-devel/binutils-apple
 -sys-devel/native-cctools
 # and unmask FSF GCC itself of course
 -sys-devel/gcc



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/

2020-11-23 Thread Fabian Groffen
commit: 5041e4a996b6c5846608895b65ffb17c0bd2c87f
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 16:14:21 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 16:16:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5041e4a9

profiles/prefix/darwin/macos: mask also openssh-8.3_p1-r5

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/package.mask | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/prefix/darwin/macos/package.mask 
b/profiles/prefix/darwin/macos/package.mask
index 8dd31a23782..502af5fe4ab 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -3,6 +3,7 @@
 
 # Fabian Groffen  (2020-11-23)
 # no symbols from libopenbsd-compat
+=net-misc/openssh-8.3_p1-r5
 =net-misc/openssh-8.4_p1-r2
 
 # Fabian Groffen  (2020-11-23)



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/10.6/, profiles/prefix/darwin/macos/10.13/, ...

2020-11-23 Thread Fabian Groffen
commit: 18079b6770f94c037c7d992a5b4c3c6c030820c8
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 15:54:02 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 15:54:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18079b67

profiles/prefix/darwin/macos: drop headers usage/inclusion

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/10.10/package.mask |  2 --
 profiles/prefix/darwin/macos/10.10/packages |  6 --
 profiles/prefix/darwin/macos/10.11/package.mask |  2 --
 profiles/prefix/darwin/macos/10.11/packages |  6 --
 profiles/prefix/darwin/macos/10.12/package.mask |  7 ---
 profiles/prefix/darwin/macos/10.13/package.mask |  7 ---
 profiles/prefix/darwin/macos/10.14/package.mask |  7 ---
 profiles/prefix/darwin/macos/10.4/packages  |  6 --
 profiles/prefix/darwin/macos/10.5/packages  |  6 --
 profiles/prefix/darwin/macos/10.6/packages  |  6 --
 profiles/prefix/darwin/macos/10.7/packages  |  6 --
 profiles/prefix/darwin/macos/10.8/package.mask  |  2 --
 profiles/prefix/darwin/macos/10.8/packages  |  6 --
 profiles/prefix/darwin/macos/10.9/package.mask  |  2 --
 profiles/prefix/darwin/macos/10.9/packages  |  6 --
 profiles/prefix/darwin/macos/package.mask   | 10 --
 profiles/prefix/darwin/macos/packages   |  6 +-
 17 files changed, 1 insertion(+), 92 deletions(-)

diff --git a/profiles/prefix/darwin/macos/10.10/package.mask 
b/profiles/prefix/darwin/macos/10.10/package.mask
deleted file mode 100644
index c103679ebe5..000
--- a/profiles/prefix/darwin/macos/10.10/package.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2

diff --git a/profiles/prefix/darwin/macos/10.10/packages 
b/profiles/prefix/darwin/macos/10.10/packages
deleted file mode 100644
index 9c15af461c7..000
--- a/profiles/prefix/darwin/macos/10.10/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# File a bug if you need these provided for your OS version
--*sys-kernel/xnu-headers
--*sys-libs/darwin-libc-headers

diff --git a/profiles/prefix/darwin/macos/10.11/package.mask 
b/profiles/prefix/darwin/macos/10.11/package.mask
deleted file mode 100644
index c103679ebe5..000
--- a/profiles/prefix/darwin/macos/10.11/package.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2

diff --git a/profiles/prefix/darwin/macos/10.11/packages 
b/profiles/prefix/darwin/macos/10.11/packages
deleted file mode 100644
index 9c15af461c7..000
--- a/profiles/prefix/darwin/macos/10.11/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# File a bug if you need these provided for your OS version
--*sys-kernel/xnu-headers
--*sys-libs/darwin-libc-headers

diff --git a/profiles/prefix/darwin/macos/10.12/package.mask 
b/profiles/prefix/darwin/macos/10.12/package.mask
deleted file mode 100644
index 2ae88c5d921..000
--- a/profiles/prefix/darwin/macos/10.12/package.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen  (2019-11-11)
-# Unmask versions matching the OS profile
--sys-kernel/xnu-headers:10.12
--sys-libs/darwin-libc-headers:10.12

diff --git a/profiles/prefix/darwin/macos/10.13/package.mask 
b/profiles/prefix/darwin/macos/10.13/package.mask
deleted file mode 100644
index 1bb624aa74a..000
--- a/profiles/prefix/darwin/macos/10.13/package.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen  (2019-11-11)
-# Unmask versions matching the OS profile
--sys-kernel/xnu-headers:10.13
--sys-libs/darwin-libc-headers:10.13

diff --git a/profiles/prefix/darwin/macos/10.14/package.mask 
b/profiles/prefix/darwin/macos/10.14/package.mask
deleted file mode 100644
index e3f098738d1..000
--- a/profiles/prefix/darwin/macos/10.14/package.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen  (2019-11-11)
-# Unmask versions matching the OS profile
--sys-kernel/xnu-headers:10.14
--sys-libs/darwin-libc-headers:10.14

diff --git a/profiles/prefix/darwin/macos/10.4/packages 
b/profiles/prefix/darwin/macos/10.4/packages
deleted file mode 100644
index 9c15af461c7..000
--- a/profiles/prefix/darwin/macos/10.4/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/

2020-11-23 Thread Fabian Groffen
commit: 78a144b00067dd88095ff9c9f97628f9e9307dcc
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 15:58:20 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 15:58:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78a144b0

profiles/prefix/darwin/macos: mask latest openssh

fails to compile

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/package.mask | 4 
 1 file changed, 4 insertions(+)

diff --git a/profiles/prefix/darwin/macos/package.mask 
b/profiles/prefix/darwin/macos/package.mask
index a4dc5a23fe2..8dd31a23782 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen  (2020-11-23)
+# no symbols from libopenbsd-compat
+=net-misc/openssh-8.4_p1-r2
+
 # Fabian Groffen  (2020-11-23)
 # doesn't link, some unresolved symbol from gnulib
 =sys-devel/gettext-0.21



[gentoo-commits] repo/gentoo:master commit in: profiles/

2020-11-23 Thread Fabian Groffen
commit: 159fcadec92e4af74670ba0449f407ddabeefc21
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 16:00:26 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 16:00:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=159fcade

profiles/package.mask: mask darwin headers and libmissing

all three packages are prefix-only, attempting to provide missing
content, but are no longer current and useful.

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/package.mask | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index c9ee7dc841c..d769320c1cf 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Fabian Groffen  (2020-11-23)
+# No longer used, not really functional either, noone should be using
+# this, removal in 30 days.
+sys-kernel/xnu-headers
+sys-libs/darwin-libc-headers
+dev-libs/libmissing
+
 # David Seifert  (2020-11-22)
 # Upstream abandoned since 2012, tons of QA issues and
 # build bugs, esoteric NIH build system. Bug #293567, #670954,



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/features/fsf-gcc-nold/

2020-11-23 Thread Fabian Groffen
commit: 9654ceee13b78d0dae6b11df360eed3281d47535
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 14:13:53 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 14:13:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9654ceee

profiles/prefix/darwin/macos: drop csu from system on gcc-based system

since we ld from Xcode, we can as well rely on it having a proper crt1.o

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages 
b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages
index bef3bc68550..e036014e912 100644
--- a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages
@@ -9,3 +9,4 @@
 -*sys-devel/binutils-apple
 -*sys-devel/clang
 -*sys-devel/gcc-apple
+-*sys-libs/csu



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/features/fsf-gcc-nold/

2020-11-23 Thread Fabian Groffen
commit: 365f1c928ff474881d68c55954fb8b37fa37f516
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 13:40:45 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 13:40:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=365f1c92

profiles/prefix/darwin/macos: don't install gcc-apple in gcc profile

stick with FSF GCC

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages 
b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages
index ca17aa36acf..bef3bc68550 100644
--- a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages
@@ -5,7 +5,7 @@
 # missing blocks support in GCC)
 *sys-devel/gcc
 *sys-devel/gcc-config
--*sys-devel/clang
-*sys-devel/gcc-apple
--*sys-devel/binutils-apple
 *sys-devel/native-cctools
+-*sys-devel/binutils-apple
+-*sys-devel/clang
+-*sys-devel/gcc-apple



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/

2020-11-23 Thread Fabian Groffen
commit: 7eb4579f34194ff9086eda5d485736c63ecdd2f1
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 13:19:44 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 13:31:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eb4579f

profiles/prefix/darwin/macos/package.mask: mask gettext-0.21

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/package.mask | 4 
 1 file changed, 4 insertions(+)

diff --git a/profiles/prefix/darwin/macos/package.mask 
b/profiles/prefix/darwin/macos/package.mask
index 13dff7f7a41..73710b495b1 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen  (2020-11-23)
+# doesn't link, some unresolved symbol from gnulib
+=sys-devel/gettext-0.21
+
 # Fabian Groffen  (2020-06-09)
 # fails to compile, needs fixing
 =sys-apps/gentoo-functions-0.13



[gentoo-commits] repo/gentoo:master commit in: dev-util/pkgconf/

2020-11-23 Thread Fabian Groffen
commit: 314c063de4e77ccd6c7199b2fbe8bc5ce40eca07
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 12:28:51 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 13:31:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314c063d

dev-util/pkgconf-1.7.3: marked ~x64-macos

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 dev-util/pkgconf/pkgconf-1.7.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/pkgconf/pkgconf-1.7.3.ebuild 
b/dev-util/pkgconf/pkgconf-1.7.3.ebuild
index 40e4e28319d..a801ef026bf 100644
--- a/dev-util/pkgconf/pkgconf-1.7.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf;
 else
SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than 
ANSI C89"



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/features/fsf-gcc-nold/

2020-11-23 Thread Fabian Groffen
commit: 788bd76b1982f7ce955359d3ea99b0e5cf095450
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 13:28:31 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 13:31:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=788bd76b

profiles/prefix/darwin/macos: mask pkgconfig on fsf-gcc profile

pkgconfig uses system frameworks for some reason, and thus needs blocks
support

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask 
b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
index 08447c2eba6..f86a094ace0 100644
--- a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
@@ -6,3 +6,6 @@
 -sys-devel/native-cctools
 # and unmask FSF GCC itself of course
 -sys-devel/gcc
+
+# packages which link to framework and therefore fail (blocks)
+dev-util/pkgconfig



[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/

2020-11-23 Thread Fabian Groffen
commit: d74690c60e79b075f9fc162ae3783d5514e8e9fe
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 07:56:20 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 07:56:20 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d74690c6

sys-apps/portage-3.0.10.1: version bump

Package-Manager: Portage-3.0.10-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest   | 2 +-
 sys-apps/portage/{portage-3.0.10.ebuild => portage-3.0.10.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b4c2dac774..7ce942d939 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
-DIST prefix-portage-3.0.10.tar.bz2 1358206 BLAKE2B 
846a5da7c1316eff7e906a658b3f204a999dbf7137704a97f04341661516215f731c749c9ed6ec83124ee71307104cc3d22dda593fb26523d5892a573eac5339
 SHA512 
2bed81c51ea0b8dea4abb9f793f4fac3e32a20b277bc262310115d380b0b766f7ac7bdee2eeaf4f6b899f9030a8c0d57b5ff051c758447deeab186b1a15b49bb
+DIST prefix-portage-3.0.10.1.tar.bz2 1316537 BLAKE2B 
a844265ed7ff74f5effa5827205fd87547351675045dc5e9a565eb210af88f50c9f1b77065db250bbfb4866ae4b271599158ee1b2e271bafd4627dd42887
 SHA512 
5e6b95fa1ecf3591360dac42866421f5d574e8402acd2c804347ecfc8a234bb484f3e756bb62297e0cd12f6dbc953b6f14238a098d60332cd41308737e2ee9b3
 DIST prefix-portage-3.0.8.tar.bz2 1360204 BLAKE2B 
b4d3046e4a2ac7ae611a54b1a669d3d13b337aa29a9adb540f6da5104b47ca8d41798cc268bc4ab464f553bb280173a598127b5b290871ba0bf57f2fbd15bf58
 SHA512 
fb532b4145952f9467e1a86349e753e80d20b8b35d17d2d99ede590ff5aa6d367f16be41f2335738ed01c82238e2f93179e9b35d588ad92859f4b1f135539a00

diff --git a/sys-apps/portage/portage-3.0.10.ebuild 
b/sys-apps/portage/portage-3.0.10.1.ebuild
similarity index 100%
rename from sys-apps/portage/portage-3.0.10.ebuild
rename to sys-apps/portage/portage-3.0.10.1.ebuild



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-23 Thread Fabian Groffen
commit: 0ccf7c8d3af43ed124903a51a56ec9777bcbf18d
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 10:26:16 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 10:26:16 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0ccf7c8d

scripts/bootstrap-prefix: use xattr-fixed Portage to bootstrap

in addition, set SDK in use in tmp offset too

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 80c2b8eb8b..458d18cc55 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -656,8 +656,8 @@ bootstrap_portage() {
# STABLE_PV that is known to work. Intended for power users only.
## It is critical that STABLE_PV is the lastest (non-masked) version 
that is
## included in the snapshot for bootstrap_tree.
-   STABLE_PV="3.0.8"
-   [[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.8"
+   STABLE_PV="3.0.10.1"
+   [[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.10.1"
PV="${TESTING_PV:-${STABLE_PV}}"
A=prefix-portage-${PV}.tar.bz2
einfo "Bootstrapping ${A%-*}"
@@ -1743,6 +1743,9 @@ bootstrap_stage2() {
echo "# DARWIN_USE_GCC block"
echo "sys-devel/gcc ~ppc-macos"
} >> "${ROOT}"/tmp/etc/portage/package.accept_keywords
+
+   rm -f "${ROOT}"/tmp/MacOSX.sdk
+   ( cd "${ROOT}"/tmp && ln -s ../MacOSX.sdk )
fi
 
# cmake has some external dependencies which require autoconf, etc.



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/features/fsf-gcc-nold/

2020-11-23 Thread Fabian Groffen
commit: 09c9c9459c1be58388ef5526b802b886400fa557
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 09:57:30 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 09:57:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09c9c945

profiles/prefix/darwin/macos: unmask GCC in gcc feature

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask 
b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
index 8e306bca311..08447c2eba6 100644
--- a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
@@ -4,3 +4,5 @@
 # unmask ld symlink package, due to missing blocks support we are not
 # able to compile this
 -sys-devel/native-cctools
+# and unmask FSF GCC itself of course
+-sys-devel/gcc



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/features/fsf-gcc-nold/, ...

2020-11-23 Thread Fabian Groffen
commit: 1ec8186b37649272de2c41d034a0328acca758d9
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 09:46:56 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 09:47:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ec8186b

profiles/prefix/darwin/macos: add FSF GCC feature

to be extended to other profiles once initial explorations have finished

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/10.13/x64/gcc/eapi   |  1 +
 profiles/prefix/darwin/macos/10.13/x64/gcc/parent |  2 ++
 .../prefix/darwin/macos/features/fsf-gcc-nold/package.mask|  6 ++
 profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages   | 11 +++
 4 files changed, 20 insertions(+)

diff --git a/profiles/prefix/darwin/macos/10.13/x64/gcc/eapi 
b/profiles/prefix/darwin/macos/10.13/x64/gcc/eapi
new file mode 100644
index 000..7ed6ff82de6
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.13/x64/gcc/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/prefix/darwin/macos/10.13/x64/gcc/parent 
b/profiles/prefix/darwin/macos/10.13/x64/gcc/parent
new file mode 100644
index 000..5ebbfd24d62
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.13/x64/gcc/parent
@@ -0,0 +1,2 @@
+..
+../../../features/fsf-gcc-nold

diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask 
b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
new file mode 100644
index 000..8e306bca311
--- /dev/null
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# unmask ld symlink package, due to missing blocks support we are not
+# able to compile this
+-sys-devel/native-cctools

diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages 
b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages
new file mode 100644
index 000..ca17aa36acf
--- /dev/null
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages
@@ -0,0 +1,11 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# usage of FSF GCC, disabling Clang, without binutils-apple (due to
+# missing blocks support in GCC)
+*sys-devel/gcc
+*sys-devel/gcc-config
+-*sys-devel/clang
+*sys-devel/gcc-apple
+-*sys-devel/binutils-apple
+*sys-devel/native-cctools



[gentoo-commits] proj/portage:prefix commit in: /

2020-11-22 Thread Fabian Groffen
commit: 1289ca4c5b58d96173c4b37600b3ff1ab1ff8173
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 07:47:31 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 07:47:31 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1289ca4c

Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Signed-off-by: Fabian Groffen  gentoo.org>

 lib/portage/util/_compare_files.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)



[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/

2020-11-22 Thread Fabian Groffen
commit: 5b8c7be1cbfb52046f5d87892075837f01430492
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Nov 22 17:37:29 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sun Nov 22 17:37:29 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5b8c7be1

sys-devel/gcc-10.1.0-r1: marked ~x64-macos

Package-Manager: Portage-3.0.8-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/gcc/gcc-10.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/gcc/gcc-10.1.0-r1.ebuild 
b/sys-devel/gcc/gcc-10.1.0-r1.ebuild
index e163d95646..8b2a273da8 100644
--- a/sys-devel/gcc/gcc-10.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-10.1.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="2"
 
 inherit toolchain
 
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=""
 BDEPEND="



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-22 Thread Fabian Groffen
commit: 21808d104ee069ca4d9077784b8cf0d861f63fd1
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Nov 22 17:18:13 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sun Nov 22 17:18:13 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=21808d10

scripts/bootstrap-prefix: adjust/fix Darwin FSF GCC path

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 33 ++---
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f45bf57b73..80c2b8eb8b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -181,43 +181,39 @@ configure_toolchain() {
 
case ${CHOST}:${DARWIN_USE_GCC} in
powerpc-*darwin*|*:yes|*:1|*:true)
-   compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu"
+   einfo "Triggering Darwin with GCC toolchain path"
+   compiler_stage1+=" sys-apps/darwin-miscutils 
sys-libs/csu"
local ccvers="$( (unset CHOST; gcc --version 
2>/dev/null) )"
-   local mycc=
case "${ccvers}" in
*"(GCC) 4.2.1 "*)
linker=sys-devel/binutils-apple
-   mycc=gcc
;;
*"(GCC) 4.0.1 "*)
linker="=sys-devel/binutils-apple-3.2"
+   # upgrade to 4.2.1 first
compiler_stage1+="
-   ${gcc_deps}
-   sys-devel/gcc-config
sys-devel/gcc-apple
sys-devel/binutils-apple"
-   mycc=gcc
;;
*"(Gentoo "*)
# probably the result of a bootstrap in 
progress
linker=sys-devel/binutils-apple
-   mycc=gcc
;;
-   *"Apple clang version "*)
+   *"Apple clang version "*|*"Apple LLVM version 
"*)
# gcc cannot build (recent) 
binutils-apple due to
# missing blocks support, so use Xcode 
provided
# linker/assembler
linker=sys-devel/native-cctools
-   mycc=gcc
;;
*)
-   eerror "unknown compiler"
+   eerror "unknown compiler: ${ccvers}"
return 1
;;
esac
-   compiler="${gcc_deps} sys-devel/gcc-config 
sys-devel/gcc"
+   compiler_stage1+=" sys-devel/gcc"
;;
*-darwin*)
+   einfo "Triggering Darwin with Clang toolchain path"
# for compilers choice, see bug:
# https://bugs.gentoo.org/show_bug.cgi?id=538366
compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu"
@@ -1734,6 +1730,21 @@ bootstrap_stage2() {
[[ ${CHOST} == *-solaris* ]] && echo "=dev-libs/libffi-3.3_rc0" \
>> "${ROOT}"/tmp/etc/portage/package.mask
 
+   # unlock GCC on Darwin for DARWIN_USE_GCC bootstraps
+   if [[ ${DARWIN_USE_GCC} == 1 || ${DARWIN_USE_GCC} == "yes" || \
+   ${DARWIN_USE_GCC} == "true" ]]
+   then
+   {
+   echo "# DARWIN_USE_GCC block"
+   echo "sys-devel/gcc"
+   echo "sys-devel/native-cctools"
+   } >> "${ROOT}"/tmp/etc/portage/package.unmask
+   {
+   echo "# DARWIN_USE_GCC block"
+   echo "sys-devel/gcc ~ppc-macos"
+   } >> "${ROOT}"/tmp/etc/portage/package.accept_keywords
+   fi
+
# cmake has some external dependencies which require autoconf, etc.
# unless we only build the buildtool, bug #603012
echo "dev-util/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use



[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/

2020-11-22 Thread Fabian Groffen
commit: 6cc6802a01746c6b683d0320d37620b442cb4049
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Nov 22 11:30:53 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sun Nov 22 11:30:53 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6cc6802a

sys-apps/portage-3.0.10: version bump

Package-Manager: Portage-3.0.10-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest| 2 +-
 sys-apps/portage/{portage-3.0.1.ebuild => portage-3.0.10.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7c17104cbe..b4c2dac774 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
-DIST prefix-portage-3.0.1.tar.bz2 1279330 BLAKE2B 
ac94a2c2b56f23cf35cb229ae8719077e41fe7fb8e74d16beb3542b43d246d6c26dce73b9cec4c126b65b9bf0b4452bc233a83aeb4c873e8dd7c8d5742008221
 SHA512 
5c141b80e20f11aad6990e5f42fcc2cddb6475e03fc978fd1446773dd6833dd4ccf96b07440e1184cb95e210654218011b383872004907a915164813da22663c
+DIST prefix-portage-3.0.10.tar.bz2 1358206 BLAKE2B 
846a5da7c1316eff7e906a658b3f204a999dbf7137704a97f04341661516215f731c749c9ed6ec83124ee71307104cc3d22dda593fb26523d5892a573eac5339
 SHA512 
2bed81c51ea0b8dea4abb9f793f4fac3e32a20b277bc262310115d380b0b766f7ac7bdee2eeaf4f6b899f9030a8c0d57b5ff051c758447deeab186b1a15b49bb
 DIST prefix-portage-3.0.8.tar.bz2 1360204 BLAKE2B 
b4d3046e4a2ac7ae611a54b1a669d3d13b337aa29a9adb540f6da5104b47ca8d41798cc268bc4ab464f553bb280173a598127b5b290871ba0bf57f2fbd15bf58
 SHA512 
fb532b4145952f9467e1a86349e753e80d20b8b35d17d2d99ede590ff5aa6d367f16be41f2335738ed01c82238e2f93179e9b35d588ad92859f4b1f135539a00

diff --git a/sys-apps/portage/portage-3.0.1.ebuild 
b/sys-apps/portage/portage-3.0.10.ebuild
similarity index 100%
rename from sys-apps/portage/portage-3.0.1.ebuild
rename to sys-apps/portage/portage-3.0.10.ebuild



[gentoo-commits] proj/portage:prefix commit in: /

2020-11-22 Thread Fabian Groffen
commit: 7238a400b115fca23ba39b1b1ce123f2ac1bf993
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Nov 22 11:14:34 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sun Nov 22 11:15:16 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7238a400

Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Signed-off-by: Fabian Groffen  gentoo.org>

 RELEASE-NOTES  |  16 ++
 bin/isolated-functions.sh  |   3 +-
 bin/phase-helpers.sh   |   3 +-
 bin/pid-ns-init|  24 ++-
 cnf/repo.postsync.d/example|   3 +-
 cnf/sets/portage.conf  |   6 +
 doc/package/ebuild/eapi/4.docbook  |   2 +-
 lib/_emerge/DepPriorityNormalRange.py  |   2 +
 lib/_emerge/DepPrioritySatisfiedRange.py   |  53 +++---
 lib/_emerge/actions.py |  19 +-
 lib/_emerge/depgraph.py|  56 --
 lib/_emerge/main.py|   5 +
 lib/portage/cache/template.py  |   2 +-
 .../package/ebuild/_config/KeywordsManager.py  |   2 +-
 .../package/ebuild/_config/LocationsManager.py |  30 ++-
 lib/portage/package/ebuild/_config/UseManager.py   |   4 +-
 lib/portage/package/ebuild/config.py   |   9 +-
 .../package/ebuild/deprecated_profile_check.py |   9 +-
 lib/portage/tests/emerge/test_simple.py|   8 +-
 lib/portage/tests/resolver/test_merge_order.py |  10 +
 .../tests/resolver/test_slot_operator_bdeps.py | 209 +
 lib/portage/util/_compare_files.py |   3 +-
 lib/portage/util/movefile.py   |  10 +-
 lib/portage/util/netlink.py|   2 +-
 man/emerge.1   |  10 +-
 man/make.conf.5|   2 +-
 repoman/RELEASE-NOTES  |   5 +
 repoman/cnf/qa_data/qa_data.yaml   |   1 -
 repoman/cnf/repository/qa_data.yaml|   1 -
 repoman/lib/repoman/modules/scan/fetch/fetches.py  |   7 +-
 repoman/man/repoman.1  |   2 +-
 repoman/setup.py   |   2 +-
 setup.py   |   2 +-
 33 files changed, 430 insertions(+), 92 deletions(-)



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-21 Thread Fabian Groffen
commit: feb0124810202854af925a84f63fb30d43aff56a
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 21 14:28:09 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 21 14:28:09 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=feb01248

scripts/bootstrap-prefix: move llvm_deps into only consuming block

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e7f4ff194d..f45bf57b73 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -178,11 +178,6 @@ configure_toolchain() {
 
CC=gcc
CXX=g++
-   llvm_deps="
-   app-arch/libarchive
-   app-crypt/rhash
-   dev-util/cmake
-   dev-util/ninja"
 
case ${CHOST}:${DARWIN_USE_GCC} in
powerpc-*darwin*|*:yes|*:1|*:true)
@@ -229,6 +224,11 @@ configure_toolchain() {
compiler_type="clang"
local ccvers="$( (unset CHOST; gcc --version 
2>/dev/null) )"
local mycc=
+   local llvm_deps="
+   app-arch/libarchive
+   app-crypt/rhash
+   dev-util/cmake
+   dev-util/ninja"
case "${ccvers}" in
*"Apple clang version "*)
vers=${ccvers#*Apple clang version }



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-21 Thread Fabian Groffen
commit: 224ac9a7692fc0cc66fe4fc2e63eed6596663c9f
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 21 13:44:29 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 21 13:44:29 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=224ac9a7

scripts/bootstrap-prefix: avoid unnecessary rebuilds in stage1

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 32 +++-
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ca029edc21..e7f4ff194d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1383,28 +1383,42 @@ bootstrap_stage1() {
# packages following (e.g. zlib builds 64-bits)
 
# don't rely on $MAKE, if make == gmake packages that call 'make' fail
-   [[ $(make --version 2>&1) == *GNU" Make "4* ]] \
+   [[ -x ${ROOT}/tmp/usr/bin/make ]] \
+   || [[ $(make --version 2>&1) == *GNU" Make "4* ]] \
|| (bootstrap_make) || return 1
[[ ${OFFLINE_MODE} ]] || [[ -x ${ROOT}/tmp/usr/bin/openssl ]] \
|| (bootstrap_libressl) # do not fail if this fails, we'll try 
without
[[ ${OFFLINE_MODE} ]] || type -P wget > /dev/null \
|| (bootstrap_wget) || return 1
-   [[ $(sed --version 2>&1) == *GNU* ]] || (bootstrap_sed) || return 1
+   [[ -x ${ROOT}/tmp/usr/bin/sed ]] \
+   || [[ $(sed --version 2>&1) == *GNU* ]] \
+   || (bootstrap_sed) || return 1
type -P xz > /dev/null || (bootstrap_xz) || return 1
type -P bzip2 > /dev/null || (bootstrap_bzip2) || return 1
-   [[ $(patch --version 2>&1) == *"patch 2."[6-9]*GNU* ]] \
+   [[ -x ${ROOT}/tmp/usr/bin/patch ]] \
+   || [[ $(patch --version 2>&1) == *"patch 2."[6-9]*GNU* ]] \
|| (bootstrap_patch) || return 1
-   [[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] || (bootstrap_m4) || return 1
+   [[ -x ${ROOT}/tmp/usr/bin/m4 ]] \
+   || [[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] \
+   || (bootstrap_m4) || return 1
[[ -x ${ROOT}/tmp/usr/bin/bison ]] \
|| [[ $(bison --version 2>&1) == *GNU" "Bison") "2.[3-7]* ]] \
|| [[ $(bison --version 2>&1) == *GNU" "Bison") "[3-9]* ]] \
|| (bootstrap_bison) || return 1
-   [[ $(uniq --version 2>&1) == *"(GNU coreutils) "[6789]* ]] \
+   [[ -x ${ROOT}/tmp/usr/bin/uniq ]] \
+   || [[ $(uniq --version 2>&1) == *"(GNU coreutils) "[6789]* ]] \
|| (bootstrap_coreutils) || return 1
-   [[ $(find --version 2>&1) == *GNU* ]] || (bootstrap_findutils) || 
return 1
-   [[ $(tar --version 2>&1) == *GNU* ]] || (bootstrap_tar) || return 1
-   [[ $(grep --version 2>&1) == *GNU* ]] || (bootstrap_grep) || return 1
-   [[ $(awk --version < /dev/null 2>&1) == *GNU" Awk "[456789]* ]] \
+   [[ -x ${ROOT}/tmp/usr/bin/find ]] \
+   || [[ $(find --version 2>&1) == *GNU* ]] \
+   || (bootstrap_findutils) || return 1
+   [[ -x ${ROOT}/tmp/usr/bin/tar ]] \
+   || [[ $(tar --version 2>&1) == *GNU* ]] \
+   || (bootstrap_tar) || return 1
+   [[ -x ${ROOT}/tmp/usr/bin/grep ]] \
+   || [[ $(grep --version 2>&1) == *GNU* ]] \
+   || (bootstrap_grep) || return 1
+   [[ -x ${ROOT}/tmp/usr/bin/gawk ]] \
+   || [[ $(awk --version < /dev/null 2>&1) == *GNU" Awk "[456789]* 
]] \
|| bootstrap_gawk || return 1
# always build our own bash, for we don't know what devilish thing
# we're working with now, bug #650284



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-21 Thread Fabian Groffen
commit: fd2058cbd9c38988b7b58e78f1c1d214273f329c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 21 13:42:20 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 21 13:42:20 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fd2058cb

scripts/bootstrap-prefix: clean up m4 bootstrapping

On macOS we need a patch (no newer version exists), so add it, else we
keep on having a crashing m4.
Remove all backup versions, since patching those versions fails, so
we'll stay on the fragile path and hope this works.

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 34b6c25a82..7edc5b9d3e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -856,6 +856,10 @@ bootstrap_gnu() {
# doesn't match
sed -i -e '/_GL_WARN_ON_USE (gets/d' lib/stdio.in.h lib/stdio.h
 
+   # macOS 10.13 have an issue with %n, which crashes m4
+   efetch 
"http://rsync.prefix.bitzolder.nl/sys-devel/m4/files/m4-1.4.18-darwin17-printf-n.patch;
 || return 1
+   patch -p1 < "${DISTDIR}"/m4-1.4.18-darwin17-printf-n.patch || 
return 1
+
# Bug 715880
efetch http://dev.gentoo.org/~heroxbd/m4-1.4.18-glibc228.patch 
|| return 1
patch -p1 < "${DISTDIR}"/m4-1.4.18-glibc228.patch || return 1
@@ -1304,10 +1308,7 @@ bootstrap_bison() {
 }
 
 bootstrap_m4() {
-   bootstrap_gnu m4 1.4.18 ||
-   bootstrap_gnu m4 1.4.17 ||
-   bootstrap_gnu m4 1.4.16 ||
-   bootstrap_gnu m4 1.4.15
+   bootstrap_gnu m4 1.4.18 # version is patched, so beware
 }
 
 bootstrap_gzip() {



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-21 Thread Fabian Groffen
commit: 2185ae8dc74b8f86221018b77d4aac8770e8
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 21 13:43:59 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 21 13:43:59 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2185ae8d

scripts/bootstrap-prefix: use latest portage which matches snapshot

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7edc5b9d3e..ca029edc21 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -660,8 +660,8 @@ bootstrap_portage() {
# STABLE_PV that is known to work. Intended for power users only.
## It is critical that STABLE_PV is the lastest (non-masked) version 
that is
## included in the snapshot for bootstrap_tree.
-   STABLE_PV="2.3.100"
-   [[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.100"
+   STABLE_PV="3.0.8"
+   [[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.8"
PV="${TESTING_PV:-${STABLE_PV}}"
A=prefix-portage-${PV}.tar.bz2
einfo "Bootstrapping ${A%-*}"



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-21 Thread Fabian Groffen
commit: 8559e1c3e77e54115746b61ad58d8a492ce8b024
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 21 13:01:43 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 21 13:01:43 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8559e1c3

scripts/bootstrap-prefix: add some code for GCC bootstrap on macOS

In addition, bump snapshot for package fixes.

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 26 ++
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ea559afe5c..34b6c25a82 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -183,8 +183,9 @@ configure_toolchain() {
app-crypt/rhash
dev-util/cmake
dev-util/ninja"
-   case ${CHOST} in
-   powerpc-*darwin*)
+
+   case ${CHOST}:${DARWIN_USE_GCC} in
+   powerpc-*darwin*|*:yes|*:1|*:true)
compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu"
local ccvers="$( (unset CHOST; gcc --version 
2>/dev/null) )"
local mycc=
@@ -207,6 +208,13 @@ configure_toolchain() {
linker=sys-devel/binutils-apple
mycc=gcc
;;
+   *"Apple clang version "*)
+   # gcc cannot build (recent) 
binutils-apple due to
+   # missing blocks support, so use Xcode 
provided
+   # linker/assembler
+   linker=sys-devel/native-cctools
+   mycc=gcc
+   ;;
*)
eerror "unknown compiler"
return 1
@@ -414,7 +422,7 @@ bootstrap_setup() {
rev=${CHOST##*darwin}
profile="prefix/darwin/macos/10.$((rev - 4))/x86"
;;
-   x86_64-apple-darwin19)
+   x86_64-apple-darwin19|x86_64-apple-darwin2[0123456789])
# handle newer releases on the last profile we have 
headers
# and stuff for (https://opensource.apple.com/)
profile="prefix/darwin/macos/10.14/x64"
@@ -505,6 +513,16 @@ bootstrap_setup() {
einfo "Your profile is set to ${fullprofile}."
fi
 
+   case ${DARWIN_USE_GCC} in
+   yes|1|true)
+   # setup MacOSX.sdk symlink for GCC, this should 
probably be
+   # managed using an eselect module in the future
+   ( cd ${ROOT} && ln -s $(xcrun --show-sdk-path --sdk 
macosx) )
+   einfo "using system sources from $(\
+   xcrun --show-sdk-version --sdk macosx)"
+   ;;
+   esac
+
is-rap && cat >> "${ROOT}"/etc/portage/make.profile/make.defaults 
<<-'EOF'
# For baselayout-prefix in stage2 only.
ACCEPT_KEYWORDS="~${ARCH}-linux"
@@ -576,7 +594,7 @@ do_tree() {
 bootstrap_tree() {
# RAP uses the latest gentoo main repo snapshot to bootstrap.
is-rap && LATEST_TREE_YES=1
-   local PV="20200607"
+   local PV="20201120"
if [[ -n ${LATEST_TREE_YES} ]]; then
do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
else



[gentoo-commits] proj/portage-utils:master commit in: /

2020-11-21 Thread Fabian Groffen
commit: 8acb5968a74837cc1434a48ff89c1255c2c1676d
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 21 10:53:40 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 21 10:53:40 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=8acb5968

travis: try newer macOS image

Signed-off-by: Fabian Groffen  gentoo.org>

 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6ab918f..af1504c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@
 language: c
 dist: focal
 os: linux
+osx_image: xcode11.3.1
 
 jobs:
   include:
@@ -60,7 +61,6 @@ addons:
 - coreutils
 - bash
 - libressl
-  #update: true   # working around unknown bundle command
 
 before_install:
   - ./travis/install-blake2.sh



[gentoo-commits] proj/portage-utils:master commit in: /

2020-11-21 Thread Fabian Groffen
commit: 4e83d6875843dd52842ed9a591e91a036693dd9a
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 21 10:45:37 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 21 10:45:37 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=4e83d687

travis: disable homebrew update, it seems to recompile everything

Signed-off-by: Fabian Groffen  gentoo.org>

 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2a908f0..6ab918f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,7 +60,7 @@ addons:
 - coreutils
 - bash
 - libressl
-update: true   # working around unknown bundle command
+  #update: true   # working around unknown bundle command
 
 before_install:
   - ./travis/install-blake2.sh



[gentoo-commits] proj/portage-utils:master commit in: /

2020-11-21 Thread Fabian Groffen
commit: e74c54552cb6d13770ee85985a7d69b70e31c320
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 21 10:00:06 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 21 10:00:31 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=e74c5455

travis: try all available arches at Travis CI

Signed-off-by: Fabian Groffen  gentoo.org>

 .travis.yml | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2201fef..2a908f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,14 +8,24 @@ os: linux
 jobs:
   include:
 - compiler: gcc
+  arch: amd64
+- compiler: gcc
+  arch: arm64
+- compiler: gcc
+  arch: ppc64le
+- compiler: gcc
+  arch: s390x
 - compiler: clang
+  arch: amd64
 - compiler: coverity
+  arch: amd64
   env:
 - COVERITY_SCAN_PROJECT_NAME="$TRAVIS_REPO_SLUG"
 - COVERITY_SCAN_BRANCH_PATTERN="master"
 - COVERITY_SCAN_NOTIFICATION_EMAIL="grob...@gentoo.org"
 - COVERITY_SCAN_BUILD_COMMAND="make"
 - compiler: valgrind
+  arch: amd64
   env:
 - CFLAGS="-g"
 - Q_RUN_WITH_VALGRIND=1
@@ -26,10 +36,6 @@ jobs:
 - CPPFLAGS="-I/usr/local/opt/libressl/include"
 - PATH="$(brew --prefix)/opt/gnu-sed/libexec/gnubin:$PATH"
 - PATH="$(brew --prefix)/opt/coreutils/libexec/gnubin:$PATH"
-- compiler: gcc
-  arch: arm64-graviton2
-  virt: lxd
-  group: edge
 
 env:
   global:



[gentoo-commits] proj/portage-utils:master commit in: /

2020-11-21 Thread Fabian Groffen
commit: 41674ff4508c0d7b0194e658b6854c20d427b4a9
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 21 09:52:38 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 21 09:52:49 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=41674ff4

travis: try new Ubuntu Focal (20.04) and the AWS Graviton2 cluster

Signed-off-by: Fabian Groffen  gentoo.org>

 .travis.yml | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f435dc6..2201fef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@
 # https://docs.travis-ci.com/
 
 language: c
-dist: bionic
+dist: focal
 os: linux
 
 jobs:
@@ -26,6 +26,10 @@ jobs:
 - CPPFLAGS="-I/usr/local/opt/libressl/include"
 - PATH="$(brew --prefix)/opt/gnu-sed/libexec/gnubin:$PATH"
 - PATH="$(brew --prefix)/opt/coreutils/libexec/gnubin:$PATH"
+- compiler: gcc
+  arch: arm64-graviton2
+  virt: lxd
+  group: edge
 
 env:
   global:



[gentoo-commits] proj/portage-utils:master commit in: /

2020-11-21 Thread Fabian Groffen
commit: ca5054171ebd47939a451f600d62e762a51b7d27
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 21 08:52:45 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 21 08:52:45 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ca505417

qmerge: report relevant errors on binpkg unpacks

Thanks Peter Stuge for noticing.

Signed-off-by: Fabian Groffen  gentoo.org>

 qmerge.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qmerge.c b/qmerge.c
index 73efcb6..e439a7d 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -1258,7 +1258,7 @@ pkg_merge(int level, const depend_atom *atom, const 
struct pkg_t *pkg)
rd = fread(iobuf, 1, n, tbz2f);
if (0 == rd) {
if ((err = ferror(tbz2f)) != 0)
-   err("reading %s failed: %s", tbz2, 
strerror(errno));
+   err("reading %s failed: %s", tbz2, 
strerror(err));
 
if (feof(tbz2f))
err("unexpected EOF in %s: corrupted 
binpkg", tbz2);
@@ -1268,7 +1268,7 @@ pkg_merge(int level, const depend_atom *atom, const 
struct pkg_t *pkg)
n = fwrite(iobuf + wr, 1, rd - wr, tarpipe);
if (n != rd - wr) {
if ((err = ferror(tarpipe)) != 0)
-   err("failed to unpack binpkg: 
%s", strerror(errno));
+   err("failed to unpack binpkg: 
%s", strerror(err));
 
if (feof(tarpipe))
err("unexpected EOF trying to 
unpack binpkg");



[gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/

2020-11-20 Thread Fabian Groffen
commit: a444dde143f9c29e5331888ddc10d0139827666f
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Nov 20 18:59:24 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Fri Nov 20 18:59:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a444dde1

mail-client/mutt-2.0.2: bump for CVE-2020-28896

Bug: https://bugs.gentoo.org/755866
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-client/mutt/Manifest | 4 ++--
 mail-client/mutt/{mutt-2.0.0.ebuild => mutt-2.0.2.ebuild} | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 0d5727c40d5..1a31a0f8b3f 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,8 +1,8 @@
 DIST mutt-1.14.4.tar.gz 5007437 BLAKE2B 
89d4327ddd86ec320c63db6ee9d3c07b7540a74aba7efdcb9605e5c5c242dec99fb5137d1cfc62fd4401e2af7589f03ebce78dfa2deae262aef408b804544656
 SHA512 
86484f009ca8bd1e26206694e03609a16f8a4e8c83620a07a4376fe160535a838e8c918a8a30799fb3d9cf46c059d67124f7425c42093fb5e5bf8ea4ac310daa
 DIST mutt-1.14.5.tar.gz 5008208 BLAKE2B 
a7c2f7f63d2ee23e743114315cbb40903db720de7f2836f551739edb0b78857c525c40ebde083064dd2430b89b21d7a17745dfc1185672f86b15a9a082c3778e
 SHA512 
950c8df3bdc552b41ba6209aed8d5ade6fff80fe4018a75856d0fdbcd6389bd995a6dee69e7badd05a9b40d2e2293ada9a9f9a96632e88af36b61162f226e2b9
 DIST mutt-1.14.7.tar.gz 5009968 BLAKE2B 
f729412d3da97fe9bd76733705317660edfa3858a9eb1012179fb289b03da58d79b6e261dbdc4ab8b001e89ca455e9972bab8f270bac28e887afc7e0bd9fc8c1
 SHA512 
dc9739b5f0a99ca70fcbd495c71fbead23e3481f9c9e426feb827997c9c42e5f28355084f54788820c96a079dedb649fcc20e69436fb3c4df7e46f372b533e7c
-DIST mutt-2.0.0.tar.gz 5287742 BLAKE2B 
d45cae45e560548a3f278972e7bff820c860b194f06286a4e2c456141e7d421b1812f423e31594d0c4b0c82c8c9f59749a8e127d41b8c172a5319a23cc8e
 SHA512 
2f48bf7eb9bb79a477e3fb9bf4bcde6033d7aaa8922eee20b6e6a05f49a1aea152a7987b99f335343175d87180062064c90c5a7b5bfa82aed188eeab0ac4a90b
+DIST mutt-2.0.2.tar.gz 5293613 BLAKE2B 
215a4d54e6dd202ebced91d0536a7f70e774b3c41c129ef87a55ea75a298e485b72145e5dd3c654d9b28138800c4b3e87a3815ab789d952b6b58cfc068fd397b
 SHA512 
5dea02edf60b33e4873806481aa4256f91d90b05de99a9eccc620c459bd924197b656f85eb5a31757a61675389e6c4d76571128a757cfda255240934e82eec29
 DIST mutt-gentoo-1.14.4-patches-r0.tar.xz 31124 BLAKE2B 
a9774a5bb5af18a275f7ea171cb08a12a98d63cbff57320d5d3fb4f995aac16f409689ac0015f3b5d37cfc20004c9fca72a3f63663aaa679a129d5f3886bc5cc
 SHA512 
05506399a471c262479db88ef11d2a95d79598fd696fe50de5f5c1c3cae5adf30a2806a1500ba94a62bcbf7deed99acc59a8afb903f50169e41b77010e0ad8cc
 DIST mutt-gentoo-1.14.5-patches-r0.tar.xz 31100 BLAKE2B 
14525b54afa1414667ebe2dc0c58b9b5d5ad4dcc5dbae3c5db13cc23d33dbd9434fa929ad297625c891b2d690e34729a4f61c526fb94857e271ac85f5a07488e
 SHA512 
fd8e473efa02e412aeaba258afee6dc02f9ca24f9edff643e4ef53c759a091e54c6a544e39cd7faa94cd680546bfcf845e282638045ae65a88d140ebb03a4631
 DIST mutt-gentoo-1.14.7-patches-r0.tar.xz 31144 BLAKE2B 
5a9806dec79f8a991e39464afde1faf2ba988e67ffd85ec16943432a83ee1d05ddcb839095a475ab56aa80a4bbe25de58835d6bde84c0c95e4487df139e16e82
 SHA512 
ca57af137bc5a2663724cb97a7ea04e4d62b2fe8a3864489f15552ef361c1fb8c881ebc783a4f3a6d82c5e9bb45e83fbe6cad59158c831c54361729ada24b458
-DIST mutt-gentoo-2.0.0-patches-r0.tar.xz 26396 BLAKE2B 
80db2456871208050e5cccbd8ba22024dc45ffc69e9b8cbb892904010f0521061f0755f62984502c2cee58bb74aa0c30fafa4613709d2e8a6d0fe291bbc86e27
 SHA512 
f9b8f9abded13de54d7fcf991d58fa45e68d6e059c807dcca1530bdb927d7301faa30e31798e5a3f2d25504cb9db81dfa26f8cde3946a14f540f54955add2828
+DIST mutt-gentoo-2.0.2-patches-r0.tar.xz 26380 BLAKE2B 
3ce2dbe07f9340adbaeb0489fe88564b6cc44ef330d298915d42617357799a26f277cc0dcab2b78a5620f20a2533f2fe43287bab76eeb9529013e9f9c7659ffb
 SHA512 
79fb00ccf6084da805c75eedbdb1631b12e616318e91a4c246d0194a478b803e3dc5d2815f757fecc91316c010058c2d0e9ecaf3fe40d5664ac25af63a0d7e13

diff --git a/mail-client/mutt/mutt-2.0.0.ebuild 
b/mail-client/mutt/mutt-2.0.2.ebuild
similarity index 98%
rename from mail-client/mutt/mutt-2.0.0.ebuild
rename to mail-client/mutt/mutt-2.0.2.ebuild
index 353c1c707ea..098178a8242 100644
--- a/mail-client/mutt/mutt-2.0.0.ebuild
+++ b/mail-client/mutt/mutt-2.0.2.ebuild
@@ -97,9 +97,6 @@ src_prepare() {
sed -i \
-e '/ReachingUs = N_(/aThis release of Mutt is heavily 
enriched with patches.\\nFor this reason, any bugs are better reported at 
https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce 
your problem.\\n\\' \
main.c || die "Failed to add bug instructions"
-
-   # https://gitlab.com/muttmua/mutt/-/issues/294
-   sed -i -e 's/u_int32_t/uint32_t/g' mutt_random.c || die
fi
 
local upatches=



[gentoo-commits] repo/gentoo:master commit in: app-portage/portage-utils/

2020-11-17 Thread Fabian Groffen
commit: ef3fba9bbf2517a67fcb3a657b36b75dd5accee0
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Nov 17 19:30:46 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Tue Nov 17 19:30:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef3fba9b

app-portage/portage-utils-0.90.1: version bump for 32-bits arches only

Closes: https://bugs.gentoo.org/754102
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 app-portage/portage-utils/Manifest |  1 +
 .../portage-utils/portage-utils-0.90.1.ebuild  | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/app-portage/portage-utils/Manifest 
b/app-portage/portage-utils/Manifest
index 9b4dc1f0425..8ca3a26ec03 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,3 +1,4 @@
 DIST portage-utils-0.87.tar.xz 1772956 BLAKE2B 
b1487d89303b524ffa9e6030feba181fcad73a6f38febf29f63b1f7bcd7a5080ddb1f907ca217040d064427f2060bb3885a61c30663594428be475a5bf7253f0
 SHA512 
a29f2d1fc85aea1c2b4c8b16fca0e9b559a980951f79cb10d7fd836d99ec65a904f2cbc54a949150ce490ba5d705b0aa5aa39f56365968b3dd591cb3d7c5eb21
 DIST portage-utils-0.89.tar.xz 1775088 BLAKE2B 
6218cd3a5a435622366550857753529b38a8c2c9dbc2c9d72d3ce8517679fb782caded843807cebd606294a5ecb6dd110311e8da95d54626126b091ee902ab1d
 SHA512 
c285901f1200f0ee81a4cd12840f5b4938fa525ce3611458287d6f5439c78b9ecf5ec0dc40d759fe5e6a848d4fd13b6d9ac38222ebf2c4453a60f9fdb842a55c
+DIST portage-utils-0.90.1.tar.xz 1779252 BLAKE2B 
27c94694cab84970c0c92e835b9039d9420fbfa20f9f2e03f4f53d118df4dc243cddce33994095a3e41bd1027a42c9c29cda65cb7cf4f45279a028b21555f4f8
 SHA512 
67290a69ad6ac40da3ce0f41d2630096690e69bb97a1428af921ccc582dcfbf903bbf98259f68afdbe9e96aef81672ea3352a9266a649e75f99acec7fa00cd8a
 DIST portage-utils-0.90.tar.xz 1776636 BLAKE2B 
bbacc05aa97c77705ae4fbdb5efde5f1d49a99ac8ed259e026c9a997f43a86551b3a10a397e0c5f1da161d2c0d88afe88e22870705ca39d911c4a98ad13f4928
 SHA512 
2077061dd7dfd444d4ad38faf5a87aa44392d7747f71d7283b5e2775ce3d714773cd642ea085aea3dd34a715f2c446d42fd64ba42fa99e716e8d843aae3d9682

diff --git a/app-portage/portage-utils/portage-utils-0.90.1.ebuild 
b/app-portage/portage-utils/portage-utils-0.90.1.ebuild
new file mode 100644
index 000..aa5f157c1b9
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.90.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Small and fast Portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls static openmp +qmanifest +qtegrity libressl"
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3 autotools
+   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git;
+else
+   SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+fi
+
+RDEPEND="
+   qmanifest? (
+   openmp? (
+   || (
+   >=sys-devel/gcc-4.2:*[openmp]
+   sys-devel/clang-runtime:*[openmp]
+   )
+   )
+   static? (
+   app-crypt/libb2:=[static-libs]
+   !libressl? ( dev-libs/openssl:0=[static-libs] )
+   libressl? ( dev-libs/libressl:0=[static-libs] )
+   sys-libs/zlib:=[static-libs]
+   app-crypt/gpgme:=[static-libs]
+   )
+   !static? (
+   app-crypt/libb2:=
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   sys-libs/zlib:=
+   app-crypt/gpgme:=
+   )
+   )
+   qtegrity? (
+   openmp? (
+   || (
+   >=sys-devel/gcc-4.2:*[openmp]
+   sys-devel/clang-runtime:*[openmp]
+   )
+   )
+   static? (
+   !libressl? ( dev-libs/openssl:0=[static-libs] )
+   libressl? ( dev-libs/libressl:0=[static-libs] )
+   )
+   !static? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )
+   )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+   econf \
+   --disable-maintainer-mode \
+  

[gentoo-commits] proj/portage-utils: New tag: v0.90.1

2020-11-17 Thread Fabian Groffen
commit: 
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Nov 17 19:21:15 2020 +

New tag: v0.90.1




[gentoo-commits] proj/portage-utils:master commit in: /

2020-11-14 Thread Fabian Groffen
commit: 0b59c2de6f0390260c1313823c0c044bfffb48b0
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 14 17:06:24 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 14 17:06:24 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=0b59c2de

qmerge: adapt style after previous commit

Signed-off-by: Fabian Groffen  gentoo.org>

 qmerge.c | 42 ++
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/qmerge.c b/qmerge.c
index 6d98329..73efcb6 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -1231,56 +1231,58 @@ pkg_merge(int level, const depend_atom *atom, const 
struct pkg_t *pkg)
 * Since some tools (e.g. zstd) complain about the .bz2
 * extension, we feed the tool by input redirection. */
snprintf(buf, sizeof(buf),
-   BUSYBOX " sh -c '%s%s"
-   "tar -x%sf - -C image/'",
+   BUSYBOX " sh -c '%s%star -x%sf - -C image/'",
compr, compr[0] == '\0' ? "" : " | ",
((verbose > 1) ? "v" : ""));
 
/* start the tar pipe and copy tbz2size binpkg bytes into it
 * "manually" rather than depending on dd or head */
{
-   FILE *tarpipe, *tbz2f;
+   FILE *tarpipe;
+   FILE *tbz2f;
unsigned char iobuf[8192];
int piped = 0;
-   size_t n, rd, wr;
+   int err;
+   size_t n;
+   size_t rd;
+   size_t wr;
 
-   tarpipe = popen(buf, "w");
-   if (NULL == tarpipe)
-   errp("popen(%s)", buf);
+   if ((tarpipe = popen(buf, "w")) == NULL)
+   errp("failed to start %s", buf);
 
-   tbz2f = fopen(tbz2, "r");
-   if (NULL == tbz2f)
-   errp("fopen(%s)", tbz2);
+   if ((tbz2f = fopen(tbz2, "r")) == NULL)
+   errp("failed to open %s for reading", tbz2);
 
for (piped = wr = 0; piped < tbz2size; piped += wr) {
n = MIN(tbz2size - piped, (ssize_t)sizeof iobuf);
rd = fread(iobuf, 1, n, tbz2f);
if (0 == rd) {
-   errno = ferror(tbz2f);
-   if (errno)
-   errp("fread(%s)", tbz2);
+   if ((err = ferror(tbz2f)) != 0)
+   err("reading %s failed: %s", tbz2, 
strerror(errno));
 
if (feof(tbz2f))
-   err("%s: unexpected EOF; corrupted 
binpkg", tbz2);
+   err("unexpected EOF in %s: corrupted 
binpkg", tbz2);
}
 
for (wr = n = 0; wr < rd; wr += n) {
n = fwrite(iobuf + wr, 1, rd - wr, tarpipe);
if (n != rd - wr) {
-   errno = ferror(tarpipe);
-   if (errno)
-   errp("fwrite(%s)", buf);
+   if ((err = ferror(tarpipe)) != 0)
+   err("failed to unpack binpkg: 
%s", strerror(errno));
 
if (feof(tarpipe))
-   err("%s pipe: unexpected EOF", 
buf);
+   err("unexpected EOF trying to 
unpack binpkg");
}
}
}
 
fclose(tbz2f);
 
-   if (-1 == pclose(tarpipe))
-   errp("pclose(%s)", buf);
+   err = pclose(tarpipe);
+   if (err > 0)
+   err("finishing unpack binpkg exited with status %d", 
err);
+   else if (err < 0)
+   errp("finishing unpack binpkg unsuccessful");
}
 
free(tbz2);



[gentoo-commits] proj/portage-utils:master commit in: /

2020-11-14 Thread Fabian Groffen
commit: 77a0017b2ea736670eba1f3923201dc1c2858feb
Author: Peter Stuge  stuge  se>
AuthorDate: Tue Nov 10 19:01:44 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 14 16:44:47 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=77a0017b

qmerge: copy tbz2 archive into decompressor/tar pipe ourselves

We have nothing to do while tar is running so let's copy the tbz2
archive part into a popen():ed tar pipe ourselves, rather than depend
on an external program.

Doing so also fixes a possible shell injection vulnerability and
improves performance.

Fixes: 7171479f ("qmerge: unpack tbz2 file without splitting it first", 
2020-05-17)
Signed-off-by: Peter Stuge  stuge.se>
Signed-off-by: Fabian Groffen  gentoo.org>

 qmerge.c | 52 +---
 1 file changed, 49 insertions(+), 3 deletions(-)

diff --git a/qmerge.c b/qmerge.c
index 36d3596..6d98329 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -1231,13 +1231,59 @@ pkg_merge(int level, const depend_atom *atom, const 
struct pkg_t *pkg)
 * Since some tools (e.g. zstd) complain about the .bz2
 * extension, we feed the tool by input redirection. */
snprintf(buf, sizeof(buf),
-   BUSYBOX " sh -c 'dd status=none if=%s bs=1 count=%d %s%s | "
+   BUSYBOX " sh -c '%s%s"
"tar -x%sf - -C image/'",
-   tbz2, tbz2size, compr[0] == '\0' ? "" : "| ", compr,
+   compr, compr[0] == '\0' ? "" : " | ",
((verbose > 1) ? "v" : ""));
 
+   /* start the tar pipe and copy tbz2size binpkg bytes into it
+* "manually" rather than depending on dd or head */
+   {
+   FILE *tarpipe, *tbz2f;
+   unsigned char iobuf[8192];
+   int piped = 0;
+   size_t n, rd, wr;
+
+   tarpipe = popen(buf, "w");
+   if (NULL == tarpipe)
+   errp("popen(%s)", buf);
+
+   tbz2f = fopen(tbz2, "r");
+   if (NULL == tbz2f)
+   errp("fopen(%s)", tbz2);
+
+   for (piped = wr = 0; piped < tbz2size; piped += wr) {
+   n = MIN(tbz2size - piped, (ssize_t)sizeof iobuf);
+   rd = fread(iobuf, 1, n, tbz2f);
+   if (0 == rd) {
+   errno = ferror(tbz2f);
+   if (errno)
+   errp("fread(%s)", tbz2);
+
+   if (feof(tbz2f))
+   err("%s: unexpected EOF; corrupted 
binpkg", tbz2);
+   }
+
+   for (wr = n = 0; wr < rd; wr += n) {
+   n = fwrite(iobuf + wr, 1, rd - wr, tarpipe);
+   if (n != rd - wr) {
+   errno = ferror(tarpipe);
+   if (errno)
+   errp("fwrite(%s)", buf);
+
+   if (feof(tarpipe))
+   err("%s pipe: unexpected EOF", 
buf);
+   }
+   }
+   }
+
+   fclose(tbz2f);
+
+   if (-1 == pclose(tarpipe))
+   errp("pclose(%s)", buf);
+   }
+
free(tbz2);
-   xsystem(buf);
fflush(stdout);
 
eat_file("vdb/DEFINED_PHASES", , _len);



[gentoo-commits] proj/portage-utils:master commit in: libq/, tests/profile/, tests/qfile/, tests/atom_compare/, tests/atom_explode/, ...

2020-11-13 Thread Fabian Groffen
commit: 9cbdb752cdf67fadf0eced5a852cf6eedfb6a33d
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Nov 13 09:32:14 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Fri Nov 13 09:32:14 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=9cbdb752

buildsys: regen

Signed-off-by: Fabian Groffen  gentoo.org>

 Makefile.in| 16 +++
 autotools/gnulib/Makefile.in   |  4 +--
 config.h.in|  6 
 configure  | 65 +-
 libq/Makefile.in   |  4 +--
 tests/Makefile.in  |  4 +--
 tests/atom_compare/Makefile.in |  4 +--
 tests/atom_explode/Makefile.in |  4 +--
 tests/copy_file/Makefile.in|  4 +--
 tests/install/Makefile.in  |  4 +--
 tests/mkdir/Makefile.in|  4 +--
 tests/profile/Makefile.in  |  4 +--
 tests/qatom/Makefile.in|  4 +--
 tests/qcheck/Makefile.in   |  4 +--
 tests/qdepends/Makefile.in |  4 +--
 tests/qfile/Makefile.in|  4 +--
 tests/qlist/Makefile.in|  4 +--
 tests/qlop/Makefile.in |  4 +--
 tests/qmanifest/Makefile.in|  4 +--
 tests/qmerge/Makefile.in   |  4 +--
 tests/qtbz2/Makefile.in|  4 +--
 tests/quse/Makefile.in |  4 +--
 tests/qxpak/Makefile.in|  4 +--
 tests/rmspace/Makefile.in  |  4 +--
 tests/source/Makefile.in   |  4 +--
 25 files changed, 125 insertions(+), 50 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 91d9a3b..4e26d75 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -375,8 +375,8 @@ am__recursive_targets = \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope distdir distdir-am dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-   $(LISP)config.h.in
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
+   config.h.in
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
@@ -2281,6 +2281,10 @@ dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c 
>$(distdir).tar.xz
$(am__post_remove_distdir)
 
+dist-zstd: distdir
+   tardir=$(distdir) && $(am__tar) | zstd -c 
$${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
+   $(am__post_remove_distdir)
+
 dist-tarZ: distdir
@echo WARNING: "Support for distribution archives compressed with" \
   "legacy program 'compress' is deprecated." >&2
@@ -2323,6 +2327,8 @@ distcheck: dist
  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
  unzip $(distdir).zip ;;\
+   *.tar.zst*) \
+ zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
@@ -2548,7 +2554,7 @@ uninstall-man: uninstall-man1
clean-binPROGRAMS clean-cscope clean-generic clean-libtool \
clean-local cscope cscopelist-am ctags ctags-am dist dist-all \
dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \
-   dist-zip distcheck distclean distclean-compile \
+   dist-zip dist-zstd distcheck distclean distclean-compile \
distclean-generic distclean-hdr distclean-libtool \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \

diff --git a/autotools/gnulib/Makefile.in b/autotools/gnulib/Makefile.in
index 8be76d3..7103387 100644
--- a/autotools/gnulib/Makefile.in
+++ b/autotools/gnulib/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

diff --git a/config.h.in b/config.h.in
index c8155e2..9b75f3a 100644
--- a/config.h.in
+++ b/config.h.in
@@ -670,6 +670,9 @@
 /* Define if you have ssl */
 #undef HAVE_SSL
 
+/* Define to 1 if you have the  header file. */
+#undef HAVE_STDDEF_H
+
 /* Define to 1 if you have the  header file. */
 #undef HAVE_STDINT_H
 
@@ -987,6 +990,9 @@
'sig_atomic_t'. */
 #undef SIG_ATOMIC_T_SUFFIX
 
+/* The number of 

[gentoo-commits] proj/portage-utils:master commit in: /

2020-11-13 Thread Fabian Groffen
commit: 4622c79b0a1bad6dd0c741f3d10fbc987e4f565e
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Nov 13 09:30:53 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Fri Nov 13 09:30:53 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=4622c79b

qmerge: don't call zstd with --long=31 on 32-bits platforms

32-bits recent versions of zstd do not grok this argument, so just drop
it for those platforms

Bug: https://bugs.gentoo.org/754102
Signed-off-by: Fabian Groffen  gentoo.org>

 configure.ac | 10 ++
 qmerge.c | 11 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 0efdf3e..989a34f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,16 @@ AM_PROG_AR
 LT_INIT
 AC_SUBST([LIBTOOL_DEPS])
 
+headers='#ifdef HAVE_STDDEF_H
+#include 
+#endif
+#ifdef HAVE_UNISTD_H
+#include 
+#endif
+'
+AC_CHECK_HEADERS([stddef.h unistd.h])
+AC_COMPILE_CHECK_SIZEOF([size_t], [${headers}])
+
 AC_CHECK_FUNCS_ONCE(m4_flatten([
   fmemopen
   scandirat

diff --git a/qmerge.c b/qmerge.c
index 143c4f3..36d3596 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -1191,8 +1191,17 @@ pkg_merge(int level, const depend_atom *atom, const 
struct pkg_t *pkg)
 * --long=xx where xx>27. The option is "safe" 
in the sense
 * that not more memory is allocated than what 
is really
 * needed to decompress the file. See
-* 
https://bugs.gentoo.org/show_bug.cgi?id=634980 */
+* 
https://bugs.gentoo.org/show_bug.cgi?id=634980,
+* however, on 32-bits arches this yields an 
parameter
+* out of bound error:
+* 
https://bugs.gentoo.org/show_bug.cgi?id=710444
+* 
https://bugs.gentoo.org/show_bug.cgi?id=754102
+* so only do this on 64-bits systems */
+#if SIZEOF_SIZE_T >= 8
compr = "zstd --long=31 -dc";
+#else
+   compr = "zstd -dc";
+#endif
/* If really tar -I would be used we would have 
to quote:
 * compr = "I \"zstd --long=31\"";
 * But actually we use a pipe (see below) */



[gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/

2020-11-09 Thread Fabian Groffen
commit: e136e62a128971469e60aead3fdbf6508398d4e8
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov  9 09:51:35 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov  9 09:53:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e136e62a

mail-client/mutt-2.0.0: version bump

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-client/mutt/Manifest  |   2 +
 mail-client/mutt/mutt-2.0.0.ebuild | 268 +
 2 files changed, 270 insertions(+)

diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index c35860c6471..0d5727c40d5 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,8 @@
 DIST mutt-1.14.4.tar.gz 5007437 BLAKE2B 
89d4327ddd86ec320c63db6ee9d3c07b7540a74aba7efdcb9605e5c5c242dec99fb5137d1cfc62fd4401e2af7589f03ebce78dfa2deae262aef408b804544656
 SHA512 
86484f009ca8bd1e26206694e03609a16f8a4e8c83620a07a4376fe160535a838e8c918a8a30799fb3d9cf46c059d67124f7425c42093fb5e5bf8ea4ac310daa
 DIST mutt-1.14.5.tar.gz 5008208 BLAKE2B 
a7c2f7f63d2ee23e743114315cbb40903db720de7f2836f551739edb0b78857c525c40ebde083064dd2430b89b21d7a17745dfc1185672f86b15a9a082c3778e
 SHA512 
950c8df3bdc552b41ba6209aed8d5ade6fff80fe4018a75856d0fdbcd6389bd995a6dee69e7badd05a9b40d2e2293ada9a9f9a96632e88af36b61162f226e2b9
 DIST mutt-1.14.7.tar.gz 5009968 BLAKE2B 
f729412d3da97fe9bd76733705317660edfa3858a9eb1012179fb289b03da58d79b6e261dbdc4ab8b001e89ca455e9972bab8f270bac28e887afc7e0bd9fc8c1
 SHA512 
dc9739b5f0a99ca70fcbd495c71fbead23e3481f9c9e426feb827997c9c42e5f28355084f54788820c96a079dedb649fcc20e69436fb3c4df7e46f372b533e7c
+DIST mutt-2.0.0.tar.gz 5287742 BLAKE2B 
d45cae45e560548a3f278972e7bff820c860b194f06286a4e2c456141e7d421b1812f423e31594d0c4b0c82c8c9f59749a8e127d41b8c172a5319a23cc8e
 SHA512 
2f48bf7eb9bb79a477e3fb9bf4bcde6033d7aaa8922eee20b6e6a05f49a1aea152a7987b99f335343175d87180062064c90c5a7b5bfa82aed188eeab0ac4a90b
 DIST mutt-gentoo-1.14.4-patches-r0.tar.xz 31124 BLAKE2B 
a9774a5bb5af18a275f7ea171cb08a12a98d63cbff57320d5d3fb4f995aac16f409689ac0015f3b5d37cfc20004c9fca72a3f63663aaa679a129d5f3886bc5cc
 SHA512 
05506399a471c262479db88ef11d2a95d79598fd696fe50de5f5c1c3cae5adf30a2806a1500ba94a62bcbf7deed99acc59a8afb903f50169e41b77010e0ad8cc
 DIST mutt-gentoo-1.14.5-patches-r0.tar.xz 31100 BLAKE2B 
14525b54afa1414667ebe2dc0c58b9b5d5ad4dcc5dbae3c5db13cc23d33dbd9434fa929ad297625c891b2d690e34729a4f61c526fb94857e271ac85f5a07488e
 SHA512 
fd8e473efa02e412aeaba258afee6dc02f9ca24f9edff643e4ef53c759a091e54c6a544e39cd7faa94cd680546bfcf845e282638045ae65a88d140ebb03a4631
 DIST mutt-gentoo-1.14.7-patches-r0.tar.xz 31144 BLAKE2B 
5a9806dec79f8a991e39464afde1faf2ba988e67ffd85ec16943432a83ee1d05ddcb839095a475ab56aa80a4bbe25de58835d6bde84c0c95e4487df139e16e82
 SHA512 
ca57af137bc5a2663724cb97a7ea04e4d62b2fe8a3864489f15552ef361c1fb8c881ebc783a4f3a6d82c5e9bb45e83fbe6cad59158c831c54361729ada24b458
+DIST mutt-gentoo-2.0.0-patches-r0.tar.xz 26396 BLAKE2B 
80db2456871208050e5cccbd8ba22024dc45ffc69e9b8cbb892904010f0521061f0755f62984502c2cee58bb74aa0c30fafa4613709d2e8a6d0fe291bbc86e27
 SHA512 
f9b8f9abded13de54d7fcf991d58fa45e68d6e059c807dcca1530bdb927d7301faa30e31798e5a3f2d25504cb9db81dfa26f8cde3946a14f540f54955add2828

diff --git a/mail-client/mutt/mutt-2.0.0.ebuild 
b/mail-client/mutt/mutt-2.0.0.ebuild
new file mode 100644
index 000..353c1c707ea
--- /dev/null
+++ b/mail-client/mutt/mutt-2.0.0.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r0"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/;
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+   https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+   https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES};
+IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos 
libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic 
+smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+   hcache?   ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+   imap? ( ssl )
+   pop?  ( ssl )
+   smime-classic?( ssl !gnutls )
+   smtp? ( ssl sasl )
+   sasl? ( || ( imap pop smtp ) )
+   kerberos? ( || ( imap pop smtp ) )
+   autocrypt?( gpgme )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-so

[gentoo-commits] repo/gentoo:master commit in: profiles/

2020-11-08 Thread Fabian Groffen
commit: ffcf405cd800665176ae8393b10b6cf11e053c5d
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov  9 07:10:35 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov  9 07:10:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffcf405c

profiles/profiles.desc: add 17.1 amd64 prefix profiles

Closes: https://bugs.gentoo.org/753626
Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/profiles.desc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 258698f08ab..c7dab8d650c 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -272,6 +272,9 @@ x86-linux   prefix/linux/x86
exp
 amd64-linuxdefault/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+ 
dev
 amd64-linux
default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+  exp
 amd64-linux
default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+  exp
+amd64-linuxdefault/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+ 
dev
+amd64-linux
default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+  exp
+amd64-linux
default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+  exp
 x86-linux  default/linux/x86/17.0/prefix/kernel-3.2+   exp
 x86-linux  default/linux/x86/17.0/prefix/kernel-2.6.32+exp
 x86-linux  default/linux/x86/17.0/prefix/kernel-2.6.16+exp



[gentoo-commits] repo/gentoo:master commit in: eclass/

2020-11-07 Thread Fabian Groffen
commit: a82b2524490da31ea9df557e0fcb200c401df02c
Author: Alexey Sokolov  google  com>
AuthorDate: Thu Oct 15 21:52:24 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov  7 14:50:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a82b2524

virtualx.eclass: don't skip xvfb dependency on Prefix

Closes: https://bugs.gentoo.org/730190
Signed-off-by: Alexey Sokolov  asokolov.org>
Signed-off-by: Fabian Groffen  gentoo.org>

 eclass/virtualx.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index 6aba6bf488d..fa16784bd94 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -40,7 +40,7 @@ esac
 # complicated dep is needed.
 # You can specify the variable BEFORE inherit to add more dependencies.
 VIRTUALX_DEPEND="${VIRTUALX_DEPEND}
-   !prefix? ( x11-base/xorg-server[xvfb] )
+   x11-base/xorg-server[xvfb]
x11-apps/xhost
 "
 



[gentoo-commits] repo/gentoo:master commit in: profiles/features/prefix/

2020-11-07 Thread Fabian Groffen
commit: 4586707c18a802093926ce6db7a9c3df075a9a73
Author: Alexey Sokolov  google  com>
AuthorDate: Thu Oct 15 21:46:18 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov  7 14:49:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4586707c

profiles: prefix: mask USE=elogind in x11-base/xorg-server

Bug: https://bugs.gentoo.org/730190
Signed-off-by: Alexey Sokolov  asokolov.org>
Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/features/prefix/package.use.mask | 4 
 1 file changed, 4 insertions(+)

diff --git a/profiles/features/prefix/package.use.mask 
b/profiles/features/prefix/package.use.mask
index 407c79e2f15..37eb627c398 100644
--- a/profiles/features/prefix/package.use.mask
+++ b/profiles/features/prefix/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen  (2020-10-15)
+# Requires PAM
+x11-base/xorg-server elogind
+
 # Georgy Yakovlev  (2020-10-21)
 # depends on systemd
 sys-apps/ipmitool openbmc



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-11-07 Thread Fabian Groffen
commit: 0d7f6b6eb00d0f51f35019846b8f79048b30be93
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov  7 11:55:19 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov  7 11:55:19 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0d7f6b6e

scripts/bootstrap-prefix: move RAP bootstrap profile to 17.1 for amd64

Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 46a5ec10c4..ea559afe5c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -428,7 +428,7 @@ bootstrap_setup() {
;;
x86_64-pc-linux-gnu)
profile=${profile_linux/ARCH/amd64}
-   profile=${profile/17.0/17.0/no-multilib}
+   profile=${profile/17.0/17.1/no-multilib}
;;
ia64-pc-linux-gnu)
profile=${profile_linux/ARCH/ia64}



[gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+/, ...

2020-11-07 Thread Fabian Groffen
commit: a9c478dc881ee18fefc7342da994b00e60eaad8e
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov  7 11:52:01 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov  7 11:52:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9c478dc

profiles/default/linux/amd64/no-multilib: add RAP Prefix anchors

This is a straight copy from the 17.0 profile to be able move away from
it.

Signed-off-by: Fabian Groffen  gentoo.org>

 .../default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+/eapi | 1 +
 .../default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+/parent   | 2 ++
 .../default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+/eapi | 1 +
 .../default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+/parent   | 2 ++
 profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+/eapi   | 1 +
 profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+/parent | 2 ++
 profiles/default/linux/amd64/17.1/no-multilib/prefix/parent | 1 +
 7 files changed, 10 insertions(+)

diff --git 
a/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+/eapi 
b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+/eapi
new file mode 100644
index 000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+/eapi
@@ -0,0 +1 @@
+5

diff --git 
a/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+/parent 
b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+/parent
new file mode 100644
index 000..665aafbea8d
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone/kernel-2.6.16+

diff --git 
a/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+/eapi 
b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+/eapi
new file mode 100644
index 000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+/eapi
@@ -0,0 +1 @@
+5

diff --git 
a/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+/parent 
b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+/parent
new file mode 100644
index 000..7eed652658f
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone/kernel-2.6.32+

diff --git 
a/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+/eapi 
b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+/eapi
new file mode 100644
index 000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5

diff --git 
a/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+/parent 
b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+/parent
new file mode 100644
index 000..b3da232ba55
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone

diff --git a/profiles/default/linux/amd64/17.1/no-multilib/prefix/parent 
b/profiles/default/linux/amd64/17.1/no-multilib/prefix/parent
new file mode 100644
index 000..f3229c5b987
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/prefix/parent
@@ -0,0 +1 @@
+..



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux/amd64/

2020-11-07 Thread Fabian Groffen
commit: b0445c0a8dd6d2f792c5bb088b154aca53868353
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov  7 11:48:57 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Nov  7 11:50:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0445c0a

profiles/prefix/linux/amd64: switch parent to 17.1 amd64 profile

This change only affects host-style Prefix on Linux, e.g. non-RAP.

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/linux/amd64/parent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/prefix/linux/amd64/parent 
b/profiles/prefix/linux/amd64/parent
index 0d2c53ad27f..c8d63be093b 100644
--- a/profiles/prefix/linux/amd64/parent
+++ b/profiles/prefix/linux/amd64/parent
@@ -1,2 +1,2 @@
-../../../default/linux/amd64/17.0/no-multilib
+../../../default/linux/amd64/17.1/no-multilib
 ..



[gentoo-commits] repo/gentoo:master commit in: dev-python/dulwich/

2020-11-02 Thread Fabian Groffen
commit: 133900581bdda61a6a01e3b75d75b96da1ec2c64
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov  2 09:35:53 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov  2 09:50:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13390058

dev-python/dulwich-0.20.6: set DISTUTILS_USE_SETUPTOOLS

Closes: https://bugs.gentoo.org/746530
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 dev-python/dulwich/dulwich-0.20.6.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-python/dulwich/dulwich-0.20.6.ebuild 
b/dev-python/dulwich/dulwich-0.20.6.ebuild
index 7b74aac571b..3e1b56579a8 100644
--- a/dev-python/dulwich/dulwich-0.20.6.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.6.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend  # tests use setuptools, setup uses if found
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/

2020-11-02 Thread Fabian Groffen
commit: a621519a8314153d9237e7f8809f3ae19b501c77
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov  2 09:27:30 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Mon Nov  2 09:50:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a621519a

net-analyzer/graphite-web-1.1.7: set DISTUTILS_USE_SETUPTOOLS

Closes: https://bugs.gentoo.org/751685
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 net-analyzer/graphite-web/graphite-web-1.1.7.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild 
b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
index 2cdf6cbba79..96b7920163d 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
# 1.1.7 supports up to 3.9, so it's a matter of deps
+DISTUTILS_USE_SETUPTOOLS=no  # export USE_SETUPTOOLS to activate
 
 inherit distutils-r1 prefix
 



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/

2020-11-01 Thread Fabian Groffen
commit: eb3e00242c8bf57a2cd677bae5dcbf906ded
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Nov  1 08:40:30 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sun Nov  1 08:40:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb3e0024

net-analyzer/graphite-web: allow python3.8 now python-memcached got support

Closes: https://bugs.gentoo.org/718418
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild | 2 +-
 net-analyzer/graphite-web/graphite-web-1.1.7.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild 
b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
index 35eb0f1c76f..4eb15c40b8c 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )  # 3.8 dropped due to dep on python-memcached
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 prefix
 

diff --git a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild 
b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
index 74a4e43dac9..2cdf6cbba79 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )  # 3.8 dropped due to dep on python-memcached
+PYTHON_COMPAT=( python3_{6,7,8} )
# 1.1.7 supports up to 3.9, so it's a matter of deps
 
 inherit distutils-r1 prefix



[gentoo-commits] repo/gentoo:master commit in: app-text/vilistextum/, app-text/vilistextum/files/

2020-10-31 Thread Fabian Groffen
commit: 377ba1b3198a4b260e30600a4479a3e48e3693e5
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Oct 31 12:36:23 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Sat Oct 31 12:36:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=377ba1b3

app-text/vilistextum-2.8.0.20200411: version bump for -fno-common

Bug: https://bugs.gentoo.org/707644
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 app-text/vilistextum/Manifest  |   1 +
 .../vilistextum-2.8.0.20200411-blockquote.patch| 120 +
 ...vilistextum-2.8.0.20200411-list-alignment.patch |  43 
 .../vilistextum/vilistextum-2.8.0.20200411.ebuild  |  80 ++
 4 files changed, 244 insertions(+)

diff --git a/app-text/vilistextum/Manifest b/app-text/vilistextum/Manifest
index a8d25bac9f5..73b4114bac3 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -1,2 +1,3 @@
 DIST vilistextum-2.6.9.tar.bz2 147743 BLAKE2B 
1cf6f187cb277271ddd9946984afb4d59336ea0cd446e62df3593070ccc63b3510a107e2b7e7b8dc757c63e4f5caf3790c7d998b6be325f4d22d2a6b9fea3432
 SHA512 
ce76a4061b766e4544d1a8698614a3b6959439ba6995a2977c10b01b0142c524d4b215c3272a1dcfcc4f5b6fda03210de95d65cedecfc6a1c940cedf487d
 DIST vilistextum-2.8.0.20191023.tar.gz 219395 BLAKE2B 
5e3962b4b18b9e6e3896f26e04a63394b3ed58473862f264a3255641b5d13474e12529acadcff3d2f71eb5a41ec7b11a1367f3da15e473551e87e554472f6727
 SHA512 
99023b4801159047e1433dc5a887e6164192f7aa25bdc79594e717f047f83177612e5120d55cbbc22f3ad4e225bc229a0b186f7fc337c6081ff27ac781422f4e
+DIST vilistextum-2.8.0.20200411.tar.gz 219791 BLAKE2B 
95b86d17e8dbf29b520aa48c88eb8c9e8abb01a234848ed55bdad0a63a7c0ec8ca9ae7c437fe7f84bbf7f4dad74fc8437a9e3b53493552e9e01b8029b10ef18a
 SHA512 
40a219ebe7bebd61548a3bad794690cf091b67b70e8e6c44548a0c1b9f61077b141a035335e7128b191a8501103707f5324b00326a407e29ec0fee383c4d0917

diff --git 
a/app-text/vilistextum/files/vilistextum-2.8.0.20200411-blockquote.patch 
b/app-text/vilistextum/files/vilistextum-2.8.0.20200411-blockquote.patch
new file mode 100644
index 000..c8a7da2c212
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0.20200411-blockquote.patch
@@ -0,0 +1,120 @@
+Many clients seem to use blockquote tags to flag quotes these days, so
+write them out as quotes, so they remain readable.
+
+--- a/src/html_tags.c  2019-10-23 16:25:27.0 +0200
 b/src/html_tags.c  2020-02-05 20:11:57.308596941 +0100
+@@ -261,6 +261,7 @@
+   line_break();
+   } else {
+   start_p();
++  quote++;
+   }
+ } /* html_pre */
+ 
+@@ -271,6 +272,7 @@
+   line_break();
+   } else {
+   paragraphen_ende();
++  quote -= quote != 0;
+   }
+ } /* html_pre_end */
+ 
+--- a/src/multibyte.h  2020-02-05 20:08:43.863715764 +0100
 b/src/multibyte.h  2020-02-05 20:12:34.401382354 +0100
+@@ -18,6 +18,7 @@
+  #define ATOI(n) wcstoi(n)
+ 
+  #define ONESPACE L" "
++ #define QUOTE L">"
+  #define WORT_PLUS_STRING(str) wort_plus_string(L##str)
+ 
+  #define STRSTR(haystack, needle) wcsstr(haystack, L##needle)
+@@ -43,6 +44,7 @@
+  #define ATOI(n) atoi(n)
+ 
+  #define ONESPACE " "
++ #define QUOTE ">"
+  #define WORT_PLUS_STRING(str) wort_plus_string(str)
+ 
+  #define STRSTR(haystack, needle) strstr(haystack, needle)
+--- a/src/text.c   2019-10-23 16:25:27.0 +0200
 b/src/text.c   2020-02-05 20:16:04.852164539 +0100
+@@ -28,6 +28,7 @@
+ int breite=76,
+   hr_breite=76,
+   paragraph=0,
++  quote=0,
+ 
+   tab=4, /* tabulator */
+   spaces=0,  /* spaces at beginning of line */
+@@ -378,6 +379,12 @@
+   printf(" z0: zeilen_pos: %d\n",zeilen_pos);
+ #endif
+   print_zeile();
++  if (quote > 0)
++  {
++  i=0;
++  while (i0) { zeile_plus_wort(ONESPACE,1,1); }
+@@ -398,6 +405,12 @@
+   printf(" z2: zeilen_len: %d\n",zeilen_len);
+   printf(" z2: zeilen_pos: %d\n",zeilen_pos);
+ #endif
++  if (quote > 0)
++  {
++  i=0;
++  while (i0) { zeile_plus_wort(ONESPACE,1,1); }
+--- a/src/text.h   2019-10-23 16:25:27.0 +0200
 b/src/text.h   2020-02-05 20:18:40.792261818 +0100
+@@ -26,6 +26,7 @@
+ 
+ extern int tab;
+ extern int spaces;
++extern int quote;
+ 
+ void print_zeile();
+ int is_zeile_empty();
+--- a/tests/test_functions
 b/tests/test_functions
+@@ -12,6 +12,9 @@
+   rm -f testcases/$prefix.output.test
+   ../src/vilistextum 2>/dev/null $args testcases/$prefix.html 
testcases/$output_prefix.output.test
+ 
++  # remove (block)quotes
+

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-10-27 Thread Fabian Groffen
commit: 6c17f821de91c518556ea345a1a88abbe8706bc3
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Oct 27 07:42:40 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Tue Oct 27 07:42:40 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6c17f821

scripts/bootstrap-prefix: pre-create portroot

For some reason linking the portage tree in the tmp image fails, so
ensure whilst setting up all other dirs in /tmp that also the portroot
is created.

Bug: https://bugs.gentoo.org/751421
Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a3ada85d3b..46a5ec10c4 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1349,6 +1349,8 @@ bootstrap_stage1() {
# best.
 
# See comments in do_tree().
+   local portroot=${PORTDIR%/*}
+   mkdir -p "${ROOT}"/tmp/${portroot#${ROOT}/}
for x in lib sbin bin; do
mkdir -p "${ROOT}"/tmp/usr/${x}
[[ -e ${ROOT}/tmp/${x} ]] || ( cd "${ROOT}"/tmp && ln -s 
usr/${x} )



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2020-10-27 Thread Fabian Groffen
commit: 4af2e4cc26e0076bbec9eb48ff8f70519e297583
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Oct 27 07:17:48 2020 +
Commit:     Fabian Groffen  gentoo  org>
CommitDate: Tue Oct 27 07:17:48 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4af2e4cc

scripts/bootstrap-prefix: don't pull in python2 for clang any more, bug #751412

Closes: https://bugs.gentoo.org/751412
Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index df71d5d392..a3ada85d3b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -379,13 +379,6 @@ bootstrap_setup() {
echo "USE=\"\${USE} 
${MAKE_CONF_ADDITIONAL_USE}\""
[[ ${OFFLINE_MODE} ]] && \
echo 'FETCHCOMMAND="bash -c \"echo I need 
\${FILE} from \${URI} in \${DISTDIR}; read\""'
-   if [[ ${compiler_type} == clang ]] ; then
-   local ptrgs=$(sed -n 
's/^PYTHON_TARGETS="\([^"]\+\)".*$/\1/' \
-   "${PORTDIR}"/profiles/prefix/make.conf)
-   ptrgs=${ptrgs/-python2_7/}
-   echo "# python2 is required by 
sys-devel/clang-6"
-   echo "PYTHON_TARGETS=\"python2_7 ${ptrgs}\""
-   fi
} > "${ROOT}"/etc/portage/make.conf
fi
 



  1   2   3   4   5   6   7   8   9   10   >