remove HPUX keywords ia64-hpux and hppa-hpux
authorFabian Groffen <grobian@gentoo.org>
Mon, 30 Jan 2017 19:20:44 +0000 (20:20 +0100)
committerFabian Groffen <grobian@gentoo.org>
Mon, 30 Jan 2017 19:21:50 +0000 (20:21 +0100)
26 files changed:
eclass/qt4-build-multilib.eclass
profiles/arch.list
profiles/base/make.defaults
profiles/embedded/make.defaults
profiles/prefix/hpux/B.11.23/eapi [deleted file]
profiles/prefix/hpux/B.11.23/ia64/eapi [deleted file]
profiles/prefix/hpux/B.11.23/ia64/make.defaults [deleted file]
profiles/prefix/hpux/B.11.23/ia64/parent [deleted file]
profiles/prefix/hpux/B.11.23/parent [deleted file]
profiles/prefix/hpux/B.11.31/eapi [deleted file]
profiles/prefix/hpux/B.11.31/hppa2.0/eapi [deleted file]
profiles/prefix/hpux/B.11.31/hppa2.0/make.defaults [deleted file]
profiles/prefix/hpux/B.11.31/hppa2.0/parent [deleted file]
profiles/prefix/hpux/B.11.31/ia64/eapi [deleted file]
profiles/prefix/hpux/B.11.31/ia64/make.defaults [deleted file]
profiles/prefix/hpux/B.11.31/ia64/parent [deleted file]
profiles/prefix/hpux/B.11.31/parent [deleted file]
profiles/prefix/hpux/eapi [deleted file]
profiles/prefix/hpux/make.defaults [deleted file]
profiles/prefix/hpux/package.mask [deleted file]
profiles/prefix/hpux/packages [deleted file]
profiles/prefix/hpux/parent [deleted file]
profiles/prefix/hpux/profile.bashrc [deleted file]
profiles/prefix/hpux/use.force [deleted file]
profiles/prefix/hpux/use.mask [deleted file]
profiles/profiles.desc

