diff -uNr dev-python/pyside/pyside-9999.ebuild dev-python_work/pyside/pyside-9999.ebuild
--- dev-python/pyside/pyside-9999.ebuild	2017-06-17 17:36:11.000000000 +0200
+++ dev-python_work/pyside/pyside-9999.ebuild	2017-07-13 19:03:17.496095059 +0200
@@ -13,8 +13,6 @@
 	"git://code.qt.io/pyside/pyside-setup.git"
 	"https://code.qt.io/git/pyside/pyside-setup.git"
 )
-#FIXME: Switch to the clang-enabled "dev" branch once stable.
-EGIT_BRANCH="5.6"
 
 LICENSE="|| ( GPL-2+ LGPL-3 )"
 SLOT="2"
@@ -47,38 +45,48 @@
 
 # Minimum version of Qt required, derived from the CMakeLists.txt line:
 #   find_package(Qt5 ${QT_PV} REQUIRED COMPONENTS Core)
-QT_PV="5.6*:5"
+QT_PV="5.6.0:5"
 
 DEPEND="
 	${PYTHON_DEPS}
 	>=dev-python/shiboken-${PV}:${SLOT}[${PYTHON_USEDEP}]
-	=dev-qt/qtcore-${QT_PV}
-	=dev-qt/qtxml-${QT_PV}
-	concurrent? ( =dev-qt/qtconcurrent-${QT_PV} )
-	declarative? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( =dev-qt/designer-${QT_PV} )
-	gui? ( =dev-qt/qtgui-${QT_PV} )
-	help? ( =dev-qt/qthelp-${QT_PV} )
-	multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( =dev-qt/qtnetwork-${QT_PV} )
-	opengl? ( =dev-qt/qtopengl-${QT_PV} )
-	printsupport? ( =dev-qt/qtprintsupport-${QT_PV} )
-	script? ( =dev-qt/qtscript-${QT_PV} )
-	sql? ( =dev-qt/qtsql-${QT_PV} )
-	svg? ( =dev-qt/qtsvg-${QT_PV} )
-	testlib? ( =dev-qt/qttest-${QT_PV} )
-	webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
-	webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets] )
-	webkit? ( =dev-qt/qtwebkit-${QT_PV}[printsupport] )
-	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( =dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( =dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( =dev-qt/qtxmlpatterns-${QT_PV} )
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	concurrent? ( >=dev-qt/qtconcurrent-${QT_PV} )
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	gui? ( >=dev-qt/qtgui-${QT_PV} )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+	network? ( >=dev-qt/qtnetwork-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+	script? ( >=dev-qt/qtscript-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV}[printsupport] )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
+	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+	dev-qt/qtcore:=
+	"
 
 S=${WORKDIR}/${P}/sources/pyside2
 
+src_unpack() { 
+	#FIXME: Switch to the clang-enabled "dev" branch once stable.
+	has_version ">=dev-qt/qtcore-5.7.0" && EGIT_BRANCH="5.9" || EGIT_BRANCH="5.6" ;
+	
+	git-r3_src_unpack 
+}
+
 src_prepare() {
 	if use prefix; then
 		cp "${FILESDIR}"/rpath.cmake . || die
diff -uNr dev-python/pyside-tools/pyside-tools-9999.ebuild dev-python_work/pyside-tools/pyside-tools-9999.ebuild
--- dev-python/pyside-tools/pyside-tools-9999.ebuild	2017-06-12 13:54:23.000000000 +0200
+++ dev-python_work/pyside-tools/pyside-tools-9999.ebuild	2017-07-13 19:07:19.419102734 +0200
@@ -23,8 +23,6 @@
 	"git://code.qt.io/pyside/${PN}.git"
 	"https://code.qt.io/git/pyside/${PN}.git"
 )
-#FIXME: Switch to the clang-enabled "dev" branch once stable.
-EGIT_BRANCH="5.6"
 
 LICENSE="BSD GPL-2"
 SLOT="2"
@@ -39,11 +37,19 @@
 	>=dev-python/pyside-${PV}:${SLOT}[gui,widgets,${PYTHON_USEDEP}]
 	>=dev-python/shiboken-${PV}:${SLOT}[${PYTHON_USEDEP}]
 	dev-qt/qtcore:5
+	dev-qt/qtcore:=
 "
 DEPEND="${RDEPEND}
 	test? ( virtual/pkgconfig )
 "
 
+src_unpack() {
+	#FIXME: Switch to the clang-enabled "dev" branch once stable.
+	has_version ">=dev-qt/qtcore-5.7.0" && EGIT_BRANCH="5.9" || EGIT_BRANCH="5.6" ;
+	
+	git-r3_src_unpack 
+}
+
 src_prepare() {
 	cmake-utils_src_prepare
 
diff -uNr dev-python/shiboken/shiboken-9999.ebuild dev-python_work/shiboken/shiboken-9999.ebuild
--- dev-python/shiboken/shiboken-9999.ebuild	2017-06-17 17:36:11.000000000 +0200
+++ dev-python_work/shiboken/shiboken-9999.ebuild	2017-07-13 19:16:28.310120147 +0200
@@ -13,8 +13,6 @@
 	"git://code.qt.io/pyside/pyside-setup.git"
 	"https://code.qt.io/git/pyside/pyside-setup.git"
 )
-#FIXME: Switch to the clang-enabled "dev" branch once stable.
-EGIT_BRANCH="5.6"
 
 LICENSE="|| ( GPL-2+ LGPL-3 ) GPL-3"
 SLOT="2"
@@ -23,23 +21,33 @@
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Minimum version of Qt required.
-QT_PV="5.6*:5"
+QT_PV="5.6.0:5"
 
 #FIXME: Add "sys-devel/clang:*" after switching to the "dev" branch.
 DEPEND="
 	${PYTHON_DEPS}
 	dev-libs/libxml2
 	dev-libs/libxslt
-	=dev-qt/qtcore-${QT_PV}
-	=dev-qt/qtxml-${QT_PV}
-	=dev-qt/qtxmlpatterns-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	>=dev-qt/qtxmlpatterns-${QT_PV}
 "
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+	dev-qt/qtcore:=
+	"
 
 S=${WORKDIR}/${P}/sources/shiboken2
 
 DOCS=( AUTHORS )
 
+src_unpack() { 
+	#FIXME: Switch to the clang-enabled "dev" branch once stable.
+	has_version ">=dev-qt/qtcore-5.7.0" && EGIT_BRANCH="5.9" || EGIT_BRANCH="5.6" ;
+	
+	git-r3_src_unpack 
+}
+
 src_prepare() {
 	#FIXME: Uncomment after switching to the "dev" branch.
 	# sed -i -e "/^find_library(CLANG_LIBRARY/ s~/lib)$~/$(get_libdir))~" CMakeLists.txt || die