summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmadeusz Żołnowski <aidecoe@gentoo.org>2011-07-03 11:11:20 +0000
committerAmadeusz Żołnowski <aidecoe@gentoo.org>2011-07-03 11:11:20 +0000
commita53200a436a5ea398970edf7bcb2b06c47e3d9e3 (patch)
tree1217915ee60a147f2fe118d44aee9de6c554f5c0 /sys-boot/plymouth-openrc-plugin
parentAdd --disable-atomic for sh (diff)
downloadhistorical-a53200a436a5ea398970edf7bcb2b06c47e3d9e3.tar.gz
historical-a53200a436a5ea398970edf7bcb2b06c47e3d9e3.tar.bz2
historical-a53200a436a5ea398970edf7bcb2b06c47e3d9e3.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. Package-Manager: portage-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/Manifest18
-rw-r--r--sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.1.ebuild10
3 files changed, 22 insertions, 13 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/Manifest b/sys-boot/plymouth-openrc-plugin/Manifest
index c91de0b79fa5..fff14bc0f448 100644
--- a/sys-boot/plymouth-openrc-plugin/Manifest
+++ b/sys-boot/plymouth-openrc-plugin/Manifest
@@ -2,17 +2,17 @@
Hash: SHA1
DIST plymouth-openrc-plugin-0.1.1.tar.bz2 8581 RMD160 64c300ea9a34b84ac13bdd3b55758fa0094493c1 SHA1 c6b103e13503b705a1314fb07c6bc45851a598e5 SHA256 5c176703b61bd4406955ee104c478359dc8849ed7f8fca59da138232e3e1e24c
-EBUILD plymouth-openrc-plugin-0.1.1.ebuild 1032 RMD160 7e632c65f3382cf1fdd5ba7edb4318be7877ab62 SHA1 9c30cf442b006e9cd99e72ca8b83cb6abd81d291 SHA256 1b0bc10d6ef8aa6f03ae5587fe9481436c6d7d779cd79cd2ddb8c9257e8d23c7
-MISC ChangeLog 589 RMD160 588814d375847e32bbc15c6a0f583b7e55ec4586 SHA1 63dff7a27dac517da7e8db67c95b3cee524d1837 SHA256 69aea27198b92fb0bbebe33bac76c6fe1a9ec57e05209e9f7f7cc171c7516de3
+EBUILD plymouth-openrc-plugin-0.1.1.ebuild 1097 RMD160 0925d4f666f796343c94cb6fe01cc74149f6e0fc SHA1 ffce3cb44f9685104d110c310a55fc70d05ec317 SHA256 0e475628f09cc9cc7cb279a42249f7858afdd7066408e79315b4aa0081b921a6
+MISC ChangeLog 813 RMD160 570013a88dff4088833c3c412e700c6112cafa82 SHA1 ff0972029998dfce3d1599a578c338e37b2373bb SHA256 ef236b8f76b0052687177e5a645da0e30763210ac0503c20ed0949166a0a9b87
MISC metadata.xml 259 RMD160 25732f5f46f07037e04235a0330ab259cb4742fa SHA1 e67508c06c50a4893fabdc1461d9eeb8d46aa322 SHA256 63d5c505667d5ea432f92eaa44307dae03178b13c4f545e276a5d65269262d40
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQEcBAEBAgAGBQJOEDvtAAoJEPATRTHh2/q1p/IH/RVjJsjlGEajOqQDeRWSlhh+
-i1H/vSBbKkGGBvT9t6YuliED8beJiDVFQaA67c07BTbVhv2Ue/QM30C3E3rk7+BK
-4tjEt+v6LMyEBWD2GX/xK6zmJz+R40HapC8zAdcil3j/d+vmH6d3GNBiOHBjl9Wr
-Rs8TVGZe9z2zvGNLZoFja8zwphWxlpTSya/aoaU4seUs/yg8lXBnXt2g+e5b2ZDE
-XdDwzeCCqe7g9ra+bUD37Z6wHFg1bRFkwXXpknT+eHBPMSz/+JNG5xqmouFfYOBl
-2UZXQcFzPqBCk//LVpY2lOm8dGkM2/3Ycvn7XW/ndcbg9KQoIvRWazaXSck8NtY=
-=UuHj
+iQEcBAEBAgAGBQJOEE5dAAoJEPATRTHh2/q1HDMH/Axru51r2YFPZTt6GM3lhFS4
+RLfKtkwaN/xulxDPB8Uu/a2bGgKuayagn9sL1G6ruZjBXKfxP7yOutzPRb/TlobL
+JlNsdUcydt84UNeEtQHxsNh5nkjULx1yqX98zSaiWqT0CCenrZ651adAf5EHYd68
+/Bs6tQVKXBY711gEmj+gJbncoFWHYAx/hc23HMlWmJDu7A2KS1XtQN3Rr2F8HXkm
+aBq6rxEzqbVXC4K86Flap4/k9kFgCqHTQ7gOD0ykosTNvKtDRimjBd9IlF8jOGTG
+OM/2sRFqMKy4TTp3FNaQWSJAQMp7osPlXBTxS/+nO6loGloDY5nJa1KpMSa7264=
+=6oW4
-----END PGP SIGNATURE-----
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