subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: profiles\/prefix\/windows\/"

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/windows/winnt/, profiles/prefix/windows/, ...

2023-05-25 Thread Fabian Groffen

commit: c871254beb58794d1098fd2c12b05b7c9c646e6e
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu May 25 19:58:18 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu May 25 19:58:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c871254b

profiles: remove x64-cygwin/windows

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

 profiles/prefix/windows/cygwin/eapi  |   1 -
 profiles/prefix/windows/cygwin/make.defaults |  11 -
 profiles/prefix/windows/cygwin/package.mask  |  23 --
 profiles/prefix/windows/cygwin/package.unmask|   6 -
 profiles/prefix/windows/cygwin/package.use   |  14 --
 profiles/prefix/windows/cygwin/package.use.mask  |   6 -
 profiles/prefix/windows/cygwin/packages  |   6 -
 profiles/prefix/windows/cygwin/parent|   1 -
 profiles/prefix/windows/cygwin/profile.bashrc| 211 
 profiles/prefix/windows/cygwin/use.force |   5 -
 profiles/prefix/windows/cygwin/use.mask  |   5 -
 profiles/prefix/windows/cygwin/x64/eapi  |   1 -
 profiles/prefix/windows/cygwin/x64/make.defaults |  17 --
 profiles/prefix/windows/cygwin/x64/parent|   1 -
 profiles/prefix/windows/eapi |   1 -
 profiles/prefix/windows/package.mask |   6 -
 profiles/prefix/windows/package.use.mask |   7 -
 profiles/prefix/windows/parent   |   3 -
 profiles/prefix/windows/use.force|   5 -
 profiles/prefix/windows/use.mask |   8 -
 profiles/prefix/windows/winnt/eapi   |   1 -
 profiles/prefix/windows/winnt/make.defaults  |  10 -
 profiles/prefix/windows/winnt/package.mask   |   2 -
 profiles/prefix/windows/winnt/package.use.mask   |   7 -
 profiles/prefix/windows/winnt/packages   |  37 ---
 profiles/prefix/windows/winnt/parent |   1 -
 profiles/prefix/windows/winnt/profile.bashrc | 305 ---
 profiles/prefix/windows/winnt/use.force  |   5 -
 profiles/prefix/windows/winnt/use.mask   |  66 -
 profiles/prefix/windows/winnt/x64/eapi   |   1 -
 profiles/prefix/windows/winnt/x64/make.defaults  |  28 ---
 profiles/prefix/windows/winnt/x64/parent |   1 -
 profiles/prefix/windows/winnt/x86/eapi   |   1 -
 profiles/prefix/windows/winnt/x86/make.defaults  |  28 ---
 profiles/prefix/windows/winnt/x86/parent |   1 -
 profiles/profiles.desc   |   7 -
 36 files changed, 839 deletions(-)

diff --git a/profiles/prefix/windows/cygwin/eapi 
b/profiles/prefix/windows/cygwin/eapi
deleted file mode 100644
index 7ed6ff82de6b..
--- a/profiles/prefix/windows/cygwin/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/windows/cygwin/make.defaults 
b/profiles/prefix/windows/cygwin/make.defaults
deleted file mode 100644
index d7ba076a8812..
--- a/profiles/prefix/windows/cygwin/make.defaults
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# System-wide defaults for all Cygwin profiles
-# This file should rarely need to be changed
-
-# 'Sane' defaults
-ELIBC="Cygwin"
-
-# no scanelf
-FEATURES="nostrip"

diff --git a/profiles/prefix/windows/cygwin/package.mask 
b/profiles/prefix/windows/cygwin/package.mask
deleted file mode 100644
index ee0e3ad4aacc..
--- a/profiles/prefix/windows/cygwin/package.mask
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Michael Haubenwallner  (2019-06-07)
-# 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  (2019-06-07)
-# Cygwin does not provide this new version yet in it's repo.
->=sys-devel/gcc-8.4
-
-# Michael Haubenwallner  (2019-02-13)
-# see upstream report https://savannah.gnu.org/bugs/index.php?55708
-=sys-apps/groff-1.22.4
-
-# Michael Haubenwallner  (2019-01-30)
-# Cygwin does not have updated patches yet, is not trivial
->=sys-apps/coreutils-8.30
-
-# Michael Haubenwallner  (2016-05-20)
-# Does not work with Cygwin.
-sys-apps/man-db

diff --git a/profiles/prefix/windows/cygwin/package.unmask 
b/profiles/prefix/windows/cygwin/package.unmask
deleted file mode 100644
index 0037a47423bd..
--- a/profiles/prefix/windows/cygwin/package.unmask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Michael Haubenwallner  (2019-02-13)
-# A little less broken on Cygwin than openssl-1.1.0j.
-=dev-libs/openssl-1.1.1*

diff --git a/profiles/prefix/windows/cygwin/package.use 
b/profiles/prefix/windows/cygwin/package.use
deleted file mode 100644
index e42eadac8934..
---

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/windows/winnt/, profiles/arch/powerpc/, profiles/, ...

2022-07-15 Thread David Seifert

commit: 0d23a383b61fe3b5c51b815215a9ad4b0039b833
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jul 15 07:58:06 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jul 15 07:58:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d23a383

profiles: remove global USE=altivec

Signed-off-by: David Seifert  gentoo.org>

 profiles/arch/base/use.mask| 1 -
 profiles/arch/powerpc/use.mask | 2 --
 profiles/prefix/darwin/macos/10.5/ppc/use.mask | 4 
 profiles/prefix/windows/winnt/use.mask | 1 -
 profiles/use.desc  | 1 -
 5 files changed, 9 deletions(-)

diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 4556ba23f498..b583af578451 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -68,7 +68,6 @@ cpu_flags_x86_ssse3
 cpu_flags_x86_xop
 
 # ppc arch specific USE flags
-altivec
 ppcsha1
 
 # mips arch specific USE flags

diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index 5a92cd7a0e0f..cfeda8e5851a 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -55,8 +55,6 @@ appindicator
 
 # These flags should only be used for ppc
 -ppcsha1
-# Unmask the Altivec instruction set
--altivec
 
 # Incompatible Use Flags
 #

diff --git a/profiles/prefix/darwin/macos/10.5/ppc/use.mask 
b/profiles/prefix/darwin/macos/10.5/ppc/use.mask
deleted file mode 100644
index cb5937b71a2e..
--- a/profiles/prefix/darwin/macos/10.5/ppc/use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
--altivec

diff --git a/profiles/prefix/windows/winnt/use.mask 
b/profiles/prefix/windows/winnt/use.mask
index 96fe791477a6..5466fd4b5e09 100644
--- a/profiles/prefix/windows/winnt/use.mask
+++ b/profiles/prefix/windows/winnt/use.mask
@@ -11,7 +11,6 @@
 3dfx
 acpi
 alsa
-altivec
 apm
 bluetooth
 caps

diff --git a/profiles/use.desc b/profiles/use.desc
index 52f51fa3cdbe..dc7a6daebde3 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -14,7 +14,6 @@ acpi - Add support for Advanced Configuration and Power 
Interface
 adns - Add support for asynchronous DNS resolution
 afs - Add OpenAFS support (distributed file system)
 alsa - Add support for media-libs/alsa-lib (Advanced Linux Sound Architecture)
-altivec - Add support for optimizations for G4 and G5/ppc970 processors
 ao - Use libao audio output library for sound playback
 apache2 - Add Apache2 support
 aqua - Include support for the Mac OS X Aqua (Carbon/Cocoa) GUI

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/windows/winnt/, profiles/desc/, profiles/base/, ...

2022-01-02 Thread David Seifert

commit: f097dc38fb4229a34dc2a36b156dbaa697148fc5
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jan  2 10:01:45 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan  2 10:01:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f097dc38

profiles: remove uclibc

Closes: https://bugs.gentoo.org/820905
Signed-off-by: David Seifert  gentoo.org>

 profiles/base/make.defaults|  2 +-
 profiles/base/use.mask |  2 -
 .../default/linux/amd64/17.0/uclibc/deprecated | 17 --
 profiles/default/linux/amd64/17.0/uclibc/eapi  |  1 -
 .../linux/amd64/17.0/uclibc/hardened/deprecated| 17 --
 .../default/linux/amd64/17.0/uclibc/hardened/eapi  |  1 -
 .../linux/amd64/17.0/uclibc/hardened/parent|  2 -
 .../default/linux/amd64/17.0/uclibc/make.defaults  | 10 
 profiles/default/linux/amd64/17.0/uclibc/parent|  3 -
 .../linux/arm/17.0/uclibc/armv6j/deprecated| 17 --
 profiles/default/linux/arm/17.0/uclibc/armv6j/eapi |  1 -
 .../arm/17.0/uclibc/armv6j/hardened/deprecated | 17 --
 .../linux/arm/17.0/uclibc/armv6j/hardened/eapi |  1 -
 .../linux/arm/17.0/uclibc/armv6j/hardened/parent   |  2 -
 .../linux/arm/17.0/uclibc/armv6j/make.defaults | 10 
 .../default/linux/arm/17.0/uclibc/armv6j/parent|  1 -
 .../linux/arm/17.0/uclibc/armv7a/deprecated| 17 --
 profiles/default/linux/arm/17.0/uclibc/armv7a/eapi |  1 -
 .../arm/17.0/uclibc/armv7a/hardened/deprecated | 17 --
 .../linux/arm/17.0/uclibc/armv7a/hardened/eapi |  1 -
 .../linux/arm/17.0/uclibc/armv7a/hardened/parent   |  2 -
 .../linux/arm/17.0/uclibc/armv7a/make.defaults | 10 
 .../default/linux/arm/17.0/uclibc/armv7a/parent|  1 -
 profiles/default/linux/arm/17.0/uclibc/deprecated  | 17 --
 profiles/default/linux/arm/17.0/uclibc/eapi|  1 -
 profiles/default/linux/arm/17.0/uclibc/parent  |  3 -
 profiles/default/linux/musl/package.mask   |  5 +-
 profiles/default/linux/musl/use.mask   |  3 +-
 .../linux/powerpc/ppc32/17.0/uclibc/deprecated | 17 --
 .../default/linux/powerpc/ppc32/17.0/uclibc/eapi   |  1 -
 .../powerpc/ppc32/17.0/uclibc/hardened/deprecated  | 17 --
 .../linux/powerpc/ppc32/17.0/uclibc/hardened/eapi  |  1 -
 .../powerpc/ppc32/17.0/uclibc/hardened/parent  |  2 -
 .../linux/powerpc/ppc32/17.0/uclibc/make.defaults  | 10 
 .../linux/powerpc/ppc32/17.0/uclibc/package.use|  3 -
 .../powerpc/ppc32/17.0/uclibc/package.use.mask |  7 ---
 .../default/linux/powerpc/ppc32/17.0/uclibc/parent |  3 -
 profiles/default/linux/uclibc/deprecated   | 17 --
 profiles/default/linux/uclibc/eapi |  1 -
 profiles/default/linux/uclibc/make.defaults| 12 
 profiles/default/linux/uclibc/mips/deprecated  | 17 --
 profiles/default/linux/uclibc/mips/eapi|  1 -
 profiles/default/linux/uclibc/mips/make.defaults   | 20 ---
 .../default/linux/uclibc/mips/mipsel/deprecated| 17 --
 profiles/default/linux/uclibc/mips/mipsel/eapi |  1 -
 .../default/linux/uclibc/mips/mipsel/make.defaults |  5 --
 profiles/default/linux/uclibc/mips/mipsel/parent   |  1 -
 profiles/default/linux/uclibc/mips/package.mask| 10 
 .../default/linux/uclibc/mips/package.use.force|  8 ---
 .../default/linux/uclibc/mips/package.use.mask | 14 -
 profiles/default/linux/uclibc/mips/parent  |  1 -
 profiles/default/linux/uclibc/mips/use.force   |  6 --
 profiles/default/linux/uclibc/mips/use.mask|  6 --
 profiles/default/linux/uclibc/package.mask | 68 --
 profiles/default/linux/uclibc/package.use.mask | 20 ---
 profiles/default/linux/uclibc/packages |  7 ---
 profiles/default/linux/uclibc/packages.build   |  8 ---
 profiles/default/linux/uclibc/parent   |  3 -
 profiles/default/linux/uclibc/use.force|  5 --
 profiles/default/linux/uclibc/use.mask | 15 -
 profiles/default/linux/x86/17.0/uclibc/deprecated  | 17 --
 profiles/default/linux/x86/17.0/uclibc/eapi|  1 -
 .../linux/x86/17.0/uclibc/hardened/deprecated  | 17 --
 .../default/linux/x86/17.0/uclibc/hardened/eapi|  1 -
 .../default/linux/x86/17.0/uclibc/hardened/parent  |  2 -
 .../default/linux/x86/17.0/uclibc/make.defaults| 10 
 profiles/default/linux/x86/17.0/uclibc/parent  |  3 -
 profiles/desc/elibc.desc   |  1 -
 profiles/embedded/make.defaults|  2 +-
 profiles/features/musl/package.mask|  3 -
 profiles/features/musl/use.mask|  3 +-
 profiles/features/uclibc/deprecated| 17 --
 profiles/features/uclibc/eapi  |  1 -
 profiles/features/uclibc/make.defaults | 13 -
 profiles/features/uclibc/package.mask  | 27 -

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/windows/winnt/, profiles/, profiles/arch/base/

