svn commit: r451832 - in head: . net net/py-python-cloudfiles sysutils/duplicity

[Baptiste Daroussin]

Author: bapt
Date: Thu Oct 12 08:13:48 2017
New Revision: 451832
URL: https://svnweb.freebsd.org/changeset/ports/451832

Log:
  Remove py-python-cloudfiles expired since 2017-08-31

Deleted:
  head/net/py-python-cloudfiles/
Modified:
  head/MOVED
  head/net/Makefile
  head/sysutils/duplicity/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Thu Oct 12 08:12:13 2017	(r451831)
+++ head/MOVED	Thu Oct 12 08:13:48 2017	(r451832)
@@ -9582,3 +9582,4 @@ japanese/jd||2017-10-08|Does not build and 2ch.net API
 devel/vtable-dumper|devel/abi-compliance-checker|2017-10-08|Use abi-compliance-checker, which contains this program in newer version
 graphics/py-graph-dot||2017-10-08|Has expired: Unfetchable for more than six months (google code has gone away)
 graphics/py-graph||2017-10-08|Removed, depends on graphics/py-graph-dot
+net/py-python-cloudfiles||2017-10-12|Deprecated by usptream since August 1, 2013. Use databases/py-python-swiftclient instead

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Thu Oct 12 08:12:13 2017	(r451831)
+++ head/net/Makefile	Thu Oct 12 08:13:48 2017	(r451832)
@@ -1,3 +1,4 @@
+
 # $FreeBSD$
 #
 
@@ -1037,7 +1038,6 @@
     SUBDIR += py-python-bitcoinrpc
     SUBDIR += py-python-ceilometerclient
     SUBDIR += py-python-cinderclient
-    SUBDIR += py-python-cloudfiles
     SUBDIR += py-python-designateclient
     SUBDIR += py-python-glanceclient
     SUBDIR += py-python-heatclient

Modified: head/sysutils/duplicity/Makefile
==============================================================================
--- head/sysutils/duplicity/Makefile	Thu Oct 12 08:12:13 2017	(r451831)
+++ head/sysutils/duplicity/Makefile	Thu Oct 12 08:13:48 2017	(r451832)
@@ -3,6 +3,7 @@
 
 PORTNAME=	duplicity
 PORTVERSION=	0.7.14
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://launchpad.net/duplicity/0.7-series/${PORTVERSION}/+download/
 
@@ -21,13 +22,12 @@ USE_LDCONFIG=	yes
 
 PORTDOCS=	CHANGELOG COPYING README README-REPO README-LOG
 
-OPTIONS_DEFINE=		CLOUDFILES DOCS FTP FTPS GDOCS GIO NLS S3
+OPTIONS_DEFINE=		DOCS FTP FTPS GDOCS GIO NLS S3
 OPTIONS_GROUP=		GPG SSH
 OPTIONS_SINGLE=		GPG
 OPTIONS_SINGLE_GPG=	GNUPG GNUPG2
 OPTIONS_GROUP_SSH=	PARAMIKO PEXPECT
 OPTIONS_DEFAULT=	FTP FTPS GNUPG PARAMIKO S3
-CLOUDFILES_DESC=	CloudFiles backend
 FTP_DESC=		FTP backend
 FTPS_DESC=		FTPS backend
 GDOCS_DESC=		Google Docs backend
@@ -40,7 +40,6 @@ SSH_DESC=		SSH/SCP/SFTP backend
 PARAMIKO_DESC=		python ssh implementation
 PEXPECT_DESC=		pexpect and use ssh binaries
 
-CLOUDFILES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-cloudfiles>0:net/py-python-cloudfiles
 FTP_RUN_DEPENDS=	ncftp>=3.2.2:ftp/ncftp3
 FTPS_RUN_DEPENDS=	lftp>=3.7.15:ftp/lftp
 GDOCS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata
@@ -53,6 +52,11 @@ PARAMIKO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>
 PEXPECT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect
 S3_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}boto>=1.6b:devel/py-boto
 
+post-patch:
+.for f in cfbackend _cf_cloudfiles _cf_pyrax
+	@${RM} ${WRKSRC}/${PORTNAME}/backends/${f}.py
+.endfor
+
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e '56,67d' \
 		${WRKSRC}/setup.py
@@ -78,16 +82,6 @@ post-patch-S3-off:
 
 post-patch-GDOCS-off:
 	@${RM} ${WRKSRC}/${PORTNAME}/backends/gdocsbackend.py
-
-post-patch-CLOUDFILES-off:
-.for f in cfbackend _cf_cloudfiles _cf_pyrax
-	@${RM} ${WRKSRC}/${PORTNAME}/backends/${f}.py
-.endfor
-
-post-patch-CLOUDFILES-on:
-# Make pycloudfiles the default backend for cloudfiles, as pyrax isn't in the Ports Collection yet
-# Use --cf-backend=pyrax arg when running duplicity to manually select pyrax as the backend
-	@${REINPLACE_CMD} 's|"pyrax"|"cloudfiles"|' ${WRKSRC}/${PORTNAME}/globals.py
 
 post-patch-GIO-off:
 	@${RM} ${WRKSRC}/${PORTNAME}/backends/giobackend.py