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

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

[Michael Haubenwallner]

commit:     7260b2621df1794ea13e6455866ecd1e13b4db4b
Author:     Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com>
AuthorDate: Wed May 11 14:58:39 2016 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon May 23 12:38:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7260b262

profiles/prefix/cygwin: python-3.5 is not cygwin ready yet

 profiles/prefix/windows/cygwin/use.mask | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/profiles/prefix/windows/cygwin/use.mask b/profiles/prefix/windows/cygwin/use.mask
index f4da8b4..10b15a1 100644
--- a/profiles/prefix/windows/cygwin/use.mask
+++ b/profiles/prefix/windows/cygwin/use.mask
@@ -4,3 +4,6 @@
 
 # Re-add Cygwin's libc
 -elibc_Cygwin
+
+# python-3.5 is not cygwin ready yet
+python_targets_python3_5

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

[Michael Haubenwallner]

commit:     b9718f60648df42ffa281d0b7bef90568fa1b9bc
Author:     Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com>
AuthorDate: Wed May 25 14:12:17 2016 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 12:06:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9718f60

profiles/prefix/cygwin: use.mask python_targets_python3 for now

 profiles/prefix/windows/cygwin/use.mask | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/profiles/prefix/windows/cygwin/use.mask b/profiles/prefix/windows/cygwin/use.mask
index 10b15a1..4304213 100644
--- a/profiles/prefix/windows/cygwin/use.mask
+++ b/profiles/prefix/windows/cygwin/use.mask
@@ -5,5 +5,10 @@
 # Re-add Cygwin's libc
 -elibc_Cygwin
 
-# python-3.5 is not cygwin ready yet
+# we do not have python-3 cygwin ready yet
+python_targets_python3_0
+python_targets_python3_1
+python_targets_python3_2
+python_targets_python3_3
+python_targets_python3_4
 python_targets_python3_5

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

[Michael Haubenwallner]

commit:     34eb5e381662df359d92137d5218207c9e1ffc89
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 11:23:12 2016 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 11:24:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34eb5e38

profiles/cygwin/packages: add sys-devel/binutils

 profiles/prefix/windows/cygwin/packages | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/profiles/prefix/windows/cygwin/packages b/profiles/prefix/windows/cygwin/packages
new file mode 100644
index 00000000..8f7809e
--- /dev/null
+++ b/profiles/prefix/windows/cygwin/packages
@@ -0,0 +1,5 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+*sys-devel/binutils

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

[Michael Haubenwallner]

commit:     481ad51cc1a533dfe2c158344ed129ebfadb426b
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 16 11:24:14 2017 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 11:24:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=481ad51c

profiles/prefix/cygwin: p.mask libidn2-0.16

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

diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask
index b44aec6face..92beb403eb7 100644
--- a/profiles/prefix/windows/cygwin/package.mask
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michael Haubenwallner <haubi@gentoo.org> (15 Mar 2017)
+# Cygwin breakage in 0.16 should be fixed in 0.17
+~net-dns/libidn2-0.16
+
 # Michael Haubenwallner <haubi@gentoo.org> (20 May 2016)
 # Does not work with Cygwin.
 sys-apps/man-db

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

[Michael Haubenwallner]

commit:     e1406fbe6106358c77bffed0ebb4d8e76b871413
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 07:56:20 2017 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 07:59:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1406fbe

profiles/prefix/cygwin: p.use nettle for libarchive

To hide a macro conflict between openssl and wincrypt due to wrong
detection algorithm of openssl for Cygwin.

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

diff --git a/profiles/prefix/windows/cygwin/package.use b/profiles/prefix/windows/cygwin/package.use
index 1681aa34eee..9439b6ac23c 100644
--- a/profiles/prefix/windows/cygwin/package.use
+++ b/profiles/prefix/windows/cygwin/package.use
@@ -1,6 +1,10 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michael Haubenwallner <haubi@gentoo.org> (23 Mar 2017)
+# Using nettle hides a conflict between wincrypt and openssl.
+app-arch/libarchive nettle
+
 # Michael Haubenwallner <haubi@gentoo.org> (18 Apr 2016)
 # Cygwin coreutils provide kill as gkill
 sys-apps/coreutils kill

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

[Michael Haubenwallner]

commit:     45d65f366877d7d45e567997e0a43a1008bb7d10
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 25 09:55:51 2017 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 25 09:56:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45d65f36

