From 65737cf14a7220bd9a487aa2af4ae0e79bd23e86 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 8 Jan 2018 21:45:04 +0000 Subject: gentoo resync : 08.01.2018 --- profiles/Manifest.gz | Bin 184458 -> 184627 bytes profiles/arch/amd64/no-multilib/package.mask | 4 + profiles/arch/amd64/no-multilib/package.use.mask | 5 -- profiles/arch/amd64/x32/package.use.mask | 4 - profiles/arch/ia64/package.use.mask | 4 + profiles/base/make.defaults | 4 +- profiles/desc/crosscompile_opts.desc | 8 -- profiles/desc/l10n.desc | 3 + profiles/embedded/make.defaults | 4 +- .../standalone/beyond-kernel-2.6.16/make.defaults | 17 ++++ .../standalone/beyond-kernel-2.6.16/package.mask | 8 ++ .../standalone/beyond-kernel-2.6.16/package.unmask | 3 + .../prefix/standalone/beyond-kernel-2.6.16/parent | 1 + .../standalone/beyond-kernel-2.6.16/profile.bashrc | 6 ++ .../standalone/beyond-kernel-2.6.32/package.mask | 7 ++ .../standalone/beyond-kernel-2.6.32/package.unmask | 7 ++ .../prefix/standalone/beyond-kernel-2.6.32/parent | 1 + .../prefix/standalone/legacy/make.defaults | 17 ---- .../features/prefix/standalone/legacy/package.mask | 7 -- .../prefix/standalone/legacy/package.unmask | 2 - .../prefix/standalone/legacy/profile.bashrc | 6 -- profiles/features/prefix/standalone/make.defaults | 2 + profiles/features/prefix/standalone/packages | 12 +++ profiles/features/prefix/standalone/profile.bashrc | 86 +++++++++++++++++++++ .../linux/amd64/no-multilib/package.use.mask | 4 - profiles/package.mask | 3 +- .../prefix/linux-standalone/amd64/legacy/parent | 2 +- profiles/prefix/linux-standalone/eapi | 1 - profiles/prefix/linux-standalone/packages | 12 --- profiles/prefix/linux-standalone/profile.bashrc | 86 --------------------- profiles/prefix/linux-standalone/x86/legacy/parent | 2 +- profiles/profiles.desc | 26 +++---- profiles/use.desc | 1 + profiles/use.local.desc | 2 + 34 files changed, 185 insertions(+), 172 deletions(-) delete mode 100644 profiles/desc/crosscompile_opts.desc create mode 100644 profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults create mode 100644 profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask create mode 100644 profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask create mode 100644 profiles/features/prefix/standalone/beyond-kernel-2.6.16/parent create mode 100644 profiles/features/prefix/standalone/beyond-kernel-2.6.16/profile.bashrc create mode 100644 profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.mask create mode 100644 profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.unmask create mode 100644 profiles/features/prefix/standalone/beyond-kernel-2.6.32/parent delete mode 100644 profiles/features/prefix/standalone/legacy/make.defaults delete mode 100644 profiles/features/prefix/standalone/legacy/package.mask delete mode 100644 profiles/features/prefix/standalone/legacy/package.unmask delete mode 100644 profiles/features/prefix/standalone/legacy/profile.bashrc create mode 100644 profiles/features/prefix/standalone/packages create mode 100644 profiles/features/prefix/standalone/profile.bashrc delete mode 100644 profiles/prefix/linux-standalone/eapi delete mode 100644 profiles/prefix/linux-standalone/packages delete mode 100644 profiles/prefix/linux-standalone/profile.bashrc (limited to 'profiles') diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz index 336cf58db0f8..7ecbe01cd29d 100644 Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask index 1b7096875ce9..d399cb2abd5a 100644 --- a/profiles/arch/amd64/no-multilib/package.mask +++ b/profiles/arch/amd64/no-multilib/package.mask @@ -1,6 +1,10 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Michał Górny (07 Jan 2018) +# Requires 32-bit libraries. +net-misc/teamviewer + # David Seifert (03 Jan 2018) # Requires 32-bit multilib compatibility sys-block/megamgr diff --git a/profiles/arch/amd64/no-multilib/package.use.mask b/profiles/arch/amd64/no-multilib/package.use.mask index 5df0d7d46a82..5f73f3af51e5 100644 --- a/profiles/arch/amd64/no-multilib/package.use.mask +++ b/profiles/arch/amd64/no-multilib/package.use.mask @@ -8,7 +8,6 @@ app-emulation/xen-tools ovmf # NP-Hardass (11 Jul 2017) # GLEP 73 Immutability, USE=test requires # abi_x86_32 at this time. -app-emulation/wine test app-emulation/wine-vanilla test app-emulation/wine-staging test app-emulation/wine-d3d9 test @@ -18,10 +17,6 @@ app-emulation/wine-any test # Requires sys-boot/grub:0 which is masked here. sys-apps/memtest86+ floppy -# Alexandre Rostovtsev (24 Jun 2012) -# Disable 32-bit parts of wine, bug #351436 -app-emulation/wine mono - # Intel Integrated Primitive (sci-libs/ipp) support media-libs/opencv ipp diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask index e34318af7887..0d9f33f624b8 100644 --- a/profiles/arch/amd64/x32/package.use.mask +++ b/profiles/arch/amd64/x32/package.use.mask @@ -3,10 +3,6 @@ # This file requires >=portage-2.1.1 -# Alexandre Rostovtsev (03 Mar 2013) -# Wine is x86- and x64-only -app-emulation/wine abi_x86_x32 - # Davide Pesavento (30 Nov 2011) # The QML (V4) and JSC JITs do not work on x32. dev-qt/qtdeclarative jit diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask index e63ab33040a5..75e24af7a486 100644 --- a/profiles/arch/ia64/package.use.mask +++ b/profiles/arch/ia64/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Mart Raudsepp (08 Jan 2018) +# mail-client/evolution[ytnef] requires net-mail/ytnef which is not keyworded +mail-client/evolution ytnef + # Sergei Trofimovich (25 Dec 2017) # net-firewall/nftables[doc] requires dblatex which is not keyworded net-firewall/nftables doc diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 95b8d6516ba9..493af9ce75db 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -13,11 +13,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU" # Env vars to expand into USE vars. Modifying this requires prior # discussion on gentoo-dev@lists.gentoo.org. -USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CALLIGRA_EXPERIMENTAL_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CROSSCOMPILE_OPTS CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS" +USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CALLIGRA_EXPERIMENTAL_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS" # USE_EXPAND variables whose contents are not shown in package manager # output. Changes need discussion on gentoo-dev. -USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86" +USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86" CONFIG_PROTECT="/etc" CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" diff --git a/profiles/desc/crosscompile_opts.desc b/profiles/desc/crosscompile_opts.desc deleted file mode 100644 index 1923d8b13e80..000000000000 --- a/profiles/desc/crosscompile_opts.desc +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# This file contains descriptions of CROSSCOMPILE_OPTS USE_EXPAND flags. - -# Keep it sorted. - -headers-only - Build the toolchain against cross-headers only. diff --git a/profiles/desc/l10n.desc b/profiles/desc/l10n.desc index 4e4a062fbb47..1d185344ea93 100644 --- a/profiles/desc/l10n.desc +++ b/profiles/desc/l10n.desc @@ -42,6 +42,7 @@ ca - Catalan ca-valencia - Catalan (Valencian) cak - Kaqchikel chr - Cherokee +cnr - Montenegrin cs - Czech cy - Welsh da - Danish @@ -121,6 +122,7 @@ mni - Manipuri mr - Marathi ms - Malay (macrolanguage) my - Burmese +nan - Min Nan Chinese nb - Norwegian Bokmål nds - Low German ne - Nepali @@ -177,6 +179,7 @@ ts - Tsonga tt - Tatar ug - Uyghur uk - Ukrainian +ur - Urdu ur-PK - Urdu (Pakistan) uz - Uzbek uz-Cyrl - Uzbek (Cyrillic script) diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults index 911c7037f5dc..793ae3689176 100644 --- a/profiles/embedded/make.defaults +++ b/profiles/embedded/make.defaults @@ -27,11 +27,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU" # Env vars to expand into USE vars. Modifying this requires prior # discussion on gentoo-dev@lists.gentoo.org. -USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CROSSCOMPILE_OPTS CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS" +USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS" # USE_EXPAND variables whose contents are not shown in package manager # output. Changes need discussion on gentoo-dev. -USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86" +USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86" # Variables that are set exclusively by the profile # and not by user configuration files. diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults new file mode 100644 index 000000000000..22044de87632 --- /dev/null +++ b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults @@ -0,0 +1,17 @@ +# This profile is supporting >=linux-2.6.16[a] and =linux-2.6.27. Needed by python-3. +ac_cv_func_pipe2=no + +# >=python-3 is masked. +PYTHON_TARGETS="-python3_5" diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask new file mode 100644 index 000000000000..0aa01a72efb0 --- /dev/null +++ b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask @@ -0,0 +1,8 @@ +# >=glibc-2.20 requires >=linux-2.6.32. +# https://lwn.net/Articles/611162 +>=sys-libs/glibc-2.20 + +# >=python-3.4 assumes F_DUPFD_CLOEXEC of fcntl, +# which requires >=linux-2.6.24. +# python-3.3 seems to be unconditionally using utimensat. +>=dev-lang/python-3 diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask new file mode 100644 index 000000000000..9b37b1386380 --- /dev/null +++ b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask @@ -0,0 +1,3 @@ +# >=glibc-2.20 requires >=linux-2.6.32. +# https://lwn.net/Articles/611162 +=sys-libs/glibc-2.24 diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.unmask b/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.unmask new file mode 100644 index 000000000000..9f79b4f81de0 --- /dev/null +++ b/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.unmask @@ -0,0 +1,7 @@ +# https://www.sourceware.org/ml/libc-alpha/2016-08/msg00212.html +# glibc-2.24 needs linux-3.2 at runtime, except on x86 and amd64. +# on x86 and amd64, it is glibc-2.26 to require linux-3.2. +# https://www.sourceware.org/ml/libc-alpha/2017-08/msg00010.html + +# we just use a universal glibc-2.24 on all ARCHes for simplicity. +=linux-2.6.16[a] and =linux-2.6.27. Needed by python-3. -ac_cv_func_pipe2=no - -# >=python-3 is masked. -PYTHON_TARGETS="-python3_5" diff --git a/profiles/features/prefix/standalone/legacy/package.mask b/profiles/features/prefix/standalone/legacy/package.mask deleted file mode 100644 index 5125269d289d..000000000000 --- a/profiles/features/prefix/standalone/legacy/package.mask +++ /dev/null @@ -1,7 +0,0 @@ -# >=glibc-2.20 requires >=linux-2.6.32. ->=sys-libs/glibc-2.20 - -# >=python-3.4 assumes F_DUPFD_CLOEXEC of fcntl, -# which requires >=linux-2.6.24. -# python-3.3 seems to be unconditionally using utimensat. ->=dev-lang/python-3 \ No newline at end of file diff --git a/profiles/features/prefix/standalone/legacy/package.unmask b/profiles/features/prefix/standalone/legacy/package.unmask deleted file mode 100644 index 0d7380b42738..000000000000 --- a/profiles/features/prefix/standalone/legacy/package.unmask +++ /dev/null @@ -1,2 +0,0 @@ -# >=glibc-2.20 requires >=linux-2.6.32. - (24 Jun 2012) -# Disable 32-bit parts of wine, bug #351436 -app-emulation/wine mono - # Intel Integrated Primitive (sci-libs/ipp) support media-libs/opencv ipp diff --git a/profiles/package.mask b/profiles/package.mask index f642a1676b6f..ade95b0630c5 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -50,7 +50,8 @@ kde-apps/konsolepart # Alice Ferrazzi (05 Jan 2018) # kernel: Meltdown and Spectre - Processor flaw. (#643228) -# Please upgrade for Intel processor flaw workaround, +# Please upgrade for Intel processor flaw workaround +# (currently KPTI patch are 64bit only), # also excluding AMD from the fix as not affected. # Please unmask your kernel version if you want to # continue to use your kernel with AMD. diff --git a/profiles/prefix/linux-standalone/amd64/legacy/parent b/profiles/prefix/linux-standalone/amd64/legacy/parent index 0ca4be1beb9c..a0af85877726 100644 --- a/profiles/prefix/linux-standalone/amd64/legacy/parent +++ b/profiles/prefix/linux-standalone/amd64/legacy/parent @@ -1,2 +1,2 @@ .. -../../../../features/prefix/standalone/legacy +../../../../features/prefix/standalone/beyond-kernel-2.6.16 diff --git a/profiles/prefix/linux-standalone/eapi b/profiles/prefix/linux-standalone/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/linux-standalone/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/prefix/linux-standalone/packages b/profiles/prefix/linux-standalone/packages deleted file mode 100644 index 8d5b9aeeb330..000000000000 --- a/profiles/prefix/linux-standalone/packages +++ /dev/null @@ -1,12 +0,0 @@ -# RAP does not need busybox for emergency recovery, the host have all those tools. --*sys-apps/busybox - -# Most of the iproute2 suit require root privilege to function. --*sys-apps/iproute2 - -# Man pages are not essential. --*sys-apps/man-pages --*virtual/man - -# A service manager is not essential. --*virtual/service-manager diff --git a/profiles/prefix/linux-standalone/profile.bashrc b/profiles/prefix/linux-standalone/profile.bashrc deleted file mode 100644 index 60a2af632d18..000000000000 --- a/profiles/prefix/linux-standalone/profile.bashrc +++ /dev/null @@ -1,86 +0,0 @@ -# -*- mode: shell-script; -*- -# RAP specific patches pending upstream: -# binutils: http://article.gmane.org/gmane.comp.gnu.binutils/67593 -# gcc: https://gcc.gnu.org/ml/gcc-patches/2014-12/msg00331.html - -# Disable RAP trick during bootstrap stage2 -[[ -z ${BOOTSTRAP_RAP_STAGE2} ]] || return 0 - -if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; then - cd "${S}" - einfo "Prefixifying dynamic linkers..." - for h in gcc/config/*/*linux*.h; do - ebegin " Updating $h" - sed -i -r "/_DYNAMIC_LINKER/s,([\":])(/lib),\1${EPREFIX}\2,g" $h - eend $? - done - - # use sysroot of toolchain to get currect include and library at compile time - EXTRA_ECONF="${EXTRA_ECONF} --with-sysroot=${EPREFIX}" - - ebegin "remove --sysroot call on ld for native toolchain" - sed -i 's/--sysroot=%R//' gcc/gcc.c - eend $? -elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then - ebegin "Prefixifying native library path" - sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \ - "${S}"/ld/configure.tgt - eend $? - ebegin "Prefixifying path to /etc/ld.so.conf" - sed -i -r "s,\"/etc,\"${EPREFIX}/etc," "${S}"/ld/emultempl/elf32.em - eend $? -elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == compile ]]; then - cd "${S}" - einfo "Prefixifying hardcoded path" - - for f in libio/iopopen.c \ - shadow/lckpwdf.c resolv/{netdb,resolv}.h elf/rtld.c \ - nis/nss_compat/compat-{grp,initgroups,{,s}pwd}.c \ - nss/{bug-erange,nss_files/files-{XXX,init{,groups}}}.c \ - sysdeps/{{generic,unix/sysv/linux}/paths.h,posix/system.c} - do - ebegin " Updating $f" - sed -i -r "s,([:\"])/(etc|usr|bin|var),\1${EPREFIX}/\2,g" $f - eend $? - done - ebegin " Updating nss/db-Makefile" - sed -i -r \ - -e "s,/(etc|var),${EPREFIX}/\1,g" \ - nss/db-Makefile - eend $? -elif [[ ${CATEGORY}/${PN} == dev-lang/python && ${EBUILD_PHASE} == configure ]]; then - # Guide h2py to look into glibc of Prefix - ebegin "Guiding h2py to look into Prefix" - export include="${EPREFIX}"/usr/include - sed -i -r \ - -e "s,/usr/include,\"${EPREFIX}\"/usr/include,g" "${S}"/Lib/plat-linux*/regen - eend $? - ebegin "Prefixifying distutils paths" - sed -re "s,([^[:alnum:]])(/usr[/[:alnum:]]*/(lib[[:alnum:]]*|include)|/lib[[:alnum:]]*),\1${EPREFIX}\2,g" \ - -i "${S}"/setup.py - eend $? -elif [[ ${CATEGORY}/${PN} == dev-lang/perl && ${EBUILD_PHASE} == configure ]]; then - ebegin "Prefixifying pwd path" - sed -r "s,'((|/usr)/bin/pwd),'${EPREFIX}\1," -i "${S}"/dist/PathTools/Cwd.pm - eend $? - - # Configure checks for /system/lib/libandroid.so to override linux into linux-android, - # which is not desired for Gentoo - ebegin "Removing Android detection" - sed "/libandroid.so/d" -i "${S}"/Configure - eend $? -elif [[ ${CATEGORY}/${PN} == sys-devel/make && ${EBUILD_PHASE} == prepare ]]; then - ebegin "Prefixifying default shell" - sed -i -r "/default_shell/s,\"(/bin/sh),\"${EPREFIX}\1," "${S}"/job.c - eend $? -elif [[ ${CATEGORY}/${PN} == sys-libs/zlib && ${EBUILD_PHASE} == prepare ]]; then - [[ -n "${BOOTSTRAP_RAP}" ]] || return 0 - ebegin "Remove executable builds for bootstrap" - sed -i 's/ALL=.*/ALL="\\$(LIBS)"/' "${S}"/configure - eend $? -elif [[ ${CATEGORY}/${PN} == dev-lang/php && ${EBUILD_PHASE} == prepare ]]; then - # introduced in bug 419525, subtle glibc location difference. - ebegin "Prefixifying ext/iconv/config.m4 paths" - sed -i -r "/for i in/s,(/usr(/local|)),${EPREFIX}\1,g" "${S}"/ext/iconv/config.m4 - eend $? -fi diff --git a/profiles/prefix/linux-standalone/x86/legacy/parent b/profiles/prefix/linux-standalone/x86/legacy/parent index 0ca4be1beb9c..a0af85877726 100644 --- a/profiles/prefix/linux-standalone/x86/legacy/parent +++ b/profiles/prefix/linux-standalone/x86/legacy/parent @@ -1,2 +1,2 @@ .. -../../../../features/prefix/standalone/legacy +../../../../features/prefix/standalone/beyond-kernel-2.6.16 diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 2812791936cc..66dd7a32799f 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -48,19 +48,19 @@ amd64 default/linux/amd64/17.0/x32 dev # Experimental SYMLINK_LIB=no profiles # Run app-portage/unsymlink-lib *before* switching the profile. -amd64 default/linux/amd64/17.1 exp -amd64 default/linux/amd64/17.1/selinux exp -amd64 default/linux/amd64/17.1/hardened exp -amd64 default/linux/amd64/17.1/desktop exp -amd64 default/linux/amd64/17.1/desktop/gnome exp -amd64 default/linux/amd64/17.1/desktop/gnome/systemd exp -amd64 default/linux/amd64/17.1/desktop/plasma exp -amd64 default/linux/amd64/17.1/desktop/plasma/systemd exp -amd64 default/linux/amd64/17.1/developer exp -amd64 default/linux/amd64/17.1/no-multilib exp -amd64 default/linux/amd64/17.1/no-multilib/hardened exp -amd64 default/linux/amd64/17.1/no-multilib/hardened/selinux exp -amd64 default/linux/amd64/17.1/systemd exp +#amd64 default/linux/amd64/17.1 exp +#amd64 default/linux/amd64/17.1/selinux exp +#amd64 default/linux/amd64/17.1/hardened exp +#amd64 default/linux/amd64/17.1/desktop exp +#amd64 default/linux/amd64/17.1/desktop/gnome exp +#amd64 default/linux/amd64/17.1/desktop/gnome/systemd exp +#amd64 default/linux/amd64/17.1/desktop/plasma exp +#amd64 default/linux/amd64/17.1/desktop/plasma/systemd exp +#amd64 default/linux/amd64/17.1/developer exp +#amd64 default/linux/amd64/17.1/no-multilib exp +#amd64 default/linux/amd64/17.1/no-multilib/hardened exp +#amd64 default/linux/amd64/17.1/no-multilib/hardened/selinux exp +#amd64 default/linux/amd64/17.1/systemd exp # ARM Profiles arm default/linux/arm/13.0 stable diff --git a/profiles/use.desc b/profiles/use.desc index 44beb587629d..042b3e915790 100644 --- a/profiles/use.desc +++ b/profiles/use.desc @@ -135,6 +135,7 @@ handbook - Enable handbooks generation for packages by KDE hardened - Activate default security enhancements for toolchain (gcc, glibc, binutils) hddtemp - Enable monitoring of hdd temperature (app-admin/hddtemp) hdf5 - Add support for the Hierarchical Data Format v5 +headers-only - Install only C headers instead of whole package. Mainly used by sys-devel/crossdev for toolchain bootstrap. hscolour - Include coloured haskell sources to generated documentation (dev-haskell/hscolour) ibm - Add support for IBM ppc64 specific systems iconv - Enable support for the iconv character set conversion library diff --git a/profiles/use.local.desc b/profiles/use.local.desc index ae8e846b54b6..f1e79f581239 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -3336,6 +3336,7 @@ gnome-base/gnome-shell:openrc-force - Skip systemd dependency (#480336), enablin gnome-base/gvfs:afp - Enables support for accessing AFP (Apple Filing Protocol) network shares gnome-base/gvfs:archive - Enables support for accessing files in archives transparently via app-arch/libarchive gnome-base/gvfs:bluray - Enable playback of Blu-ray filesystems using media-libs/libbluray +gnome-base/gvfs:elogind - Use sys-auth/elogind for session tracking. gnome-base/gvfs:fuse - Enables fuse mount points in $HOME/.gvfs for legacy application access gnome-base/gvfs:gnome-online-accounts - Enable configuration panel for net-libs/gnome-online-accounts accounts gnome-base/gvfs:google - Enables support for accessing Google accounts via dev-libs/libgdata @@ -3634,6 +3635,7 @@ mail-client/evolution:highlight - Enable text highlighting plugin mail-client/evolution:ldap - Enable support for fetching contacts from an LDAP or Active Directory server using net-nds/openldap mail-client/evolution:spamassassin - Build mail-filter/spamassassin plugin mail-client/evolution:weather - Enable optional weather calendar support +mail-client/evolution:ytnef - Enable optional TNEF attachments parser support using net-mail/ytnef mail-client/mail-notification:sylpheed - Enable support for MH mailboxes used by mail-client/sylpheed mail-client/mutt:berkdb - Enable sys-libs/db database backend for header caching mail-client/mutt:crypt - Add support for encryption -- using mcrypt or gpg where applicable -- cgit v1.2.3