Merge updates from master

This commit is contained in:
Repository QA checks
2015-08-15 16:57:42 -04:00
@@ -51,3 +51,26 @@ sys-auth/polkit-kde-agent minimal
# Required by app-office/libreoffice
media-libs/phonon designer
# Fix REQUIRED_USE conflicts: qt5? ( !qt4 )
>=app-office/texmaker-4.4.1 -qt4
>=app-office/texstudio-2.9.4 -qt4
app-text/qpdfview -qt4
dev-db/sqlitebrowser -qt4
>=dev-games/openscenegraph-3.2.1-r1 -qt4
>=dev-libs/qcustomplot-1.3.0 -qt4
>=dev-libs/quazip-0.7.1 -qt4
>=kde-misc/kdiff3-0.9.98-r1 -kde -qt4
>=media-libs/opencv-3.0.0 -qt4
>=media-video/smplayer-14.9.0.6690 -qt4
media-video/vlc -qt4
net-misc/owncloud-client -qt4
net-news/rssguard -qt4
>=net-news/quiterss-0.17.7 -qt4
net-p2p/bitcoin-qt -qt4
>=net-p2p/qbittorrent-3.2.0 -qt4
>=sci-geosciences/qlandkartegt-1.8.0 -qt4
sci-visualization/kst -qt4
www-client/qupzilla -kde -qt4
>=x11-libs/qtermwidget-0.6.0 -qt4
>=x11-terms/qterminal-0.6.0 -qt4