sablink/build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Nove to new layout

Browse Source
This commit is contained in:
Mario Fetka
2014-11-02 09:42:47 +01:00
parent 68d6318910
commit 250a08b5dd
124 changed files with 5211 additions and 1623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

252
conf/noarch/entropy/packages/packages.server.dep_rewrite
View File

@@ -1,52 +1,66 @@
# 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
app-text/xournal app-text/poppler(\[.*\]) app-text/poppler-glib
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
app-leechcraft/lc-monocle (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
app-misc/beagle (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2
app-misc/pdfpc (.*)app-text/poppler(.*) app-text/poppler-glib
app-misc/recoll (.*)app-text/poppler(.*) \1app-text/poppler-base\2
app-misc/tracker (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
app-office/calligra (.*)app-text/poppler(.*) \1app-text/poppler-base\2
x11-misc/qcomicbook (.*)app-text/poppler(.*) \1app-text/poppler\2
app-office/impressive (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2
app-office/krita (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
app-office/libreoffice (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2
app-office/openoffice (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2
app-office/texmaker (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
app-office/texmakerx (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
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
dev-ruby/ruby-poppler (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
www-apps/dotproject (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2
www-apps/swish-e (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2
app-office/texstudio (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
app-text/apvlv (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
app-text/atril (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-glib\2
app-text/calibre (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\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/dvipdfmx (.*)app-text/poppler(\d.*)(\[.*\])? \1app-text/poppler-base\2
app-text/epdfview (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
app-text/evince (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2
app-text/kbibtex (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
app-text/mate-document-viewer (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
app-text/pdf2djvu (.*)app-text/poppler(.*) \1app-text/poppler-base\2
app-text/pdf2oo (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-base\2
app-text/pdfgrep (.*)app-text/poppler(.*) \1app-text/poppler-base\2
app-text/zathura-pdf-poppler (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
dev-tex/pstplus (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
app-text/kbibtex (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
app-misc/recoll (.*)app-text/poppler(.*) \1app-text/poppler-base\2
gnome-extra/gnome-commander (.*)app-text/poppler(.*) \1app-text/poppler-base\2
dev-python/python-poppler-qt4 (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
app-text/mate-document-viewer (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2
app-text/qpdfview (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
app-text/leechcraft-monocle (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
app-text/referencer (.*)app-text/poppler(.*) app-text/poppler-glib
app-text/texlive-core (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2
app-text/xournal app-text/poppler(\[.*\]) app-text/poppler-glib
app-text/xpdf (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2
app-text/zathura-pdf-poppler (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
dev-games/openscenegraph (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
dev-python/python-poppler (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
dev-python/python-poppler-qt4 (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
dev-ruby/ruby-poppler (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
dev-tex/luatex (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2
dev-tex/pstplus (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
gnome-extra/gnome-commander (.*)app-text/poppler(.*) \1app-text/poppler-base\2
gnustep-libs/popplerkit (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2
kde-base/kfilemetadata (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
kde-base/nepomuk-core (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
kde-base/okular (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
kde-misc/tellico (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
mail-client/claws-mail (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-glib\2
media-gfx/gimp (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
media-gfx/graphviz (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-glib\2
media-gfx/inkscape (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
media-gfx/keyjnote (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2
media-gfx/pdf2svg (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
net-print/cups (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2
net-print/cups-filters (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2
sci-libs/gdal (.*)app-text/poppler(.*) \1app-text/poppler-base\2
www-apps/dotproject (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2
www-apps/swish-e (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2
x11-misc/qcomicbook (.*)app-text/poppler(.*) \1app-text/poppler\2
xfce-extra/tumbler (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
# lightdm split rewrite
razorqt-base/razorqt-lightdm-greeter (.*)x11-misc/lightdm(.*)\[qt4\] \1x11-misc/lightdm-qt4\2
x11-misc/lightdm-gtk-greeter (.*)x11-misc/lightdm(.*) \1x11-misc/lightdm-base\2
x11-misc/lightdm-kde (.*)x11-misc/lightdm(.*)\[qt4\] \1x11-misc/lightdm-qt4\2
# Fix enigmail deps, to point to our split pinentry packages
x11-plugins/enigmail (.*)app-crypt/pinentry(.*)\[gtk\] \1app-crypt/pinentry-gtk2\2
@@ -72,15 +86,19 @@ app-emulation/virtualbox-guest-additions#3.3.0-sabayon (.*)x11-drivers/xf86-vide
app-emulation/virtualbox-guest-additions#3.4.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.4.0-sabayon
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
app-emulation/virtualbox-guest-additions#3.2.0-fusion (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.2.0-fusion
app-emulation/virtualbox-guest-additions#3.3.0-fusion (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.3.0-fusion
app-emulation/virtualbox-guest-additions#3.4.0-fusion (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.4.0-fusion
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
app-emulation/virtualbox-guest-additions#3.7.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.7.0-sabayon
app-emulation/virtualbox-guest-additions#3.8.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.8.0-sabayon
app-emulation/virtualbox-guest-additions#3.9.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.9.0-sabayon
app-emulation/virtualbox-guest-additions#3.10.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.10.0-sabayon
app-emulation/virtualbox-guest-additions#3.11.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.11.0-sabayon
app-emulation/virtualbox-guest-additions#3.12.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.12.0-sabayon
app-emulation/virtualbox-guest-additions#3.13.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.13.0-sabayon
app-emulation/virtualbox-guest-additions#3.14.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.14.0-sabayon
app-emulation/virtualbox-guest-additions#3.15.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.15.0-sabayon
app-emulation/virtualbox-guest-additions#3.16.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.16.0-sabayon
app-emulation/virtualbox-guest-additions#3.17.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.17.0-sabayon
app-emulation/virtualbox-guest-additions#3.18.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.18.0-sabayon
app-emulation/virtualbox-guest-additions#3.19.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.19.0-sabayon
# drop virtualbox-modules dep from virtualbox-bin
# 2011-02-08: DISABLED because vboxusers group is required but not created by virtualbox-bin
@@ -92,104 +110,8 @@ app-emulation/virtualbox-guest-additions#3.6.0-fusion (.*)x11-drivers/xf86-video
# 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/smooth-tasks (.*)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(.*)
kde-misc/kgtk (.*)kde-base/kde-l10n(.*)
kde-misc/skanlite (.*)kde-base/kde-l10n(.*)
media-plugins/kipi-plugins (.*)kde-base/kde-l10n(.*)
kde-misc/krusader (.*)kde-base/kde-l10n(.*)
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(.*)
media-sound/amarok (.*)kde-base/kde-l10n(.*)
net-nntp/kwooty (.*)kde-base/kde-l10n(.*)
app-office/skrooge (.*)kde-base/kde-l10n(.*)
app-office/kmymoney (.*)kde-base/kde-l10n(.*)
kde-misc/kdesudo (.*)kde-base/kde-l10n(.*)
dev-vcs/kdesvn (.*)kde-base/kde-l10n(.*)
media-video/kplayer (.*)kde-base/kde-l10n(.*)
kde-misc/yawp (.*)kde-base/kde-l10n(.*)
app-cdr/k3b (.*)kde-base/kde-l10n(.*)
net-misc/knemo (.*)kde-base/kde-l10n(.*)
net-im/choqok (.*)kde-base/kde-l10n(.*)
media-video/kmplayer (.*)kde-base/kde-l10n(.*)
sci-calculators/keurocalc (.*)kde-base/kde-l10n(.*)
media-sound/kradio (.*)kde-base/kde-l10n(.*)
kde-misc/networkmanagement (.*)kde-base/kde-l10n(.*)
kde-misc/eventlist (.*)kde-base/kde-l10n(.*)
net-irc/konversation (.*)kde-base/kde-l10n(.*)
net-wireless/bluedevil (.*)kde-base/kde-l10n(.*)
kde-misc/fancytasks (.*)kde-base/kde-l10n(.*)
app-cdr/kcdemu (.*)kde-base/kde-l10n(.*)
kde-misc/krecipes (.*)kde-base/kde-l10n(.*)
kde-misc/kio-locate (.*)kde-base/kde-l10n(.*)
kde-misc/kio_gopher (.*)kde-base/kde-l10n(.*)
kde-misc/quickaccess (.*)kde-base/kde-l10n(.*)
kde-misc/steamcompanion (.*)kde-base/kde-l10n(.*)
kde-misc/serverstatuswidget (.*)kde-base/kde-l10n(.*)
media-sound/soundkonverter (.*)kde-base/kde-l10n(.*)
sci-mathematics/rkward (.*)kde-base/kde-l10n(.*)
media-gfx/kpovmodeler (.*)kde-base/kde-l10n(.*)
dev-util/kdevelop-php (.*)kde-base/kde-l10n(.*)
net-im/ktp-accounts-kcm (.*)kde-base/kde-l10n(.*)
net-im/ktp-approver (.*)kde-base/kde-l10n(.*)
net-im/ktp-auth-handler (.*)kde-base/kde-l10n(.*)
net-im/ktp-common-internals (.*)kde-base/kde-l10n(.*)
net-im/ktp-contact-applet (.*)kde-base/kde-l10n(.*)
net-im/ktp-contact-list (.*)kde-base/kde-l10n(.*)
net-im/ktp-filetransfer-handler (.*)kde-base/kde-l10n(.*)
net-im/ktp-kded-module (.*)kde-base/kde-l10n(.*)
net-im/ktp-presence-applet (.*)kde-base/kde-l10n(.*)
net-im/ktp-send-file (.*)kde-base/kde-l10n(.*)
net-im/ktp-text-ui (.*)kde-base/kde-l10n(.*)
www-client/rekonq (.*)kde-base/kde-l10n(.*)
app-portage/kportagetray (.*)kde-base/kde-l10n(.*)
kde-misc/takeoff (.*)kde-base/kde-l10n(.*)
kde-misc/kde-gtk-config (.*)kde-base/kde-l10n(.*)
app-backup/kbackup (.*)kde-base/kde-l10n(.*)
kde-misc/colibri (.*)kde-base/kde-l10n(.*)
kde-misc/rsibreak (.*)kde-base/kde-l10n(.*)
media-gfx/kcoloredit (.*)kde-base/kde-l10n(.*)
media-gfx/kfax (.*)kde-base/kde-l10n(.*)
media-gfx/kgraphviewer (.*)kde-base/kde-l10n(.*)
media-gfx/kiconedit (.*)kde-base/kde-l10n(.*)
media-gfx/kphotoalbum (.*)kde-base/kde-l10n(.*)
media-sound/audex (.*)kde-base/kde-l10n(.*)
kde-misc/plasma-applet-daisy (.*)kde-base/kde-l10n(.*)
kde-misc/miniplayer (.*)kde-base/kde-l10n(.*)
media-video/kamerka (.*)kde-base/kde-l10n(.*)
media-sound/kaudiocreator (.*)kde-base/kde-l10n(.*)
net-im/ktp-contact-runner (.*)kde-base/kde-l10n(.*)
kde-misc/yakuake (.*)kde-base/kde-l10n(.*)
media-gfx/kuickshow (.*)kde-base/kde-l10n(.*)
# Drop kde-l10n* deps, always
* (.*)kde-base/kde-l10n(.*)
# Drop x11-libs/cairo PDEPEND from dev-libs/gobject-introspection
# cairo pulls in mesa (through virtual/opengl) and this is very
@@ -229,6 +151,7 @@ net-misc/networkmanager (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
net-misc/remmina (.*)net-dns/avahi(.*)(\[.*\]) \1net-dns/avahi-gtk3\2
net-misc/vino (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
net-print/cups (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
net-print/cups-filters (.*)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
sci-physics/root (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
@@ -244,6 +167,8 @@ net-ftp/qshare (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
net-fs/netatalk (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
gnome-base/libgdu (.*)net-dns/avahi(.*)(\[.*\]) \1net-dns/avahi-gtk3\2
media-video/miro (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
kde-misc/kdeconnect (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
media-tv/tvheadend (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2
# Fix gtk-3 deps
media-video/kino (.*)x11-libs/gtk(.*) \1x11-libs/gtk\2:2
@@ -251,15 +176,40 @@ media-video/kino (.*)x11-libs/gtk(.*) \1x11-libs/gtk\2:2
# 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>
# We provide media-video/libav and we want systems to have it pulled in
virtual/ffmpeg (.*)media-video/ffmpeg(.*) \1media-video/libav\2
# pygobject-cairo rewrite, simple catch-all rewrite
# this might not catch all the strings
* (.*)dev-python/pygobject(.*)\[cairo\] \1dev-python/pygobject-cairo\2
* (.*)dev-python/pygobject(.*)\[cairo(.*)\] \1dev-python/pygobject-cairo\2
# Rewrite almost every standard dev-python/pygobject dependency
* (.*)dev-python/pygobject(?!.*-base.*)(?!.*-cairo.*)((?=-[0-9]\.)?)(?!.*-2\*)(?!.*:2)((.*:3)?)(?!.*\[.*cairo.*\].*) \1dev-python/pygobject-base\2\3
# ati-drivers, nvidia-drivers rewrites
virtual/opencl (.*)x11-drivers/ati-drivers(.*) \1x11-drivers/ati-userspace\2
virtual/opencl (.*)x11-drivers/nvidia-drivers(.*) \1x11-drivers/nvidia-userspace\2
dev-util/nvidia-cuda-sdk (.*)x11-drivers/nvidia-drivers(.*) \1x11-drivers/nvidia-userspace\2
dev-python/pycuda (.*)x11-drivers/nvidia-drivers(.*) \1x11-drivers/nvidia-userspace\2
# Drop dracut dependency from plymouth, not needed atm
sys-boot/plymouth (.*)sys-kernel/dracut(.*)
# drop PyQt4 dependency from pyudev, let runtime stuff deal with it
dev-python/pyudev (.*)dev-python/PyQt4(.*)
# Steam, don't pull in gcc directly
games-util/steam-launcher (.*)sys-devel/gcc-(.*) \1sys-devel/base-gcc-\2
games-util/steam-client-meta (.*)sys-devel/gcc-(.*) \1sys-devel/base-gcc-\2
# Add conflict to systemd-sysv-utils for eselect-init
sys-apps/systemd-sysv-utils ++!app-admin/eselect-init<2>
# Replace x11-drivers/ati-drivers with ati-userspace from xvba-video
x11-libs/xvba-video (.*)x11-drivers/ati-drivers(.*) \1x11-drivers/ati-userspace\2
# Ensure a smooth migration from libgcrypt-1.5 to 1.6
=dev-libs/libgcrypt-1.6* ++dev-libs/libgcrypt:11<2>
# Drop VCS dependencies for app-portage/layman (related to bug 4822)
# keep it aligned with USE flags
app-portage/layman (.*)dev-vcs/bzr(.*)
app-portage/layman (.*)dev-vcs/git(.*)
app-portage/layman (.*)dev-vcs/mercurial(.*)
app-portage/layman (.*)dev-vcs/subversion(.*)