2020-12-18 Thread Fabian Groffen

commit: d5bcc0d15ff498edb53afde6933e4a249ef501ef
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Dec 18 14:07:36 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Dec 18 14:15:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5bcc0d1

profiles: remove all traces of x86-cygwin, add arm64-macos

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

 profiles/arch/base/make.defaults   | 1 +
 profiles/arches.desc   | 1 +
 profiles/prefix/windows/winnt/packages | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults
index 3f1632b71a2..f0ea8107cb1 100644
--- a/profiles/arch/base/make.defaults
+++ b/profiles/arch/base/make.defaults
@@ -4,5 +4,6 @@
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH"
 USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 
m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sparc 
sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 
x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 
arm64-macos hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix 
ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos 
x64-solaris x64-winnt x86 x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
 
 PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH"

diff --git a/profiles/arches.desc b/profiles/arches.desc
index 0cebf4609f1..264149975db 100644
--- a/profiles/arches.desc
+++ b/profiles/arches.desc
@@ -30,6 +30,7 @@ arm-linux testing
 arm64-linuxtesting
 ppc64-linuxtesting
 x86-linux  testing
+arm64-macostesting
 ppc-macos  testing
 x86-macos  testing
 x64-macos  testing

diff --git a/profiles/prefix/windows/winnt/packages 
b/profiles/prefix/windows/winnt/packages
index 7ffc61e1574..614ae274d29 100644
--- a/profiles/prefix/windows/winnt/packages
+++ b/profiles/prefix/windows/winnt/packages
@@ -3,7 +3,7 @@
 
 # those are packages not available/required on winnt, since
 # winnt can be a child EPREFIX only, which tears it's DEPENDS
-# from a parent (e.g. x86-cygwin) prefix.
+# from a parent (e.g. x64-cygwin) prefix.
 
 -*sys-apps/grep
 -*app-arch/gzip

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

2020-08-04 Thread Fabian Groffen

commit: 84aa9049129c8d7b6c00dd863e0bc9495659b614
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Aug  4 19:00:34 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Aug  4 19:02:23 2020 +
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  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 000..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  (2020-08-04)
+# missing keywords on deps
+dev-util/ninja doc test

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

2020-06-03 Thread Michael Haubenwallner

commit: 242a84765384452152b13921659f69f60612b9d6
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Jun  3 08:15:04 2020 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Jun  3 13:50:24 2020 +
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  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/winnt/

2020-04-19 Thread Sergei Trofimovich

commit: 7846712858fa0f77b912b55029330909fe983acc
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Apr 19 15:02:07 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Apr 19 15:02:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78467128

profiles/prefix/windows/winnt/profile.bashrc: fix lexicographical number compare

Closes: https://bugs.gentoo.org/705272
Signed-off-by: Sergei Trofimovich  gentoo.org>

 profiles/prefix/windows/winnt/profile.bashrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/profiles/prefix/windows/winnt/profile.bashrc 
b/profiles/prefix/windows/winnt/profile.bashrc
index 1a70e77b1cb..9420300435c 100644
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ b/profiles/prefix/windows/winnt/profile.bashrc
@@ -212,7 +212,7 @@ force_dest_file_opt=
 
 nextargs=( "$@" )
 
