From e331dd7a2ad7b1ddcc50fb3729c9c4a726b975a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Nizio?= Date: Tue, 30 Jan 2018 22:17:43 +0100 Subject: [PATCH] dep_rewrite: don't match avahi split dependencies --- conf/noarch/entropy/packages/packages.server.dep_rewrite | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/noarch/entropy/packages/packages.server.dep_rewrite b/conf/noarch/entropy/packages/packages.server.dep_rewrite index c611b569..cb20fd67 100644 --- a/conf/noarch/entropy/packages/packages.server.dep_rewrite +++ b/conf/noarch/entropy/packages/packages.server.dep_rewrite @@ -108,7 +108,9 @@ dev-java/icedtea (.*)sys-devel/gcc(.*) * (.*)net-dns/avahi(.*)(\[.*qt4(,.*)?\]) \1net-dns/avahi-qt\2 * (.*)net-dns/avahi(.*)(\[.*mono(,.*)?\]) \1net-dns/avahi-mono\2 # net-dns/avahi, without [...] -* (.*)net-dns/avahi([^\[\]]*$) \1net-dns/avahi-base\2 +# note: make sure not to match the split dependencies (from the metapackage) +# themselves +* (.*)net-dns/avahi(?!-base|-gtk|-gtk3|-mono|-qt)([^\[\]]*$) \1net-dns/avahi-base\2 # Fix gtk-3 deps media-video/kino (.*)x11-libs/gtk(.*) \1x11-libs/gtk\2:2