13 files changed, 3 insertions, 103 deletions

diff --git a/MOVED b/MOVED
index 476dcaa73b71..8f4ff848ca77 100644
--- a/MOVED
+++ b/MOVED
@@ -10410,3 +10410,6 @@ www/rubygem-gollum-lib-gitlab|www/rubygem-gitlab-gollum-lib|2018-08-02|Has expir
 www/py-django-threaded-multihost||2018-08-02|Has expired: Project development unmaintained
 www/py-django-keyedcache||2018-08-02|Has expired: Project development abandoned
 www/py-django-signals-ahoy||2018-08-02|Has expired: Project development unmaintained
+databases/rubygem-redis-namespace15|databases/rubygem-redis-namespace|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use databases/rubygem-redis-namespace instead.
+security/py-python-social-auth||2018-08-02|Has expired: Upstream Deprecated
+www/py-django-social-auth||2018-08-02|Has expired: no support for new django
diff --git a/databases/Makefile b/databases/Makefile
index f00e8eff0dfd..53ace13aabfc 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1001,7 +1001,6 @@
     SUBDIR += rubygem-redis-actionpack-rails5
     SUBDIR += rubygem-redis-actionpack-rails50
     SUBDIR += rubygem-redis-namespace
-    SUBDIR += rubygem-redis-namespace15
     SUBDIR += rubygem-redis3
     SUBDIR += rubygem-seed-fu
     SUBDIR += rubygem-sqlite3
diff --git a/databases/rubygem-redis-namespace15/Makefile b/databases/rubygem-redis-namespace15/Makefile
deleted file mode 100644
index 82a4ca49836d..000000000000
--- a/databases/rubygem-redis-namespace15/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	redis-namespace
-PORTVERSION=	1.5.3
-CATEGORIES=	databases rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	15
-
-MAINTAINER=	mfechner@FreeBSD.org
-COMMENT=	Ruby client class for Redis with namespace support
-
-DEPRECATED=	Obsoleted by update of www/gitlab-ce. Please use databases/rubygem-redis-namespace instead.
-EXPIRATION_DATE=	2018-07-31
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-RUN_DEPENDS=	rubygem-redis3>=3.0.4:databases/rubygem-redis3
-
-PORTSCOUT=	limit:^1\.5
-
-NO_ARCH=	yes
-USES=		gem
-USE_RUBY=	yes
-
-.include <bsd.port.mk>
diff --git a/databases/rubygem-redis-namespace15/distinfo b/databases/rubygem-redis-namespace15/distinfo
deleted file mode 100644
index 4cb805bfc677..000000000000
--- a/databases/rubygem-redis-namespace15/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1518175502
-SHA256 (rubygem/redis-namespace-1.5.3.gem) = 2aa4a1b0103143e7ffdd8efe710b6d0e0d63bb96e4b4a38f19ecfb073d20d464
-SIZE (rubygem/redis-namespace-1.5.3.gem) = 16896
diff --git a/databases/rubygem-redis-namespace15/pkg-descr b/databases/rubygem-redis-namespace15/pkg-descr
deleted file mode 100644
index 40e1df3222fe..000000000000
--- a/databases/rubygem-redis-namespace15/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Adds a Redis::Namespace class which can be used to namespace calls to Redis.
-This is useful when using a single instance of Redis with multiple, different
-applications.
-
-WWW: https://github.com/resque/redis-namespace
diff --git a/security/Makefile b/security/Makefile
index 7fda692bb49a..3759587025d2 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1014,7 +1014,6 @@
     SUBDIR += py-python-nss
     SUBDIR += py-python-openid
     SUBDIR += py-python-registry
-    SUBDIR += py-python-social-auth
     SUBDIR += py-python3-openid
     SUBDIR += py-pywinrm
     SUBDIR += py-rekall
diff --git a/security/py-python-social-auth/Makefile b/security/py-python-social-auth/Makefile
deleted file mode 100644
index dd54d2d78107..000000000000
--- a/security/py-python-social-auth/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Created by: Tom Judge <tj@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	python-social-auth
-PORTVERSION=	0.2.21
-CATEGORIES=	security python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	tj@FreeBSD.org
-COMMENT=	Python Social Auth is a social authentication/registration mechanism
-
-LICENSE=	BSD3CLAUSE
-
-RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}python-openid>=2.2:security/py-python-openid@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.5.1:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oauthlib>=0.3.8:security/py-oauthlib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.1:www/py-requests-oauthlib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt@${PY_FLAVOR}
-
-DEPRECATED=	Upstream Deprecated
-EXPIRATION_DATE=	2018-08-01
-
-NO_ARCH=	yes
-USES=		python
-USE_PYTHON=	autoplist distutils
-
-.include <bsd.port.mk>
diff --git a/security/py-python-social-auth/distinfo b/security/py-python-social-auth/distinfo
deleted file mode 100644
index 6f1322ae5643..000000000000
--- a/security/py-python-social-auth/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1475772560
-SHA256 (python-social-auth-0.2.21.tar.gz) = c4dd52bf3da4b9c9cfe2b79727d37a2ec6c34b50336fed54aec5811c134d0496
-SIZE (python-social-auth-0.2.21.tar.gz) = 295998
diff --git a/security/py-python-social-auth/pkg-descr b/security/py-python-social-auth/pkg-descr
deleted file mode 100644
index 33098d87761c..000000000000
--- a/security/py-python-social-auth/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Python Social Auth is an easy-to-setup social authentication/registration
-mechanism with support for several frameworks and auth providers.
-
-WWW: https://github.com/omab/python-social-auth
diff --git a/www/Makefile b/www/Makefile
index da720e63a681..95f47b6aa2c0 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1609,7 +1609,6 @@
     SUBDIR += py-django-sekizai
     SUBDIR += py-django-simple-captcha
     SUBDIR += py-django-simple-history
-    SUBDIR += py-django-social-auth
     SUBDIR += py-django-solo
     SUBDIR += py-django-sortedm2m
     SUBDIR += py-django-star-ratings
diff --git a/www/py-django-social-auth/Makefile b/www/py-django-social-auth/Makefile
deleted file mode 100644
index 9f0badfe6b6b..000000000000
--- a/www/py-django-social-auth/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: Tom Judge <tj@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	social-auth
-PORTVERSION=	0.7.28
-CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
-DISTNAME=	django-${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	tj@FreeBSD.org
-COMMENT=	Setup social authentication/authorization mechanism for Django
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-social-auth>=0:security/py-python-social-auth@${PY_FLAVOR}
-
-DEPRECATED=	no support for new django	
-EXPIRATION_DATE=	2018-08-01
-
-USES=		python
-USE_PYTHON=	distutils autoplist
-NO_ARCH=	yes
-
-.include <bsd.port.mk>
diff --git a/www/py-django-social-auth/distinfo b/www/py-django-social-auth/distinfo
deleted file mode 100644
index 2c1e069c0677..000000000000
--- a/www/py-django-social-auth/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (django-social-auth-0.7.28.tar.gz) = a0141b12de90504128ce31e5dcd25521d32de96e27994993126263aed8a5f672
-SIZE (django-social-auth-0.7.28.tar.gz) = 83071
diff --git a/www/py-django-social-auth/pkg-descr b/www/py-django-social-auth/pkg-descr
deleted file mode 100644
index c7182f75b646..000000000000
--- a/www/py-django-social-auth/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Django Social Auth is an easy way to setup social authentication/authorization
-mechanism for Django projects.
-
-WWW: https://github.com/omab/django-social-auth