diff options
| author |   William Hubbs <williamh@gentoo.org> | 2013-04-18 20:02:28 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2013-04-18 20:02:28 +0000 |
| commit | e747e67cb037cf2b9b18c42968493b52f2950634 (patch) | |
| tree | 0d2d328440427bae0be54520f362a9dbe232ebf0 /sys-apps/systemd | |
| parent | Version bump (diff) | |
| download | gentoo-2-e747e67cb037cf2b9b18c42968493b52f2950634.tar.gz gentoo-2-e747e67cb037cf2b9b18c42968493b52f2950634.tar.bz2 gentoo-2-e747e67cb037cf2b9b18c42968493b52f2950634.zip | |
revert the check for CONFIG_FW_LOADER_USER_HELPER per mgorny since we force the firmware-loader use flag on.
(Portage version: 2.2.0_alpha173/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Diffstat (limited to 'sys-apps/systemd')
| -rw-r--r-- | sys-apps/systemd/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-201.ebuild | 6 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index ad85cc5ea825..f55e3fd5f5f0 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.128 2013/04/18 17:48:56 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.129 2013/04/18 20:02:28 williamh Exp $ + + 18 Apr 2013; William Hubbs <williamh@gentoo.org> systemd-201.ebuild, + systemd-9999.ebuild: + revert the check for CONFIG_FW_LOADER_USER_HELPER per mgorny since we force + the firmware-loader use flag on. 18 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-201.ebuild, systemd-9999.ebuild: diff --git a/sys-apps/systemd/systemd-201.ebuild b/sys-apps/systemd/systemd-201.ebuild index bede04c4ffd2..09e497f72af7 100644 --- a/sys-apps/systemd/systemd-201.ebuild +++ b/sys-apps/systemd/systemd-201.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-201.ebuild,v 1.14 2013/04/18 19:46:36 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-201.ebuild,v 1.15 2013/04/18 20:02:28 williamh Exp $ EAPI=5 @@ -68,8 +68,8 @@ DEPEND="${COMMON_DEPEND} pkg_pretend() { local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD - ~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 - ~!FW_LOADER_USER_HELPER" + ~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2" +# ~!FW_LOADER_USER_HELPER" if [[ ${MERGE_TYPE} != binary ]]; then if [[ $(gcc-major-version) -lt 4 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index a82ad179860a..7794f5092713 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.55 2013/04/18 19:46:36 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.56 2013/04/18 20:02:28 williamh Exp $ EAPI=5 @@ -92,8 +92,8 @@ src_prepare() { pkg_pretend() { local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD - ~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 - ~!FW_LOADER_USER_HELPER" + ~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2" +# ~!FW_LOADER_USER_HELPER" if [[ ${MERGE_TYPE} != binary ]]; then if [[ $(gcc-major-version) -lt 4 |