devel/py-scripttest: Rename, Update to 1.3.0

- Update to 1.3.0
- Chase upstream rename from ScriptTest to "scripttest"
- USE_GITHUB to get tests until sdist includes it [1]
- Add python to CATEGORIES
- Add TEST_DEPENDS and regression-test target
- Sort USE_PYTHON
- Patch tests to include skipIf reasons. Send upstream [2]

While MOVE'ing:

- Update MOVED
- Update devel/Makefile
- Fix date going backwards bug in MOVED [3]

[1] https://github.com/pypa/scripttest/issues/11
[2] https://github.com/pypa/scripttest/pull/12
[3] 7597: date going backwards from 2015-05-24 to 2015-05-23

Approved by:	nivit (maintainer, via email)

MOVED

@@ -7580,6 +7580,8 @@ deskutils/msynctool||2015-05-09|Has expired: Unfetchable, devices are not produc
 devel/ruby-flexmock|devel/rubygem-flexmock|2015-05-10|Rename to match our rubygems naming
 lang/pypy-devel|lang/pypy|2015-05-17|Superseded by lang/pypy
 databases/my2cego|databases/cegobridge|2015-05-19|Superseded by databases/cegobridge
+emulators/wine-compholio|emulators/wine-staging|2015-05-23|Renamed
+emulators/i386-wine-compholio|emulators/i386-wine-staging|2015-05-23|Renamed
 devel/rubygem-bioruby|devel/rubygem-bio|2015-05-23|Rename to match our rubygems naming
 www/rubygem-taggable|www/rubygem-acts_as_taggable|2015-05-23|Rename to match our rubygems naming
 security/rubygem-meterpreter_bins|security/rubygem-metasploit-payloads|2015-05-23|Renamed upstream
@@ -7591,8 +7593,6 @@ science/rubygem-netcdf|science/rubygem-ruby-netcdf|2015-05-24|Rename to match ou
 security/rubygem-rc4|security/rubygem-ruby-rc4|2015-05-24|Rename to match our rubygems naming
 print/rubygem-colortools|print/rubygem-color-tools|2015-05-24|Rename to match our rubygems naming
 security/qtkeychain|security/qtkeychain-qt5|2015-05-24|Renamed to indicate supported QT version
-emulators/wine-compholio|emulators/wine-staging|2015-05-23|Renamed
-emulators/i386-wine-compholio|emulators/i386-wine-staging|2015-05-23|Renamed
 www/rubygem-layout-yullio|www/rubygem-layout_yullio_generator|2015-05-27|Rename to match our rubygems naming
 net/rubygem-rightaws|net/rubygem-right_aws|2015-05-27|Rename to match our rubygems naming
 net/rubygem-rightflexiscale|net/rubygem-right_flexiscale|2015-05-27|Rename to match our rubygems naming
@@ -7607,3 +7607,4 @@ net/rubygem-yadis|net/rubygem-ruby-yadis|2015-05-30|Rename to match our rubygems
 ports-mgmt/porteasy||2015-06-01|Has expired: Does not support pkgng
 textproc/hgrep||2015-06-01|Has expired: Not needed any more, base grep has coloring support
 www/diamanda||2015-06-01|Has expired: Broken for more than 6 months
+devel/py-ScriptTest|devel/py-scripttest|2015-06-01|Renamed upstream

devel/Makefile

@@ -3738,7 +3738,6 @@
     SUBDIR += py-Products.validation
     SUBDIR += py-RPyC
     SUBDIR += py-Record
-    SUBDIR += py-ScriptTest
     SUBDIR += py-SymbolType
     SUBDIR += py-TGScheduler
     SUBDIR += py-ToscaWidgets
@@ -4091,6 +4090,7 @@
     SUBDIR += py-rtree
     SUBDIR += py-ruledispatch
     SUBDIR += py-sanetime
+    SUBDIR += py-scripttest
     SUBDIR += py-sdl2
     SUBDIR += py-serpent
     SUBDIR += py-setproctitle

devel/py-ScriptTest/Makefile

@@ -1,19 +0,0 @@
-# Created by: Nicola Vitale <nivit@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	ScriptTest
-PORTVERSION=	1.2
-PORTREVISION=	1
-CATEGORIES=	devel
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	nivit@FreeBSD.org
-COMMENT=	Helper to test command-line scripts
-
-LICENSE=	MIT
-
-USES=		python
-USE_PYTHON=	distutils autoplist
-
-.include <bsd.port.mk>

devel/py-ScriptTest/distinfo

@@ -1,2 +0,0 @@
-SHA256 (ScriptTest-1.2.tar.gz) = 158c34cfa736288c33177588572c2bb3372b836eb4c90b05222911b4ff976942
-SIZE (ScriptTest-1.2.tar.gz) = 7208

devel/py-scripttest/Makefile

@@ -0,0 +1,25 @@
+# Created by: Nicola Vitale <nivit@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	scripttest
+PORTVERSION=	1.3.0
+CATEGORIES=	devel python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	nivit@FreeBSD.org
+COMMENT=	Helper to test command-line scripts
+
+LICENSE=	MIT
+
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+
+USES=		python
+USE_PYTHON=	autoplist distutils
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	pypa
+
+regression-test: build
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+
+.include <bsd.port.mk>

devel/py-scripttest/distinfo

@@ -0,0 +1,2 @@
+SHA256 (pypa-scripttest-1.3.0_GH0.tar.gz) = 33c2c5315538598652cecc28984557d55dbe75ff814e50e4307dc8fbfac51cd5
+SIZE (pypa-scripttest-1.3.0_GH0.tar.gz) = 14885

devel/py-scripttest/files/patch-tests_test__string.py

@@ -0,0 +1,13 @@
+--- tests/test_string.py.orig	2015-06-02 05:43:40 UTC
++++ tests/test_string.py
+@@ -22,8 +22,8 @@ else:
+     utf8_str = 'Björk Guðmundsdóttir [ˈpjœr̥k ˈkvʏðmʏntsˌtoʊhtɪr]'
+ 
+ 
+-py2only = pytest.mark.skipif("sys.version_info >= (3, 0)")
+-py3only = pytest.mark.skipif("sys.version_info < (3, 0)")
++py2only = pytest.mark.skipif("sys.version_info >= (3, 0)",reason="Python 2.x Only")
++py3only = pytest.mark.skipif("sys.version_info < (3, 0)",reason="Python 3.x Only")
+ 
+ 
+ #-----------------------------------------