profiles/prefix/cygwin (packages): add sys-libs/cygwin-crypt

 profiles/prefix/windows/cygwin/packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/prefix/windows/cygwin/packages b/profiles/prefix/windows/cygwin/packages
index 869d80c4ff0..48b7c0bfe44 100644
--- a/profiles/prefix/windows/cygwin/packages
+++ b/profiles/prefix/windows/cygwin/packages
@@ -2,3 +2,4 @@
 # Distributed under the terms of the GNU General Public License v2
 
 *sys-devel/binutils
+*sys-libs/cygwin-crypt

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

[Michael Haubenwallner]

commit:     5f0a88d282cb77b13ff25e7f738262d6e15f8821
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 07:59:58 2017 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 07:59:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f0a88d2

profiles/cygwin/p.mask: >=coreutils-8.27, cygwin provides 8.26 for now, bug#638816

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

diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask
index 92beb403eb7..3a8ae9a85b7 100644
--- a/profiles/prefix/windows/cygwin/package.mask
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Michael Haubenwallner <haubi@gentoo.org> (15 Mar 2017)
+# Cygwin upstream does not provide coreutils-8.28 yet, bug#638816.
+>=sys-apps/coreutils-8.27
+
+# Michael Haubenwallner <haubi@gentoo.org> (15 Mar 2017)
 # Cygwin breakage in 0.16 should be fixed in 0.17
 ~net-dns/libidn2-0.16
 

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

[Michael Haubenwallner]

commit:     68a31fc314197b0827b6ea01731ec85c02914ca8
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 08:03:19 2017 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 08:03:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a31fc3

