Switch the accounts-sso ports to USE_GITLAB.

* Due to the different fetch method the distinfo changed.

12 files changed, 32 insertions, 43 deletions

diff --git a/net-im/libaccounts-glib/Makefile b/net-im/libaccounts-glib/Makefile
index 3c3f3ce38707..811b74ffb83a 100644
--- a/net-im/libaccounts-glib/Makefile
+++ b/net-im/libaccounts-glib/Makefile
@@ -5,9 +5,7 @@ PORTNAME=	libaccounts-glib
 PORTVERSION=	1.21
 PORTREVISION=	1
 CATEGORIES=	net-im
-MASTER_SITES=	https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}/repository/archive${EXTRACT_SUFX}?ref=VERSION_${GL_TAGNAME}#/ \
-		LOCAL/rakuco
-DISTNAME=	${GL_PROJECT}-VERSION_${GL_TAGNAME}-${GL_COMMIT}
+DIST_SUBDIR=	KDE/${GL_ACCOUNT}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Accounts and SSO framework for Linux and POSIX based platforms
@@ -27,9 +25,8 @@ USE_GNOME=	pygobject3 introspection libxml2
 USE_PYTHON=	py3kplist
 
 # GitLab variables.
+USE_GITLAB=	yes
 GL_ACCOUNT=	accounts-sso
-GL_PROJECT=	${PORTNAME}
-GL_TAGNAME=	${PORTVERSION}
 GL_COMMIT=	00254a604a7c7bd38c41794a80ad8930e90f21aa
 
 pre-configure:
diff --git a/net-im/libaccounts-glib/distinfo b/net-im/libaccounts-glib/distinfo
index bc2983220c77..38423c9387e1 100644
--- a/net-im/libaccounts-glib/distinfo
+++ b/net-im/libaccounts-glib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libaccounts-glib-VERSION_1.21-00254a604a7c7bd38c41794a80ad8930e90f21aa.tar.gz) = 27cb75f3f2f0ce736b77f0fd0432f8d565297f0735846a2862577eadaec92488
-SIZE (libaccounts-glib-VERSION_1.21-00254a604a7c7bd38c41794a80ad8930e90f21aa.tar.gz) = 127061
+TIMESTAMP = 1525025366
+SHA256 (KDE/accounts-sso/accounts-sso-libaccounts-glib-00254a604a7c7bd38c41794a80ad8930e90f21aa_GL0.tar.gz) = 63df498a587ae5cce8dca6e6f2a3a453a1c535383d6c57c7d154be35ca619202
+SIZE (KDE/accounts-sso/accounts-sso-libaccounts-glib-00254a604a7c7bd38c41794a80ad8930e90f21aa_GL0.tar.gz) = 126994
diff --git a/net-im/libsignon-glib/Makefile b/net-im/libsignon-glib/Makefile
index c693e5a802a5..e77835423a21 100644
--- a/net-im/libsignon-glib/Makefile
+++ b/net-im/libsignon-glib/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-PORTNAME=	${GL_PROJECT}
+PORTNAME=	libsignon-glib
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	net-im
-MASTER_SITES=	https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}/repository/archive${EXTRACT_SUFX}?ref=${GL_TAGNAME}#/ \
-		LOCAL/tcberner/${GL_ACCOUNT}/
 DIST_SUBDIR=	KDE/${GL_ACCOUNT}
 
 MAINTAINER=	kde@FreeBSD.org
@@ -27,10 +26,9 @@ USE_PYTHON=	py3kplist
 PATHFIX_MAKEFILEIN=	Makefile.am
 
 # gitlab variables
+USE_GITLAB=	yes
 GL_ACCOUNT=	accounts-sso
-GL_PROJECT=	libsignon-glib
-GL_TAGNAME=	4e85baaf483268d04bbf835bebeac4ae30c7c327
-WRKSRC=		${WRKDIR}/${GL_PROJECT}-${GL_TAGNAME}-${GL_TAGNAME}
+GL_COMMIT=	4e85baaf483268d04bbf835bebeac4ae30c7c327
 
 # Run gtdocize as done in autogen.sh
 pre-configure:
diff --git a/net-im/libsignon-glib/distinfo b/net-im/libsignon-glib/distinfo
index ad5d961d1bd7..822481425ff5 100644
--- a/net-im/libsignon-glib/distinfo
+++ b/net-im/libsignon-glib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470555249
-SHA256 (KDE/accounts-sso/libsignon-glib-1.14.tar.bz2) = ec49dd2680ff07211e51745eccfc2b5e14452480e1d340eb76b93d54a0c2cede
-SIZE (KDE/accounts-sso/libsignon-glib-1.14.tar.bz2) = 44488
+TIMESTAMP = 1521876594
+SHA256 (KDE/accounts-sso/accounts-sso-libsignon-glib-4e85baaf483268d04bbf835bebeac4ae30c7c327_GL0.tar.gz) = fea04d2cb4e59b9322226ba532e1600c23f817ee409d3c6ec0b7659aec1840a7
+SIZE (KDE/accounts-sso/accounts-sso-libsignon-glib-4e85baaf483268d04bbf835bebeac4ae30c7c327_GL0.tar.gz) = 54781
diff --git a/net-im/telepathy-accounts-signon/Makefile b/net-im/telepathy-accounts-signon/Makefile
index 62e724811699..27dcdbbc8ca4 100644
--- a/net-im/telepathy-accounts-signon/Makefile
+++ b/net-im/telepathy-accounts-signon/Makefile
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
-PORTNAME=	${GL_PROJECT}
+PORTNAME=	telepathy-accounts-signon
 PORTVERSION=	1.0
 CATEGORIES=	net-im
