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

[Fabian Groffen]

commit:     56797d83eeccb79d62f809eda4192ca5e2dac3ce
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 19:31:50 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 19:34:33 2017 +0000
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 a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index 382e06c..62e63fb 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -20,7 +20,7 @@ LINGUAS="en"
 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 a/profiles/prefix/windows/interix/3.5/eapi b/profiles/prefix/windows/interix/3.5/eapi
deleted file mode 100644
index 7ed6ff8..00000000
--- a/profiles/prefix/windows/interix/3.5/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/windows/interix/3.5/package.mask b/profiles/prefix/windows/interix/3.5/package.mask
deleted file mode 100644
index b71075d..00000000
--- a/profiles/prefix/windows/interix/3.5/package.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Markus Duft <mduft@g.o> 31 Jul 2009
-# Does not build on Interix 3.5 because some functions
-# conflict with system math.h header.
-dev-python/numpy

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

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

diff --git a/profiles/prefix/windows/interix/3.5/x86/make.defaults b/profiles/prefix/windows/interix/3.5/x86/make.defaults
deleted file mode 100644
index d438c99..00000000
--- a/profiles/prefix/windows/interix/3.5/x86/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-ARCH="x86-interix"
-CHOST="i586-pc-interix3.5"
-ACCEPT_KEYWORDS="~x86-interix"

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

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

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

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

diff --git a/profiles/prefix/windows/interix/5.2/x86/make.defaults b/profiles/prefix/windows/interix/5.2/x86/make.defaults
deleted file mode 100644
index ff5f753..00000000
--- a/profiles/prefix/windows/interix/5.2/x86/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-ARCH="x86-interix"
-CHOST="i586-pc-interix5.2"
-ACCEPT_KEYWORDS="~x86-interix"

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

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

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

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

diff --git a/profiles/prefix/windows/interix/6.0/x86/make.defaults b/profiles/prefix/windows/interix/6.0/x86/make.defaults
deleted file mode 100644
index 36b4634..00000000
--- a/profiles/prefix/windows/interix/6.0/x86/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# the CHOST version number is the version number of the host libc, not the version of the interix SDK package.
-
-ARCH="x86-interix"
-CHOST="i586-pc-interix6.0"
-ACCEPT_KEYWORDS="~x86-interix"

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

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

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

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

diff --git a/profiles/prefix/windows/interix/6.1/x86/make.defaults b/profiles/prefix/windows/interix/6.1/x86/make.defaults
deleted file mode 100644
index adff393..00000000
--- a/profiles/prefix/windows/interix/6.1/x86/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# the CHOST version number is the version number of the host libc, not the version of the interix SDK package.
-
-ARCH="x86-interix"
-CHOST="i586-pc-interix6.1"
-ACCEPT_KEYWORDS="~x86-interix"

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

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

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

diff --git a/profiles/prefix/windows/interix/package.mask b/profiles/prefix/windows/interix/package.mask
deleted file mode 100644
index 2c1bf4b..00000000
--- a/profiles/prefix/windows/interix/package.mask
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# $Id$
-
-# Markus Duft <mduft@g.o> (05 May 2008)
-# Does not build with the slang interface, and
-# somebody removed the use flag for ncurses (bug #220365)
->=app-misc/mc-4.6.2_pre1
-
-# Michael Haubenwallner <haubi@g.o> (18 Mar 2008)
-# Interix patches not working yet (mduft)
->=sys-devel/gcc-4.3.0

diff --git a/profiles/prefix/windows/interix/package.use.force b/profiles/prefix/windows/interix/package.use.force
deleted file mode 100644
index d397f3f..00000000
--- a/profiles/prefix/windows/interix/package.use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Markus Duft <mduft@g.o> (28 Oct 2010)
-# really need them statically, as long as portage uses coreutils
-# during merge. if re-merging suacomp, utilities don't work otherwise.
-sys-apps/coreutils static

diff --git a/profiles/prefix/windows/interix/package.use.mask b/profiles/prefix/windows/interix/package.use.mask
deleted file mode 100644
index 23d371d..00000000
--- a/profiles/prefix/windows/interix/package.use.mask
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Markus Duft <mduft@g.o> (9 Aug 2011)
-# mask git flag from gettext, as gettext's build tries to munge
-# some archives with 'root' group, which doesn't exist on interix
-# (not even with user/group mapping through suacomp).
-sys-devel/gettext git
-
-# Markus Duft <mduft@g.o> (28 Oct 2010)
-# mask optimization flags from eix, as they cause build troubles
-# wrt visibility flags - seems gcc 4.2.4 on interix needs another
-# patch (it already has one to disable -fvisibility=, but that
-# seems to miss -fvisibility-inlines-hidden, etc.)
-app-portage/eix optimization strong-optimization
-
-dev-scheme/guile threads
-x11-wm/fluxbox nls
-net-libs/libsoup ssl
-app-arch/pdv X
-

diff --git a/profiles/prefix/windows/interix/packages b/profiles/prefix/windows/interix/packages
deleted file mode 100644
index c455db7..00000000
--- a/profiles/prefix/windows/interix/packages
+++ /dev/null
@@ -1,3 +0,0 @@
-# suacomp library is required on interix now! this is a crucial part of the system.
-# without it, there is only a broken poll, no multi-cpu/core support, etc...
-*sys-libs/suacomp

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

