repoman fix, convert dependency on baselayout to a blocker against older versions.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)

5 files changed, 18 insertions, 13 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index f94bd364bc5c..e6867e527730 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.309 2014/10/26 22:31:52 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.310 2014/10/28 17:27:35 williamh Exp $
+
+  28 Oct 2014; William Hubbs <williamh@gentoo.org> openrc-0.12.4.ebuild,
+  openrc-0.13.1.ebuild, openrc-0.13.2.ebuild, openrc-9999.ebuild:
+  repoman fix, convert dependency on baselayout to a blocker against older
+  versions.
 
 *openrc-0.13.2 (26 Oct 2014)
 
diff --git a/sys-apps/openrc/openrc-0.12.4.ebuild b/sys-apps/openrc/openrc-0.12.4.ebuild
index 5762a36e4e00..1732de93c180 100644
--- a/sys-apps/openrc/openrc-0.12.4.ebuild
+++ b/sys-apps/openrc/openrc-0.12.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.12.4.ebuild,v 1.12 2014/01/19 19:38:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.12.4.ebuild,v 1.13 2014/10/28 17:27:35 williamh Exp $
 
 EAPI=5
 
@@ -22,8 +22,7 @@ SLOT="0"
 IUSE="debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
 	tools unicode kernel_linux kernel_FreeBSD"
 
-COMMON_DEPEND=">=sys-apps/baselayout-2.1-r1
-	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+COMMON_DEPEND=" kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
 	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses )
 	pam? ( sys-auth/pambase )
@@ -32,6 +31,7 @@ COMMON_DEPEND=">=sys-apps/baselayout-2.1-r1
 		sys-process/psmisc
 	)
 	selinux? ( sec-policy/selinux-openrc )
+	!<sys-apps/baselayout-2.1-r1
 	!<sys-fs/udev-init-scripts-17
 	!<sys-fs/udev-133"
 DEPEND="${COMMON_DEPEND}
diff --git a/sys-apps/openrc/openrc-0.13.1.ebuild b/sys-apps/openrc/openrc-0.13.1.ebuild
index 65e292aea70d..139860743564 100644
--- a/sys-apps/openrc/openrc-0.13.1.ebuild
+++ b/sys-apps/openrc/openrc-0.13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.13.1.ebuild,v 1.1 2014/08/22 20:06:23 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.13.1.ebuild,v 1.2 2014/10/28 17:27:35 williamh Exp $
 
 EAPI=5
 
@@ -22,8 +22,7 @@ SLOT="0"
 IUSE="debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
 	tools unicode kernel_linux kernel_FreeBSD"
 
-COMMON_DEPEND=">=sys-apps/baselayout-2.1-r1
-	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
 	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses )
 	pam? ( sys-auth/pambase )
@@ -35,6 +34,7 @@ COMMON_DEPEND=">=sys-apps/baselayout-2.1-r1
 	selinux? ( sec-policy/selinux-base-policy
 		sec-policy/selinux-openrc
 		sys-libs/libselinux )
+	!<sys-apps/baselayout-2.1-r1
 	!<sys-fs/udev-init-scripts-27"
 DEPEND="${COMMON_DEPEND}
 	virtual/os-headers
diff --git a/sys-apps/openrc/openrc-0.13.2.ebuild b/sys-apps/openrc/openrc-0.13.2.ebuild
index 90a6f3683c4c..db2cdec568c3 100644
--- a/sys-apps/openrc/openrc-0.13.2.ebuild
+++ b/sys-apps/openrc/openrc-0.13.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.13.2.ebuild,v 1.1 2014/10/26 22:31:52 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.13.2.ebuild,v 1.2 2014/10/28 17:27:35 williamh Exp $
 
 EAPI=5
 
@@ -22,8 +22,7 @@ SLOT="0"
 IUSE="debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
 	tools unicode kernel_linux kernel_FreeBSD"
 
-COMMON_DEPEND=">=sys-apps/baselayout-2.1-r1
-	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
 	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses )
 	pam? ( sys-auth/pambase )
@@ -35,6 +34,7 @@ COMMON_DEPEND=">=sys-apps/baselayout-2.1-r1
 	selinux? ( sec-policy/selinux-base-policy
 		sec-policy/selinux-openrc
 		sys-libs/libselinux )
+	!<sys-apps/baselayout-2.1-r1
 	!<sys-fs/udev-init-scripts-27"
 DEPEND="${COMMON_DEPEND}
 	virtual/os-headers
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 16851d9739e6..d3c0bc7f1595 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.139 2014/10/26 22:31:52 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.140 2014/10/28 17:27:35 williamh Exp $
 
 EAPI=5
 
@@ -22,8 +22,7 @@ SLOT="0"
 IUSE="debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
 	tools unicode kernel_linux kernel_FreeBSD"
 
-COMMON_DEPEND=">=sys-apps/baselayout-2.1-r1
-	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
 	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses )
 	pam? ( sys-auth/pambase )
@@ -35,6 +34,7 @@ COMMON_DEPEND=">=sys-apps/baselayout-2.1-r1
 	selinux? ( sec-policy/selinux-base-policy
 		sec-policy/selinux-openrc
 		sys-libs/libselinux )
+	!<sys-apps/baselayout-2.1-r1
 	!<sys-fs/udev-init-scripts-27"
 DEPEND="${COMMON_DEPEND}
 	virtual/os-headers