-MASTER_SITES=	https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}/repository/archive${EXTRACT_SUFX}?ref=${GL_TAGNAME}#/ \
-		LOCAL/tcberner/${GL_ACCOUNT}/
 DIST_SUBDIR=	KDE/${GL_ACCOUNT}
 
 MAINTAINER=	kde@FreeBSD.org
@@ -23,10 +21,9 @@ USE_QT5=	buildtools_build core qmake_build
 USE_LDCONFIG=	YES
 
 # gitlab variables
+USE_GITLAB=	yes
 GL_ACCOUNT=	accounts-sso
-GL_PROJECT=	telepathy-accounts-signon
-GL_TAGNAME=	f01a6d9eccad24a3cb4a5300fb0ae0fd426cc815
-WRKSRC=		${WRKDIR}/${GL_PROJECT}-${GL_TAGNAME}-${GL_TAGNAME}
+GL_COMMIT=	f01a6d9eccad24a3cb4a5300fb0ae0fd426cc815
 
 PLIST_FILES=	lib/mission-control-plugins.0/mcp-account-manager-accounts-sso.so
 
diff --git a/net-im/telepathy-accounts-signon/distinfo b/net-im/telepathy-accounts-signon/distinfo
index a3316c72eb28..76b3a4e2992c 100644
--- a/net-im/telepathy-accounts-signon/distinfo
+++ b/net-im/telepathy-accounts-signon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470554779
-SHA256 (KDE/accounts-sso/telepathy-accounts-signon-1.0.tar.bz2) = 42d16d0f96bb9d60b3d7e9f42cc505fc6bc4e02fee0fcb3e9afd159e4e7197cf
-SIZE (KDE/accounts-sso/telepathy-accounts-signon-1.0.tar.bz2) = 15528
+TIMESTAMP = 1521876611
+SHA256 (KDE/accounts-sso/accounts-sso-telepathy-accounts-signon-f01a6d9eccad24a3cb4a5300fb0ae0fd426cc815_GL0.tar.gz) = 1588bc8190664ea13bb086d125a999f7556d5d47cd61ee2a7bd80699f07fd413
+SIZE (KDE/accounts-sso/accounts-sso-telepathy-accounts-signon-f01a6d9eccad24a3cb4a5300fb0ae0fd426cc815_GL0.tar.gz) = 16676
diff --git a/sysutils/signon-plugin-oauth2/Makefile b/sysutils/signon-plugin-oauth2/Makefile
index c19bdef5b3b6..0169b3617c10 100644
--- a/sysutils/signon-plugin-oauth2/Makefile
+++ b/sysutils/signon-plugin-oauth2/Makefile
@@ -4,6 +4,7 @@ PORTNAME=	signon-plugin-oauth2
 DISTVERSION=	0.24
 CATEGORIES=	sysutils kde
 DISTNAME=	archive
+DIST_SUBDIR=	KDE/${GL_ACCOUNT}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Signon OAuth 1.0 and 2.0 plugin for accounts-sso
diff --git a/sysutils/signon-plugin-oauth2/distinfo b/sysutils/signon-plugin-oauth2/distinfo
index 64a672a18c32..84526c8ce88a 100644
--- a/sysutils/signon-plugin-oauth2/distinfo
+++ b/sysutils/signon-plugin-oauth2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521877026
-SHA256 (accounts-sso-signon-plugin-oauth2-2dd9ba521a0dd4277c4bf6970a7f4e3894fd85ae_GL0.tar.gz) = 4c259c64259822b240e4011265953863f18c2dc9ff0461a781a09fdd94bc325e
-SIZE (accounts-sso-signon-plugin-oauth2-2dd9ba521a0dd4277c4bf6970a7f4e3894fd85ae_GL0.tar.gz) = 38949
+TIMESTAMP = 1525025016
+SHA256 (KDE/accounts-sso/accounts-sso-signon-plugin-oauth2-2dd9ba521a0dd4277c4bf6970a7f4e3894fd85ae_GL0.tar.gz) = 4c259c64259822b240e4011265953863f18c2dc9ff0461a781a09fdd94bc325e
+SIZE (KDE/accounts-sso/accounts-sso-signon-plugin-oauth2-2dd9ba521a0dd4277c4bf6970a7f4e3894fd85ae_GL0.tar.gz) = 38949
diff --git a/sysutils/signon-qt5/Makefile b/sysutils/signon-qt5/Makefile
index 4f887bd89e28..3cb4843e3fc2 100644
--- a/sysutils/signon-qt5/Makefile
+++ b/sysutils/signon-qt5/Makefile
@@ -3,8 +3,6 @@
 PORTNAME=	signon
 PORTVERSION=	8.58
 CATEGORIES=	sysutils kde
