Index: head/MOVED
===================================================================
--- head/MOVED
+++ head/MOVED
@@ -10280,3 +10280,6 @@
 net/syncthing-discosrv|net/syncthing|2018-06-18|Has expired: Included in net/syncthing now
 net/syncthing-inotify|net/syncthing|2018-06-18|Has expired: Included in net/syncthing now
 net/syncthing-cli|net/syncthing|2018-06-18|Has expired: Included in net/syncthing now
+x11-themes/adwaita-common||2018-06-19|Move to flavored version
+x11-themes/adwaita-qt4|x11-themes/adwaita-qt@qt4|2018-06-19|Move to flavored version
+x11-themes/adwaita-qt5|x11-themes/adwaita-qt@qt5|2018-06-19|Move to flavored version
Index: head/x11-themes/Makefile
===================================================================
--- head/x11-themes/Makefile
+++ head/x11-themes/Makefile
@@ -5,10 +5,8 @@
 
     SUBDIR += adapta-backgrounds
     SUBDIR += adapta-gtk-theme
-    SUBDIR += adwaita-common
     SUBDIR += adwaita-icon-theme
-    SUBDIR += adwaita-qt4
-    SUBDIR += adwaita-qt5
+    SUBDIR += adwaita-qt
     SUBDIR += arc-gruvbox-theme
     SUBDIR += audacious-skins
     SUBDIR += beastie
Index: head/x11-themes/adwaita-common/Makefile
===================================================================
--- head/x11-themes/adwaita-common/Makefile
+++ head/x11-themes/adwaita-common/Makefile
@@ -1,40 +0,0 @@
-# Created by: Olivier Duchateau
-# $FreeBSD$
-
-PORTNAME=	adwaita
-PORTVERSION=	1.0
-PORTREVISION?=	1
-CATEGORIES=	x11-themes
-PKGNAMESUFFIX=	-${OPTIONS_SLAVE:tl}
-
-MAINTAINER=	tcberner@FreeBSD.org
-COMMENT=	Adwaita theme for Qt applications
-
-LICENSE=	GPLv2 LGPL20
-LICENSE_COMB=	multi
-
-OPTIONS_DEFINE=	QT4 QT5 COMMON
-OPTIONS_EXCLUDE=${OPTIONS_DEFINE}
-
-OPTIONS_SLAVE?=	COMMON
-
-COMMON_RUN_DEPENDS=	adwaita-qt4>=${PORTVERSION}:x11-themes/adwaita-qt4 \
-			adwaita-qt5>=${PORTVERSION}:x11-themes/adwaita-qt5
-COMMON_USES=		metaport
-COMMON_PLIST_FILES=	# none
-
-# Set the values for the QT[45] slave ports -- COMMON is ignored, as it is already set.
-${OPTIONS_SLAVE}_USES?=	cmake:outsource compiler:c++11-lib localbase pkgconfig
-${OPTIONS_SLAVE}_PLIST_FILES?=	%%QT_PLUGINDIR%%/styles/adwaita.so
-
-QT4_USE=	QT4=moc_build,rcc_build,uic_build,qmake_build,corelib,dbus,gui
-QT4_CMAKE_BOOL=	USE_QT4
-
-QT5_USE=	QT5=buildtools_build,qmake_build,core,dbus,gui,widgets
-QT5_CMAKE_BOOL_OFF=	USE_QT4
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	MartinBriza
-GH_PROJECT=	adwaita-qt
-
-.include <bsd.port.mk>
Index: head/x11-themes/adwaita-common/distinfo
===================================================================
--- head/x11-themes/adwaita-common/distinfo
+++ head/x11-themes/adwaita-common/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1496037433
-SHA256 (MartinBriza-adwaita-qt-1.0_GH0.tar.gz) = c2c0c71b131d0e3e58ee108570796cf70b35dccaa64ce17915d4486de5e91513
-SIZE (MartinBriza-adwaita-qt-1.0_GH0.tar.gz) = 565625
Index: head/x11-themes/adwaita-common/pkg-descr
===================================================================
--- head/x11-themes/adwaita-common/pkg-descr
+++ head/x11-themes/adwaita-common/pkg-descr
@@ -1,4 +0,0 @@
-A native style to bend Qt applications to look like they belong into
-GNOME Shell.
-
-WWW: https://github.com/MartinBriza/adwaita-qt
Index: head/x11-themes/adwaita-qt/Makefile
===================================================================
--- head/x11-themes/adwaita-qt/Makefile
+++ head/x11-themes/adwaita-qt/Makefile
@@ -0,0 +1,35 @@
+# Created by: Olivier Duchateau
+# $FreeBSD$
+
+PORTNAME=	adwaita-qt
+DISTVERSION=	1.0
+CATEGORIES=	x11-themes
+
+MAINTAINER=	tcberner@FreeBSD.org
+COMMENT=	Adwaita theme for Qt applications
+
+LICENSE=	GPLv2 LGPL20
+LICENSE_COMB=	multi
+
+FLAVORS=	qt5 qt4
+FLAVOR?=	${FLAVORS:[1]}
+qt4_PKGNAMESUFFIX=	4
+qt5_PKGNAMESUFFIX=	5
+
+USES=		cmake:outsource compiler:c++11-lib localbase pkgconfig
+.  if ${FLAVOR} == qt4
+USE_QT4=	corelib dbus gui \
+		moc_build rcc_build uic_build qmake_build
+CMAKE_ON=	USE_QT4
+.  else
+USE_QT5=	core dbus gui widgets \
+		buildtools_build qmake_build
+CMAKE_OFF=	USE_QT4
+.  endif
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	FedoraQt
+
+PLIST_FILES=	${QT_PLUGINDIR}/styles/adwaita.so
+
+.include <bsd.port.mk>
Index: head/x11-themes/adwaita-qt/distinfo
===================================================================
--- head/x11-themes/adwaita-qt/distinfo
+++ head/x11-themes/adwaita-qt/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1525031614
+SHA256 (FedoraQt-adwaita-qt-1.0_GH0.tar.gz) = c2c0c71b131d0e3e58ee108570796cf70b35dccaa64ce17915d4486de5e91513
+SIZE (FedoraQt-adwaita-qt-1.0_GH0.tar.gz) = 565625
Index: head/x11-themes/adwaita-qt/pkg-descr
===================================================================
--- head/x11-themes/adwaita-qt/pkg-descr
+++ head/x11-themes/adwaita-qt/pkg-descr
@@ -0,0 +1,4 @@
+A native style to bend Qt applications to look like they belong into
+GNOME Shell.
+
+WWW: https://github.com/MartinBriza/adwaita-qt
Index: head/x11-themes/adwaita-qt4/Makefile
===================================================================
--- head/x11-themes/adwaita-qt4/Makefile
+++ head/x11-themes/adwaita-qt4/Makefile
@@ -1,10 +0,0 @@
-# Created by: Olivier Duchateau
-# $FreeBSD$
-
-PORTREVISION=	0
-
-MASTERDIR=	${.CURDIR:H:H}/x11-themes/adwaita-common
-
-OPTIONS_SLAVE=	QT4
-
-.include "${MASTERDIR}/Makefile"
Index: head/x11-themes/adwaita-qt5/Makefile
===================================================================
--- head/x11-themes/adwaita-qt5/Makefile
+++ head/x11-themes/adwaita-qt5/Makefile
@@ -1,10 +0,0 @@
-# Created by: Olivier Duchateau
-# $FreeBSD$
-
-PORTREVISION=	0
-
-MASTERDIR=	${.CURDIR:H:H}/x11-themes/adwaita-common
-
-OPTIONS_SLAVE=	QT5
-
-.include "${MASTERDIR}/Makefile"