ssuominen 14/04/02 20:29:21
Modified: udev-init-scripts-9999.ebuild
udev-init-scripts-26-r1.ebuild
udev-init-scripts-26.ebuild ChangeLog
Log:
Make virtual/udev also a DEPEND to fix race with emerge order wrt #503174 by
Jack Suter. Thanks to Jorge Manuel B. S. Vicetto and Magnus Granberg for
tracking this down.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key
4868F14D)
Revision Changes Path
1.25 sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild?rev=1.25&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild?rev=1.25&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild?r1=1.24&r2=1.25
Index: udev-init-scripts-9999.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- udev-init-scripts-9999.ebuild 28 Mar 2014 18:57:01 -0000 1.24
+++ udev-init-scripts-9999.ebuild 2 Apr 2014 20:29:21 -0000 1.25
@@ -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-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v
1.24 2014/03/28 18:57:01 axs Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v
1.25 2014/04/02 20:29:21 ssuominen Exp $
EAPI=5
@@ -27,6 +27,7 @@
RDEPEND=">=virtual/udev-180
!<sys-fs/udev-186"
+DEPEND="${RDEPEND}"
src_prepare()
{
1.3 sys-fs/udev-init-scripts/udev-init-scripts-26-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26-r1.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26-r1.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26-r1.ebuild?r1=1.2&r2=1.3
Index: udev-init-scripts-26-r1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- udev-init-scripts-26-r1.ebuild 28 Mar 2014 18:57:01 -0000 1.2
+++ udev-init-scripts-26-r1.ebuild 2 Apr 2014 20:29:21 -0000 1.3
@@ -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-fs/udev-init-scripts/udev-init-scripts-26-r1.ebuild,v
1.2 2014/03/28 18:57:01 axs Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26-r1.ebuild,v
1.3 2014/04/02 20:29:21 ssuominen Exp $
EAPI=5
@@ -25,9 +25,10 @@
RESTRICT="test"
-DEPEND="virtual/pkgconfig"
RDEPEND=">=virtual/udev-180
!<sys-fs/udev-186"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
src_prepare()
{
1.18 sys-fs/udev-init-scripts/udev-init-scripts-26.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26.ebuild?rev=1.18&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26.ebuild?rev=1.18&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26.ebuild?r1=1.17&r2=1.18
Index: udev-init-scripts-26.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- udev-init-scripts-26.ebuild 28 Mar 2014 18:57:01 -0000 1.17
+++ udev-init-scripts-26.ebuild 2 Apr 2014 20:29:21 -0000 1.18
@@ -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-fs/udev-init-scripts/udev-init-scripts-26.ebuild,v
1.17 2014/03/28 18:57:01 axs Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26.ebuild,v
1.18 2014/04/02 20:29:21 ssuominen Exp $
EAPI=5
@@ -26,12 +26,11 @@
RESTRICT="test"
# net.sh and 90-network.rules are part of >=net-misc/netifrc-0.2.1:
-COMMON_DEPEND="!>=net-misc/netifrc-0.2.1"
-DEPEND="${COMMON_DEPEND}
+RDEPEND=">=virtual/udev-180
+ !<sys-fs/udev-186
+ !>=net-misc/netifrc-0.2.1"
+DEPEND="${RDEPEND}
virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
- >=virtual/udev-180
- !<sys-fs/udev-186"
src_prepare()
{
1.90 sys-fs/udev-init-scripts/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog?rev=1.90&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog?rev=1.90&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog?r1=1.89&r2=1.90
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- ChangeLog 28 Mar 2014 18:57:01 -0000 1.89
+++ ChangeLog 2 Apr 2014 20:29:21 -0000 1.90
@@ -1,6 +1,13 @@
# ChangeLog for sys-fs/udev-init-scripts
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.89
2014/03/28 18:57:01 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.90
2014/04/02 20:29:21 ssuominen Exp $
+
+ 02 Apr 2014; Samuli Suominen <[email protected]>
+ udev-init-scripts-26-r1.ebuild, udev-init-scripts-26.ebuild,
+ udev-init-scripts-9999.ebuild:
+ Make virtual/udev also a DEPEND to fix race with emerge order wrt #503174 by
+ Jack Suter. Thanks to Jorge Manuel B. S. Vicetto and Magnus Granberg for
+ tracking this down.
28 Mar 2014; Ian Stakenvicius (_AxS_) <[email protected]>
udev-init-scripts-26-r1.ebuild, udev-init-scripts-26.ebuild,