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

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538

6 files changed, 26 insertions, 21 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/Manifest b/sys-apps/openrc/Manifest
index d8cb85d295df..95d741ab5642 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -10,16 +10,16 @@ AUX start-stop-daemon.pam 63 SHA256 2681da17e4a122656b5303b7c7eca82b8fb182641290
 DIST openrc-0.12.4.tar.bz2 131914 SHA256 c4edda2fff4b613f50b9cc265bb457a9ab0170fbc1fe7c26eccd4a5d63b2625c SHA512 14e188e382dfe02037d3e4211fa3265152d5ec92ca491b1e86154c0615583ddfc0a2592ca849ab453068dd60000886e57e7da024036fa58d7474acdbb6b92208 WHIRLPOOL 7bdc2c310ee6e87a439574f377a3c1541a118b4122d098d727f6d4464e9f645e5a4d40bedfc82f401b53e640e78494f74fac94f9b6813eb202cc18d1c5391280
 DIST openrc-0.13.1.tar.bz2 135712 SHA256 c2eeea257aa8b6b614fa69a73dd1dbc8b8a0a80e283a73e12356c212414540f6 SHA512 01e92c213cd9cda8f6d16b5428c63338f836dd047d2dd6032f37dd192a791b05be7233c20210219b594d4ef8b0851f7f64f04503e484a577f085991028d30b36 WHIRLPOOL 4f61a8a97ad53eeb8af0796ae2460538598d3f8f7ac6938f55ed454753a2e6542fef818e832d4a667dd1a924981383c87c7805ee2ea1d77b31a6fe9132616523
 DIST openrc-0.13.2.tar.bz2 141784 SHA256 6552cbc58f86ad6cb680c3ee5544ced1865bee8edb3543473eccc6aeaaf47855 SHA512 e4209691136cbe7bb66c4b0a927c416afe54ae1fbf9678d51b5766e6dab51ab7f59ccdf16e6b375e97c53707f486b6e19b49a27b762ad6fd3eecac391033e801 WHIRLPOOL 7e2bfe3f3fc17aaa9a8a8cb0f7294e16d80eba256ed1e40fb2e4075af25b4c196f22a132e6aeab386bd31077529cd5feaeb23e07a851ab51af4a4d68f1bc0047
-EBUILD openrc-0.12.4.ebuild 10522 SHA256 0293519019d791318d61c2032d877023c91c9ccd960031505736529692cbc58a SHA512 447fb48c781b2945e22215eb7faabac5e67e401ea6e14559b765ac4963df11e61ff73c19dd1b5697420ad0ffff93de23c69a6dd423df06dc882e809d39fce0aa WHIRLPOOL e986349c14881af8f76ee322d5434272b6d025ea3e6ba03d798f49fd216c336332cd0e7932796588e50a64148dab744f1c4d004d2b9f1615e3b666078cd48884
-EBUILD openrc-0.13.1.ebuild 10626 SHA256 1ddc1f4481aea87e18ac705bef7df217b5a06e6bcc5f5a1ecc19e6819e28d5c7 SHA512 6e93054153adbf35c198ad1ff66f74ef415eb076f70d47fa978d0c1dfaac7e2b4fd9bea818474e44a4f1b29eb8d58448208d9e34af1b62e7a81bb51dc328cc3f WHIRLPOOL a8dbc1547cc95f7e4ca213efd063bfb062202ef598a39f71e4819e71beac531b790af3e3864afefea85689526cf4c9583f2ce868f316535ddc410d5209637794
-EBUILD openrc-0.13.2.ebuild 10676 SHA256 b10ebae12f0508606ad4b6b93c222254585a527b7db1ae2c4f6187d7810732a6 SHA512 a292f572d6807625d40743ea41af10435ac6a2cc4dd9d33b5b231a97926c24cffd1478e26712ee07a0113a8d9be38ad3e368fe8a78a8bf1245b0a175e2b074ce WHIRLPOOL 3a1baaa09ab818acb3a4c82816ee3e6a154b9f6179c6108530de29a4e38bb5b3dcc41b5dc00efbbf8ddd5ceae0311ece303ca9cb8c5c30efe5a8ad183cb2fec6
-EBUILD openrc-9999.ebuild 10676 SHA256 ff093ba5360f4c0ea1e95e2f7cade7e80ca4d315b78ae74da384afa2bfc59811 SHA512 f2e60e5503f136d1fc1820875def3be83e9892b5146a07d684fc4f6ef9bc0aefcaab7201c072200be0c3e0b1a6d5102b71880d453b07699aa659f72615b171fd WHIRLPOOL eb7a77e2a9d4f507932a2db65f75478595167cfcc1f94e7d28c53717ea916fe3df605752eb1bfd42e66a6c903a5d87f66ab7caac9061c682399b2f5d3215b13b
-MISC ChangeLog 50743 SHA256 64f75e7c3593a718f99c6c34ed7bd646aa32557caa814d3cbef896e17693c126 SHA512 84b34815f1cfbaea6bcbe6b805542277a8867396bfd0d4744baaeffa0d4aaf74dc38f9909acc1a652a9409f39be2f6136fd5467427cd6a4ef05435462b6ce908 WHIRLPOOL 643ebe9224c6c7d6973f48c748bc49fe6fcb72dbcc4acd99de833189ffc3c3ec9db9cfd56493699c8d2fdb74f32bd80f6dd27648c0f7fcfc4eeef359e3df5909
+EBUILD openrc-0.12.4.ebuild 10528 SHA256 a205628a178892ca3887da9141c7bcb7a30bc7088112eca814f799a54eb11b1a SHA512 4b421e32a867754007cc077f21b9c254a80cfae82f10ea43f548d0e48bffea12c2b36982c495ab176517ce4cd53a182f27883ed3e729939a33b5610e1d6bfcdd WHIRLPOOL bed8ab46f3f04f29adaabf4c1be678f193397ead232fe6f952b6d8e5d95fc6fecb2a08e31ae54374451a2f53ffbb2204e3071efa870b96013ddde860c4085c68
+EBUILD openrc-0.13.1.ebuild 10626 SHA256 e4595aef0a69cfba948ad6ed32b720abd06b96e35380a5272833714887cf5659 SHA512 ebfc13b1b949471b3b80937c6704ad95fd78f614a76351228cf6ad4d7fd4b2f39fa1e04d8b96f26289f55ff3059fb68edc2acd9e6589044a9b0bec69860007d1 WHIRLPOOL 2a84a29c08daafe67b21c60a0a4efb5f92e3aa881772995e8d4773fc981a2720a993daf7e997a9dafc277e5b515d9f4e92255d713157c850691079c05438557f
+EBUILD openrc-0.13.2.ebuild 10676 SHA256 21b191d0509672629d87b6f924622b5ac913e8e0fe4540cb560557b7e41ab0f9 SHA512 d5796d0058342d8bada81b2922f0a6351aa09aef22fb03f1555e333acd23f66f2013f958a8cd81fd9216274ae41522fb5dd60f8e7c2415a0678af75b6bec17e8 WHIRLPOOL e300d0bcb215ce42ef052ce0b85cad1dd2b1aa1bf55399978374a5bab72a79b35af99bac0a35ceb5f148ee98c6d6163ae00f9b24c076606c03b338ca36e64e69
+EBUILD openrc-9999.ebuild 10676 SHA256 0c64f4c90f71b5c60616e3d05d9aa119ebf5a93d885fe52a9d21a5c7e046c488 SHA512 910ca280574907a64d7127645555d598d2cd971881412dd2d6f4401c6dc49ee1c2b0d42ffef035688b666143284a16fdef1710914f58d0bbe721b89b7f1e0133 WHIRLPOOL 4328fd65f36ad66d097dff4d46e4aeedfe56f99a8a0e756025082bc6c80a69a65dd3751386db936d86fd46fe3e0bf1cc9804ed31ce39ce04279d2cf768507b52
+MISC ChangeLog 50970 SHA256 65c9ee845466f64169f3a08fded186e2350e703b27a002a5dff6c44f3b42dc7a SHA512 af9618261d14d99ecd773a3ecdaff4a44fb39b8c769b4217f5a7ee16aeb20f6a1b79136b6f257cefb01a8dd23f1d19c37834638f408f0d73c8c55e9692ad15c0 WHIRLPOOL b1d295feffb9583666e305b7dc00bf5bc6fc70601e29af69c0607557be2499ff2ac9b8bd9fc1b60a964e6158355c26255343a7585ebbc9f94236e07d324513a8
 MISC metadata.xml 373 SHA256 02f4a9ad32e00c6c046a55dd14949c4b5a3b9a8f5d4725aa07c698c107bbc1cf SHA512 80d1f2a14cddd37e7d8866ff556c753e631eca6239c0474f8a067bf387778e702a8d15152b1324744110b2f5972c2e2858eb195f8448001f322e19acc589e033 WHIRLPOOL 8a8176f52fd07682ee407923e956962ded7ce45f1b9b535e80b84195f6407954f504c44dc1b0f2cb2af8ed8a84a1e8b4cd5dc956163431c59bbc1f7785fb9151
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRNdnwACgkQblQW9DDEZTiHsgCeM8so/82PMKlvKE/J1cNfY0bP
-zDIAnjF3N1vCRfUzgS/GqQD+XciEOL3X
-=gSSV
+iEYEAREIAAYFAlRP0hcACgkQblQW9DDEZTh/MACgjKNZTkW7xeg1goKkhlYlK9J+
+DtsAnR2fPJ92DINvibr9WnpVAWMDQvlz
+=jnkW
 -----END PGP SIGNATURE-----
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