2011-07-15 07:32:04 +02:00
|
|
|
# Fix poppler dependencies, we provide our own split deps
|
|
|
|
|
media-gfx/pdf2svg (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2
|
|
|
|
|
kde-base/okular (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-qt4-\2
|
|
|
|
|
media-gfx/inkscape (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2
|
|
|
|
|
gnustep-libs/popplerkit (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2
|
|
|
|
|
app-text/texlive-core (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2
|
|
|
|
|
media-gfx/gimp (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2
|
|
|
|
|
net-print/cups (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2
|
|
|
|
|
app-text/calibre (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-qt4-\2
|
|
|
|
|
app-text/dvipdfmx (.*)app-text/poppler-(\d.*)(\[.*\])? \1app-text/poppler-base-\2
|
|
|
|
|
dev-tex/luatex (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2
|
|
|
|
|
app-misc/beagle (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2
|
|
|
|
|
app-misc/tracker (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2
|
|
|
|
|
app-office/krita (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-qt4-\2
|
|
|
|
|
app-office/openoffice (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2
|
|
|
|
|
app-text/evince (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2
|
|
|
|
|
kde-misc/tellico (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-qt4-\2
|
|
|
|
|
app-text/epdfview (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2
|
|
|
|
|
app-text/xpdf (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2
|
2011-11-06 16:53:56 +01:00
|
|
|
app-text/xournal app-text/poppler(\[.*\]) app-text/poppler-glib
|
2011-07-15 07:32:04 +02:00
|
|
|
media-gfx/keyjnote (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2
|
|
|
|
|
dev-games/openscenegraph (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
|
|
|
|
|
xfce-extra/tumbler (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2
|
|
|
|
|
app-office/texmaker (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
|
|
|
|
|
app-editors/gummi (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
|
2011-07-23 01:03:15 +02:00
|
|
|
app-office/calligra (.*)app-text/poppler(.*) \1app-text/poppler-base\2
|
2011-08-13 17:04:35 +02:00
|
|
|
x11-misc/qcomicbook (.*)app-text/poppler(.*) \1app-text/poppler\2
|
2011-08-13 17:05:19 +02:00
|
|
|
app-office/texmakerx (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
|
2011-07-15 07:32:04 +02:00
|
|
|
app-office/libreoffice (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2
|
|
|
|
|
app-office/impressive (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2
|
|
|
|
|
dev-python/python-poppler (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
|
|
|
|
|
sci-libs/gdal (.*)app-text/poppler(.*) \1app-text/poppler-base\2
|
2011-08-21 11:02:31 +02:00
|
|
|
dev-ruby/ruby-poppler (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
|
2011-09-01 16:11:22 +02:00
|
|
|
www-apps/dotproject (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2
|
|
|
|
|
www-apps/swish-e (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2
|
2011-09-25 22:06:44 +02:00
|
|
|
app-text/apvlv (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
|
|
|
|
|
app-text/diffpdf (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
|
|
|
|
|
app-text/pdf2djvu (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-base\2
|
|
|
|
|
app-text/pdf2oo (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-base\2
|
2011-09-25 22:09:29 +02:00
|
|
|
app-text/pdfgrep (.*)app-text/poppler(.*) \1app-text/poppler-base\2
|
2011-09-25 22:06:44 +02:00
|
|
|
app-text/zathura (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
|
2011-07-15 07:32:04 +02:00
|
|
|
|
|
|
|
|
# Fix enigmail deps, to point to our split pinentry packages
|
|
|
|
|
x11-plugins/enigmail (.*)app-crypt/pinentry(.*)\[gtk\] \1app-crypt/pinentry-gtk2\2
|
|
|
|
|
x11-plugins/enigmail (.*)app-crypt/pinentry(.*)\[qt4\] \1app-crypt/pinentry-qt4\2
|
2011-08-24 15:48:21 +02:00
|
|
|
mail-client/thunderbird (.*)app-crypt/pinentry(.*)\[gtk\] \1app-crypt/pinentry-gtk2\2
|
2011-09-07 21:37:43 +02:00
|
|
|
app-crypt/gnupg (.*)app-crypt/pinentry(.*) app-crypt/pinentry-base
|
2011-09-07 21:41:37 +02:00
|
|
|
mail-client/evolution (.*)app-crypt/pinentry(.*)(\[.*\]) \1app-crypt/pinentry-gtk2\2
|
2011-07-15 07:32:04 +02:00
|
|
|
|
|
|
|
|
# Fix virtualbox shitty dependencies
|
|
|
|
|
app-emulation/virtualbox-guest-additions#2.6.31-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#2.6.31-sabayon
|
|
|
|
|
app-emulation/virtualbox-guest-additions#2.6.32-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#2.6.32-sabayon
|
|
|
|
|
app-emulation/virtualbox-guest-additions#2.6.33-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#2.6.33-sabayon
|
|
|
|
|
app-emulation/virtualbox-guest-additions#2.6.34-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#2.6.34-sabayon
|
|
|
|
|
app-emulation/virtualbox-guest-additions#2.6.35-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#2.6.35-sabayon
|
|
|
|
|
app-emulation/virtualbox-guest-additions#2.6.36-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#2.6.36-sabayon
|
|
|
|
|
app-emulation/virtualbox-guest-additions#2.6.37-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#2.6.37-sabayon
|
|
|
|
|
app-emulation/virtualbox-guest-additions#2.6.38-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#2.6.38-sabayon
|
|
|
|
|
app-emulation/virtualbox-guest-additions#2.6.39-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#2.6.39-sabayon
|
2011-08-04 09:08:13 +02:00
|
|
|
app-emulation/virtualbox-guest-additions#3.0.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.0.0-sabayon
|
|
|
|
|
app-emulation/virtualbox-guest-additions#3.1.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.1.0-sabayon
|
|
|
|
|
app-emulation/virtualbox-guest-additions#3.2.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.2.0-sabayon
|
2011-08-25 09:42:42 +02:00
|
|
|
# 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
|
|
|
|
|
app-emulation/virtualbox-guest-additions#3.2.0-fusion (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.2.0-fusion
|
|
|
|
|
|
2011-07-15 07:32:04 +02:00
|
|
|
|
|
|
|
|
# drop virtualbox-modules dep from virtualbox-bin
|
|
|
|
|
# 2011-02-08: DISABLED because vboxusers group is required but not created by virtualbox-bin
|
|
|
|
|
# app-emulation/virtualbox-bin (.*)app-emulation/virtualbox-modules-(.*) dev-libs/glib
|
|
|
|
|
|
|
|
|
|
# Add conflict to net-im/ejabberd for ejabberd-babel
|
|
|
|
|
# net-im/ejabberd ++!net-im/ejabberd-babel<2>
|
|
|
|
|
|
|
|
|
|
# Force netbeans-ide to use our split subversion-java package
|
|
|
|
|
dev-java/netbeans-ide (.*)dev-vcs/subversion(.*):0\[java\] \1dev-vcs/subversion-java\2:0
|
|
|
|
|
|
|
|
|
|
# Drop kde-l10n* deps
|
|
|
|
|
kde-misc/customizable-weather (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
media-gfx/digikam (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
dev-util/kdevelop (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
dev-util/kdevplatform (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
net-p2p/ktorrent (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
kde-misc/konq-plugins (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
net-wireless/bluedevil (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
net-libs/libktorrent (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
kde-misc/kcm-grub2 (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
kde-misc/wacomtablet (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
media-video/kaffeine (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
kde-misc/krename (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
kde-misc/tellico (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
media-sound/kwave (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
media-video/bangarang (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
media-video/kdenlive (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
kde-misc/kcm-gtk-config (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
kde-misc/plasma-smoothtasks (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
kde-misc/plasma-mpd-nowplayin (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
kde-misc/wicd-client-kde (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
media-video/2mandvd (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
app-cdr/k9copy (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
net-misc/smb4k (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
kde-misc/synaptiks (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
kde-base/kdepim-runtime (.*)kde-base/kde-l10n(.*)
|
2011-07-25 13:27:59 +02:00
|
|
|
kde-misc/kgtk (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
kde-misc/skanlite (.*)kde-base/kde-l10n(.*)
|
2011-08-03 21:14:39 +02:00
|
|
|
media-plugins/kipi-plugins (.*)kde-base/kde-l10n(.*)
|
2011-08-08 12:13:34 +02:00
|
|
|
kde-misc/krusader (.*)kde-base/kde-l10n(.*)
|
2011-07-15 07:32:04 +02:00
|
|
|
dev-util/kdevelop-php-docs (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
games-board/knights (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
kde-misc/kshutdown (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
kde-misc/plasma-mpd-nowplaying (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
media-sound/kid3 (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
media-video/loopy (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
x11-themes/nitrogen (.*)kde-base/kde-l10n(.*)
|
2011-08-12 09:11:31 +02:00
|
|
|
media-sound/amarok (.*)kde-base/kde-l10n(.*)
|
2011-08-15 12:58:11 +02:00
|
|
|
net-nntp/kwooty (.*)kde-base/kde-l10n(.*)
|
2011-08-21 10:59:48 +02:00
|
|
|
app-office/skrooge (.*)kde-base/kde-l10n(.*)
|
|
|
|
|
app-office/kmymoney (.*)kde-base/kde-l10n(.*)
|
2011-09-07 10:09:07 +02:00
|
|
|
kde-misc/kdesudo (.*)kde-base/kde-l10n(.*)
|
2011-09-09 13:11:43 +02:00
|
|
|
dev-vcs/kdesvn (.*)kde-base/kde-l10n(.*)
|
2011-09-10 09:42:03 +02:00
|
|
|
media-video/kplayer (.*)kde-base/kde-l10n(.*)
|
2011-09-22 20:12:14 +02:00
|
|
|
kde-misc/yawp (.*)kde-base/kde-l10n(.*)
|
2011-10-18 22:20:10 +02:00
|
|
|
app-cdr/k3b (.*)kde-base/kde-l10n(.*)
|
2011-10-26 12:00:13 +02:00
|
|
|
net-misc/knemo (.*)kde-base/kde-l10n(.*)
|
2011-11-01 12:06:02 +01:00
|
|
|
net-im/choqok (.*)kde-base/kde-l10n(.*)
|
2011-11-01 13:08:17 +01:00
|
|
|
media-video/kmplayer (.*)kde-base/kde-l10n(.*)
|
2011-11-02 14:02:30 +01:00
|
|
|
sci-calculators/keurocalc (.*)kde-base/kde-l10n(.*)
|
2011-07-15 07:32:04 +02:00
|
|
|
|
|
|
|
|
# net-dns/avahi dep rewrites
|
|
|
|
|
app-crypt/seahorse (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
app-emulation/libvirt (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
dev-db/desktopcouch (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
dev-python/kaa-base (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
gnome-base/gnome-vfs:2 (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
gnome-base/gvfs:0 (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
gnustep-base/gnustep-base (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
kde-base/kdelibs (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
kde-base/krdc (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
media-gfx/sane-backends (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
media-libs/libgphoto2 (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
media-plugins/gmpc-avahi (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
media-sound/ario (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
media-sound/mpd (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
media-sound/mt-daapd (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
media-sound/mumble (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
media-sound/pulseaudio (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
media-sound/xmms2 (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
media-video/vlc (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
media-tv/xbmc (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
net-fs/samba (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
net-im/pidgin (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
2011-07-19 21:55:49 +02:00
|
|
|
net-libs/libepc (.*)net-dns/avahi(.*)(\[.*\]) \1net-dns/avahi-gtk3\2
|
2011-07-15 07:32:04 +02:00
|
|
|
net-libs/obby (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
net-misc/networkmanager (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
net-misc/remmina (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
net-misc/vino (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
net-voip/ekiga (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
net-voip/telepathy-salut (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
sys-auth/nss-mdns (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
sys-fs/owfs (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
www-apache/mod_dnssd (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
www-client/epiphany (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
x11-misc/service-discovery-applet (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
|
|
|
|
x11-misc/x11vnc (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
|
2011-07-16 23:21:51 +02:00
|
|
|
|
|
|
|
|
# Fix gtk-3 deps
|
2011-07-16 23:47:09 +02:00
|
|
|
media-video/kino (.*)x11-libs/gtk(.*) \1x11-libs/gtk\2:2
|
2011-07-20 11:02:25 +02:00
|
|
|
|
|
|
|
|
# gnome-session-3.0.2 should pull in notification-daemon or it won't start
|
|
|
|
|
>=gnome-base/gnome-session-3.0 ++>=x11-misc/notification-daemon-0.7.1<2>
|
