summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmadeusz Piotr Żołnowski <aidecoe@gentoo.org>2011-07-03 11:11:20 +0000
committerAmadeusz Piotr Żołnowski <aidecoe@gentoo.org>2011-07-03 11:11:20 +0000
commite0dbcfe9a22a7167d689f414d7ba4daa52279ebc (patch)
treeaf8a8605868461e25dfc17c07d4fc203dd866e44 /sys-boot/plymouth-openrc-plugin
parentAdd --disable-atomic for sh (diff)
downloadgentoo-2-e0dbcfe9a22a7167d689f414d7ba4daa52279ebc.tar.gz
gentoo-2-e0dbcfe9a22a7167d689f414d7ba4daa52279ebc.tar.bz2
gentoo-2-e0dbcfe9a22a7167d689f414d7ba4daa52279ebc.zip
sys-boot/plymouth-openrc-plugin-0.1.1: block old plymouth, depend on new
Block <sys-boot/plymouth-0.8.3-r5 because of conflicting file /lib/rc/plugins/plymouth.so and depend on 0.8.3-r5 or above. (Portage version: 2.1.10.3/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot/plymouth-openrc-plugin')
-rw-r--r--sys-boot/plymouth-openrc-plugin/ChangeLog7
-rw-r--r--sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.1.ebuild10
2 files changed, 13 insertions, 4 deletions
diff --git a/sys-boot/plymouth-openrc-plugin/ChangeLog b/sys-boot/plymouth-openrc-plugin/ChangeLog
index e4b3563e13ff..10328e956079 100644
--- a/sys-boot/plymouth-openrc-plugin/ChangeLog
+++ b/sys-boot/plymouth-openrc-plugin/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-boot/plymouth-openrc-plugin
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth-openrc-plugin/ChangeLog,v 1.1 2011/07/03 09:52:40 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth-openrc-plugin/ChangeLog,v 1.2 2011/07/03 11:11:20 aidecoe Exp $
+
+ 03 Jul 2011; Amadeusz Żołnowski <aidecoe@gentoo.org>
+ plymouth-openrc-plugin-0.1.1.ebuild:
+ Block <sys-boot/plymouth-0.8.3-r5 because of conflicting file
+ /lib/rc/plugins/plymouth.so and depend on 0.8.3-r5 or above.
*plymouth-openrc-plugin-0.1.1 (03 Jul 2011)
diff --git a/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.1.ebuild b/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.1.ebuild
index 1979ee42ec00..b688988c0f57 100644
--- a/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.1.ebuild
+++ b/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.1.ebuild,v 1.1 2011/07/03 09:52:40 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.1.ebuild,v 1.2 2011/07/03 11:11:20 aidecoe Exp $
EAPI=4
@@ -14,8 +14,12 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND=">=sys-apps/openrc-0.8.2-r1"
-RDEPEND="${DEPEND}"
+DEPEND=">=sys-apps/openrc-0.8.2-r1
+ !!<sys-boot/plymouth-0.8.3-r5
+ "
+RDEPEND="${DEPEND}
+ >=sys-boot/plymouth-0.8.3-r5
+ "
pkg_pretend() {
if [[ ! -w /run ]]; then