diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-03-20 12:35:05 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-03-20 12:35:05 +0000 |
| commit | db1c98ec6df239f9861a3f776fc0ee6648c97f48 (patch) | |
| tree | 8f6279c29f3065a413812f4dd212bf27d61d07d2 /sys-fs/udev-init-scripts | |
| parent | net-mail/notmuch: Version bump to 0.12. (diff) | |
| download | gentoo-2-db1c98ec6df239f9861a3f776fc0ee6648c97f48.tar.gz gentoo-2-db1c98ec6df239f9861a3f776fc0ee6648c97f48.tar.bz2 gentoo-2-db1c98ec6df239f9861a3f776fc0ee6648c97f48.zip | |
Set blockers to prevent file collision wrt #405505
(Portage version: 2.2.0_alpha92/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/udev-init-scripts')
| -rw-r--r-- | sys-fs/udev-init-scripts/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/udev-init-scripts/udev-init-scripts-10.ebuild | 7 | ||||
| -rw-r--r-- | sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild | 8 |
3 files changed, 13 insertions, 8 deletions
diff --git a/sys-fs/udev-init-scripts/ChangeLog b/sys-fs/udev-init-scripts/ChangeLog index 2baadab2cae1..1ebb43bce270 100644 --- a/sys-fs/udev-init-scripts/ChangeLog +++ b/sys-fs/udev-init-scripts/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/udev-init-scripts # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.8 2012/03/19 21:17:23 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.9 2012/03/20 12:35:05 ssuominen Exp $ + + 20 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> + udev-init-scripts-10.ebuild, udev-init-scripts-9999.ebuild: + Set blockers to prevent file collision wrt #405505 *udev-init-scripts-10 (19 Mar 2012) diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-10.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-10.ebuild index 68adca9f38a3..087e97e60544 100644 --- a/sys-fs/udev-init-scripts/udev-init-scripts-10.ebuild +++ b/sys-fs/udev-init-scripts/udev-init-scripts-10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-10.ebuild,v 1.1 2012/03/19 21:17:23 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-10.ebuild,v 1.2 2012/03/20 12:35:05 ssuominen Exp $ EAPI=4 @@ -22,8 +22,9 @@ if [ "${PV}" != "9999" ]; then KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86" fi -DEPEND="" -RDEPEND=">=sys-fs/udev-182 +DEPEND="!<sys-fs/udev-182" +RDEPEND="${DEPEND} + >=sys-fs/udev-182 sys-apps/openrc" src_compile() diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild index 8486d48b6520..3bf497c3e4c2 100644 --- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild +++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.3 2012/03/19 17:06:09 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.4 2012/03/20 12:35:05 ssuominen Exp $ EAPI=4 @@ -22,9 +22,9 @@ if [ "${PV}" != "9999" ]; then KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi -DEPEND="" -RDEPEND=">=sys-fs/udev-181 - !<sys-fs/udev-181 +DEPEND="!<sys-fs/udev-182" +RDEPEND="${DEPEND} + >=sys-fs/udev-182 sys-apps/openrc" src_compile() |