commit: 2a0c0529cab65854fca8381693a222867f2913fd Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Dec 18 14:12:12 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Dec 18 14:12:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a0c0529
*/*: drop ~x86-cygwin Bug: https://bugs.gentoo.org/760057 Signed-off-by: Sam James <sam <AT> gentoo.org> app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild | 2 +- app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild | 2 +- app-portage/elt-patches/elt-patches-20170422.ebuild | 2 +- app-portage/elt-patches/elt-patches-20170815.ebuild | 2 +- app-portage/elt-patches/elt-patches-20170826.1.ebuild | 2 +- app-portage/elt-patches/elt-patches-20201205.ebuild | 2 +- profiles/arch/base/make.defaults | 2 +- profiles/arches.desc | 1 - profiles/embedded/make.defaults | 2 +- sys-libs/cygwin-crypt/cygwin-crypt-1.4.ebuild | 2 +- virtual/libcrypt/libcrypt-1-r1.ebuild | 2 +- virtual/libcrypt/libcrypt-2.ebuild | 2 +- 12 files changed, 11 insertions(+), 12 deletions(-) diff --git a/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild b/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild index f80b7c07b4d..5feb16b43ff 100644 --- a/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild +++ b/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild @@ -31,7 +31,7 @@ else https://github.com/haubi/cygwin-rebase/compare/rebase-${MY_PV}...rebase-${MY_PV}_merge-files-flag-0.patch -> ${P}_merge-files-flag-0.patch " PATCHES=( "${DISTDIR}/${P}_merge-files-flag-0.patch" ) - KEYWORDS="-* ~x64-cygwin ~x86-cygwin" + KEYWORDS="-* ~x64-cygwin" fi DEPEND="" diff --git a/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild b/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild index f80b7c07b4d..5feb16b43ff 100644 --- a/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild +++ b/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild @@ -31,7 +31,7 @@ else https://github.com/haubi/cygwin-rebase/compare/rebase-${MY_PV}...rebase-${MY_PV}_merge-files-flag-0.patch -> ${P}_merge-files-flag-0.patch " PATCHES=( "${DISTDIR}/${P}_merge-files-flag-0.patch" ) - KEYWORDS="-* ~x64-cygwin ~x86-cygwin" + KEYWORDS="-* ~x64-cygwin" fi DEPEND="" diff --git a/app-portage/elt-patches/elt-patches-20170422.ebuild b/app-portage/elt-patches/elt-patches-20170422.ebuild index 52613545662..d849bf22dec 100644 --- a/app-portage/elt-patches/elt-patches-20170422.ebuild +++ b/app-portage/elt-patches/elt-patches-20170422.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="" RDEPEND="sys-apps/gentoo-functions" diff --git a/app-portage/elt-patches/elt-patches-20170815.ebuild b/app-portage/elt-patches/elt-patches-20170815.ebuild index 8836b8a3c50..9946949d30c 100644 --- a/app-portage/elt-patches/elt-patches-20170815.ebuild +++ b/app-portage/elt-patches/elt-patches-20170815.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="" RDEPEND="sys-apps/gentoo-functions" diff --git a/app-portage/elt-patches/elt-patches-20170826.1.ebuild b/app-portage/elt-patches/elt-patches-20170826.1.ebuild index 98f318e07e4..a481f1a73b2 100644 --- a/app-portage/elt-patches/elt-patches-20170826.1.ebuild +++ b/app-portage/elt-patches/elt-patches-20170826.1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="" RDEPEND="sys-apps/gentoo-functions" diff --git a/app-portage/elt-patches/elt-patches-20201205.ebuild b/app-portage/elt-patches/elt-patches-20201205.ebuild index e6ebc44e78a..644e301f3f3 100644 --- a/app-portage/elt-patches/elt-patches-20201205.ebuild +++ b/app-portage/elt-patches/elt-patches-20201205.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="" RDEPEND="sys-apps/gentoo-functions" diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults index 0470aeb57c3..3f1632b71a2 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 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_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" PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH" diff --git a/profiles/arches.desc b/profiles/arches.desc index cb185e0c9e5..0cebf4609f1 100644 --- a/profiles/arches.desc +++ b/profiles/arches.desc @@ -41,6 +41,5 @@ x86-solaris testing x64-winnt testing x86-winnt testing x64-cygwin testing -x86-cygwin testing # vim: set ts=8 noet ft=conf: diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults index d5337bc35a2..43106d8c28e 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 riscv s390 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_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_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/sys-libs/cygwin-crypt/cygwin-crypt-1.4.ebuild b/sys-libs/cygwin-crypt/cygwin-crypt-1.4.ebuild index 1b97a32993a..0a8f46c6fb6 100644 --- a/sys-libs/cygwin-crypt/cygwin-crypt-1.4.ebuild +++ b/sys-libs/cygwin-crypt/cygwin-crypt-1.4.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~x64-cygwin ~x86-cygwin" +KEYWORDS="~x64-cygwin" IUSE="" DEPEND="" diff --git a/virtual/libcrypt/libcrypt-1-r1.ebuild b/virtual/libcrypt/libcrypt-1-r1.ebuild index 26346878635..423799862f8 100644 --- a/virtual/libcrypt/libcrypt-1-r1.ebuild +++ b/virtual/libcrypt/libcrypt-1-r1.ebuild @@ -8,7 +8,7 @@ inherit multilib-build DESCRIPTION="Virtual for libcrypt.so" SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+static-libs" RDEPEND=" diff --git a/virtual/libcrypt/libcrypt-2.ebuild b/virtual/libcrypt/libcrypt-2.ebuild index 9e060ac3dcd..89e894adf38 100644 --- a/virtual/libcrypt/libcrypt-2.ebuild +++ b/virtual/libcrypt/libcrypt-2.ebuild @@ -8,7 +8,7 @@ inherit multilib-build DESCRIPTION="Virtual for libcrypt.so" SLOT="0/2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+static-libs" RDEPEND="
