summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-09-26 19:46:56 +0000
committerMike Gilbert <floppym@gentoo.org>2013-09-26 19:46:56 +0000
commitf04492cd3dc009c88fd2113d4a6403fe5b319b3c (patch)
tree19934b5a05267292f0b287f42d1a46460a652612 /sys-apps
parentApply cross-compile fixes to python-2.7.5. (diff)
downloadgentoo-2-f04492cd3dc009c88fd2113d4a6403fe5b319b3c.tar.gz
gentoo-2-f04492cd3dc009c88fd2113d4a6403fe5b319b3c.tar.bz2
gentoo-2-f04492cd3dc009c88fd2113d4a6403fe5b319b3c.zip
Move gentoo-systemd-integration to PDEPEND, bug 486112.
(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/ChangeLog6
-rw-r--r--sys-apps/systemd/systemd-204-r1.ebuild6
-rw-r--r--sys-apps/systemd/systemd-207-r2.ebuild6
-rw-r--r--sys-apps/systemd/systemd-9999-r1.ebuild6
4 files changed, 14 insertions, 10 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 05cc446c9f0b..0ae7924d36c7 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.178 2013/09/26 17:28:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.179 2013/09/26 19:46:56 floppym Exp $
+
+ 26 Sep 2013; Mike Gilbert <floppym@gentoo.org> systemd-204-r1.ebuild,
+ systemd-207-r2.ebuild, systemd-9999-r1.ebuild:
+ Move gentoo-systemd-integration to PDEPEND, bug 486112.
26 Sep 2013; Agostino Sarubbo <ago@gentoo.org> systemd-204-r1.ebuild:
Stable for arm, wrt bug #485546
diff --git a/sys-apps/systemd/systemd-204-r1.ebuild b/sys-apps/systemd/systemd-204-r1.ebuild
index 2ff298286898..65cc3c8a3ecb 100644
--- a/sys-apps/systemd/systemd-204-r1.ebuild
+++ b/sys-apps/systemd/systemd-204-r1.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-204-r1.ebuild,v 1.2 2013/09/26 17:28:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-204-r1.ebuild,v 1.3 2013/09/26 19:46:56 floppym Exp $
EAPI=5
@@ -49,12 +49,12 @@ RDEPEND="${COMMON_DEPEND}
>=sys-apps/util-linux-2.22
<sys-apps/sysvinit-2.88-r4
)
- !vanilla? ( ~sys-apps/gentoo-systemd-integration-1 )
!sys-auth/nss-myhostname
!<sys-libs/glibc-2.10
!sys-fs/udev"
-PDEPEND=">=sys-apps/hwids-20130326.1[udev]"
+PDEPEND=">=sys-apps/hwids-20130326.1[udev]
+ !vanilla? ( ~sys-apps/gentoo-systemd-integration-1 )"
DEPEND="${COMMON_DEPEND}
app-arch/xz-utils
diff --git a/sys-apps/systemd/systemd-207-r2.ebuild b/sys-apps/systemd/systemd-207-r2.ebuild
index 7f3068461ab2..af70b6cd59e3 100644
--- a/sys-apps/systemd/systemd-207-r2.ebuild
+++ b/sys-apps/systemd/systemd-207-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-207-r2.ebuild,v 1.1 2013/09/22 08:36:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-207-r2.ebuild,v 1.2 2013/09/26 19:46:56 floppym Exp $
EAPI=5
@@ -52,13 +52,13 @@ RDEPEND="${COMMON_DEPEND}
>=sys-apps/util-linux-2.22
<sys-apps/sysvinit-2.88-r4
)
- !vanilla? ( sys-apps/gentoo-systemd-integration )
!sys-auth/nss-myhostname
!<sys-libs/glibc-2.10
!sys-fs/udev"
PDEPEND=">=sys-apps/hwids-20130717-r1[udev]
- policykit? ( sys-auth/polkit )"
+ policykit? ( sys-auth/polkit )
+ !vanilla? ( sys-apps/gentoo-systemd-integration )"
DEPEND="${COMMON_DEPEND}
app-arch/xz-utils
diff --git a/sys-apps/systemd/systemd-9999-r1.ebuild b/sys-apps/systemd/systemd-9999-r1.ebuild
index b5fe82f78e1d..e3ec5e60037e 100644
--- a/sys-apps/systemd/systemd-9999-r1.ebuild
+++ b/sys-apps/systemd/systemd-9999-r1.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-r1.ebuild,v 1.17 2013/09/18 10:23:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.18 2013/09/26 19:46:56 floppym Exp $
EAPI=5
@@ -60,13 +60,13 @@ RDEPEND="${COMMON_DEPEND}
>=sys-apps/util-linux-2.22
<sys-apps/sysvinit-2.88-r4
)
- !vanilla? ( sys-apps/gentoo-systemd-integration )
!sys-auth/nss-myhostname
!<sys-libs/glibc-2.10
!sys-fs/udev"
PDEPEND=">=sys-apps/hwids-20130717-r1[udev]
- policykit? ( sys-auth/polkit )"
+ policykit? ( sys-auth/polkit )
+ !vanilla? ( sys-apps/gentoo-systemd-integration )"
DEPEND="${COMMON_DEPEND}
app-arch/xz-utils