From 1774026791ad7c29365b346796d3dc41033f6027 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 28 May 2012 18:24:40 +0200 Subject: [PATCH] [noarch/entropy] add dep_rewrites for sys-fs/zfs --- .../entropy/packages/packages.server.dep_rewrite | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/conf/noarch/entropy/packages/packages.server.dep_rewrite b/conf/noarch/entropy/packages/packages.server.dep_rewrite index 8882400..a65a6d1 100644 --- a/conf/noarch/entropy/packages/packages.server.dep_rewrite +++ b/conf/noarch/entropy/packages/packages.server.dep_rewrite @@ -70,7 +70,6 @@ app-emulation/virtualbox-guest-additions#3.4.0-sabayon (.*)x11-drivers/xf86-vide app-emulation/virtualbox-guest-additions#3.5.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.5.0-sabayon app-emulation/virtualbox-guest-additions#3.6.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.6.0-sabayon - # Fix virtualbox shitty dependencies, fusion sources app-emulation/virtualbox-guest-additions#3.0.0-fusion (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.0.0-fusion app-emulation/virtualbox-guest-additions#3.1.0-fusion (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.1.0-fusion @@ -80,6 +79,20 @@ app-emulation/virtualbox-guest-additions#3.4.0-fusion (.*)x11-drivers/xf86-video app-emulation/virtualbox-guest-additions#3.5.0-fusion (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.5.0-fusion app-emulation/virtualbox-guest-additions#3.6.0-fusion (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.6.0-fusion +# Fix sys-fs/zfs dependency against sys-kernel/spl +sys-fs/zfs#3.2.0-sabayon (.*)sys-kernel/spl(.*) \1sys-kernel/spl\2#3.2.0-sabayon +sys-fs/zfs#3.3.0-sabayon (.*)sys-kernel/spl(.*) \1sys-kernel/spl\2#3.3.0-sabayon +sys-fs/zfs#3.4.0-sabayon (.*)sys-kernel/spl(.*) \1sys-kernel/spl\2#3.4.0-sabayon +sys-fs/zfs#3.5.0-sabayon (.*)sys-kernel/spl(.*) \1sys-kernel/spl\2#3.5.0-sabayon +sys-fs/zfs#3.6.0-sabayon (.*)sys-kernel/spl(.*) \1sys-kernel/spl\2#3.6.0-sabayon +sys-fs/zfs#3.7.0-sabayon (.*)sys-kernel/spl(.*) \1sys-kernel/spl\2#3.7.0-sabayon +sys-fs/zfs#3.2.0-server (.*)sys-kernel/spl(.*) \1sys-kernel/spl\2#3.2.0-server +sys-fs/zfs#3.3.0-server (.*)sys-kernel/spl(.*) \1sys-kernel/spl\2#3.3.0-server +sys-fs/zfs#3.4.0-server (.*)sys-kernel/spl(.*) \1sys-kernel/spl\2#3.4.0-server +sys-fs/zfs#3.5.0-server (.*)sys-kernel/spl(.*) \1sys-kernel/spl\2#3.5.0-server +sys-fs/zfs#3.6.0-server (.*)sys-kernel/spl(.*) \1sys-kernel/spl\2#3.6.0-server +sys-fs/zfs#3.7.0-server (.*)sys-kernel/spl(.*) \1sys-kernel/spl\2#3.7.0-server + # drop virtualbox-modules dep from virtualbox-bin # 2011-02-08: DISABLED because vboxusers group is required but not created by virtualbox-bin