diff --git a/dev-qt/assistant/assistant-5.5.1.ebuild b/dev-qt/assistant/assistant-5.5.1-r1.ebuild
similarity index 70%
rename from dev-qt/assistant/assistant-5.5.1.ebuild
rename to dev-qt/assistant/assistant-5.5.1-r1.ebuild
index da3f3e978fbdb..7505c992a44f9 100644
--- a/dev-qt/assistant/assistant-5.5.1.ebuild
+++ b/dev-qt/assistant/assistant-5.5.1-r1.ebuild
@@ -15,14 +15,14 @@ fi
 IUSE="webkit"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5
-	>=dev-qt/qthelp-${PV}:5
-	>=dev-qt/qtnetwork-${PV}:5
-	>=dev-qt/qtprintsupport-${PV}:5
-	>=dev-qt/qtsql-${PV}:5[sqlite]
-	>=dev-qt/qtwidgets-${PV}:5
-	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qthelp-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtprintsupport-${PV}
+	~dev-qt/qtsql-${PV}[sqlite]
+	~dev-qt/qtwidgets-${PV}
+	webkit? ( ~dev-qt/qtwebkit-${PV} )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/linguist-tools/linguist-tools-5.5.1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.5.1-r1.ebuild
similarity index 86%
rename from dev-qt/linguist-tools/linguist-tools-5.5.1.ebuild
rename to dev-qt/linguist-tools/linguist-tools-5.5.1-r1.ebuild
index 3ff0b4ab95433..3132acf5ca073 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.5.1.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.5.1-r1.ebuild
@@ -15,9 +15,9 @@ fi
 IUSE="qml"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtxml-${PV}:5
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtxml-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/linguist/linguist-5.5.1.ebuild b/dev-qt/linguist/linguist-5.5.1-r1.ebuild
similarity index 71%
rename from dev-qt/linguist/linguist-5.5.1.ebuild
rename to dev-qt/linguist/linguist-5.5.1-r1.ebuild
index 51ac0b44ca0ca..5cf33cd753a2d 100644
--- a/dev-qt/linguist/linguist-5.5.1.ebuild
+++ b/dev-qt/linguist/linguist-5.5.1-r1.ebuild
@@ -15,12 +15,12 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/designer-${PV}:5
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5
-	>=dev-qt/qtprintsupport-${PV}:5
-	>=dev-qt/qtwidgets-${PV}:5
-	>=dev-qt/qtxml-${PV}:5
+	~dev-qt/designer-${PV}
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtprintsupport-${PV}
+	~dev-qt/qtwidgets-${PV}
+	~dev-qt/qtxml-${PV}
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/pixeltool/pixeltool-5.5.1.ebuild b/dev-qt/pixeltool/pixeltool-5.5.1-r1.ebuild
similarity index 77%
rename from dev-qt/pixeltool/pixeltool-5.5.1.ebuild
rename to dev-qt/pixeltool/pixeltool-5.5.1-r1.ebuild
index f1a9f732cb29a..6b58bdd293b41 100644
--- a/dev-qt/pixeltool/pixeltool-5.5.1.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.5.1-r1.ebuild
@@ -15,10 +15,10 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5
-	>=dev-qt/qtnetwork-${PV}:5
-	>=dev-qt/qtwidgets-${PV}:5
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtwidgets-${PV}
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qdbus/qdbus-5.5.1.ebuild b/dev-qt/qdbus/qdbus-5.5.1-r1.ebuild
similarity index 84%
rename from dev-qt/qdbus/qdbus-5.5.1.ebuild
rename to dev-qt/qdbus/qdbus-5.5.1-r1.ebuild
index 17e425aca9037..ebe5d79c1d0fd 100644
--- a/dev-qt/qdbus/qdbus-5.5.1.ebuild
+++ b/dev-qt/qdbus/qdbus-5.5.1-r1.ebuild
@@ -15,9 +15,9 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtdbus-${PV}:5
-	>=dev-qt/qtxml-${PV}:5
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
+	~dev-qt/qtxml-${PV}
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.5.1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.5.1-r1.ebuild
similarity index 76%
rename from dev-qt/qdbusviewer/qdbusviewer-5.5.1.ebuild
rename to dev-qt/qdbusviewer/qdbusviewer-5.5.1-r1.ebuild
index 5c5f0ab659c9e..1e3cb4fcdd3be 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.5.1.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.5.1-r1.ebuild
@@ -15,11 +15,11 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtdbus-${PV}:5
-	>=dev-qt/qtgui-${PV}:5
-	>=dev-qt/qtwidgets-${PV}:5
-	>=dev-qt/qtxml-${PV}:5
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+	~dev-qt/qtxml-${PV}
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.5.1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.5.1-r1.ebuild
similarity index 77%
rename from dev-qt/qtbluetooth/qtbluetooth-5.5.1.ebuild
rename to dev-qt/qtbluetooth/qtbluetooth-5.5.1-r1.ebuild
index c7cdd6581fe11..34e81f683189d 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.5.1.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.5.1-r1.ebuild
@@ -15,14 +15,14 @@ fi
 IUSE="qml"
 
 RDEPEND="