-MASTER_SITES=	https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}/repository/archive${EXTRACT_SUFX}?ref=${GL_TAGNAME}#/ \
-		LOCAL/tcberner/${GL_ACCOUNT}/
 PKGNAMESUFFIX=	-qt5
 DIST_SUBDIR=	KDE/${GL_ACCOUNT}
 
@@ -19,10 +17,10 @@ USE_QT5=	core dbus gui network sql testlib xml \
 		buildtools_build qmake_build
 
 # gitlab variables
+USE_GITLAB=	yes
 GL_ACCOUNT=	accounts-sso
 GL_PROJECT=	signond
-GL_TAGNAME=	aa1bcf3c9218addbdb376a40151b689409046125
-WRKSRC=		${WRKDIR}/${GL_PROJECT}-${GL_TAGNAME}-${GL_TAGNAME}
+GL_COMMIT=	aa1bcf3c9218addbdb376a40151b689409046125
 
 pre-configure:
 	#make it find qdbusxml2ccp (as ${QT_BINDIR} is not in PATH)
diff --git a/sysutils/signon-qt5/distinfo b/sysutils/signon-qt5/distinfo
index 5eb2a4d0e572..d21b70618cca 100644
--- a/sysutils/signon-qt5/distinfo
+++ b/sysutils/signon-qt5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486501812
-SHA256 (KDE/accounts-sso/signon-8.58.tar.bz2) = 83d15ac2237b6d16296d02e94194bed4a72e43fc30d1c74dbe8c543e42e5ed86
-SIZE (KDE/accounts-sso/signon-8.58.tar.bz2) = 199717
+TIMESTAMP = 1521876255
+SHA256 (KDE/accounts-sso/accounts-sso-signond-aa1bcf3c9218addbdb376a40151b689409046125_GL0.tar.gz) = 764aa2b1481785f847d4b299a974a885615280d2daaf7fc39b93b81e17a900f3
+SIZE (KDE/accounts-sso/accounts-sso-signond-aa1bcf3c9218addbdb376a40151b689409046125_GL0.tar.gz) = 277074
diff --git a/sysutils/signon-ui/Makefile b/sysutils/signon-ui/Makefile
index 7ec761d4cf27..9f9b1f511b46 100644
--- a/sysutils/signon-ui/Makefile
+++ b/sysutils/signon-ui/Makefile
@@ -3,8 +3,6 @@
 PORTNAME=	signon-ui
 PORTVERSION=	0.17
 CATEGORIES=	sysutils kde
-MASTER_SITES=	https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}/repository/archive${EXTRACT_SUFX}?ref=${GL_TAGNAME}#/ \
-		LOCAL/tcberner/${GL_ACCOUNT}/
 DIST_SUBDIR=	KDE/${GL_ACCOUNT}
 
 MAINTAINER=	kde@FreeBSD.org
@@ -22,9 +20,8 @@ USES=		pkgconfig python qmake tar:bz2
 USE_QT5=	buildtools_build qmake_build webkit widgets
 
 # gitlab variables
+USE_GITLAB=	yes
 GL_ACCOUNT=	accounts-sso
-GL_PROJECT=	signon-ui
-GL_TAGNAME=	075830f31096947fcea70802b8d3c142bccfbefa
-WRKSRC=		${WRKDIR}/${GL_PROJECT}-${GL_TAGNAME}-${GL_TAGNAME}
+GL_COMMIT=	075830f31096947fcea70802b8d3c142bccfbefa
 
 .include <bsd.port.mk>
diff --git a/sysutils/signon-ui/distinfo b/sysutils/signon-ui/distinfo
index 3626e3d8874b..b7468cc0afc1 100644
--- a/sysutils/signon-ui/distinfo
+++ b/sysutils/signon-ui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486501812
-SHA256 (KDE/accounts-sso/signon-ui-0.17.tar.bz2) = e8056fe7346db33cfe1c526b7bf2cd68f6a65fc727d5ad836e02806c3f630c4e
-SIZE (KDE/accounts-sso/signon-ui-0.17.tar.bz2) = 60117
+TIMESTAMP = 1521876646
+SHA256 (KDE/accounts-sso/accounts-sso-signon-ui-075830f31096947fcea70802b8d3c142bccfbefa_GL0.tar.gz) = 463e644e96005e05436c159e9207ea09ee8757cedf558d0807f201a98297eaf0
+SIZE (KDE/accounts-sso/accounts-sso-signon-ui-075830f31096947fcea70802b8d3c142bccfbefa_GL0.tar.gz) = 71478