diff options
author | 2013-12-04 03:06:19 +0000 | |
---|---|---|
committer | 2013-12-04 03:06:19 +0000 | |
commit | f3d39af05f08d78cc7616c0de8538018c33f84c4 (patch) | |
tree | a19f8b8dd6458de8af58344062beca4387d44937 /sys-apps | |
parent | Add patch to fix building against xorg-server-1.14.99.903 (diff) | |
download | gentoo-2-f3d39af05f08d78cc7616c0de8538018c33f84c4.tar.gz gentoo-2-f3d39af05f08d78cc7616c0de8538018c33f84c4.tar.bz2 gentoo-2-f3d39af05f08d78cc7616c0de8538018c33f84c4.zip |
Move udev-init-scripts to PDEPEND to break circular dep.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/systemd/ChangeLog | 6 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-208-r2.ebuild | 4 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index b4cae96994fc..726f6911d121 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,10 @@ # 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.202 2013/12/02 16:49:59 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.203 2013/12/04 03:06:19 floppym Exp $ + + 04 Dec 2013; Mike Gilbert <floppym@gentoo.org> systemd-208-r2.ebuild, + systemd-9999.ebuild: + Move udev-init-scripts to PDEPEND to break circular dep. 02 Dec 2013; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild: Disable maintainer mode which now gets enabled by default. diff --git a/sys-apps/systemd/systemd-208-r2.ebuild b/sys-apps/systemd/systemd-208-r2.ebuild index 13d02429c20c..9b5ab9c336ac 100644 --- a/sys-apps/systemd/systemd-208-r2.ebuild +++ b/sys-apps/systemd/systemd-208-r2.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-208-r2.ebuild,v 1.8 2013/12/01 15:50:12 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208-r2.ebuild,v 1.9 2013/12/04 03:06:19 floppym Exp $ EAPI=5 @@ -48,7 +48,6 @@ COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1 # baselayout-2.2 has /run RDEPEND="${COMMON_DEPEND} >=sys-apps/baselayout-2.2 - >=sys-fs/udev-init-scripts-25 || ( >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 @@ -58,6 +57,7 @@ RDEPEND="${COMMON_DEPEND} !sys-fs/udev" PDEPEND=">=sys-apps/hwids-20130717-r1[udev] + >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )" diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 5279a9499090..ad5fa6424f8c 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.74 2013/12/02 16:49:59 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.75 2013/12/04 03:06:19 floppym Exp $ EAPI=5 @@ -54,7 +54,6 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20:0= # baselayout-2.2 has /run RDEPEND="${COMMON_DEPEND} >=sys-apps/baselayout-2.2 - >=sys-fs/udev-init-scripts-25 || ( >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 @@ -66,6 +65,7 @@ RDEPEND="${COMMON_DEPEND} # sys-apps/daemon: the daemon only (+ build-time lib dep for tests) PDEPEND=">=sys-apps/dbus-1.6.8-r1:0 >=sys-apps/hwids-20130717-r1[udev] + >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )" |