index 68badd65b9039a86ec5d503509a6f7c89aa28c5d..37aef6cfd96e4408ee3909713d67c97c8dcddbc8 100644 (file)
@@ -843,7 +843,6 @@ qt4_get_mkspec() {
        if use amd64-linux || use ppc64-linux ||
                use x64-macos ||
                use sparc64-freebsd || use x64-freebsd || use x64-openbsd ||
-               use ia64-hpux ||
                use sparc64-solaris || use x64-solaris
        then
                [[ -d ${S}/mkspecs/${spec}-64 ]] && spec+=-64
index 6f5aa9f1d73961122aecfd4ed09c42d29113ae6a..8e3cfc8126635e8683e101f94619d8951f97bae5 100644 (file)
@@ -23,8 +23,6 @@ ppc-aix
 x86-freebsd
 x64-freebsd
 sparc64-freebsd
-hppa-hpux
-ia64-hpux
 x86-interix
 amd64-linux
 arm-linux
index a9e9157dc867162c3e3b2641ec54533b00967dc2..53fadc899992c1830cda0abeb4a2669e54240d5f 100644 (file)
@@ -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 hppa-hpux ia64 ia64-hpux m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd riscv s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd 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 ppc-openbsd riscv s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd 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"
index c1b582a77f41cca831a880d775ab63ef6d35ffbf..c3f5c286f989eed9e11464eb9c966041ef086405 100644 (file)
@@ -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 hppa-hpux ia64 ia64-hpux m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd riscv s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd 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 ppc-openbsd riscv s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd 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/hpux/B.11.23/eapi b/profiles/prefix/hpux/B.11.23/eapi
deleted file mode 100644 (file)
index 7ed6ff8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/hpux/B.11.23/ia64/eapi b/profiles/prefix/hpux/B.11.23/ia64/eapi
deleted file mode 100644 (file)
index 7ed6ff8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/hpux/B.11.23/ia64/make.defaults b/profiles/prefix/hpux/B.11.23/ia64/make.defaults
deleted file mode 100644 (file)
index 793bfc3..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-ARCH="ia64-hpux"
-CHOST="ia64-hp-hpux11.23"
-ACCEPT_KEYWORDS="~ia64-hpux"
diff --git a/profiles/prefix/hpux/B.11.23/ia64/parent b/profiles/prefix/hpux/B.11.23/ia64/parent
deleted file mode 100644 (file)
index f3229c5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/hpux/B.11.23/parent b/profiles/prefix/hpux/B.11.23/parent
deleted file mode 100644 (file)
index f3229c5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/hpux/B.11.31/eapi b/profiles/prefix/hpux/B.11.31/eapi
deleted file mode 100644 (file)
index 7ed6ff8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/hpux/B.11.31/hppa2.0/eapi b/profiles/prefix/hpux/B.11.31/hppa2.0/eapi
deleted file mode 100644 (file)
index 7ed6ff8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/hpux/B.11.31/hppa2.0/make.defaults b/profiles/prefix/hpux/B.11.31/hppa2.0/make.defaults
deleted file mode 100644 (file)
index a7d11b8..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-ARCH="hppa-hpux"
-# config.guess tells for hpux11 on hppa2.0 cpu:
-#   "hppa2.0n-hp-hpux11.31" for 32bit kernel
-#   "hppa2.0w-hp-hpux11.31" for 64bit kernel and 32bit default compiler output
-#   "hppa64-hp-hpux11.31"   for 64bit kernel and 64bit default compiler output
-# This is the 32bit profile, so we use "hppa2.0n"
-CHOST="hppa2.0n-hp-hpux11.31"
-ACCEPT_KEYWORDS="~hppa-hpux"
diff --git a/profiles/prefix/hpux/B.11.31/hppa2.0/parent b/profiles/prefix/hpux/B.11.31/hppa2.0/parent
deleted file mode 100644 (file)
index f3229c5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/hpux/B.11.31/ia64/eapi b/profiles/prefix/hpux/B.11.31/ia64/eapi
deleted file mode 100644 (file)
index 7ed6ff8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/hpux/B.11.31/ia64/make.defaults b/profiles/prefix/hpux/B.11.31/ia64/make.defaults
deleted file mode 100644 (file)
index 0cbbea0..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-ARCH="ia64-hpux"
-CHOST="ia64-hp-hpux11.31"
-ACCEPT_KEYWORDS="~ia64-hpux"
diff --git a/profiles/prefix/hpux/B.11.31/ia64/parent b/profiles/prefix/hpux/B.11.31/ia64/parent
deleted file mode 100644 (file)
index f3229c5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/hpux/B.11.31/parent b/profiles/prefix/hpux/B.11.31/parent
deleted file mode 100644 (file)
index f3229c5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/hpux/eapi b/profiles/prefix/hpux/eapi
deleted file mode 100644 (file)
index 7ed6ff8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/hpux/make.defaults b/profiles/prefix/hpux/make.defaults
deleted file mode 100644 (file)
index e340e74..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# System-wide defaults for all HP-UX profiles
-# This file should rarely need to be changed
-
-# 'Sane' defaults
-ELIBC="HPUX"
-KERNEL="HPUX"
-
-# no scanelf
-FEATURES="nostrip"
diff --git a/profiles/prefix/hpux/package.mask b/profiles/prefix/hpux/package.mask
deleted file mode 100644 (file)
index 8ebbeb9..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Michael Haubenwallner <haubi@gentoo.org> (16 Jul 2009)
-# Is blocked by QA check 'implicit pointer usage warnings' on ia64-hpux.
-# Cannot recompile itself on hppa-hpux and ia64-hpux. bug 311239
->=sys-devel/gcc-4.3
diff --git a/profiles/prefix/hpux/packages b/profiles/prefix/hpux/packages
deleted file mode 100644 (file)
index f361711..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# need GNU as on HP-UX
-*sys-devel/binutils
diff --git a/profiles/prefix/hpux/parent b/profiles/prefix/hpux/parent
deleted file mode 100644 (file)
index cd11492..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-../../base
-..
diff --git a/profiles/prefix/hpux/profile.bashrc b/profiles/prefix/hpux/profile.bashrc
deleted file mode 100644 (file)
index d28accf..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# /bin/sh is korn shell, incompatible with bash used by makefiles later.
-# This is a problem with recent libtool detecting non-bashism 'print' fex.
-export CONFIG_SHELL=${BASH}
-
-# On hpux, 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 process.
-#
-# This is a workaround for portage bug#199868,
-# and should be dropped once portage does sth. like this itself.
-
-hpux-busytext-get-listfile() {
-       echo "${ROOT%%/}${EPREFIX}/var/lib/portage/files2bremoved"
-}
-
-hpux-busytext-cleanup() {
-       local removedlist=$(hpux-busytext-get-listfile)
-
-       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
-
-       local rmstem f
-       while read rmstem
-       do
-               # try to remove previously recorded files
-               for f in $(ls "${ROOT}${rmstem}"*); do
-                       echo "trying to remove old busy text file ${f}"
-                       rm -f "${f}"
-               done
-               # but keep it in list if still exists
-               for f in $(ls "${ROOT}${rmstem}"*); do
-                       echo "${rmstem}" >> "${removedlist}".new
-                       break
-               done
-       done < "${removedlist}"
-
-       # update the list
-       mv "${removedlist}"{,.old}
-       mv "${removedlist}"{.new,}
-       rm "${removedlist}".old
-}
-
-hpux-busytext-backup() {
-       local removedlist=$(hpux-busytext-get-listfile)
-
-       # now go for current package
-       cd "${D}" || exit 1
-
-       /usr/bin/find ".${EPREFIX}" '!' -type d \
-       | while read f
-         do
-                 f=${f#./}
-                 [[ ! -f ${ROOT}${f} || -h ${ROOT}${f} ]] && continue
-                 echo "${ROOT}${f}"
-         done \
-         | xargs -r /usr/bin/file \
-         | /usr/bin/grep -E '(object file|shared library|executable)' \
-         | while read f t
-               do
-                       # file prints: "file-argument: type-of-file"
-                       f=${f#${ROOT}}
-                       f=${f%:}
-                       test -r "${ROOT}${f}" || continue
-                       rmstem="${f}.removedbyportage"
-                       # keep list of old busy text files unique
-                       /usr/bin/grep "^${rmstem/[/\\[}$" "${removedlist}" >/dev/null \
-                       || echo "${rmstem}" >> "${removedlist}"
-                       n=0
-                       while [[ ${n} -lt 100 && -f "${ROOT}${rmstem}${n}" ]]; do
-                               n=$((n=n+1))
-                       done
-
-                       if [[ ${n} -ge 100 ]]; then
-                               echo "too many (>=100) old text files busy of '${ROOT}${f}'" >&2
-                               exit 1
-                       fi
-                       echo "backing up text file ${ROOT}${f} (${n})"
-                       /usr/bin/mv -f "${ROOT}${f}" "${ROOT}${rmstem}${n}" || exit 1
-                       /usr/bin/cp -f "${ROOT}${rmstem}${n}" "${ROOT}${f}" || exit 1
-               done || exit 1
-}
-
-prefix_hpux-post_pkg_preinst() {
-       hpux-busytext-cleanup
-       hpux-busytext-backup
-}
-
-prefix_hpux-pre_pkg_postinst() {
-       hpux-busytext-cleanup
-}
-
-# These are because of
-# https://archives.gentoo.org/gentoo-dev/msg_529a0806ed2cf841a467940a57e2d588.xml
-# The profile-* ones are meant to be used in etc/portage/profile.bashrc by user
-# until there is the registration mechanism.
-profile-post_pkg_preinst() { prefix_hpux-post_pkg_preinst ; }
-        post_pkg_preinst() { prefix_hpux-post_pkg_preinst ; }
-
-profile-pre_pkg_postinst() { prefix_hpux-pre_pkg_postinst ; }
-        pre_pkg_postinst() { prefix_hpux-pre_pkg_postinst ; }
diff --git a/profiles/prefix/hpux/use.force b/profiles/prefix/hpux/use.force
deleted file mode 100644 (file)
index 7851b40..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Re-add HPUX OS
-kernel_HPUX
-elibc_HPUX
diff --git a/profiles/prefix/hpux/use.mask b/profiles/prefix/hpux/use.mask
deleted file mode 100644 (file)
index e1385cc..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Re-add HPUX libc
--elibc_HPUX
--kernel_HPUX
-
-# these will more than likely never work on HPUX
-3dfx
-acpi
-alsa
-apm
-caps
-cman
-clvm
-directfb
-djbfft
-fbcon
-fmod
-ggi
-gpm
-hardened
-oss
-svga
-sybase
-sybase-ct
-rtc
-uclibc
-v4l
index fc1aefb58aa3d2abcbba13323078462819d273cc..6cc43fc2fd427394d02ed3c5c892b9be9a43721e 100644 (file)
@@ -319,11 +319,6 @@ x86-winnt          prefix/windows/winnt/6.1/x86                    exp
 x86-cygwin             prefix/windows/cygwin/x86                       exp
 x64-cygwin             prefix/windows/cygwin/x64                       exp
 
-# HP-UX Profiles
-ia64-hpux              prefix/hpux/B.11.23/ia64                        exp
-hppa-hpux              prefix/hpux/B.11.31/hppa2.0                     exp
-ia64-hpux              prefix/hpux/B.11.31/ia64                        exp
-
 # FreeBSD Profiles
 x86-freebsd            prefix/bsd/freebsd/7.1/x86                      exp
 x64-freebsd            prefix/bsd/freebsd/7.1/x64                      exp