From 43b99f237ccf6009466cce8bf207dbd5555c8f1e Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 30 Nov 2014 14:27:02 +0000 Subject: [PATCH] [noarch/entropy] drop bogus libgcrypt conflict from 1.5 --- conf/noarch/entropy/packages/packages.server.dep_rewrite | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/noarch/entropy/packages/packages.server.dep_rewrite b/conf/noarch/entropy/packages/packages.server.dep_rewrite index 0676ff84..910960cd 100644 --- a/conf/noarch/entropy/packages/packages.server.dep_rewrite +++ b/conf/noarch/entropy/packages/packages.server.dep_rewrite @@ -164,6 +164,8 @@ x11-libs/xvba-video (.*)x11-drivers/ati-drivers(.*) \1x11-drivers/ati-userspace\ # Ensure a smooth migration from libgcrypt-1.5 to 1.6 =dev-libs/libgcrypt-1.6* ++dev-libs/libgcrypt:11<2> +# Drop bogus libgcrypt conflict from 1.5* +=dev-libs/libgcrypt-1.5* (.*)dev-libs/libgcrypt(.*) # Drop VCS dependencies for app-portage/layman (related to bug 4822) # keep it aligned with USE flags