-	>=dev-qt/qtconcurrent-${PV}:5
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtdbus-${PV}:5
+	~dev-qt/qtconcurrent-${PV}
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
 	>=net-wireless/bluez-5
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
 "
 DEPEND="${RDEPEND}
-	>=dev-qt/qtnetwork-${PV}:5
+	~dev-qt/qtnetwork-${PV}
 	virtual/pkgconfig
 "
 
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.5.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.5.1-r1.ebuild
similarity index 78%
rename from dev-qt/qtdeclarative/qtdeclarative-5.5.1.ebuild
rename to dev-qt/qtdeclarative/qtdeclarative-5.5.1-r1.ebuild
index d6202e6ed3a3f..840bcfc3b0728 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.5.1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.5.1-r1.ebuild
@@ -15,13 +15,13 @@ IUSE="gles2 +jit localstorage +widgets xml"
 
 # qtgui[gles2=] is needed because of bug 504322
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5[gles2=]
-	>=dev-qt/qtnetwork-${PV}:5
-	>=dev-qt/qttest-${PV}:5
-	localstorage? ( >=dev-qt/qtsql-${PV}:5 )
-	widgets? ( >=dev-qt/qtwidgets-${PV}:5[gles2=] )
-	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qttest-${PV}
+	localstorage? ( ~dev-qt/qtsql-${PV} )
+	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] )
+	xml? ( ~dev-qt/qtxmlpatterns-${PV} )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtdiag/qtdiag-5.5.1.ebuild b/dev-qt/qtdiag/qtdiag-5.5.1-r1.ebuild
similarity index 83%
rename from dev-qt/qtdiag/qtdiag-5.5.1.ebuild
rename to dev-qt/qtdiag/qtdiag-5.5.1-r1.ebuild
index c07bccc9175e2..0c7acc2aea689 100644
--- a/dev-qt/qtdiag/qtdiag-5.5.1.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.5.1-r1.ebuild
@@ -15,9 +15,9 @@ fi
 IUSE="+ssl"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5
-	>=dev-qt/qtnetwork-${PV}:5[ssl=]
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}[ssl=]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1-r1.ebuild
similarity index 82%
rename from dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1.ebuild
rename to dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1-r1.ebuild
index d83bc28e8bfe6..158ba6d99b6b7 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1-r1.ebuild
@@ -14,11 +14,11 @@ fi
 IUSE=""
 
 RDEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtdeclarative-${PV}:5
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
 "
 DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtgui-${PV}:5 )
