diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-03-05 19:02:26 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-03-05 19:02:26 +0000 |
| commit | 484422d424f6e6ac0d8265180985eb399843d922 (patch) | |
| tree | b133c38f194e7e8ca1dc0a0db82491484f4a1fa6 /net-misc/netifrc | |
| parent | Remove net.sh and 90-network.rules because they are now part of >=net-misc/ne... (diff) | |
| download | gentoo-2-484422d424f6e6ac0d8265180985eb399843d922.tar.gz gentoo-2-484422d424f6e6ac0d8265180985eb399843d922.tar.bz2 gentoo-2-484422d424f6e6ac0d8265180985eb399843d922.zip | |
Block <sys-fs/udev-init-scripts-26-r1 to prevent net.sh and 90-network.rules file collision.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'net-misc/netifrc')
| -rw-r--r-- | net-misc/netifrc/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/netifrc/netifrc-0.2.1.ebuild | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/net-misc/netifrc/ChangeLog b/net-misc/netifrc/ChangeLog index 2f17fb8f54f0..c9959d545bf8 100644 --- a/net-misc/netifrc/ChangeLog +++ b/net-misc/netifrc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/netifrc # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/netifrc/ChangeLog,v 1.20 2014/03/05 18:46:39 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/netifrc/ChangeLog,v 1.21 2014/03/05 19:02:26 ssuominen Exp $ + + 05 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> netifrc-0.2.1.ebuild: + Block <sys-fs/udev-init-scripts-26-r1 to prevent net.sh and 90-network.rules + file collision. 05 Mar 2014; Robin H. Johnson <robbat2@gentoo.org> netifrc-0.2.1.ebuild, netifrc-9999.ebuild: diff --git a/net-misc/netifrc/netifrc-0.2.1.ebuild b/net-misc/netifrc/netifrc-0.2.1.ebuild index e8bd486024a9..ec7186dc2e16 100644 --- a/net-misc/netifrc/netifrc-0.2.1.ebuild +++ b/net-misc/netifrc/netifrc-0.2.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/net-misc/netifrc/netifrc-0.2.1.ebuild,v 1.2 2014/03/05 18:46:39 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/netifrc/netifrc-0.2.1.ebuild,v 1.3 2014/03/05 19:02:26 ssuominen Exp $ EAPI=5 @@ -21,8 +21,11 @@ LICENSE="BSD-2" SLOT="0" IUSE="" -DEPEND="kernel_linux? ( virtual/pkgconfig )" -RDEPEND=">=sys-apps/openrc-0.12 +COMMON_DEPEND="!<sys-fs/udev-init-scripts-26-r1" +DEPEND="${COMMON_DEPEND} + kernel_linux? ( virtual/pkgconfig )" +RDEPEND="${COMMON_DEPEND} + >=sys-apps/openrc-0.12 !<sys-apps/openrc-0.12" src_prepare() { |