-while [[ $# > 0 ]]
+while [[ $# -gt 0 ]]
 do
arg=${1}
shift
@@ -260,7 +260,7 @@ ret=$?
 
 if [[ -z ${mydest} ]]
 then
-   [[ ${#mysrcs[@]} < 2 ]] && exit 0
+   [[ ${#mysrcs[@]} -lt 2 ]] && exit 0
: "${mysrcs[@]}" "${#mysrcs[@]}"
mydest=${mysrcs[${#mysrcs[@]}-1]}
unset mysrcs[${#mysrcs[@]}-1]

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

2020-03-11 Thread Michael Haubenwallner

commit: f68a3873380140c91e7ea1d8d4872649cf8d1aee
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Mar 11 14:24:51 2020 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Mar 11 15:47:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f68a3873

prefix/winnt/profile.bashrc: rename funcs to winnt_

Provide the winnt_post_src_install and call that one in post_src_install
rather than performing all the operation directly in post_src_install.

Signed-off-by: Michael Haubenwallner  gentoo.org>

 profiles/prefix/windows/winnt/profile.bashrc | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/profiles/prefix/windows/winnt/profile.bashrc 
b/profiles/prefix/windows/winnt/profile.bashrc
index 0670a48a5b1..c613a56cd98 100644
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ b/profiles/prefix/windows/winnt/profile.bashrc
@@ -48,7 +48,7 @@ export 
PKG_CONFIG_PATH="${EPREFIX}/lib/pkgconfig:${EPREFIX}/usr/lib/pkgconfig"
 #
 ###
 
-windows_setup_dllhelper() {
+winnt_setup_dllhelper() {
case ${CATEGORY}/${PN} in
sys-libs/zlib |\
'')
@@ -58,13 +58,17 @@ windows_setup_dllhelper() {
# and installation is done using cp, we override cp to
# additionally copy the dll when the library is copied.
ebegin "Setting up wrapper to copy the DLL along the LIB"
-   windows_setup_dllhelper_cp
+   winnt_setup_dllhelper_cp
eend $?
;;
esac
 }
 
 post_src_install() {
+   winnt_post_src_install
+}
+
+winnt_post_src_install() {
cd "${ED}" || return 0
#
# File names being treated as import library:
@@ -185,7 +189,7 @@ post_src_install() {
done
 }
 
-windows_setup_dllhelper_cp() {
+winnt_setup_dllhelper_cp() {
if ! [[ $(type -P cp) -ef ${T}/dllhelper/cp ]]
then
mkdir -p "${T}/dllhelper"
@@ -288,5 +292,5 @@ EOCP
 
 if [[ ${EBUILD_PHASE} == 'setup' ]]
 then
-   windows_setup_dllhelper
+   winnt_setup_dllhelper
 fi

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

2020-03-11 Thread Michael Haubenwallner

commit: 83a5d2e8d027d92c92bd9864b2f7cf463f1267a1
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Mar 11 14:27:32 2020 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Mar 11 15:47:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a5d2e8

prefix/winnt/profile.bashrc: leave PKG_CONFIG_PATH alone

These days, app-portage/prefix-toolkit does set up proper
PKG_CONFIG_PATH for the stacked Prefix.

Signed-off-by: Michael Haubenwallner  gentoo.org>

 profiles/prefix/windows/winnt/profile.bashrc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/profiles/prefix/windows/winnt/profile.bashrc 
b/profiles/prefix/windows/winnt/profile.bashrc
index 215ad93a943..1a70e77b1cb 100644
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ b/profiles/prefix/windows/winnt/profile.bashrc
@@ -10,9 +10,6 @@
 # and should be dropped once portage does sth. like this itself.
 #
 
-# Need to explicitly set PKG_CONFIG_PATH for cross EPREFIX.
-export PKG_CONFIG_PATH="${EPREFIX}/lib/pkgconfig:${EPREFIX}/usr/lib/pkgconfig"
-
 ###
 #
 # Unix aware build tools may provide (e.g. pkg-config) and accept

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

2020-03-11 Thread Michael Haubenwallner

commit: bdace9d42fa6b66f5524e1684c9a19b8d2117155
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Mar 11 14:26:12 2020 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Mar 11 15:47:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdace9d4

prefix/winnt/profile.bashrc: no symlink usr/lib/NAME.dll

While moving usr/lib/NAME.dll into usr/bin/ is necessary, creating the
symlink usr/lib/NAME.dll -> ../bin/NAME.dll is problematic, because the
libtool .exe wrapper may add usr/lib to PATH, causing the native loader
to fail when attempting to load a dll but discovering a cygwin symlink.
Also, need to resolve symlinks while moving from usr/lib into usr/bin.

Signed-off-by: Michael Haubenwallner  gentoo.org>

 profiles/prefix/windows/winnt/profile.bashrc | 30 +++-
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/profiles/prefix/windows/winnt/profile.bashrc 
b/profiles/prefix/windows/winnt/profile.bashrc
index c613a56cd98..215ad93a943 100644
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ b/profiles/prefix/windows/winnt/profile.bashrc
@@ -175,18 +175,30 @@ winnt_post_src_install() {
eend $?
fi
done
-   [[ -d usr/$(get_libdir) ]] &&
-   find usr/$(get_libdir) -maxdepth 1 -type f -name '*.dll' |
-   while read f
-   do
-   if [[ ! -f usr/bin/${f##*/} ]]; then
-   ebegin "moving ${f} to usr/bin for native loader"
+   if [[ -d usr/$(get_libdir) ]]
+   then
+   # The native loader does not understand symlinks to dlls,
+   # seen to be created by dev-libs/icu eventually.  For any
+   # dll we find in usr/lib we need to perform a real copy to
+   # usr/bin, to resolve potential symlinks (seen from icu),
+   # and perform the remove from usr/lib afterwards, to not
+   # break symlinks later on discovered by find.
+   local toremove=()
+   local f
+   while read f
+   do
+   [[ -f usr/bin/${f##*/} ]] && continue
+   ebegin "moving ${f} to usr/bin for the native loader"
dodir usr/bin || die
-   mv -f "${f}" usr/bin/ || die
-   ln -sf "../bin/${f##*/}" "${f}" || die
+   cp -f "${f}" usr/bin/ || die
eend $?
+   toremove=( "${toremove[@]}" "${f}" )
+   done < <(find usr/$(get_libdir) -maxdepth 1 -name '*.dll')
+   if [[ ${#toremove[@]} -gt 0 ]]
+   then
+   rm -f "${toremove[@]}" || die "removing dlls from 
usr/$(get_libdir) failed"
fi
-   done
+   fi
 }
 
 winnt_setup_dllhelper_cp() {

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

2020-03-11 Thread Michael Haubenwallner

commit: 1eb082db1646e66713be974d53ba71bd7737300d
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Mar 11 14:22:47 2020 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Mar 11 15:47:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb082db

prefix/winnt/profile.bashrc: ensure libNAME.lib, libNAME.a

Libtool for winnt does create libNAME.lib as the static library, but
some build tools may expect libNAME.a.
Non-libtool build tools may also create a static library NAME.lib, which
needs to be duplicated to both libNAME.lib and libNAME.a, but not to
libNAME.so just because it does match the shared library naming scheme.
Also, do not provide symlinks but real files only, for some build tools
may source the MSVC environment and use the native toolchain.

Signed-off-by: Michael Haubenwallner  gentoo.org>

 profiles/prefix/windows/winnt/profile.bashrc | 95 
 1 file changed, 70 insertions(+), 25 deletions(-)

diff --git a/profiles/prefix/windows/winnt/profile.bashrc 
b/profiles/prefix/windows/winnt/profile.bashrc
index b9496a65232..0670a48a5b1 100644
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ b/profiles/prefix/windows/winnt/profile.bashrc
@@ -35,9 +35,16 @@ export 
PKG_CONFIG_PATH="${EPREFIX}/lib/pkgconfig:${EPREFIX}/usr/lib/pkgconfig"
 # As Gentoo ebuilds may remove libNAME.la, we need the libNAME.so
 # because we don't want to have libNAME.dll as an import library.
 #
-# Here, for whatever import library name we find, make sure there
-# is both the NAME.lib and the libNAME.so for linkability via both
-# the -lNAME and the NAME.lib linker option.
+# The static library may be created as libNAME.a, libNAME.lib or even
+# NAME.lib - the latter we need to check for static or import library.
+#
+# For whatever import library file we find, make sure there is both the
+# NAME.lib and the libNAME.so for dynamic linkability via all the
+# -lNAME, the NAME.lib and the libNAME.so linker option.
+#
+# For whatever static library file we find, make sure there is both the
+# libNAME.lib and the libNAME.a for static linkability via all the
+# -lNAME, the libNAME.lib and the libNAME.a linker option.
 #
 ###
 
@@ -62,12 +69,13 @@ post_src_install() {
#
# File names being treated as import library:
#  libNAME.so
-   # NAME.lib
+   # NAME.lib if CHOST-dumpbin yields 'DLL name'
#  libNAME.dll.lib
#  libNAME.dll.a
#
-   # File names being ignored as static library:
+   # File names being treated as static library:
#  libNAME.lib
+   # NAME.lib if CHOST-dumpbin lacks 'DLL name'
#  libNAME.a
#
# File names being warned about as suspect:
@@ -83,46 +91,83 @@ post_src_install() {
libdir=$(dirname "${f}")
libfile=${f##*/}
libname=
+   NAMElib=# import lib to create
+   libNAMEso=  # import lib to create
+   libNAMElib= # static lib to create
+   libNAMEa=   # static lib to create
case ${libfile} in
-   lib.so) ;; # paranoia
-   lib*.so)
+   lib*.so) # found import library
libname=${libfile%.so}
libname=${libname#lib}
+   NAMElib=${libname}.lib
+   libNAMEso=lib${libname}.so
;;
-   lib.dll.lib) ;; # paranoia
-   lib*.dll.lib)
+   *.so) ;; # warn
+   lib*.dll.lib) # found import library
libname=${libfile%.dll.lib}
libname=${libname#lib}
+   NAMElib=${libname}.lib
+   libNAMEso=lib${libname}.so
;;
-   lib.lib) ;; # paranoia
-   lib*.lib) continue ;; # ignore static library
-   .lib) ;; # paranoia
-   *.lib)
-   libname=${libfile%.lib}
+   *.dll.lib) ;; # warn
+   *.lib) # found static or import library
+   ${CHOST}-dumpbin.exe /headers "./${libdir}/${libfile}" 
| grep -q 'DLL name'
+   case "${PIPESTATUS[*]}" in
+   '0 0') # found import library
+   libname=${libfile%.lib}
+   libname=${libname#lib}
+   NAMElib=${libname}.lib
+   libNAMEso=lib${libname}.so
+   ;;
+   '0 1') # found static library
+   libname=${libfile%.lib}
+   libname=${libname#lib}
+   libNAMEa=lib${libname}.a
+   libNAMElib=lib${libname}.lib
+

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

2020-03-11 Thread Michael Haubenwallner

commit: 029b4387d4d6201c1e83ad8a5d6a9c49ede5a389
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Mar 11 14:21:10 2020 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Mar 11 15:47:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=029b4387

prefix/winnt/profile.bashrc: ensure NAME.lib, libNAME.so

Libtool for winnt does create NAME.lib (for windows'ish build tools) and
libNAME.so (for libtool when .la was removed) import libs now, but
Cygwin'ish or MinGW'ish build tools may create .dll.lib or .dll.a.
Have the libNAME.so symlink point to them, to be found by libtool.

Signed-off-by: Michael Haubenwallner  gentoo.org>

 profiles/prefix/windows/winnt/profile.bashrc | 116 +--
 1 file changed, 90 insertions(+), 26 deletions(-)

diff --git a/profiles/prefix/windows/winnt/profile.bashrc 
b/profiles/prefix/windows/winnt/profile.bashrc
index b8def6390de..b9496a65232 100644
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ b/profiles/prefix/windows/winnt/profile.bashrc
@@ -13,6 +13,34 @@
 # Need to explicitly set PKG_CONFIG_PATH for cross EPREFIX.
 export PKG_CONFIG_PATH="${EPREFIX}/lib/pkgconfig:${EPREFIX}/usr/lib/pkgconfig"
 
+###
+#
+# Unix aware build tools may provide (e.g. pkg-config) and accept
+# (e.g. gcc) the -lNAME linker option.  While they create libNAME.so
+# as the import library, they may be unaware of the additional dll.
+# The dllhelper wrappers take care of copying the real dll when
+# copying the libNAME.so.
+#
+# Cygwin and MinGW aware build tools may create the import library
+# as libNAME.dll.a or libNAME.dll.lib, and are aware of the dll,
+# while a subsequent linker step still receives the -lNAME option.
+#
+# MSVC aware build tools may provide (e.g. icu-config) and accept
+# (e.g. cl.exe) the NAME.lib linker option, maybe with full path,
+# and are aware of the dll.
+#
+# Libtool does accept both the Unix and MSVC variants now, but does
+# search for the libNAME(.la|.dll|.so|.a) file upon -lNAME, in order.
+#
+# As Gentoo ebuilds may remove libNAME.la, we need the libNAME.so
+# because we don't want to have libNAME.dll as an import library.
+#
+# Here, for whatever import library name we find, make sure there
+# is both the NAME.lib and the libNAME.so for linkability via both
+# the -lNAME and the NAME.lib linker option.
+#
+###
+
 windows_setup_dllhelper() {
case ${CATEGORY}/${PN} in
sys-libs/zlib |\
@@ -30,46 +58,82 @@ windows_setup_dllhelper() {
 }
 
 post_src_install() {
-   cd "${ED}"
-   find . -name '*.exe' -o -name '*.dll.a' -o -name '*.so' |
+   cd "${ED}" || return 0
+   #
+   # File names being treated as import library:
+   #  libNAME.so
+   # NAME.lib
+   #  libNAME.dll.lib
+   #  libNAME.dll.a
+   #
+   # File names being ignored as static library:
+   #  libNAME.lib
+   #  libNAME.a
+   #
+   # File names being warned about as suspect:
+   # NAME.so
+   # NAME.a
+   # NAME.dll.lib
+   # NAME.dll.a
+   #
+   find . -name '*.so' -o -name '*.lib' -o -name '*.a' |
while read f
do
f=${f#./}
-   case ${f} in
-   *.exe)
-   if file "./${f}" | grep "GUI" > /dev/null 2>&1; then
-   if test ! -f "./${f%.exe}"; then
-   einfo "Windows GUI Executable $f will 
have no symlink."
-   fi
-   else
-   if test ! -f "./${f%.exe}"; then
-   ebegin "creating ${f%.exe} -> ${f} for 
console accessibility."
-   eend $(ln -sf "$(basename "${f}")" 
"./${f%.exe}" && echo 0 || echo 1)
-   fi
-   fi
+   libdir=$(dirname "${f}")
+   libfile=${f##*/}
+   libname=
+   case ${libfile} in
+   lib.so) ;; # paranoia
+   lib*.so)
+   libname=${libfile%.so}
+   libname=${libname#lib}
;;
-   *.dll.a)
-   if test ! -f "./${f%.a}.lib"; then
-   ebegin "creating ${f%.a}.lib -> ${f##*/} for 
libtool linkability"
-   eend $(ln -sf "$(basename "${f}")" 
"./${f%.a}.lib" && echo 0 || echo 1)
-   fi
+   lib.dll.lib) ;; # paranoia
+   lib*.dll.lib)
+   libname=${libfile%.dll.lib}
+   libname=${libname#lib}
;;
-   *.so)
-   if test ! -f "${f%.so}.dll.lib"; then
-

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

2020-03-11 Thread Michael Haubenwallner

commit: def55073a59a9114dc08dc58889228b3ac86cf90
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Mar 11 15:38:46 2020 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Mar 11 15:47:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=def55073

profiles/prefix/winnt/x86/make.defaults: fix copyright year typo

Signed-off-by: Michael Haubenwallner  gentoo.org>

 profiles/prefix/windows/winnt/x86/make.defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/prefix/windows/winnt/x86/make.defaults 
b/profiles/prefix/windows/winnt/x86/make.defaults
index 0c11ef592e9..223c275acc7 100644
--- a/profiles/prefix/windows/winnt/x86/make.defaults
+++ b/profiles/prefix/windows/winnt/x86/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This profile is designed for use as Stacked Prefix, set up using

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/windows/winnt/x86/, profiles/embedded/, profiles/arch/base/, ...

2020-03-11 Thread Michael Haubenwallner

commit: 5367729eef04d16d496434c7a6ab037d635326e0
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Tue Mar 10 14:28:48 2020 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Mar 11 08:10:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5367729e

profiles: new arch and profile for x64-winnt

New profile prefix/windows/winnt/x64, for new ARCH=x64-winnt.

This profile is designed for use as Stacked Prefix, set up using
prefix-stack-setup (app-portage/prefix-toolkit) from with a Cygwin
Prefix (Guest only), having sys-devel/parity installed (wraps MSVC).

CHOST is left unset on purpose.  It is set by prefix-stack-setup
using some --chost=x86_64-msvc16-winnt argument, selecting the
Visual Studio version and runtime variant (static|debug) to use.

Adding same comments to prefix/windows/winnt/x86 profile as well.

Signed-off-by: Michael Haubenwallner  gentoo.org>

 profiles/arch.list  |  1 +
 profiles/arch/base/make.defaults|  2 +-
 profiles/embedded/make.defaults |  2 +-
 profiles/prefix/windows/winnt/x64/eapi  |  1 +
 profiles/prefix/windows/winnt/x64/make.defaults | 28 +
 profiles/prefix/windows/winnt/x64/parent|  1 +
 profiles/prefix/windows/winnt/x86/make.defaults | 18 +++-
 profiles/profiles.desc  |  1 +
 8 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/profiles/arch.list b/profiles/arch.list
index b9a9c022c00..d44231f28c3 100644
--- a/profiles/arch.list
+++ b/profiles/arch.list
@@ -29,6 +29,7 @@ sparc-solaris
 sparc64-solaris
 x64-solaris
 x86-solaris
+x64-winnt
 x86-winnt
 x64-cygwin
 x86-cygwin

diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults
index 5dc717cefd4..81f92b89ebe 100644
--- a/profiles/arch/base/make.defaults
+++ b/profiles/arch/base/make.defaults
@@ -3,6 +3,6 @@
 
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 
m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc 
sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin 
x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 
m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc 
sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 
x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
 
 PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH"

diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index 601d31cd84a..c6dc06a3c23 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -23,7 +23,7 @@ LINGUAS="en"
 IUSE_IMPLICIT="prefix prefix-guest prefix-stack"
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 
m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos s390 sh sparc 
sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin 
x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 
m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos s390 sh sparc 
sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 
x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
 USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX 
Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
 USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD 
OpenBSD SunOS Winnt"
 USE_EXPAND_VALUES_USERLAND="BSD GNU"

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

diff --git a/profiles/prefix/windows/winnt/x64/make.defaults 
b/profiles/prefix/windows/winnt/x64/make.defaults
new file mode 100644
index 000..1200225e106
--- /dev/null
+++ b/profiles/prefix/windows/winnt/x64/make.defaults
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# This profile is designed for use as Stacked Prefix, set up using
+# prefix-stack-setup (app-portage/prefix-toolkit) from with a Cygwin
+# Prefix (Guest only), having sys-devel/parity installed (wraps MSVC).
+#
+# CHOST is left unset on purpose.  It is set by prefix-stack-setup
+# using some --chost=x86_64-msvc16-winnt argument, selecting the
+# Visual Studio version and runtime variant (static|debug) to use.
+#
+# Sample CHOST values for the runtime variant using x64 Visual Studio 2019,
+# as provided by

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/windows/winnt/, profiles/arch/sparc/, ...

2019-08-30 Thread David Seifert

commit: a92f310586e35be4b253435f4e7e0cf47d4cf541
Author: David Seifert  gentoo  org>
AuthorDate: Fri Aug 30 08:51:09 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Aug 30 08:51:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a92f3105

profiles: [QA] Remove stale USE="directfb" masks

Signed-off-by: David Seifert  gentoo.org>

 profiles/arch/mips/use.mask   | 1 -
 profiles/arch/powerpc/ppc64/64ul/use.mask | 7 ++-
 profiles/arch/s390/use.mask   | 1 -
 profiles/arch/sparc/use.mask  | 1 -
 profiles/default/bsd/use.mask | 5 ++---
 profiles/prefix/aix/use.mask  | 1 -
 profiles/prefix/darwin/use.mask   | 1 -
 profiles/prefix/mint/use.mask | 1 -
 profiles/prefix/sunos/use.mask| 1 -
 profiles/prefix/windows/winnt/use.mask| 3 +--
 10 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 0c2c0d8533c..32ba177b1fe 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -216,7 +216,6 @@ eds
 acpi
 afs
 apm
-directfb
 dvdr
 ibm
 ggi

diff --git a/profiles/arch/powerpc/ppc64/64ul/use.mask 
b/profiles/arch/powerpc/ppc64/64ul/use.mask
index 0cc7f9e27d9..70b2f2d6446 100644
--- a/profiles/arch/powerpc/ppc64/64ul/use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/use.mask
@@ -1,4 +1,5 @@
-# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
 # Ilya Tumaykin  (2017-05-07)
 # There is no luajit support on ppc64 userland. Bug #608326.
@@ -12,10 +13,6 @@ luajittex
 # virtual/opencl requires media-libs/mesa[opencl] (bug #549096)
 opencl
 
-# this is a list of USE flags that should not be used on PPC64
-# Tom Gall  manages this list
-directfb
-
 # Agostino Sarubbo  (2012-12-22)
 # mask kde since is not anymore keyworded for ppc64
 kde

diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index 78f206bc291..491c1dee8a5 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -57,7 +57,6 @@ acpi
 afs
 alsa
 apm
-directfb
 lirc
 llvm
 java

diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index 5d188553c6b..a5963370adb 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -168,7 +168,6 @@ redis
 
 # USE-flags from differents origins
 brltty
-directfb
 djbfft
 dvb
 java

diff --git a/profiles/default/bsd/use.mask b/profiles/default/bsd/use.mask
index 390fcc3df99..6629ace9a07 100644
--- a/profiles/default/bsd/use.mask
+++ b/profiles/default/bsd/use.mask
@@ -1,5 +1,5 @@
-# Copyright 1999-2018 Gentoo Authors.
-# Distributed under the terms of the GNU General Public License, v2
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
 # Mart Raudsepp 
 # net-misc/networkmanager not keyworded
@@ -15,7 +15,6 @@ alsa
 v4l
 libv4l
 fbcon
-directfb
 gpm
 lirc
 multilib

diff --git a/profiles/prefix/aix/use.mask b/profiles/prefix/aix/use.mask
index 8ba50841f10..4728fdf3fb6 100644
--- a/profiles/prefix/aix/use.mask
+++ b/profiles/prefix/aix/use.mask
@@ -11,7 +11,6 @@ acpi
 alsa
 apm
 caps
-directfb
 djbfft
 fbcon
 ggi

diff --git a/profiles/prefix/darwin/use.mask b/profiles/prefix/darwin/use.mask
index e73cdefb405..1deb466a984 100644
--- a/profiles/prefix/darwin/use.mask
+++ b/profiles/prefix/darwin/use.mask
@@ -18,7 +18,6 @@ acpi
 alsa
 apm
 caps
-directfb
 djbfft
 fbcon
 ggi

diff --git a/profiles/prefix/mint/use.mask b/profiles/prefix/mint/use.mask
index a354482fb2f..9485c70a854 100644
--- a/profiles/prefix/mint/use.mask
+++ b/profiles/prefix/mint/use.mask
@@ -11,7 +11,6 @@ acpi
 alsa
 apm
 caps
-directfb
 djbfft
 fbcon
 ggi

diff --git a/profiles/prefix/sunos/use.mask b/profiles/prefix/sunos/use.mask
index 92a4f4a28bd..e1152c2b8b7 100644
--- a/profiles/prefix/sunos/use.mask
+++ b/profiles/prefix/sunos/use.mask
@@ -11,7 +11,6 @@ acpi
 alsa
 apm
 caps
-directfb
 djbfft
 fbcon
 ggi

diff --git a/profiles/prefix/windows/winnt/use.mask 
b/profiles/prefix/windows/winnt/use.mask
index 5b60cad0f8a..727eb842a44 100644
--- a/profiles/prefix/windows/winnt/use.mask
+++ b/profiles/prefix/windows/winnt/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Re-add Winnt libc
@@ -19,7 +19,6 @@ caps
 cdr
 coreaudio
 dga
-directfb
 djbfft
 dri
 dvdr

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

2019-08-12 Thread Michael Haubenwallner

commit: ad09a180ae467a0eaf1da10e56adfb064b42691a
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Mon Aug 12 07:23:17 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Mon Aug 12 07:35:17 2019 +
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  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/

2019-07-31 Thread Michael Haubenwallner

commit: 5d3a58b645979b555110c4ad417b1be76963c3e3
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Jul 31 11:35:40 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Jul 31 11:36:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d3a58b6

profiles/prefix/windows/p.use.mask: fix copyright year

Signed-off-by: Michael Haubenwallner  gentoo.org>

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

diff --git a/profiles/prefix/windows/package.use.mask 
b/profiles/prefix/windows/package.use.mask
index 44f096f7a3b..8aa55bffc31 100644
--- a/profiles/prefix/windows/package.use.mask
+++ b/profiles/prefix/windows/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Michael Haubenwallner  (2019-07-31)

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

2019-07-31 Thread Michael Haubenwallner

commit: f8a9083ee799487181327c3d51f44bbdea1e2bfd
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Jul 31 11:19:47 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Jul 31 11:34:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8a9083e

profiles/prefix/windows: p.use.mask tinfo for ncurses

On KERNEL=Winnt, ncurses requires the term-driver option (#639670),
which conflicts with the termlib option (use.forced by #487844).
Bug: https://bugs.gentoo.org/639670
Bug: https://bugs.gentoo.org/487844

Signed-off-by: Michael Haubenwallner  gentoo.org>

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

diff --git a/profiles/prefix/windows/package.use.mask 
b/profiles/prefix/windows/package.use.mask
new file mode 100644
index 000..44f096f7a3b
--- /dev/null
+++ b/profiles/prefix/windows/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Michael Haubenwallner  (2019-07-31)
+# KERNEL=Winnt needs term-driver, which conflicts with termlib
+sys-libs/ncurses tinfo

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/windows/winnt/6.0/, profiles/prefix/windows/winnt/5.2/, ...

2019-07-01 Thread Michael Haubenwallner

commit: 3eb80e9d59d2bfbe950692a9826d23ed0ede4a4d
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Mon Jul  1 09:10:29 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Mon Jul  1 09:20:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eb80e9d

profiles/prefix/winnt/x86: kill versioned profiles, for generic one

Having the windows version in profile does not make so much sense,
instead the MSVC version would.  But as the profile is identical for any
MSVC version except for CHOST, the profile does not set CHOST but relies
on the user to choose CHOST as argument to prefix-stack-setup, one out
of the list from (sys-devel/parity) 'parity-setup --list-available'.
The generic profile was added earlier, without the profiles.desc entry.

Signed-off-by: Michael Haubenwallner  gentoo.org>

 profiles/prefix/windows/winnt/3.5/eapi  | 1 -
 profiles/prefix/windows/winnt/3.5/parent| 1 -
 profiles/prefix/windows/winnt/3.5/x86/eapi  | 1 -
 profiles/prefix/windows/winnt/3.5/x86/make.defaults | 6 --
 profiles/prefix/windows/winnt/3.5/x86/parent| 1 -
 profiles/prefix/windows/winnt/5.2/eapi  | 1 -
 profiles/prefix/windows/winnt/5.2/parent| 1 -
 profiles/prefix/windows/winnt/5.2/x86/eapi  | 1 -
 profiles/prefix/windows/winnt/5.2/x86/make.defaults | 6 --
 profiles/prefix/windows/winnt/5.2/x86/parent| 1 -
 profiles/prefix/windows/winnt/6.0/eapi  | 1 -
 profiles/prefix/windows/winnt/6.0/parent| 1 -
 profiles/prefix/windows/winnt/6.0/x86/eapi  | 1 -
 profiles/prefix/windows/winnt/6.0/x86/make.defaults | 6 --
 profiles/prefix/windows/winnt/6.0/x86/parent| 1 -
 profiles/prefix/windows/winnt/6.1/eapi  | 1 -
 profiles/prefix/windows/winnt/6.1/parent| 1 -
 profiles/prefix/windows/winnt/6.1/x86/eapi  | 1 -
 profiles/prefix/windows/winnt/6.1/x86/make.defaults | 6 --
 profiles/prefix/windows/winnt/6.1/x86/parent| 1 -
 profiles/profiles.desc  | 5 +
 21 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/profiles/prefix/windows/winnt/3.5/eapi 
b/profiles/prefix/windows/winnt/3.5/eapi
deleted file mode 100644
index 7ed6ff82de6..000
--- a/profiles/prefix/windows/winnt/3.5/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/windows/winnt/3.5/parent 
b/profiles/prefix/windows/winnt/3.5/parent
deleted file mode 100644
index f3229c5b987..000
--- a/profiles/prefix/windows/winnt/3.5/parent
+++ /dev/null
@@ -1 +0,0 @@
-..

diff --git a/profiles/prefix/windows/winnt/3.5/x86/eapi 
b/profiles/prefix/windows/winnt/3.5/x86/eapi
deleted file mode 100644
index 7ed6ff82de6..000
--- a/profiles/prefix/windows/winnt/3.5/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/windows/winnt/3.5/x86/make.defaults 
b/profiles/prefix/windows/winnt/3.5/x86/make.defaults
deleted file mode 100644
index 21cc6becd40..000
--- a/profiles/prefix/windows/winnt/3.5/x86/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="x86-winnt"
-CHOST="i586-pc-winnt3.5"
-ACCEPT_KEYWORDS="~x86-winnt"

diff --git a/profiles/prefix/windows/winnt/3.5/x86/parent 
b/profiles/prefix/windows/winnt/3.5/x86/parent
deleted file mode 100644
index f3229c5b987..000
--- a/profiles/prefix/windows/winnt/3.5/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..

diff --git a/profiles/prefix/windows/winnt/5.2/eapi 
b/profiles/prefix/windows/winnt/5.2/eapi
deleted file mode 100644
index 7ed6ff82de6..000
--- a/profiles/prefix/windows/winnt/5.2/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/windows/winnt/5.2/parent 
b/profiles/prefix/windows/winnt/5.2/parent
deleted file mode 100644
index f3229c5b987..000
--- a/profiles/prefix/windows/winnt/5.2/parent
+++ /dev/null
@@ -1 +0,0 @@
-..

diff --git a/profiles/prefix/windows/winnt/5.2/x86/eapi 
b/profiles/prefix/windows/winnt/5.2/x86/eapi
deleted file mode 100644
index 7ed6ff82de6..000
--- a/profiles/prefix/windows/winnt/5.2/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/windows/winnt/5.2/x86/make.defaults 
b/profiles/prefix/windows/winnt/5.2/x86/make.defaults
deleted file mode 100644
index 6196da2d7a5..000
--- a/profiles/prefix/windows/winnt/5.2/x86/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="x86-winnt"
-CHOST="i586-pc-winnt5.2"
-ACCEPT_KEYWORDS="~x86-winnt"

diff --git a/profiles/prefix/windows/winnt/5.2/x86/parent 
b/profiles/prefix/windows/winnt/5.2/x86/parent
deleted file mode 100644
index f3229c5b987..000
--- a/profiles/prefix/windows/winnt/5.2/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..

diff --git

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

2019-06-24 Thread Michael Haubenwallner

commit: 91830d78d6f352ee1450263b6466fda5f7c8003c
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Mon Jun 24 12:12:59 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Mon Jun 24 12:14:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91830d78

prefix/winnt/profile.bashrc: first, check if usr/lib does exist

And fail if creating the back hardlink does fail.

Signed-off-by: Michael Haubenwallner  gentoo.org>

 profiles/prefix/windows/winnt/profile.bashrc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/profiles/prefix/windows/winnt/profile.bashrc 
b/profiles/prefix/windows/winnt/profile.bashrc
index c0eaec08a6d..b8def6390de 100644
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ b/profiles/prefix/windows/winnt/profile.bashrc
@@ -62,6 +62,7 @@ post_src_install() {
;;
esac
done
+   [[ -d usr/$(get_libdir) ]] &&
find usr/$(get_libdir) -maxdepth 1 -type f -name '*.dll' |
while read f
do
@@ -69,7 +70,7 @@ post_src_install() {
ebegin "moving ${f} to usr/bin for native loader"
dodir usr/bin || die
mv -f "${f}" usr/bin || die
-   ln -sf "../bin/${f##*/}" "${f}"
+   ln -sf "../bin/${f##*/}" "${f}" || die
eend $?
fi
done

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

2019-06-24 Thread Michael Haubenwallner

commit: 3326692aad3350ef104471ba2500207754c4129f
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Mon Jun 24 11:01:25 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Mon Jun 24 11:07:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3326692a

prefix/winnt/profile.bashrc: move usr/lib/*.dll to usr/bin/

When dlls or executables are created without the parity loader in place,
dlls may not be found when not in usr/bin.
So better move dlls from usr/lib to usr/bin, much like Cygwin does.

Signed-off-by: Michael Haubenwallner  gentoo.org>

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

diff --git a/profiles/prefix/windows/winnt/profile.bashrc 
b/profiles/prefix/windows/winnt/profile.bashrc
index 4e60691a494..c0eaec08a6d 100644
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ b/profiles/prefix/windows/winnt/profile.bashrc
@@ -62,6 +62,17 @@ post_src_install() {
;;
esac
done
+   find usr/$(get_libdir) -maxdepth 1 -type f -name '*.dll' |
+   while read f
+   do
+   if test ! -f usr/bin/${f##*/}; then
+   ebegin "moving ${f} to usr/bin for native loader"
+   dodir usr/bin || die
+   mv -f "${f}" usr/bin || die
+   ln -sf "../bin/${f##*/}" "${f}"
+   eend $?
+   fi
+   done
 }
 
 windows_setup_dllhelper_cp() {

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

2019-06-24 Thread Michael Haubenwallner

commit: 95a51fc1bd0282f10c6c97cc6a3cbaca4c9163b8
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Mon Jun 24 11:00:21 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Mon Jun 24 11:07:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95a51fc1

prefix/winnt/profile.bashrc: inform on DLL cp wrapper setup

Signed-off-by: Michael Haubenwallner  gentoo.org>

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

diff --git a/profiles/prefix/windows/winnt/profile.bashrc 
b/profiles/prefix/windows/winnt/profile.bashrc
index 3c12c651967..4e60691a494 100644
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ b/profiles/prefix/windows/winnt/profile.bashrc
@@ -22,7 +22,9 @@ windows_setup_dllhelper() {
# But as there is another file to install (the real dll),
# and installation is done using cp, we override cp to
# additionally copy the dll when the library is copied.
+   ebegin "Setting up wrapper to copy the DLL along the LIB"
windows_setup_dllhelper_cp
+   eend $?
;;
esac
 }

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

2019-06-13 Thread Michael Haubenwallner

commit: 231634e8d58378461090bdba125bdbd0852510b8
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Thu Jun 13 12:49:58 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Thu Jun 13 13:07:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=231634e8

profiles/prefix/winnt/x86: define multilib defaults

Signed-off-by: Michael Haubenwallner  gentoo.org>

 profiles/prefix/windows/winnt/x86/make.defaults | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/profiles/prefix/windows/winnt/x86/make.defaults 
b/profiles/prefix/windows/winnt/x86/make.defaults
index e440495bc30..3c45b788d16 100644
--- a/profiles/prefix/windows/winnt/x86/make.defaults
+++ b/profiles/prefix/windows/winnt/x86/make.defaults
@@ -3,3 +3,10 @@
 
 ARCH="x86-winnt"
 ACCEPT_KEYWORDS="~x86-winnt"
+
+# multilib build stuff, single ABI (no multilib)
+MULTILIB_ABIS="x86"
+DEFAULT_ABI="x86"
+ABI="x86"
+IUSE_IMPLICIT="abi_x86_32"
+LIBDIR_x86="lib"

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

2019-06-12 Thread Michael Haubenwallner

commit: f9bdfa830a93275e29277ee382fce513573b6e0d
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Jun 12 14:42:07 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Jun 12 15:32:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9bdfa83

profiles/prefix/windows: add winnt/x86 generic profile

For use with prefix-stack-setup (from app-portage/prefix-toolkit), to
have some native windows profile.  As the windows toolchain name may
vary (MSVC versions), leave setting CHOST to prefix-stack-setup.

Signed-off-by: Michael Haubenwallner  gentoo.org>

 profiles/prefix/windows/winnt/x86/eapi  | 1 +
 profiles/prefix/windows/winnt/x86/make.defaults | 5 +
 profiles/prefix/windows/winnt/x86/parent| 1 +
 3 files changed, 7 insertions(+)

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

diff --git a/profiles/prefix/windows/winnt/x86/make.defaults 
b/profiles/prefix/windows/winnt/x86/make.defaults
new file mode 100644
index 000..e440495bc30
--- /dev/null
+++ b/profiles/prefix/windows/winnt/x86/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+ARCH="x86-winnt"
+ACCEPT_KEYWORDS="~x86-winnt"

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

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

2019-06-07 Thread Michael Haubenwallner

commit: 5268c328d21528213551e1738caf9219cc865923
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Fri Jun  7 10:14:52 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Fri Jun  7 10:21:31 2019 +
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  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  (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  (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/

2019-06-07 Thread Michael Haubenwallner

commit: 1c69bba7be6353c0dae4bf11ed7acba2e92f2410
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Fri Jun  7 08:58:50 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Fri Jun  7 10:21:30 2019 +
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  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  (27 Feb 2019)
+# Michael Haubenwallner  (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  (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/

2019-05-07 Thread Michael Haubenwallner

commit: 86decaadd9b5ac47c3915145bf588c34a4c69642
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Thu Apr 25 07:03:53 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Tue May  7 08:05:52 2019 +
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  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/

2019-05-07 Thread Michael Haubenwallner

commit: 949b7a9801e59a2317cd68da53bdae344cd3e417
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Mon May  6 09:43:11 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Tue May  7 08:05:53 2019 +
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  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' \
+

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

2019-05-07 Thread Michael Haubenwallner

commit: 8ed5a743068088cfc0279542ef611cdf929e48ac
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Tue May  7 07:04:51 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Tue May  7 08:05:52 2019 +
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  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/

2019-03-26 Thread Michael Haubenwallner

commit: 9c7ca565cd868d0c44f8a22d1a7a7d6b15d955f9
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Tue Mar 26 10:32:37 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Tue Mar 26 10:33:56 2019 +
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  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  (27 Feb 2020)
+# Michael Haubenwallner  (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/

2019-03-26 Thread Michael Haubenwallner

commit: 2d15595d88d9910d71f6f46633f7e4900de83617
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Tue Mar 26 09:07:59 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Tue Mar 26 09:09:25 2019 +
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  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  (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/winnt/

2019-03-20 Thread Michael Haubenwallner

commit: 22c4e0424b2f0b8861c6aa278cb2e5269ed40896
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Mon Mar 18 14:45:59 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Mar 20 08:38:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c4e042

profiles/prefix/winnt/profile.bashrc: drop exe-in-use handling

Unlike Interix, Cygwin is able to "remove" executables in use, as in
transparently moving them to trashbin.  Broken for EAPI 7, dropped.

Signed-off-by: Michael Haubenwallner  gentoo.org>

 profiles/prefix/windows/winnt/profile.bashrc | 121 ---
 1 file changed, 121 deletions(-)

diff --git a/profiles/prefix/windows/winnt/profile.bashrc 
b/profiles/prefix/windows/winnt/profile.bashrc
index 7d1251609c0..3c12c651967 100644
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ b/profiles/prefix/windows/winnt/profile.bashrc
@@ -27,69 +27,6 @@ windows_setup_dllhelper() {
esac
 }
 
-windows_cleanup_removed_files() {
-   local removedlist=$1
-   rm -f "${removedlist}".new
-
-   if [[ -r ${removedlist} ]]; then
-   rm -f "${removedlist}".old
-   fi
-   # restore in case of system fault
-   if [[ -r ${removedlist}.old ]]; then
-   mv "${removedlist}"{.old,}
-   fi
-
-   touch "${removedlist}"{,.new} # ensure they exist
-
-   while read rmstem; do
-   # try to remove previously recorded files
-   for f in "${ROOT}${rmstem}"*; do
-   ebegin "trying to remove ${f}"
-   rm -f "${f}" > /dev/null 2>&1
-   eend $?
-   done
-   # but keep it in list if still exists
-   for f in "${ROOT}${rmstem}"*; do
-   [[ -f ${f} ]] && echo "${rmstem}" >> 
"${removedlist}".new
-   break
-   done
-   done < "${removedlist}"
-
-   # update the list
-   mv "${removedlist}"{,.old}
-   mv "${removedlist}"{.new,}
-   rm "${removedlist}".old
-}
-
-windows_find_removed_slot() {
-   local f=$1
-   local n=0
-   while [[ ${n} -lt 100 && -f "${f}${n}" ]]; do
-   n=$((n=n+1))
-   done
-
-   if [[ ${n} -ge 100 ]]; then
-   echo "too many (>=100) old text files busy of '${f}'" >&2
-   exit 1
-   fi
-
-   echo $n
-}
-
-windows_prepare_file() {
-   local failed=0
-   my_mv=mv
-
-   [[ "${1}" == */mv ]] && my_mv="${1}.new"
-   [[ -f "${1}.new" ]] && rm -f "${1}.new"
-
-   cp -p "${1}" "${1}.new" || failed=1
-   ${my_mv} "${1}" "${2}" || failed=1
-   ${my_mv} "${1}.new" "${1}" || failed=1
-
-   echo $failed
-}
-
 post_src_install() {
cd "${ED}"
find . -name '*.exe' -o -name '*.dll.a' -o -name '*.so' |
@@ -125,64 +62,6 @@ post_src_install() {
done
 }
 
-post_pkg_preinst() {
-   local removedlist="${EROOT}var/lib/portage/files2bremoved"
-   windows_cleanup_removed_files $removedlist
-   
-   # now go for current package
-   cd "${D}"
-   find ".${EROOT}" -type f | xargs -r /usr/bin/file | grep ' PE ' | while 
read f t
-   do
-   f=${f#./} # find prints: "./path/to/file"
-   f=${f%:} # file prints: "file-argument: type-of-file"
-   test -r "${ROOT}${f}" || continue
-   rmstem="${f}.removedbyportage"
-   # keep list of old busy text files unique
-   grep "^${rmstem}$" "${removedlist}" >/dev/null \
-   || echo "${rmstem}" >> "${removedlist}"
-
-   local n=$(windows_find_removed_slot ${ROOT}${rmstem})
-   ebegin "backing up text file ${ROOT}${f} (${n})"
-   eend $(windows_prepare_file "${ROOT}${f}" 
"${ROOT}${rmstem}${n}")
-   done
-}
-
-post_pkg_prerm() {
-   local removedlist="${EROOT}var/lib/portage/files2bremoved"
-   save_IFS=$IFS
-   IFS='
-';
-   local MY_PR=${PR}
-   [[ ${MY_PR} == r0 ]] && MY_PR=
-   local -a 
contents=($(<"${EROOT}var/db/pkg/${CATEGORY}/${P}${MY_PR:+-}${MY_PR}/CONTENTS"));
-   IFS=$save_IFS
-   local -a cont
-   for content in "${contents[@]}"; do
-   cont=($content)
-   f=${cont[1]}
-   f=${f#/}
-
-   test -r "${ROOT}${f}" || continue
-
-   if /usr/bin/file "${ROOT}${f}" | grep ' PE ' > /dev/null; then
-   # $f should be an absolute path to the installed file
-   rmstem="${f}.removedbyportage"
-
-   grep "^${rmstem}$" "${removedlist}" > /dev/null \
-   || echo "${rmstem}" >> "${removedlist}"
-
-   local n=$(windows_find_removed_slot ${ROOT}${rmstem})
-   ebegin "preparing ${ROOT}${f} for unmerge ($n)"
-   eend $(windows_prepare_file "${ROOT}${f}" 
"${ROOT}${rmstem}${n}")
-

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

2019-03-13 Thread Michał Górny

commit: 2e94310ff383220318b562041e7e237ede86a8e7
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Mar 13 08:20:18 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Mar 13 08:20:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e94310f

profiles: Remove obsolete use.mask entry

Signed-off-by: Michał Górny  gentoo.org>

 profiles/prefix/windows/winnt/use.mask | 1 -
 1 file changed, 1 deletion(-)

diff --git a/profiles/prefix/windows/winnt/use.mask 
b/profiles/prefix/windows/winnt/use.mask
index ac0a32f6af1..5b60cad0f8a 100644
--- a/profiles/prefix/windows/winnt/use.mask
+++ b/profiles/prefix/windows/winnt/use.mask
@@ -38,7 +38,6 @@ ipod
 ipv6
 lm_sensors
 ncurses
-netboot
 opengl
 oss
 pcmcia

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

2019-02-27 Thread Michael Haubenwallner

commit: 4d4cb9163e2c845e8700b1679c686b1ba9c25ea0
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Feb 27 12:48:44 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Feb 27 12:57:39 2019 +
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  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  (27 Feb 2020)
+# Cygwin does not provide this new version yet in it's repo.
+>=sys-devel/gcc-7.4
+
 # Michael Haubenwallner  (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/

2019-02-27 Thread Michael Haubenwallner

commit: c051f21d38e094cb014842b0ead6915fb392c6db
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Feb 27 12:46:09 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Feb 27 12:57:37 2019 +
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  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  (02 Jul 2018)
-# Need to import Cygwin upstream patches still.
-~sys-devel/gettext-0.19.8.1
-
 # Michael Haubenwallner  (20 May 2016)
 # Does not work with Cygwin.
 sys-apps/man-db

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

2019-02-14 Thread Michael Haubenwallner

commit: b034d89ef20282c4480378f948ac6749ee2c2750
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Thu Feb 14 11:41:40 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Thu Feb 14 11:42:02 2019 +
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  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/

2019-02-13 Thread Michael Haubenwallner

commit: d8a976eea84b82f4352d17c6f1adc428ef3bcd2b
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Feb 13 17:41:38 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Feb 13 17:42:50 2019 +
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  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  (13 Feb 2019)
+# see upstream report https://savannah.gnu.org/bugs/index.php?55708
+=sys-apps/groff-1.22.4
+
 # Michael Haubenwallner  (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/

2019-02-13 Thread Michael Haubenwallner

commit: 9b617fcf4c6fe9e06f11f8483707e7d57802a31b
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Feb 13 17:14:51 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Feb 13 17:16:16 2019 +
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  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 000..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  (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/

2019-01-30 Thread Michael Haubenwallner

commit: 8075f44abb8acb46c87d9877031ecbdfb4d6537d
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Jan 30 14:39:23 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Jan 30 14:41:58 2019 +
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  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  (30 Jan 2019)
+# Cygwin does not have updated patches yet, is not trivial
+>=sys-apps/coreutils-8.30
+
 # Michael Haubenwallner  (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/, ...

2018-07-08 Thread Mike Gilbert

commit: 5f922f32b921fe9dfbcdbf2a268bd23b563f57a8
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Jul  8 00:17:31 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Jul  8 14:02:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f922f32

profiles: copy random python3_6 masks for python3_7

 profiles/features/prefix/standalone/kernel-2.6.16+/use.mask | 2 ++
 profiles/prefix/windows/cygwin/use.mask | 1 +
 2 files changed, 3 insertions(+)

diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask 
b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
index 2a1686418a8..a2ccaca4c8e 100644
--- a/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
@@ -1,7 +1,9 @@
 # >=python-3 is masked
+python_single_target_python3_7
 python_single_target_python3_6
 python_single_target_python3_5
 python_single_target_python3_4
+python_targets_python3_7
 python_targets_python3_6
 python_targets_python3_5
 python_targets_python3_4

diff --git a/profiles/prefix/windows/cygwin/use.mask 
b/profiles/prefix/windows/cygwin/use.mask
index a953069a805..7e47b5dd84f 100644
--- a/profiles/prefix/windows/cygwin/use.mask
+++ b/profiles/prefix/windows/cygwin/use.mask
@@ -8,3 +8,4 @@
 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/

2018-07-02 Thread Michael Haubenwallner

commit: 35470d5b1108131584d611fcc7697090eb7de0cd
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Mon Jul  2 17:00:59 2018 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Mon Jul  2 17:01:45 2018 +
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  (02 Jul 2018)
+# Need to import Cygwin upstream patches still.
+~sys-devel/gettext-0.19.8.1
+
 # Michael Haubenwallner  (20 May 2016)
 # Does not work with Cygwin.
 sys-apps/man-db

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

2018-06-10 Thread Matt Turner

commit: caa418013a6658092c728e5c3543bbc677e44187
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jun 11 01:50:08 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jun 11 01:50:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa41801

profiles/prefix/winnt: Remove super dead package.mask entry

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

diff --git a/profiles/prefix/windows/winnt/package.mask 
b/profiles/prefix/windows/winnt/package.mask
index 0af713753d9..0b9c2c93389 100644
--- a/profiles/prefix/windows/winnt/package.mask
+++ b/profiles/prefix/windows/winnt/package.mask
@@ -1,8 +1,2 @@
 
 # Distributed under the terms of the GNU General Public License v2
-
-
-# Markus Duft  (30 Sep 2009)
-# the patch does not currently apply, and needs some work.
->=x11-proto/xproto-7.0.16
-

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

2018-06-08 Thread Michael Haubenwallner

commit: be6dbc5a9d2052338d58e0a6ea2d69cf118ecec1
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Fri Jun  8 18:27:34 2018 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Fri Jun  8 18:29:25 2018 +
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  (14 May 2018)
 # stack protector does not fully work on Cygwin yet
-=sys-devel/gcc-6* -ssp
+sys-devel/gcc -ssp
 
 # Michael Haubenwallner  (23 Mar 2017)
 # Using nettle hides a conflict between wincrypt and openssl.

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

2018-05-14 Thread Michael Haubenwallner

commit: a96e8192563e02c1197134c7ff2518a5ecf8c616
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Mon May 14 15:31:05 2018 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Mon May 14 16:14:53 2018 +
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  (14 May 2018)
+# stack protector does not fully work on Cygwin yet
+=sys-devel/gcc-6* -ssp
+
 # Michael Haubenwallner  (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/winnt/

2018-01-24 Thread Michael Haubenwallner

commit: 22b59662d21039f8f3246d12a2ac0bbb93d35683
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Jan 24 16:10:36 2018 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Jan 24 16:22:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22b59662

prefix/winnt/profiles.bashrc: improve winnt helpers

With Gentoo Parity wrapping the Visual Studio compiler, build systems
unaware of Windows can create .so import libraries just fine.  But
Windows aware build systems do prefer .lib import libraries, so we do
create .lib -> .so symlinks, resolved by Gentoo Parity later on again.

Additionally, they don't know about the additional .dll to install.  So
we wrap the cp utility to also copy the dll when the library is copied.

 profiles/prefix/windows/winnt/profile.bashrc | 159 +--
 1 file changed, 149 insertions(+), 10 deletions(-)

diff --git a/profiles/prefix/windows/winnt/profile.bashrc 
b/profiles/prefix/windows/winnt/profile.bashrc
index f1c5c365338..7d1251609c0 100644
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ b/profiles/prefix/windows/winnt/profile.bashrc
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # On windows, binary files (executables, shared libraries) in use
@@ -13,6 +13,20 @@
 # Need to explicitly set PKG_CONFIG_PATH for cross EPREFIX.
 export PKG_CONFIG_PATH="${EPREFIX}/lib/pkgconfig:${EPREFIX}/usr/lib/pkgconfig"
 
+windows_setup_dllhelper() {
+   case ${CATEGORY}/${PN} in
+   sys-libs/zlib |\
+   '')
+   # When a package build system does not know about Windows at 
all,
+   # still it can be built for Windows using Gentoo Parity.
+   # But as there is another file to install (the real dll),
+   # and installation is done using cp, we override cp to
+   # additionally copy the dll when the library is copied.
+   windows_setup_dllhelper_cp
+   ;;
+   esac
+}
+
 windows_cleanup_removed_files() {
local removedlist=$1
rm -f "${removedlist}".new
@@ -78,17 +92,36 @@ windows_prepare_file() {
 
 post_src_install() {
cd "${ED}"
-   find . -name '*.exe' | while read f; do
-   if file "${f}" | grep "GUI" > /dev/null 2>&1; then
-   if test ! -f "${f%.exe}"; then
-   einfo "Windows GUI Executable $f will have no 
symlink."
+   find . -name '*.exe' -o -name '*.dll.a' -o -name '*.so' |
+   while read f
+   do
+   f=${f#./}
+   case ${f} in
+   *.exe)
+   if file "./${f}" | grep "GUI" > /dev/null 2>&1; then
+   if test ! -f "./${f%.exe}"; then
+   einfo "Windows GUI Executable $f will 
have no symlink."
+   fi
+   else
+   if test ! -f "./${f%.exe}"; then
+   ebegin "creating ${f%.exe} -> ${f} for 
console accessibility."
+   eend $(ln -sf "$(basename "${f}")" 
"./${f%.exe}" && echo 0 || echo 1)
+   fi
fi
-   else
-   if test ! -f "${f%.exe}"; then
-   ebegin "creating ${f%.exe} -> ${f} for console 
accessibility."
-   eend $(ln -sf "$(basename "${f}")" "${f%.exe}" 
&& echo 0 || echo 1)
+   ;;
+   *.dll.a)
+   if test ! -f "./${f%.a}.lib"; then
+   ebegin "creating ${f%.a}.lib -> ${f##*/} for 
libtool linkability"
+   eend $(ln -sf "$(basename "${f}")" 
"./${f%.a}.lib" && echo 0 || echo 1)
fi
-   fi
+   ;;
+   *.so)
+   if test ! -f "${f%.so}.dll.lib"; then
+   ebegin "creating ${f%.so}.dll.lib -> ${f##*/} 
for libtool linkability"
+   eend $(ln -sf "$(basename "${f}")" 
"./${f%.so}.dll.lib" && echo 0 || echo 1)
+   fi
+   ;;
+   esac
done
 }
 
@@ -149,3 +182,109 @@ pre_pkg_postrm() {
local removedlist="${EROOT}var/lib/portage/files2bremoved"
windows_cleanup_removed_files $removedlist
 }
+
+windows_setup_dllhelper_cp() {
+   if ! [[ $(type -P cp) -ef ${T}/dllhelper/cp ]]
+   then
+   mkdir -p "${T}/dllhelper"
+   cat > "${T}/dllhelper/cp" <<'EOCP'
+#!/usr/bin/env bash
+
+mysrcs=()
+myopts=()
+mydest=
+force_dest_file_opt=
+
+nextargs=( "$@" )
+
+while [[ $# > 0 ]]
+do
+   arg=${1}
+   shift
+   case ${arg} in
+   --)
+

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

2017-12-30 Thread Michał Górny

commit: 33b41f22509ee852e9ef2bbb217520b736899fda
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Dec 30 11:04:23 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Dec 30 11:49:32 2017 +
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  (15 Mar 2017)
-# Cygwin breakage in 0.16 should be fixed in 0.17
-~net-dns/libidn2-0.16
-
 # Michael Haubenwallner  (20 May 2016)
 # Does not work with Cygwin.
 sys-apps/man-db

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

2017-12-21 Thread Michael Haubenwallner

commit: 34c88b53b7b7940f643248dedae5961d2f6d718a
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Thu Dec 21 14:13:57 2017 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Thu Dec 21 14:13:57 2017 +
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 000..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/

2017-11-29 Thread Michael Haubenwallner

commit: e2d28806e884c31b16695c0d1f8e48db74017c7d
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Nov 29 09:41:27 2017 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Nov 29 09:41:27 2017 +
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  (29 Nov 2017)
-# Cygwin upstream does not provide coreutils-8.28 yet, bug#638816.
->=sys-apps/coreutils-8.27
-
 # Michael Haubenwallner  (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/

2017-11-29 Thread Michael Haubenwallner

commit: 68a31fc314197b0827b6ea01731ec85c02914ca8
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Nov 29 08:03:19 2017 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Nov 29 08:03:19 2017 +
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  (15 Mar 2017)
+# Michael Haubenwallner  (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/

2017-11-29 Thread Michael Haubenwallner

commit: 5f0a88d282cb77b13ff25e7f738262d6e15f8821
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Nov 29 07:59:58 2017 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Nov 29 07:59:58 2017 +
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  (15 Mar 2017)
+# Cygwin upstream does not provide coreutils-8.28 yet, bug#638816.
+>=sys-apps/coreutils-8.27
+
+# Michael Haubenwallner  (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/winnt/

2017-10-02 Thread Michael Haubenwallner

commit: b65b2fa48ef6e149ef42e66cb229302369812d24
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Mon Oct  2 14:31:22 2017 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Mon Oct  2 14:32:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b65b2fa4

profiles/prefix/winnt: p.use.mask asm for openssl

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

diff --git a/profiles/prefix/windows/winnt/package.use.mask 
b/profiles/prefix/windows/winnt/package.use.mask
new file mode 100644
index 000..51b019b65f2
--- /dev/null
+++ b/profiles/prefix/windows/winnt/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Michael Haubenwallner  (02 Oct 2017)
+# requires nasm, which is hard to use via parity atm
+dev-libs/openssl asm

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

2017-09-06 Thread Michael Haubenwallner

commit: 798a0433ad807b6127066cac3f6e33d6551ef0d4
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Sep  6 14:18:12 2017 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Sep  6 14:18:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=798a0433

profiles/prefix/windows: use.mask inotify

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

diff --git a/profiles/prefix/windows/use.mask b/profiles/prefix/windows/use.mask
index 3c4d7d24fc9..2d725b48a33 100644
--- a/profiles/prefix/windows/use.mask
+++ b/profiles/prefix/windows/use.mask
@@ -3,3 +3,6 @@
 
 # Re-add Windows kernel
 -kernel_Winnt
+
+# linux-exclusive feature
+inotify

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

2017-08-25 Thread Michael Haubenwallner

commit: 45d65f366877d7d45e567997e0a43a1008bb7d10
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Fri Aug 25 09:55:51 2017 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Fri Aug 25 09:56:40 2017 +
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/

2017-03-23 Thread Michael Haubenwallner

commit: e1406fbe6106358c77bffed0ebb4d8e76b871413
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Thu Mar 23 07:56:20 2017 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Thu Mar 23 07:59:25 2017 +
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  (23 Mar 2017)
+# Using nettle hides a conflict between wincrypt and openssl.
+app-arch/libarchive nettle
+
 # Michael Haubenwallner  (18 Apr 2016)
 # Cygwin coreutils provide kill as gkill
 sys-apps/coreutils kill

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

2017-03-16 Thread Michael Haubenwallner

commit: 481ad51cc1a533dfe2c158344ed129ebfadb426b
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Thu Mar 16 11:24:14 2017 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Thu Mar 16 11:24:14 2017 +
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  (15 Mar 2017)
+# Cygwin breakage in 0.16 should be fixed in 0.17
+~net-dns/libidn2-0.16
+
 # Michael Haubenwallner  (20 May 2016)
 # Does not work with Cygwin.
 sys-apps/man-db

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

2017-02-20 Thread Michael Haubenwallner

commit: c3a81b927c67cb766c3e0bafd7da14d6520c3140
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Mon Feb 20 14:18:14 2017 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Mon Feb 20 14:20:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3a81b92

profiles/prefix/cygwin: stop accepting ~amd64-linux

Since ~x64-cygwin keywords are in place, there's no need any more to
accept ~amd64-linux keywords.

 profiles/prefix/windows/cygwin/x64/make.defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/prefix/windows/cygwin/x64/make.defaults 
b/profiles/prefix/windows/cygwin/x64/make.defaults
index e243a8c687..a018bd9f76 100644
--- a/profiles/prefix/windows/cygwin/x64/make.defaults
+++ b/profiles/prefix/windows/cygwin/x64/make.defaults
@@ -4,7 +4,7 @@
 
 ARCH="x64-cygwin"
 CHOST="x86_64-pc-cygwin"
-ACCEPT_KEYWORDS="~x64-cygwin ~amd64-linux"
+ACCEPT_KEYWORDS="~x64-cygwin"
 
 # We don't have lib64 in prefix so, remove it here.
 SYMLINK_LIB=""

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/windows/interix/6.1/x86/, profiles/prefix/windows/winnt/, ...

2017-01-30 Thread Fabian Groffen

commit: 56797d83eeccb79d62f809eda4192ca5e2dac3ce
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Jan 30 19:31:50 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Jan 30 19:34:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56797d83

remove Interix keyword x86-interix

 eclass/xorg-2.eclass   |   4 +-
 profiles/arch.list |   1 -
 profiles/base/make.defaults|   2 +-
 profiles/embedded/make.defaults|   2 +-
 profiles/prefix/windows/interix/3.5/eapi   |   1 -
 profiles/prefix/windows/interix/3.5/package.mask   |   8 --
 profiles/prefix/windows/interix/3.5/parent |   1 -
 profiles/prefix/windows/interix/3.5/x86/eapi   |   1 -
 .../prefix/windows/interix/3.5/x86/make.defaults   |   7 -
 profiles/prefix/windows/interix/3.5/x86/parent |   1 -
 profiles/prefix/windows/interix/5.2/eapi   |   1 -
 profiles/prefix/windows/interix/5.2/parent |   1 -
 profiles/prefix/windows/interix/5.2/x86/eapi   |   1 -
 .../prefix/windows/interix/5.2/x86/make.defaults   |   7 -
 profiles/prefix/windows/interix/5.2/x86/parent |   1 -
 profiles/prefix/windows/interix/6.0/eapi   |   1 -
 profiles/prefix/windows/interix/6.0/parent |   1 -
 profiles/prefix/windows/interix/6.0/x86/eapi   |   1 -
 .../prefix/windows/interix/6.0/x86/make.defaults   |   9 --
 profiles/prefix/windows/interix/6.0/x86/parent |   1 -
 profiles/prefix/windows/interix/6.1/eapi   |   1 -
 profiles/prefix/windows/interix/6.1/parent |   1 -
 profiles/prefix/windows/interix/6.1/x86/eapi   |   1 -
 .../prefix/windows/interix/6.1/x86/make.defaults   |   9 --
 profiles/prefix/windows/interix/6.1/x86/parent |   1 -
 profiles/prefix/windows/interix/eapi   |   1 -
 profiles/prefix/windows/interix/make.defaults  |  12 --
 profiles/prefix/windows/interix/package.mask   |  14 --
 profiles/prefix/windows/interix/package.use.force  |   8 --
 profiles/prefix/windows/interix/package.use.mask   |  22 
 profiles/prefix/windows/interix/packages   |   3 -
 profiles/prefix/windows/interix/parent |   1 -
 profiles/prefix/windows/interix/profile.bashrc | 146 -
 profiles/prefix/windows/interix/use.force  |   6 -
 profiles/prefix/windows/interix/use.mask   |  77 ---
 profiles/prefix/windows/winnt/packages |   2 +-
 profiles/profiles.desc |   6 -
 37 files changed, 5 insertions(+), 358 deletions(-)

diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index b7c7ba2..c356c33 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -115,7 +115,7 @@ fi
 
 # Set up autotools shared dependencies
 # Remember that all versions here MUST be stable
-XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt"
+XORG_EAUTORECONF_ARCHES="ppc-aix x86-winnt"
 EAUTORECONF_DEPEND+="
>=sys-devel/libtool-2.2.6a
sys-devel/m4"
@@ -359,7 +359,7 @@ xorg-2_reconf_source() {
debug-print-function ${FUNCNAME} "$@"
 
case ${CHOST} in
-   *-interix* | *-aix* | *-winnt*)
+   *-aix* | *-winnt*)
# some hosts need full eautoreconf
[[ -e "./configure.ac" || -e "./configure.in" ]] \
&& AUTOTOOLS_AUTORECONF=1

diff --git a/profiles/arch.list b/profiles/arch.list
index f1740e3..f82b3be 100644
--- a/profiles/arch.list
+++ b/profiles/arch.list
@@ -20,7 +20,6 @@ x86-fbsd
 
 # Prefix keywords
 ppc-aix
-x86-interix
 amd64-linux
 arm-linux
 arm64-linux

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 12eaff7..9bc52b9 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -9,7 +9,7 @@
 IUSE_IMPLICIT="prefix prefix-guest"
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 
hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos 
riscv s390 sh sparc sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin 
x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-interix x86-linux x86-macos 
x86-netbsd x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 
hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos 
riscv s390 sh sparc sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin 
x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-netbsd 
x86-solaris x86-winnt"
 USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX 
Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
 USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX Interix linux 
NetBSD OpenBSD SunOS Winnt"
 USE_EXPAND_VALUES_USERLAND="BSD GNU"

diff --git

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

2017-01-25 Thread Michał Górny

commit: 266252a880d3b7ce6c9ea871e8339e0aabe44afd
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jan 25 22:15:37 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jan 25 22:56:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=266252a8

profiles: Initial support for Python 3.6 (masked)

 profiles/base/package.use.force | 8 +++-
 profiles/base/package.use.mask  | 4 
 profiles/base/package.use.stable.mask   | 3 ++-
 profiles/base/use.mask  | 5 +
 profiles/base/use.stable.mask   | 7 ++-
 profiles/desc/python_single_target.desc | 3 ++-
 profiles/desc/python_targets.desc   | 3 ++-
 profiles/prefix/windows/cygwin/use.mask | 1 +
 8 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 168903d..acb7250 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -51,7 +51,13 @@ app-shells/bash:0 readline
 # Michał Górny  (14 Oct 2012)
 # Force-enable all PYTHON_TARGETS for python-exec to avoid using private
 # API. Please remember to keep it in sync with python_targets.desc.
-dev-lang/python-exec python_targets_python2_7 python_targets_python3_4 
python_targets_python3_5 python_targets_jython2_7 python_targets_pypy 
python_targets_pypy3
+dev-lang/python-exec python_targets_python2_7
+dev-lang/python-exec python_targets_python3_4
+dev-lang/python-exec python_targets_python3_5
+dev-lang/python-exec python_targets_python3_6
+dev-lang/python-exec python_targets_jython2_7
+dev-lang/python-exec python_targets_pypy
+dev-lang/python-exec python_targets_pypy3
 
 # Zac Medico  (20 Oct 2010)
 # Force ipc USE flag since it should remain enabled unless

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 873fbab..8a432f9 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -5,6 +5,10 @@
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# Michał Górny  (25 Jan 2017)
+# Unmask python-exec support for experimental dev-lang/python:3.6
+dev-lang/python-exec -python_targets_python3_6
+
 # Matt Turner  (25 Jan 2017)
 # xf86-video-??? masked for removal
 x11-base/xorg-drivers video_cards_v4l

diff --git a/profiles/base/package.use.stable.mask 
b/profiles/base/package.use.stable.mask
index 221bded..4ccb5c1 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -75,8 +75,9 @@ app-emulation/ganeti monitoring
 =media-video/mpv-0.9.2-r1 libcaca
 
 # Mike Gilbert  (03 Oct 2015)
-# Unmask python3.5 for python-exec
+# Unmask stable-masked implementations for python-exec
 dev-lang/python-exec -python_targets_python3_5
+dev-lang/python-exec -python_targets_python3_6
 
 # Pacho Ramos  (15 May 2015)
 # Version compatible with current ffmpeg is not ready to be stabilized

diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 31136dc..480c8ee 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -2,6 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Michał Górny  (25 Jan 2017)
+# Masked until dev-lang/python:3.6 is unmasked
+python_targets_python3_6
+python_single_target_python3_6
+
 # Michael Orlitzky  (7 Jan 2017)
 # The dev-db/firebird and dev-db/oracle-instantclient* packages
 # only support amd64 and x86.

diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 76a7900..43c3066 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -1,10 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Michał Górny  (25 Jan 2017)
+# Early pre-stabilization mask for dev-lang/python:3.6
+python_targets_python3_6
+python_single_target_python3_6
+
 # Brian Evans  (06 Dec 2016)
 # Needs dev-lang/php:7.1 stable
 php_targets_php7-1

diff --git a/profiles/desc/python_single_target.desc 
b/profiles/desc/python_single_target.desc
index 958bf51..4315457 100644
--- a/profiles/desc/python_single_target.desc
+++ b/profiles/desc/python_single_target.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation.
+# Copyright 1999-2017 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,6 +7,7 @@
 python2_7 - Build for Python 2.7 only
 python3_4 - Build for Python 3.4 only
 python3_5 - Build for Python 3.5 only
+python3_6 - Build for Python 3.6 only
 jython2_7 - Build for Jython 2.7 only
 pypy - Build for PyPy only
 pypy3 - Build for PyPy3 only

diff --git

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

2016-11-22 Thread Michael Haubenwallner

commit: 34eb5e381662df359d92137d5218207c9e1ffc89
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Tue Nov 22 11:23:12 2016 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Tue Nov 22 11:24:35 2016 +
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 ..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/

2016-11-16 Thread Michael Haubenwallner

commit: b9718f60648df42ffa281d0b7bef90568fa1b9bc
Author: Michael Haubenwallner  ssi-schaefer 
 com>
AuthorDate: Wed May 25 14:12:17 2016 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Nov 16 12:06:58 2016 +
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/x86/

2016-05-23 Thread Michael Haubenwallner

commit: 05d56bfd166fda7a9fb9f5d7d966e88a00517c98
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Mon May 23 11:49:43 2016 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Mon May 23 12:38:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d56bfd

profiles/prefix/cygwin: improve/complete x86 profile

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

diff --git a/profiles/prefix/windows/cygwin/x86/make.defaults 
b/profiles/prefix/windows/cygwin/x86/make.defaults
index eb66c3d..59a035b 100644
--- a/profiles/prefix/windows/cygwin/x86/make.defaults
+++ b/profiles/prefix/windows/cygwin/x86/make.defaults
@@ -3,5 +3,12 @@
 # $Id$
 
 ARCH="x86-cygwin"
-CHOST="i686-pc-cygwin2.0"
-ACCEPT_KEYWORDS="~x86-cygwin"
+CHOST="i686-pc-cygwin"
+ACCEPT_KEYWORDS="~x86-cygwin ~x86-linux"
+
+# multilib build stuff, single ABI (no multilib)
+MULTILIB_ABIS="x86"
+DEFAULT_ABI="x86"
+ABI="x86"
+IUSE_IMPLICIT="abi_x86_32"
+LIBDIR_x86="lib"

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

2016-05-23 Thread Michael Haubenwallner

commit: 7260b2621df1794ea13e6455866ecd1e13b4db4b
Author: Michael Haubenwallner  ssi-schaefer 
 com>
AuthorDate: Wed May 11 14:58:39 2016 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Mon May 23 12:38:02 2016 +
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/x86/, profiles/prefix/windows/cygwin/x64/, ...

2016-05-23 Thread Michael Haubenwallner

commit: fb167c6c46eaf5a8a26f2810ac0d9a1237de70fc
Author: Michael Haubenwallner  ssi-schaefer 
 com>
AuthorDate: Fri May 20 10:39:21 2016 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Mon May 23 12:38:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb167c6c

profiles/prefix/cygwin: drop cygwin versions; p.mask man-db

 profiles/prefix/windows/cygwin/1.7/package.provided| 5 -
 profiles/prefix/windows/cygwin/1.7/x86/make.defaults   | 7 ---
 profiles/prefix/windows/cygwin/2.0/eapi| 1 -
 profiles/prefix/windows/cygwin/2.0/package.provided| 5 -
 profiles/prefix/windows/cygwin/2.0/parent  | 1 -
 profiles/prefix/windows/cygwin/2.0/x64/eapi| 1 -
 profiles/prefix/windows/cygwin/2.0/x64/parent  | 1 -
 profiles/prefix/windows/cygwin/2.0/x86/eapi| 1 -
 profiles/prefix/windows/cygwin/2.0/x86/parent  | 1 -
 profiles/prefix/windows/cygwin/package.mask| 7 +++
 profiles/prefix/windows/cygwin/{2.0 => }/package.use   | 0
 profiles/prefix/windows/cygwin/{1.7 => x64}/eapi   | 0
 profiles/prefix/windows/cygwin/{2.0 => }/x64/make.defaults | 0
 profiles/prefix/windows/cygwin/{1.7 => x64}/parent | 0
 profiles/prefix/windows/cygwin/{1.7 => }/x86/eapi  | 0
 profiles/prefix/windows/cygwin/{2.0 => }/x86/make.defaults | 0
 profiles/prefix/windows/cygwin/{1.7 => }/x86/parent| 0
 17 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/profiles/prefix/windows/cygwin/1.7/package.provided 
b/profiles/prefix/windows/cygwin/1.7/package.provided
deleted file mode 100644
index 51d995c..000
--- a/profiles/prefix/windows/cygwin/1.7/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-sys-cygwin/libc-1.7

diff --git a/profiles/prefix/windows/cygwin/1.7/x86/make.defaults 
b/profiles/prefix/windows/cygwin/1.7/x86/make.defaults
deleted file mode 100644
index 16c6501..000
--- a/profiles/prefix/windows/cygwin/1.7/x86/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-ARCH="x86-cygwin"
-CHOST="i686-pc-cygwin1.7"
-ACCEPT_KEYWORDS="~x86-cygwin"

diff --git a/profiles/prefix/windows/cygwin/2.0/eapi 
b/profiles/prefix/windows/cygwin/2.0/eapi
deleted file mode 100644
index 7ed6ff8..000
--- a/profiles/prefix/windows/cygwin/2.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/windows/cygwin/2.0/package.provided 
b/profiles/prefix/windows/cygwin/2.0/package.provided
deleted file mode 100644
index 86ffec8..000
--- a/profiles/prefix/windows/cygwin/2.0/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-sys-cygwin/libc-2.0

diff --git a/profiles/prefix/windows/cygwin/2.0/parent 
b/profiles/prefix/windows/cygwin/2.0/parent
deleted file mode 100644
index f3229c5b..000
--- a/profiles/prefix/windows/cygwin/2.0/parent
+++ /dev/null
@@ -1 +0,0 @@
-..

diff --git a/profiles/prefix/windows/cygwin/2.0/x64/eapi 
b/profiles/prefix/windows/cygwin/2.0/x64/eapi
deleted file mode 100644
index 7ed6ff8..000
--- a/profiles/prefix/windows/cygwin/2.0/x64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/windows/cygwin/2.0/x64/parent 
b/profiles/prefix/windows/cygwin/2.0/x64/parent
deleted file mode 100644
index f3229c5b..000
--- a/profiles/prefix/windows/cygwin/2.0/x64/parent
+++ /dev/null
@@ -1 +0,0 @@
-..

diff --git a/profiles/prefix/windows/cygwin/2.0/x86/eapi 
b/profiles/prefix/windows/cygwin/2.0/x86/eapi
deleted file mode 100644
index 7ed6ff8..000
--- a/profiles/prefix/windows/cygwin/2.0/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/windows/cygwin/2.0/x86/parent 
b/profiles/prefix/windows/cygwin/2.0/x86/parent
deleted file mode 100644
index f3229c5b..000
--- a/profiles/prefix/windows/cygwin/2.0/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..

diff --git a/profiles/prefix/windows/cygwin/package.mask 
b/profiles/prefix/windows/cygwin/package.mask
new file mode 100644
index 000..1a709f6
--- /dev/null
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Michael Haubenwallner  (20 May 2016)
+# Does not work with Cygwin.
+sys-apps/man-db

diff --git a/profiles/prefix/windows/cygwin/2.0/package.use 
b/profiles/prefix/windows/cygwin/package.use
similarity index 100%
rename from profiles/prefix/windows/cygwin/2.0/package.use
rename to profiles/prefix/windows/cygwin/package.use

diff --git a/profiles/prefix/windows/cygwin/1.7/eapi

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

2016-05-23 Thread Michael Haubenwallner

commit: e2231c0a46cc00b73aeb48665872bb716df48e68
Author: Michael Haubenwallner  ssi-schaefer 
 com>
AuthorDate: Thu May 19 16:19:20 2016 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Mon May 23 12:38:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2231c0a

profiles/prefix/cygwin: p.mask sys-apps/util-linux

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

diff --git a/profiles/prefix/windows/package.mask 
b/profiles/prefix/windows/package.mask
new file mode 100644
index 000..fb9cc66
--- /dev/null
+++ b/profiles/prefix/windows/package.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Michael Haubenwallner  (19 May 2016)
+# No point for util-linux on Windows
+sys-apps/util-linux

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

2016-04-28 Thread Michael Haubenwallner

commit: e94866a9540476fe51b05781c93801efbe97aa50
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Thu Apr 28 09:20:07 2016 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Thu Apr 28 09:20:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e94866a9

profiles/prefix/cygwin/x64: accept ~amd64-linux for now

as whe have no cygwin keywords anywhere yet

 profiles/prefix/windows/cygwin/2.0/x64/make.defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/prefix/windows/cygwin/2.0/x64/make.defaults 
b/profiles/prefix/windows/cygwin/2.0/x64/make.defaults
index a018bd9..e243a8c 100644
--- a/profiles/prefix/windows/cygwin/2.0/x64/make.defaults
+++ b/profiles/prefix/windows/cygwin/2.0/x64/make.defaults
@@ -4,7 +4,7 @@
 
 ARCH="x64-cygwin"
 CHOST="x86_64-pc-cygwin"
-ACCEPT_KEYWORDS="~x64-cygwin"
+ACCEPT_KEYWORDS="~x64-cygwin ~amd64-linux"
 
 # We don't have lib64 in prefix so, remove it here.
 SYMLINK_LIB=""

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

2016-04-18 Thread Michael Haubenwallner

commit: 48769e537f7e506ac6cfc9f9df84a2bd4e999f2f
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Mon Apr 18 15:35:06 2016 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Mon Apr 18 15:35:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48769e53

profiles/prefix/cygwin/2.0: for coreutils add p.use kill

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

diff --git a/profiles/prefix/windows/cygwin/2.0/package.use 
b/profiles/prefix/windows/cygwin/2.0/package.use
new file mode 100644
index 000..d701f36
--- /dev/null
+++ b/profiles/prefix/windows/cygwin/2.0/package.use
@@ -0,0 +1,7 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Michael Haubenwallner  (18 Apr 2016)
+# Cygwin coreutils provide kill as gkill
+sys-apps/coreutils kill

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

2016-04-13 Thread Michael Haubenwallner

commit: c20f8602fd9db2560a4606cdf5526af876f0b214
Author: Michael Haubenwallner  ssi-schaefer 
 com>
AuthorDate: Tue Apr 12 11:28:04 2016 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Apr 13 09:33:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c20f8602

prefix/cygwin/x64/make.defaults: define multilib values

 profiles/prefix/windows/cygwin/2.0/x64/make.defaults | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/profiles/prefix/windows/cygwin/2.0/x64/make.defaults 
b/profiles/prefix/windows/cygwin/2.0/x64/make.defaults
index 966294e..a018bd9 100644
--- a/profiles/prefix/windows/cygwin/2.0/x64/make.defaults
+++ b/profiles/prefix/windows/cygwin/2.0/x64/make.defaults
@@ -5,3 +5,14 @@
 ARCH="x64-cygwin"
 CHOST="x86_64-pc-cygwin"
 ACCEPT_KEYWORDS="~x64-cygwin"
+
+# We don't have lib64 in prefix so, remove it here.
+SYMLINK_LIB=""
+LIBDIR_amd64="lib"
+
+# multilib build stuff, single ABI (no multilib)
+MULTILIB_ABIS="amd64"
+DEFAULT_ABI="amd64"
+ABI="amd64"
+IUSE_IMPLICIT="abi_x86_64"
+LIBDIR_amd64="lib"

67 matches

Mail list logo