diff --git a/eclass/compat-drivers-3.8-r1.eclass b/eclass/compat-drivers-3.8-r1.eclass deleted file mode 100644 index f01faa830..000000000 --- a/eclass/compat-drivers-3.8-r1.eclass +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - - -# @ECLASS: compat-drivers-3.8-r1.eclass -# @MAINTAINER: -# wuodan@pentoo.ch -# @BLURB: Implements functionality of driver-select script for several modules -# @DESCRIPTION: -# Implements functionality of driver-select script for several modules -# needs a modified version of the driver-select file! - -# compose IUSE and REQUIRED_USE from the categories -IUSE+=" +build-all-modules" -REQUIRED_USE+=" || (" -for useexp in ${CPD_USE_EXPAND}; do - USE_TEMP="\$CPD_USE_EXPAND_$useexp" - for iuse in `eval echo "\$USE_TEMP"`; do - if [ "${iuse:0:1}" = '+' ]; then - IUSE+=" ${iuse:0:1}compat_drivers_${useexp}_${iuse:1}" || die - REQUIRED_USE+=" compat_drivers_${useexp}_${iuse:1}" || die - else - IUSE+=" compat_drivers_${useexp}_${iuse}" || die - REQUIRED_USE+=" compat_drivers_${useexp}_${iuse} build-all-modules" || die - fi - done -done -REQUIRED_USE+=" )" - -# ============================================================================== -# INTERNAL VARIABLES -# ============================================================================== - -# @VARIABLE: CPD_USE_EXPAND -# @DESCRIPTION: -# This variable needs to be set in the ebuild and contains the categories for -# USE_EXPAND - -# @VARIABLE: CPD_USE_EXPAND_category -# @DESCRIPTION: -# These variables need to be set in the ebuild, one per category in -# CPD_USE_EXPAND. They contain the modules of the categories. - -# @ECLASS-VARIABLE: CPD_MODULE -# @DESCRIPTION: -# This internal variable contains a temporary value, the currently processed -# module. - -# @ECLASS-VARIABLE: CPD_DISABLE_${CPD_MODULE} -# @DESCRIPTION: -# These internal variables contains values, the 'disable-actions' of the -# currently processed module. One variable exists for each active module. - -# ============================================================================== -# INTERNAL FUNCTIONS -# ============================================================================== - -# ============================================================================== -# EXPORTED FUNCTIONS -# ============================================================================== - -# @FUNCTION: compat-drivers-3.8-r1_src_configure -# @DESCRIPTION: -# This function reads the configuration (disable-actions and filters) for each -# single active flag, then constructs and applies the common configuration set. -compat-drivers-3.8-r1_src_configure() { - # early exit, skip filtering of configuration and build all modules - if use build-all-modules; then - ewarn "You have chosen to build all modules!" - ewarn "The Pentoo team strives to build only the desired modules and the" - ewarn "use flag 'build-all-modules' should only be used when" - ewarn "the desired modules is not available through another flag." - ewarn "Please open an issue at the Pentoo site and let us know which" - ewarn "module was missing!" - return 0 - fi - - # loop over all modules - local use_temp='' - local use_enabled_list='' - for useexp in ${CPD_USE_EXPAND}; do - use_temp="\$CPD_USE_EXPAND_$useexp" || die - for iuse in `eval echo "\$use_temp"`; do - if [ "${iuse:0:1}" = '+' ]; then - local iuse2=${iuse:1} || die - else - local iuse2=${iuse} || die - fi - local iflag="compat_drivers_${useexp}_${iuse2}" || die - # check if it's enabled - if use "${iflag}"; then - use_enabled_list+=" ${iuse2}" || die - fi - done - done - einfo "List of enabled modules: ${use_enabled_list}" - - # Call the modified driver-select script - scripts/driver-select -q ${use_enabled_list} || \ - die "driver-select failed. This file was edited by Pentoo" -} - -EXPORT_FUNCTIONS src_configure || die diff --git a/profiles/pentoo/arch/x86/package.use/net-wireless b/profiles/pentoo/arch/x86/package.use/net-wireless deleted file mode 100644 index 304ff3962..000000000 --- a/profiles/pentoo/arch/x86/package.use/net-wireless +++ /dev/null @@ -1 +0,0 @@ -sys-kernel/compat-drivers -pax-kernel diff --git a/profiles/pentoo/base/make.defaults b/profiles/pentoo/base/make.defaults index ffe7edcc7..d5916faa5 100644 --- a/profiles/pentoo/base/make.defaults +++ b/profiles/pentoo/base/make.defaults @@ -19,7 +19,7 @@ FEATURES="${FEATURES} usersandbox protect-owned userpriv userfetch fixlafiles ne #for major use of binpkgs, we need to "fix" a few of gentoo's flaws: #a package built against kernel A will attempt to be used even when remerging on kernel B (often to hilarious consequences) #so we will define a long list of such packages and exclude them from being built and used (catch it on both ends to avoid issues) -PENTOO_BINPKG_RESTRICTED="sys-kernel/compat-drivers sys-kernel/ax88179_178a x11-drivers/ati-drivers x11-drivers/nvidia-drivers sys-fs/zfs-kmod sys-kernel/spl \ +PENTOO_BINPKG_RESTRICTED="sys-kernel/ax88179_178a x11-drivers/ati-drivers x11-drivers/nvidia-drivers sys-fs/zfs-kmod sys-kernel/spl \ sys-power/bbswitch x11-drivers/xf86-video-virtualbox app-emulation/virtualbox-guest-additions dev-libs/pocl \ app-emulation/virtualbox-modules app-emulation/vmware-modules app-emulation/open-vm-tools sys-kernel/genkernel dev-python/certifi \ sys-kernel/pentoo-sources dev-python/twisted-web net-analyzer/metasploit sci-libs/lapack-reference x11-base/xorg-drivers app-admin/genmenu \ diff --git a/profiles/pentoo/overlay/make.defaults b/profiles/pentoo/overlay/make.defaults index 160e021ac..761ca57e8 100644 --- a/profiles/pentoo/overlay/make.defaults +++ b/profiles/pentoo/overlay/make.defaults @@ -16,7 +16,7 @@ FCFLAGS="${FCFLAGS} -frecord-gcc-switches" #for major use of binpkgs, we need to "fix" a few of gentoo's flaws: #a package built against kernel A will attempt to be used even when remerging on kernel B (often to hilarious consequences) #so we will define a long list of such packages and exclude them from being built and used (catch it on both ends to avoid issues) -PENTOO_BINPKG_RESTRICTED="sys-kernel/compat-drivers sys-kernel/ax88179_178a x11-drivers/ati-drivers x11-drivers/nvidia-drivers sys-fs/zfs-kmod sys-kernel/spl \ +PENTOO_BINPKG_RESTRICTED="sys-kernel/ax88179_178a x11-drivers/ati-drivers x11-drivers/nvidia-drivers sys-fs/zfs-kmod sys-kernel/spl \ sys-power/bbswitch pentoo/pentoo-installer x11-drivers/xf86-video-virtualbox app-emulation/virtualbox-guest-additions \ app-emulation/virtualbox-modules app-emulation/vmware-modules app-emulation/open-vm-tools sys-kernel/genkernel dev-python/certifi \ sys-kernel/pentoo-sources dev-python/twisted-web net-analyzer/metasploit sci-libs/lapack-reference x11-base/xorg-drivers app-admin/genmenu \ diff --git a/profiles/updates/1Q-2013 b/profiles/updates/1Q-2013 deleted file mode 100644 index 2532bfc5f..000000000 --- a/profiles/updates/1Q-2013 +++ /dev/null @@ -1 +0,0 @@ -move net-wireless/compat-wireless sys-kernel/compat-drivers