diff options
26 files changed, 2 insertions, 227 deletions
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index 68badd65b903..37aef6cfd96e 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -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 diff --git a/profiles/arch.list b/profiles/arch.list index 6f5aa9f1d739..8e3cfc812663 100644 --- a/profiles/arch.list +++ b/profiles/arch.list @@ -23,8 +23,6 @@ ppc-aix x86-freebsd x64-freebsd sparc64-freebsd -hppa-hpux -ia64-hpux x86-interix amd64-linux arm-linux diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index a9e9157dc867..53fadc899992 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 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/embedded/make.defaults b/profiles/embedded/make.defaults index c1b582a77f41..c3f5c286f989 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 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 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/hpux/B.11.23/eapi +++ /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 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/hpux/B.11.23/ia64/eapi +++ /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 index 793bfc33f616..000000000000 --- a/profiles/prefix/hpux/B.11.23/ia64/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="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 index f3229c5b9876..000000000000 --- a/profiles/prefix/hpux/B.11.23/ia64/parent +++ /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 index f3229c5b9876..000000000000 --- a/profiles/prefix/hpux/B.11.23/parent +++ /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 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/hpux/B.11.31/eapi +++ /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 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/hpux/B.11.31/hppa2.0/eapi +++ /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 index a7d11b89a1de..000000000000 --- a/profiles/prefix/hpux/B.11.31/hppa2.0/make.defaults +++ /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 index f3229c5b9876..000000000000 --- a/profiles/prefix/hpux/B.11.31/hppa2.0/parent +++ /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 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/hpux/B.11.31/ia64/eapi +++ /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 index 0cbbea055c39..000000000000 --- a/profiles/prefix/hpux/B.11.31/ia64/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="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 index f3229c5b9876..000000000000 --- a/profiles/prefix/hpux/B.11.31/ia64/parent +++ /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 index f3229c5b9876..000000000000 --- a/profiles/prefix/hpux/B.11.31/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/profiles/prefix/hpux/eapi b/profiles/prefix/hpux/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/hpux/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/prefix/hpux/make.defaults b/profiles/prefix/hpux/make.defaults deleted file mode 100644 index e340e742da67..000000000000 --- a/profiles/prefix/hpux/make.defaults +++ /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 index 8ebbeb9c45a0..000000000000 --- a/profiles/prefix/hpux/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$ - -# 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 index f3617115cbc1..000000000000 --- a/profiles/prefix/hpux/packages +++ /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 index cd1149221a41..000000000000 --- a/profiles/prefix/hpux/parent +++ /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 index d28accf58d88..000000000000 --- a/profiles/prefix/hpux/profile.bashrc +++ /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 index 7851b40d1d1e..000000000000 --- a/profiles/prefix/hpux/use.force +++ /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 index e1385cc85d56..000000000000 --- a/profiles/prefix/hpux/use.mask +++ /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 diff --git a/profiles/profiles.desc b/profiles/profiles.desc index fc1aefb58aa3..6cc43fc2fd42 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -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 |