+	test? ( ~dev-qt/qtgui-${PV} )
 "
 
 src_test() {
diff --git a/dev-qt/qtimageformats/qtimageformats-5.5.1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.5.1-r1.ebuild
similarity index 89%
rename from dev-qt/qtimageformats/qtimageformats-5.5.1.ebuild
rename to dev-qt/qtimageformats/qtimageformats-5.5.1-r1.ebuild
index df2e85f7da3dd..d36e8f54fea45 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.5.1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.5.1-r1.ebuild
@@ -14,8 +14,8 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
 	media-libs/jasper
 	media-libs/libmng:=
 	media-libs/libwebp:=
diff --git a/dev-qt/qtpaths/qtpaths-5.5.1.ebuild b/dev-qt/qtpaths/qtpaths-5.5.1-r1.ebuild
similarity index 93%
rename from dev-qt/qtpaths/qtpaths-5.5.1.ebuild
rename to dev-qt/qtpaths/qtpaths-5.5.1-r1.ebuild
index 017dd584962eb..51d6f5770a023 100644
--- a/dev-qt/qtpaths/qtpaths-5.5.1.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.5.1-r1.ebuild
@@ -15,7 +15,7 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
+	~dev-qt/qtcore-${PV}
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtpositioning/qtpositioning-5.5.1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.5.1-r1.ebuild
similarity index 88%
rename from dev-qt/qtpositioning/qtpositioning-5.5.1.ebuild
rename to dev-qt/qtpositioning/qtpositioning-5.5.1-r1.ebuild
index 6f3f8002e1405..2eb27c697b6a7 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.5.1.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.5.1-r1.ebuild
@@ -16,14 +16,14 @@ fi
 IUSE="geoclue qml"
 
 RDEPEND="
-	>=dev-qt/qtcore-${PV}:5
+	~dev-qt/qtcore-${PV}
 	geoclue? (
 		app-misc/geoclue:0
 		dev-libs/glib:2
 	)
 	qml? (
-		>=dev-qt/qtdeclarative-${PV}:5
-		>=dev-qt/qtnetwork-${PV}:5
+		~dev-qt/qtdeclarative-${PV}
+		~dev-qt/qtnetwork-${PV}
 	)
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtscript/qtscript-5.5.1.ebuild b/dev-qt/qtscript/qtscript-5.5.1-r1.ebuild
similarity index 88%
rename from dev-qt/qtscript/qtscript-5.5.1.ebuild
rename to dev-qt/qtscript/qtscript-5.5.1-r1.ebuild
index 2eadc8c8dd356..1431ee9155791 100644
--- a/dev-qt/qtscript/qtscript-5.5.1.ebuild
+++ b/dev-qt/qtscript/qtscript-5.5.1-r1.ebuild
@@ -14,10 +14,10 @@ fi
 IUSE="+jit scripttools"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
+	~dev-qt/qtcore-${PV}
 	scripttools? (
-		>=dev-qt/qtgui-${PV}:5
-		>=dev-qt/qtwidgets-${PV}:5
+		~dev-qt/qtgui-${PV}
+		~dev-qt/qtwidgets-${PV}
 	)
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsensors/qtsensors-5.5.1.ebuild b/dev-qt/qtsensors/qtsensors-5.5.1-r1.ebuild
similarity index 86%
rename from dev-qt/qtsensors/qtsensors-5.5.1.ebuild
rename to dev-qt/qtsensors/qtsensors-5.5.1-r1.ebuild
index 8b6fd4a1955c9..69c9d75b649de 100644
--- a/dev-qt/qtsensors/qtsensors-5.5.1.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.5.1-r1.ebuild
@@ -14,8 +14,8 @@ fi
 IUSE="qml"
 
 RDEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+	~dev-qt/qtcore-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-qt/qtserialport/qtserialport-5.5.1.ebuild b/dev-qt/qtserialport/qtserialport-5.5.1-r1.ebuild
similarity index 93%
rename from dev-qt/qtserialport/qtserialport-5.5.1.ebuild
rename to dev-qt/qtserialport/qtserialport-5.5.1-r1.ebuild
index 8acbb4671015b..3d01ca940fe77 100644
--- a/dev-qt/qtserialport/qtserialport-5.5.1.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.5.1-r1.ebuild
@@ -14,7 +14,7 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
+	~dev-qt/qtcore-${PV}
 	virtual/udev
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qttranslations/qttranslations-5.5.1.ebuild b/dev-qt/qttranslations/qttranslations-5.5.1-r1.ebuild
similarity index 84%
rename from dev-qt/qttranslations/qttranslations-5.5.1.ebuild
rename to dev-qt/qttranslations/qttranslations-5.5.1-r1.ebuild
index e8c2c9b6cf205..27d5c55d2f417 100644
--- a/dev-qt/qttranslations/qttranslations-5.5.1.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.5.1-r1.ebuild
@@ -14,7 +14,7 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/linguist-tools-${PV}:5
-	>=dev-qt/qtcore-${PV}:5
+	~dev-qt/linguist-tools-${PV}
+	~dev-qt/qtcore-${PV}
 "
 RDEPEND=""
diff --git a/dev-qt/qtwayland/qtwayland-5.5.1.ebuild b/dev-qt/qtwayland/qtwayland-5.5.1-r1.ebuild
similarity index 89%
rename from dev-qt/qtwayland/qtwayland-5.5.1.ebuild
rename to dev-qt/qtwayland/qtwayland-5.5.1-r1.ebuild
index 42f300b2ac148..3d7782fc0910e 100644
--- a/dev-qt/qtwayland/qtwayland-5.5.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.5.1-r1.ebuild
@@ -15,12 +15,12 @@ IUSE="egl qml wayland-compositor xcomposite"
 
 DEPEND="
 	>=dev-libs/wayland-1.4.0
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5[egl=]
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[egl=]
 	media-libs/mesa[egl?]
 	>=x11-libs/libxkbcommon-0.2.0
 	wayland-compositor? (
-		qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+		qml? ( ~dev-qt/qtdeclarative-${PV} )
 	)
 	xcomposite? (
 		x11-libs/libX11
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.5.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.5.1-r1.ebuild
similarity index 89%
rename from dev-qt/qtwebchannel/qtwebchannel-5.5.1.ebuild
rename to dev-qt/qtwebchannel/qtwebchannel-5.5.1-r1.ebuild
index 3e523daf5659d..f343adca25353 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.5.1.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.5.1-r1.ebuild
@@ -14,8 +14,8 @@ fi
 IUSE="qml"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+	~dev-qt/qtcore-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.5.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild
similarity index 82%
rename from dev-qt/qtwebsockets/qtwebsockets-5.5.1.ebuild
rename to dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild
index be842d81b23ad..5dc250ac5df9e 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.5.1.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild
@@ -14,9 +14,9 @@ fi
 IUSE="qml"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtnetwork-${PV}:5
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
 
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1-r1.ebuild
similarity index 87%
rename from dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1.ebuild
rename to dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1-r1.ebuild
index 7f447f537a23d..51b8facee86b0 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1-r1.ebuild
@@ -14,7 +14,7 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtnetwork-${PV}:5
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
 "
 RDEPEND="${DEPEND}"