diff --git a/profiles/prefix/windows/interix/profile.bashrc b/profiles/prefix/windows/interix/profile.bashrc
deleted file mode 100644
index 6d354f9..00000000
--- a/profiles/prefix/windows/interix/profile.bashrc
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# use bash as config shell. this avoids _big_ problems with new libtool (>=2.2.10),
-# as wrong asumptions about the shell arise when checking against /bin/sh.
-export CONFIG_SHELL=${BASH}
-
-# On interix, binary files (executables, shared libraries) in use
-# cannot be replaced during merge.
-# But it is possible to rename them and remove lateron when they are
-# not used any more by any running program.
-#
-# This is a workaround for portage bug#199868,
-# and should be dropped once portage does sth. like this itself.
-
-interix_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
-}
-
-interix_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
-}
-
-interix_prepare_file() {
-	local failed=0
-	if [[ ${PN} == libiconv ]]; then
-		# when moving around libiconv, the prefix' coreutils will
-		# be damaged, so we really need to use the systems ones.
-		/bin/cp -p "${1}" "${1}.new" || failed=1
-		/bin/mv "${1}" "${2}" || failed=1
-		/bin/mv "${1}.new" "${1}" || failed=1
-	else
-		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
-	fi
-
-	echo $failed
-}
-
-post_pkg_preinst() {
-	local removedlist="${EROOT}var/lib/portage/files2bremoved"
-	interix_cleanup_removed_files $removedlist
-	
-	# now go for current package
-	cd "${D}"
-	find ".${EROOT}" -type f | while read f;
-	do
-		/usr/bin/file "${f}" | grep ' PE ' > /dev/null || continue
-
-		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 -Fx "${rmstem}" "${removedlist}" >/dev/null \
-			|| echo "${rmstem}" >> "${removedlist}"
-
-		local n=$(interix_find_removed_slot ${ROOT}${rmstem})
-		ebegin "preparing ${ROOT}${f} for merge (${n})"
-		eend $(interix_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=$(interix_find_removed_slot ${ROOT}${rmstem})
-			ebegin "preparing ${ROOT}${f} for unmerge ($n)"
-			eend $(interix_prepare_file "${ROOT}${f}" "${ROOT}${rmstem}${n}")
-		fi
-	done
-}
-
-pre_pkg_postrm() {
-	local removedlist="${EROOT}var/lib/portage/files2bremoved"
-	interix_cleanup_removed_files $removedlist
-}

diff --git a/profiles/prefix/windows/interix/use.force b/profiles/prefix/windows/interix/use.force
deleted file mode 100644
index 5ebe28a..00000000
--- a/profiles/prefix/windows/interix/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Re-add Interix libc
-elibc_Interix

diff --git a/profiles/prefix/windows/interix/use.mask b/profiles/prefix/windows/interix/use.mask
deleted file mode 100644
index 6071cb1..00000000
--- a/profiles/prefix/windows/interix/use.mask
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Re-add Interix libc
--elibc_Interix
-
-# these will more than likely never work on Interix
-3dfx
-acpi
-alsa
-altivec
-apm
-bluetooth
-caps
-cdr
-coreaudio
-dga
-directfb
-djbfft
-dri
-dvdr
-# missing implementation for unexec()
-emacs
-xemacs
-fbcon
-fmod
-ggi
-glut
-gpm
-gps
-hardened
-hddtemp
-ibm
-ieee1394
-ifc
-ipod
-ipv6
-java
-lm_sensors
-netboot
-opengl
-oss
-pam
-pcmcia
-pda
-rtc
-selinux
-scanner
-smartcard
-svga
-uclibc
-#  totally b0rked on interix
-unicode
-usb
-v4l
-wifi
-
-# these are USE flags that don't _currently_ work, but may will in the future.
-ffmpeg
-fftw
-flac
-jack
-joystick
-kerberos
-ladspa
-libedit
-# bug #310007
-multitarget
-# not working yet on interix
-openmp
-portaudio
-pulseaudio
-qt4
-# libtiff only static, so avoid this!
-tiff
-timidity

diff --git a/profiles/prefix/windows/winnt/packages b/profiles/prefix/windows/winnt/packages
index 35f3377..35bfd0b 100644
--- a/profiles/prefix/windows/winnt/packages
+++ b/profiles/prefix/windows/winnt/packages
@@ -4,7 +4,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-interix) prefix.
+# from a parent (e.g. x86-cygwin) prefix.
 
 -*sys-apps/grep
 -*app-arch/gzip

diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 03faafd..5cfd522 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -303,12 +303,6 @@ ppc-aix			prefix/aix/5.3.0.0/ppc				exp
 ppc-aix			prefix/aix/6.1.0.0/ppc				exp
 ppc-aix			prefix/aix/7.1.0.0/ppc				exp
 
-# Interix Profiles
-x86-interix		prefix/windows/interix/3.5/x86			exp
-x86-interix		prefix/windows/interix/5.2/x86			exp
-x86-interix		prefix/windows/interix/6.0/x86			exp
-x86-interix		prefix/windows/interix/6.1/x86			exp
-
 # Windows Profiles
 x86-winnt		prefix/windows/winnt/3.5/x86			exp
 x86-winnt		prefix/windows/winnt/5.2/x86			exp