mgorny 14/11/18 19:25:39
Modified: gentoo-systemd-integration-9999.ebuild
gentoo-systemd-integration-4.ebuild ChangeLog
Log:
Add blockers on eudev & udev due to file collisions.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
EFB4464E!)
Revision Changes Path
1.9
sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild?rev=1.9&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild?rev=1.9&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild?r1=1.8&r2=1.9
Index: gentoo-systemd-integration-9999.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gentoo-systemd-integration-9999.ebuild 6 Jul 2014 13:23:06 -0000
1.8
+++ gentoo-systemd-integration-9999.ebuild 18 Nov 2014 19:25:39 -0000
1.9
@@ -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/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild,v
1.8 2014/07/06 13:23:06 mgorny Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild,v
1.9 2014/11/18 19:25:39 mgorny Exp $
EAPI=5
@@ -21,9 +21,9 @@
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
-DEPEND="!sys-fs/udev"
-RDEPEND="${DEPEND}
- >=sys-apps/systemd-207"
+RDEPEND=">=sys-apps/systemd-207
+ !sys-fs/eudev
+ !sys-fs/udev"
#if LIVE
SRC_URI=
1.10
sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild?rev=1.10&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild?rev=1.10&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild?r1=1.9&r2=1.10
Index: gentoo-systemd-integration-4.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gentoo-systemd-integration-4.ebuild 20 Aug 2014 12:24:38 -0000 1.9
+++ gentoo-systemd-integration-4.ebuild 18 Nov 2014 19:25:39 -0000 1.10
@@ -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/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild,v
1.9 2014/08/20 12:24:38 armin76 Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild,v
1.10 2014/11/18 19:25:39 mgorny Exp $
EAPI=5
@@ -15,9 +15,9 @@
KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sparc x86"
IUSE=""
-DEPEND="!sys-fs/udev"
-RDEPEND="${DEPEND}
- >=sys-apps/systemd-207"
+RDEPEND=">=sys-apps/systemd-207
+ !sys-fs/eudev
+ !sys-fs/udev"
src_configure() {
local myeconfargs=(
1.31 sys-apps/gentoo-systemd-integration/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/gentoo-systemd-integration/ChangeLog?rev=1.31&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/gentoo-systemd-integration/ChangeLog?rev=1.31&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/gentoo-systemd-integration/ChangeLog?r1=1.30&r2=1.31
Index: ChangeLog
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ChangeLog 20 Aug 2014 12:24:38 -0000 1.30
+++ ChangeLog 18 Nov 2014 19:25:39 -0000 1.31
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/gentoo-systemd-integration
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header:
/var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/ChangeLog,v 1.30
2014/08/20 12:24:38 armin76 Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/ChangeLog,v 1.31
2014/11/18 19:25:39 mgorny Exp $
+
+ 18 Nov 2014; Michał Górny <[email protected]>
+ gentoo-systemd-integration-4.ebuild, gentoo-systemd-integration-9999.ebuild:
+ Add blockers on eudev & udev due to file collisions.
20 Aug 2014; Raúl Porcel <[email protected]>
gentoo-systemd-integration-4.ebuild:
