svn commit: r495955 - in head: . x11-themes/adwaita-qt

[Tobias C. Berner]

Author: tcberner
Date: Sat Mar 16 20:20:32 2019
New Revision: 495955
URL: https://svnweb.freebsd.org/changeset/ports/495955

Log:
  x11-themes/adwaita-qt: remove flavors (Qt4 deprecation)

Modified:
  head/MOVED
  head/x11-themes/adwaita-qt/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sat Mar 16 20:16:24 2019	(r495954)
+++ head/MOVED	Sat Mar 16 20:20:32 2019	(r495955)
@@ -10226,8 +10226,6 @@ net/syncthing-discosrv|net/syncthing|2018-06-18|Has ex
 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 at qt4|2018-06-19|Move to flavored version
-x11-themes/adwaita-qt5|x11-themes/adwaita-qt at qt5|2018-06-19|Move to flavored version
 net-p2p/qbittorrent-nox11|net-p2p/qbittorrent at nox|2018-06-20|Moved to a flavored version
 math/digitizer|graphics/engauge-digitizer|2018-06-20|The previously deleted port math/digitizer is now graphics/engauge-digitizer
 multimedia/qt5-phonon4|multimedia/phonon at qt5|2018-06-21|Moved to a flavored version
@@ -11680,3 +11678,5 @@ devel/qjson at qt4||2019-03-16|Qt4 deprecation
 devel/qjson at qt5|devel/qjson|2019-03-16|Flavor has been removed
 devel/qca at qt4||2019-03-16|Qt4 deprecation
 devel/qca at qt5|devel/qca|2019-03-16|Flavor has been removed
+x11-themes/adwaita at qt4||2019-03-16|Qt4 deprecation
+x11-themes/adwaita at qt5|x11-themes/adwaita-qt|2019-03-16|Flavor has been removed

Modified: head/x11-themes/adwaita-qt/Makefile
==============================================================================
--- head/x11-themes/adwaita-qt/Makefile	Sat Mar 16 20:16:24 2019	(r495954)
+++ head/x11-themes/adwaita-qt/Makefile	Sat Mar 16 20:20:32 2019	(r495955)
@@ -3,8 +3,9 @@
 
 PORTNAME=	adwaita-qt
 DISTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
+PKGNAMESUFFIX=	5
 
 MAINTAINER=	tcberner at FreeBSD.org
 COMMENT=	Adwaita theme for Qt applications
@@ -12,25 +13,10 @@ 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 compiler:c++11-lib localbase pkgconfig
-.  if ${FLAVOR} == qt4
-DEPRECATED=	Qt4 has been EOL since december 2015
-EXPIRATION_DATE=2019-03-15
-USES+=		qt:4
-USE_QT=		corelib dbus gui \
-		moc_build rcc_build uic_build qmake_build
-CMAKE_ON=	USE_QT4
-.  else
-USES+=		qt:5
+USES=		cmake compiler:c++11-lib localbase pkgconfig qt:5
 USE_QT=		core dbus gui widgets \
 		buildtools_build qmake_build
 CMAKE_OFF=	USE_QT4
-.  endif
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FedoraQt