profiles/cygwin/p.mask: use current date (bug#638816)

 profiles/prefix/windows/cygwin/package.mask | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask
index 3a8ae9a85b7..cf5b2e00b3c 100644
--- a/profiles/prefix/windows/cygwin/package.mask
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -1,7 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Michael Haubenwallner <haubi@gentoo.org> (15 Mar 2017)
+# Michael Haubenwallner <haubi@gentoo.org> (29 Nov 2017)
 # Cygwin upstream does not provide coreutils-8.28 yet, bug#638816.
 >=sys-apps/coreutils-8.27
 

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

[Michael Haubenwallner]

commit:     e2d28806e884c31b16695c0d1f8e48db74017c7d
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 09:41:27 2017 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 09:41:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2d28806

profiles/cygwin/p.mask: drop >=coreutils-8.27, got patch in bug#638816

 profiles/prefix/windows/cygwin/package.mask | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask
index cf5b2e00b3c..92beb403eb7 100644
--- a/profiles/prefix/windows/cygwin/package.mask
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Michael Haubenwallner <haubi@gentoo.org> (29 Nov 2017)
-# Cygwin upstream does not provide coreutils-8.28 yet, bug#638816.
->=sys-apps/coreutils-8.27
-
 # Michael Haubenwallner <haubi@gentoo.org> (15 Mar 2017)
 # Cygwin breakage in 0.16 should be fixed in 0.17
 ~net-dns/libidn2-0.16

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

[Michael Haubenwallner]

commit:     34c88b53b7b7940f643248dedae5961d2f6d718a
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 14:13:57 2017 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 14:13:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34c88b53

profiles/prefix/cygwin/profile.bashrc: xz-utils need -I, not -isystem

During bootstrap-prefix.sh we set CPPFLAGS="-isystem .../usr/include",
but on Cygwin xz-utils eventually use the windres compiler, which fails
to understand the -isystem flag.

 profiles/prefix/windows/cygwin/profile.bashrc | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/profiles/prefix/windows/cygwin/profile.bashrc b/profiles/prefix/windows/cygwin/profile.bashrc
new file mode 100644
index 00000000000..f016c87b0d4
--- /dev/null
+++ b/profiles/prefix/windows/cygwin/profile.bashrc
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [[ ${CATEGORY}/${PN} == app-arch/xz-utils
+   && ${EBUILD_PHASE} == setup
+   && ${CPPFLAGS} == *-isystem*
+]]; then
+	# During bootstrap-prefix.sh we set CPPFLAGS="-isystem $EPREFIX/usr/include",
+	# but on Cygwin xz-utils eventually does use the windres compiler,
+	# which fails to understand -isystem.
+	# As xz-utils has no need for -isystem here, we can use -I instead.
+	CPPFLAGS=${CPPFLAGS//-isystem /-I}
+fi

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

[Michał Górny]

commit:     33b41f22509ee852e9ef2bbb217520b736899fda
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 11:04:23 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 11:49:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33b41f22

profiles/prefix/windows: Remove obsolete package masks

 profiles/prefix/windows/cygwin/package.mask | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask
index 92beb403eb7..3b9f839a32c 100644
--- a/profiles/prefix/windows/cygwin/package.mask
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -1,10 +1,6 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Michael Haubenwallner <haubi@gentoo.org> (15 Mar 2017)
-# Cygwin breakage in 0.16 should be fixed in 0.17
-~net-dns/libidn2-0.16
-
 # Michael Haubenwallner <haubi@gentoo.org> (20 May 2016)
 # Does not work with Cygwin.
 sys-apps/man-db

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

[Michael Haubenwallner]

commit:     a96e8192563e02c1197134c7ff2518a5ecf8c616
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 15:31:05 2018 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon May 14 16:14:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a96e8192

profiles/cygwin/p.use: ssp not by default yet

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

diff --git a/profiles/prefix/windows/cygwin/package.use b/profiles/prefix/windows/cygwin/package.use
index 9439b6ac23c..e115972f7c1 100644
--- a/profiles/prefix/windows/cygwin/package.use
+++ b/profiles/prefix/windows/cygwin/package.use
@@ -1,6 +1,10 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michael Haubenwallner <haubi@gentoo.org> (14 May 2018)
+# stack protector does not fully work on Cygwin yet
+=sys-devel/gcc-6* -ssp
+
 # Michael Haubenwallner <haubi@gentoo.org> (23 Mar 2017)
 # Using nettle hides a conflict between wincrypt and openssl.
 app-arch/libarchive nettle

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

[Michael Haubenwallner]

commit:     be6dbc5a9d2052338d58e0a6ea2d69cf118ecec1
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  8 18:27:34 2018 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Fri Jun  8 18:29:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be6dbc5a

profiles/cygwin/p.use: disable ssp for all gcc versions

Bug: https://bugs.gentoo.org/657594

 profiles/prefix/windows/cygwin/package.use | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/prefix/windows/cygwin/package.use b/profiles/prefix/windows/cygwin/package.use
index e115972f7c1..e84dda26175 100644
--- a/profiles/prefix/windows/cygwin/package.use
+++ b/profiles/prefix/windows/cygwin/package.use
@@ -3,7 +3,7 @@
 
 # Michael Haubenwallner <haubi@gentoo.org> (14 May 2018)
 # stack protector does not fully work on Cygwin yet
-=sys-devel/gcc-6* -ssp
+sys-devel/gcc -ssp
 
 # Michael Haubenwallner <haubi@gentoo.org> (23 Mar 2017)
 # Using nettle hides a conflict between wincrypt and openssl.

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

[Michael Haubenwallner]

commit:     35470d5b1108131584d611fcc7697090eb7de0cd
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  2 17:00:59 2018 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  2 17:01:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35470d5b

prefix/cygwin: p.mask gettext-0.19.8.1 for now

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

diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask
index 3b9f839a32c..d31399b7dbc 100644
--- a/profiles/prefix/windows/cygwin/package.mask
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michael Haubenwallner <haubi@gentoo.org> (02 Jul 2018)
+# Need to import Cygwin upstream patches still.
+~sys-devel/gettext-0.19.8.1
+
 # Michael Haubenwallner <haubi@gentoo.org> (20 May 2016)
 # Does not work with Cygwin.
 sys-apps/man-db

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

[Michael Haubenwallner]

commit:     8075f44abb8acb46c87d9877031ecbdfb4d6537d
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 30 14:39:23 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Jan 30 14:41:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8075f44a

profiles/cygwin: p.mask >=coreutils-8.30 for now

let's wait for cygwin upstream to rebase their nontrivial patch first

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 profiles/prefix/windows/cygwin/package.mask | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask
index d31399b7dbc..71b8a1e0a7b 100644
--- a/profiles/prefix/windows/cygwin/package.mask
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michael Haubenwallner <haubi@gentoo.org> (30 Jan 2019)
+# Cygwin does not have updated patches yet, is not trivial
+>=sys-apps/coreutils-8.30
+
 # Michael Haubenwallner <haubi@gentoo.org> (02 Jul 2018)
 # Need to import Cygwin upstream patches still.
 ~sys-devel/gettext-0.19.8.1

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

[Michael Haubenwallner]

commit:     9b617fcf4c6fe9e06f11f8483707e7d57802a31b
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 13 17:14:51 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Feb 13 17:16:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b617fcf

profiles/prefix/cygwin: p.unmask openssl-1.1.1a

as it is a little less broken than openssl-1.1.0j on Cygwin.
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 profiles/prefix/windows/cygwin/package.unmask | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/profiles/prefix/windows/cygwin/package.unmask b/profiles/prefix/windows/cygwin/package.unmask
new file mode 100644
index 00000000000..d66d4bab16c
--- /dev/null
+++ b/profiles/prefix/windows/cygwin/package.unmask
@@ -0,0 +1,6 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Michael Haubenwallner <haubi@gentoo.org> (13 Feb 2019)
+# A little less broken on Cygwin than openssl-1.1.0j.
+~dev-libs/openssl-1.1.1a

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

[Michael Haubenwallner]

commit:     d8a976eea84b82f4352d17c6f1adc428ef3bcd2b
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 13 17:41:38 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Feb 13 17:42:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8a976ee

profiles/prefix/cygwin: p.mask groff-1.22.4

Upstream introduced parallel build problem on Cygwin:
https://savannah.gnu.org/bugs/index.php?55708
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

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

diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask
index 71b8a1e0a7b..866c93128d7 100644
--- a/profiles/prefix/windows/cygwin/package.mask
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michael Haubenwallner <haubi@gentoo.org> (13 Feb 2019)
+# see upstream report https://savannah.gnu.org/bugs/index.php?55708
+=sys-apps/groff-1.22.4
+
 # Michael Haubenwallner <haubi@gentoo.org> (30 Jan 2019)
 # Cygwin does not have updated patches yet, is not trivial
 >=sys-apps/coreutils-8.30

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

[Michael Haubenwallner]

commit:     b034d89ef20282c4480378f948ac6749ee2c2750
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 11:41:40 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 11:42:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b034d89e

profiles/prefix/cygwin/use.mask: unmask python_targets_python3_6

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 profiles/prefix/windows/cygwin/use.mask | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/profiles/prefix/windows/cygwin/use.mask b/profiles/prefix/windows/cygwin/use.mask
index 7e47b5dd84f..a443b8e0a5e 100644
--- a/profiles/prefix/windows/cygwin/use.mask
+++ b/profiles/prefix/windows/cygwin/use.mask
@@ -4,8 +4,7 @@
 # Re-add Cygwin's libc
 -elibc_Cygwin
 
-# we do not have python-3 cygwin ready yet
+# we do have only python-3.6 ready on cygwin
 python_targets_python3_4
 python_targets_python3_5
-python_targets_python3_6
 python_targets_python3_7

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

[Michael Haubenwallner]

commit:     c051f21d38e094cb014842b0ead6915fb392c6db
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 27 12:46:09 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 12:57:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c051f21d

profiles/prefix/cygwin/p.mask: unmask gettext-0.19.8.1

have imported cygwin patches now
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 profiles/prefix/windows/cygwin/package.mask | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask
index 866c93128d7..dd14b483379 100644
--- a/profiles/prefix/windows/cygwin/package.mask
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -9,10 +9,6 @@
 # Cygwin does not have updated patches yet, is not trivial
 >=sys-apps/coreutils-8.30
 
-# Michael Haubenwallner <haubi@gentoo.org> (02 Jul 2018)
-# Need to import Cygwin upstream patches still.
-~sys-devel/gettext-0.19.8.1
-
 # Michael Haubenwallner <haubi@gentoo.org> (20 May 2016)
 # Does not work with Cygwin.
 sys-apps/man-db

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

[Michael Haubenwallner]

commit:     4d4cb9163e2c845e8700b1679c686b1ba9c25ea0
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 27 12:48:44 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 12:57:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d4cb916

profiles/prefix/cygwin: p.mask >=gcc-7.4

Cygwin gcc patches still are available up to gcc-7.3 only.
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

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

diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask
index dd14b483379..d0fd04c4259 100644
--- a/profiles/prefix/windows/cygwin/package.mask
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michael Haubenwallner <haubi@gentoo.org> (27 Feb 2020)
+# Cygwin does not provide this new version yet in it's repo.
+>=sys-devel/gcc-7.4
+
 # Michael Haubenwallner <haubi@gentoo.org> (13 Feb 2019)
 # see upstream report https://savannah.gnu.org/bugs/index.php?55708
 =sys-apps/groff-1.22.4

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

[Michael Haubenwallner]

commit:     2d15595d88d9910d71f6f46633f7e4900de83617
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 09:07:59 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 09:09:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d15595d

profiles/prefix/cygwin: p.unmask openssl-1.1.1*

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 profiles/prefix/windows/cygwin/package.unmask | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/prefix/windows/cygwin/package.unmask b/profiles/prefix/windows/cygwin/package.unmask
index d66d4bab16c..f385520e77e 100644
--- a/profiles/prefix/windows/cygwin/package.unmask
+++ b/profiles/prefix/windows/cygwin/package.unmask
@@ -3,4 +3,4 @@
 
 # Michael Haubenwallner <haubi@gentoo.org> (13 Feb 2019)
 # A little less broken on Cygwin than openssl-1.1.0j.
-~dev-libs/openssl-1.1.1a
+=dev-libs/openssl-1.1.1*

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

[Michael Haubenwallner]

commit:     9c7ca565cd868d0c44f8a22d1a7a7d6b15d955f9
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 10:32:37 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 10:33:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c7ca565

profiles/prefix/cygwin/p.mask: it was not in 2020 but 2019

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 profiles/prefix/windows/cygwin/package.mask | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask
index d0fd04c4259..b5df9c12c3a 100644
--- a/profiles/prefix/windows/cygwin/package.mask
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Michael Haubenwallner <haubi@gentoo.org> (27 Feb 2020)
+# Michael Haubenwallner <haubi@gentoo.org> (27 Feb 2019)
 # Cygwin does not provide this new version yet in it's repo.
 >=sys-devel/gcc-7.4
 

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

[Michael Haubenwallner]

commit:     86decaadd9b5ac47c3915145bf588c34a4c69642
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 25 07:03:53 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue May  7 08:05:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86decaad

prefix/cygwin/profile.bashrc: add pre/post pkg_* hook stubs

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 profiles/prefix/windows/cygwin/profile.bashrc | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/profiles/prefix/windows/cygwin/profile.bashrc b/profiles/prefix/windows/cygwin/profile.bashrc
index f016c87b0d4..dd7e59f331a 100644
--- a/profiles/prefix/windows/cygwin/profile.bashrc
+++ b/profiles/prefix/windows/cygwin/profile.bashrc
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 if [[ ${CATEGORY}/${PN} == app-arch/xz-utils
@@ -11,3 +11,27 @@ if [[ ${CATEGORY}/${PN} == app-arch/xz-utils
 	# As xz-utils has no need for -isystem here, we can use -I instead.
 	CPPFLAGS=${CPPFLAGS//-isystem /-I}
 fi
+
+post_pkg_preinst() {
+	cygwin-post_pkg_preinst
+}
+
+pre_pkg_postinst() {
+	cygwin-pre_pkg_postinst
+}
+
+post_pkg_prerm() {
+	cygwin-post_pkg_prerm
+}
+
+cygwin-post_pkg_preinst() {
+	:
+}
+
+cygwin-pre_pkg_postinst() {
+	:
+}
+
+cygwin-post_pkg_prerm() {
+	:
+}

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

[Michael Haubenwallner]

commit:     949b7a9801e59a2317cd68da53bdae344cd3e417
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon May  6 09:43:11 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue May  7 08:05:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=949b7a98

prefix/cygwin/profile.bashrc: add the Cygwin rebase hook

The Cygwin fork can work more reliable when each DLL is loaded at it's
preferred base address.  The Cygwin rebase hook does maintain these
preferred base addresses to be unique across all installed DLLs, using
the app-admin/cygwin-rebase utility.

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 profiles/prefix/windows/cygwin/profile.bashrc | 187 +++++++++++++++++++++++++-
 1 file changed, 184 insertions(+), 3 deletions(-)

diff --git a/profiles/prefix/windows/cygwin/profile.bashrc b/profiles/prefix/windows/cygwin/profile.bashrc
index dd7e59f331a..aecfd9adb7c 100644
--- a/profiles/prefix/windows/cygwin/profile.bashrc
+++ b/profiles/prefix/windows/cygwin/profile.bashrc
@@ -25,13 +25,194 @@ post_pkg_prerm() {
 }
 
 cygwin-post_pkg_preinst() {
-	:
+	cygwin-rebase-post_pkg_preinst
 }
 
 cygwin-pre_pkg_postinst() {
-	:
+	cygwin-rebase-pre_pkg_postinst
 }
 
 cygwin-post_pkg_prerm() {
-	:
+	cygwin-rebase-post_pkg_prerm
+}
+
+###############################################################################
+# To allow a Windows DLL to reside in memory just once for multiple processes,
+# each process needs to be able to map that DLL at the same base address,
+# without the need for a dynamic rebase.  However, this requires the DLL's
+# base address to be unique across all DLLs potentially loaded into a single
+# process.  Hence the PE/COFF binary format allows to define a preferred base
+# address for DLLs, but leaves it up to the package manager to maintain that
+# base address to be unique across all DLLs related together.
+# (Not sure how exactly ASLR plays in here, though.)
+#
+# Furthermore, for the Cygwin fork, it is crucial that the child process is
+# able to reload a DLL at the very same address as in the parent process.
+# Having unique preferred base addresses across all related DLLs does help
+# here as well.
+#
+# The Cygwin rebase utility does maintain some database holding the size and
+# preferred base address for each DLL, and allows to update a DLL's preferred
+# base address to not conflict with already installed DLLs.
+#
+# As updating the preferred base address for a DLL in use is a bad idea, we
+# need to update the base address while the DLL is in staging directory, and
+# update the rebase database after merging the DLL to the live file system.
+#
+# This allows to define a new preferred base address for a DLL that would
+# replace an existing one, because during fork we really want to use the
+# old version in the child process, which is verified using the preferred
+# base address value to be identical in parent and child process.
+#
+# Otherwise, the new DLL may have identical size and preferred base address
+# as the old DLL, and we may not detect a different DLL in the fork child.
+#
+# For unmerging a DLL: The Cygwin rebase utility does check if a DLL found
+# in the database does still exist, removing that database entry otherwise.
+###############################################################################
+
+cygwin-rebase-get_pendingdir() {
+	echo "var/db/rebase/pending"
+}
+
+cygwin-rebase-get_mergeddir() {
+	echo "var/db/rebase/merged"
+}
+
+cygwin-rebase-get_listname() {
+	echo "dlls_${CATEGORY}_${P}${PR:+-}${PR}"
+}
+
+cygwin-rebase-get_rebase_program() {
+	[[ ${CHOST} == "${CBUILD}" ]] || return 1
+	local pfx
+	for pfx in "${EPREFIX}" "${BROOT:-${PORTAGE_OVERRIDE_EPREFIX}}"
+	do
+		[[ -x ${pfx}/usr/bin/rebase ]] || continue
+		echo "${pfx}/usr/bin/rebase"
+		return 0
+	done
+	return 1
+}
+
+cygwin-rebase-post_pkg_preinst() {
+	# Ensure database is up to date for when dlls were merged but
+	# subsequent cygwin-rebase-merge-pending was not executed.
+	einfo "Cygwin: Merging pending files into rebase database..."
+	cygwin-rebase-merge pending
+	eend $?
+
+	local listname=$(cygwin-rebase-get_listname)
+	local pendingdir=$(cygwin-rebase-get_pendingdir)
+	local rebase_program=$(cygwin-rebase-get_rebase_program)
+
+	if [[ ${CATEGORY}/${PN} == 'app-admin/cygwin-rebase' ]]
+	then
+		local mergeddir=$(cygwin-rebase-get_mergeddir)
+		keepdir "/${pendingdir}"
+		keepdir "/${mergeddir}"
+	fi
+
+	einfo "Cygwin: Rebasing new files..."
+	(
+		set -e
+		cd "${ED}"
+
+		# The list of suffixes is found in the rebaseall script.
+		find . -type f \
+			'(' -name '*.dll' \
+			 -o -name '*.so' \
+			 -o -name '*.oct' \
+			')' \
+		| sed -e "s|^\.|${EPREFIX}|" > "${T}/rebase-filelist"
+		[[ "${PIPESTATUS[*]}" == '0 0' ]]
+
+		# Nothing found to rebase in this package.
+		[[ -s ${T}/rebase-filelist ]] || exit 0
+
+		mkdir -p "./${pendingdir}"
+		cp -f "${T}/rebase-filelist" "./${pendingdir}/${listname}"
+
+		# Without the rebase program, do not perform a rebase.
+		[[ ${rebase_program} ]] || exit 0
+
+		sed -ne "/^${EPREFIX//\//\\/}\\//{s|^${EPREFIX}/||;p}" "./${pendingdir}/${listname}" \
+		| "${rebase_program}" --verbose --oblivious --database --filelist=-
+		[[ "${PIPESTATUS[*]}" == '0 0' ]]
+	)
+	eend $?
+}
+
+cygwin-rebase-pre_pkg_postinst() {
+	if [[ ${CATEGORY}/${PN} == 'app-admin/cygwin-rebase' ]]
+	then
+		einfo "Cygwin: Updating rebase database with installed files..."
+		cygwin-rebase-merge merged
+		eend $?
+	fi
+	einfo "Cygwin: Merging updated files into rebase database..."
+	cygwin-rebase-merge pending
+	eend $?
+}
+
+cygwin-rebase-merge() {
+	local mode=${1}
+
+	local rebase_program=$(cygwin-rebase-get_rebase_program)
+	[[ ${rebase_program} ]] || return 0
+
+	local pendingdir=''
+	local mergeddir=''
+	case ${mode} in
+	pending)
+		pendingdir=$(cygwin-rebase-get_pendingdir)
+		mergeddir=$(cygwin-rebase-get_mergeddir)
+		;;
+	merged)
+		pendingdir=$(cygwin-rebase-get_mergeddir)
+		mergeddir=''
+		;;
+	*)
+		die "Invalid mode '${mode}'."
+		;;
+	esac
+
+	(
+		set -e
+		cd "${EROOT}"
+
+		[[ -r ./${pendingdir}/. ]]
+		[[ -r ./${mergeddir}/. ]]
+
+		find ./"${pendingdir}" -mindepth 1 -maxdepth 1 -type f -name 'dlls_*' \
+			-exec sed -ne "/^${EPREFIX//\//\\/}\\//{s|^${EPREFIX}/||;p}" {} + \
+			| "${rebase_program}" --verbose --merge-files --database --filelist=-
+		[[ "${PIPESTATUS[*]}" == '0 0' ]]
+
+		[[ ${mode} == 'pending' ]] || exit 0
+
+		find "./${pendingdir}" -maxdepth 1 -type f \
+			-exec mv -f -t "./${mergeddir}/" {} +
+	)
+	[[ $? == 0 ]] || die "Merging ${mode} files into rebase database failed."
+}
+
+cygwin-rebase-post_pkg_prerm() {
+	# The pending list is installed as part of the package, but
+	# the merged list is not.  Move from merged back to pending,
+	# in case the unmerge fails...
+	local pendingdir=$(cygwin-rebase-get_pendingdir)
+	local mergeddir=$(cygwin-rebase-get_mergeddir)
+	local listname=$(cygwin-rebase-get_listname)
+	(
+		set -e
+		cd "${EROOT}"
+		[[ -w ./${mergeddir}/. ]]
+		[[ -w ./${pendingdir}/. ]]
+		if [[ -s ./${mergeddir}/${listname} ]]
+		then
+			mv -f "./${mergeddir}/${listname}" "./${pendingdir}/${listname}" || :
+		fi
+		rm -f "./${mergeddir}/${listname}"
+	)
 }

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

[Michael Haubenwallner]

commit:     8ed5a743068088cfc0279542ef611cdf929e48ac
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Tue May  7 07:04:51 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue May  7 08:05:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ed5a743

profiles/prefix/cygwin/packages: add *app-admin/cygwin-rebase

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 profiles/prefix/windows/cygwin/packages | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/profiles/prefix/windows/cygwin/packages b/profiles/prefix/windows/cygwin/packages
index 48b7c0bfe44..0b7db49e865 100644
--- a/profiles/prefix/windows/cygwin/packages
+++ b/profiles/prefix/windows/cygwin/packages
@@ -1,5 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+*app-admin/cygwin-rebase
 *sys-devel/binutils
 *sys-libs/cygwin-crypt

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

[Michael Haubenwallner]

commit:     5268c328d21528213551e1738caf9219cc865923
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  7 10:14:52 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Fri Jun  7 10:21:31 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5268c328

prefix/cygwin/p.mask: portage-utils-0.80_pre breaks

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 profiles/prefix/windows/cygwin/package.mask | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask
index f952335dd29..e972e51406f 100644
--- a/profiles/prefix/windows/cygwin/package.mask
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michael Haubenwallner <haubi@gentoo.org> (07 Jun 2019)
+# Breaks due to weak functions and object file order on linkline,
+# see https://cygwin.com/ml/cygwin/2019-06/msg00092.html
+>=app-portage/portage-utils-0.80_pre
+
 # Michael Haubenwallner <haubi@gentoo.org> (07 Jun 2019)
 # Cygwin does not provide this new version yet in it's repo.
 >=sys-devel/gcc-8.4

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

[Michael Haubenwallner]

commit:     1c69bba7be6353c0dae4bf11ed7acba2e92f2410
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  7 08:58:50 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Fri Jun  7 10:21:30 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c69bba7

prefix/cygwin/p.mask: unmask up to gcc-8.3

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 profiles/prefix/windows/cygwin/package.mask | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask
index b5df9c12c3a..f952335dd29 100644
--- a/profiles/prefix/windows/cygwin/package.mask
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Michael Haubenwallner <haubi@gentoo.org> (27 Feb 2019)
+# Michael Haubenwallner <haubi@gentoo.org> (07 Jun 2019)
 # Cygwin does not provide this new version yet in it's repo.
->=sys-devel/gcc-7.4
+>=sys-devel/gcc-8.4
 
 # Michael Haubenwallner <haubi@gentoo.org> (13 Feb 2019)
 # see upstream report https://savannah.gnu.org/bugs/index.php?55708

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

[Michael Haubenwallner]

commit:     ad09a180ae467a0eaf1da10e56adfb064b42691a
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 07:23:17 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 07:35:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad09a180

prefix/cygwin/profile.bashrc: preserve new dll list for rebase

Do not overwrite the being merged new package's dll list for rebase with
the being removed old package's dll list for just getting unmerged.
This likely is the cause of some Prefix bootstraps to hang on Cygwin.
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 profiles/prefix/windows/cygwin/profile.bashrc | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/profiles/prefix/windows/cygwin/profile.bashrc b/profiles/prefix/windows/cygwin/profile.bashrc
index aecfd9adb7c..9694edc101d 100644
--- a/profiles/prefix/windows/cygwin/profile.bashrc
+++ b/profiles/prefix/windows/cygwin/profile.bashrc
@@ -198,21 +198,14 @@ cygwin-rebase-merge() {
 }
 
 cygwin-rebase-post_pkg_prerm() {
-	# The pending list is installed as part of the package, but
-	# the merged list is not.  Move from merged back to pending,
-	# in case the unmerge fails...
-	local pendingdir=$(cygwin-rebase-get_pendingdir)
+	# The pending list is registered as being installed with the package, but
+	# the merged list is not.  Just remove the unregistered one.
 	local mergeddir=$(cygwin-rebase-get_mergeddir)
 	local listname=$(cygwin-rebase-get_listname)
 	(
 		set -e
 		cd "${EROOT}"
 		[[ -w ./${mergeddir}/. ]]
-		[[ -w ./${pendingdir}/. ]]
-		if [[ -s ./${mergeddir}/${listname} ]]
-		then
-			mv -f "./${mergeddir}/${listname}" "./${pendingdir}/${listname}" || :
-		fi
 		rm -f "./${mergeddir}/${listname}"
 	)
 }

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

[Michael Haubenwallner]

commit:     242a84765384452152b13921659f69f60612b9d6
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  3 08:15:04 2020 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Jun  3 13:50:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=242a8476

cygwin/profile.bashrc: preserve pending dir for cygwin rebase

During cygwin rebase, moving all files from pending/ dir to merged/ dir
also does move the keepdir file, causing the pending/ dir to get empty.
Closes: https://bugs.gentoo.org/726800

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 profiles/prefix/windows/cygwin/profile.bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/prefix/windows/cygwin/profile.bashrc b/profiles/prefix/windows/cygwin/profile.bashrc
index 85a7eabccb1..4b147868276 100644
--- a/profiles/prefix/windows/cygwin/profile.bashrc
+++ b/profiles/prefix/windows/cygwin/profile.bashrc
@@ -191,7 +191,7 @@ cygwin-rebase-merge() {
 
 		[[ ${mode} == 'pending' ]] || exit 0
 
-		find "./${pendingdir}" -maxdepth 1 -type f \
+		find "./${pendingdir}" -mindepth 1 -maxdepth 1 -type f -name 'dlls_*' \
 			-exec mv -f -t "./${mergeddir}/" {} +
 	)
 	[[ $? == 0 ]] || die "Merging ${mode} files into rebase database failed."

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

[Fabian Groffen]

commit:     84aa9049129c8d7b6c00dd863e0bc9495659b614
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  4 19:00:34 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 19:02:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84aa9049

profiles/prefix/cygwin/package.use.mask: mask deps of ninja

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 profiles/prefix/windows/cygwin/package.use.mask | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/profiles/prefix/windows/cygwin/package.use.mask b/profiles/prefix/windows/cygwin/package.use.mask
new file mode 100644
index 00000000000..a964e7ff0cf
--- /dev/null
+++ b/profiles/prefix/windows/cygwin/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> (2020-08-04)
+# missing keywords on deps
+dev-util/ninja doc test