From 8f19e8b39980b8a744736e6dfd5f520a33e1b8a9 Mon Sep 17 00:00:00 2001 From: David Naylor Date: Fri, 18 Nov 2016 18:49:55 +0000 Subject: devel/eric6: update to 6.1.11 - remove i18n files from devel/eric6 (duplicate of the specific ports) - add support for Python 3 --- devel/cs-eric6/distinfo | 6 +++--- devel/eric6/Makefile | 3 +++ devel/eric6/Makefile.inc | 14 +++++++++++--- devel/eric6/distinfo | 6 +++--- devel/eric6/files/extra-patch-install-i18n.py | 6 +++--- devel/eric6/pkg-plist | 7 +++---- devel/es-eric6/distinfo | 6 +++--- devel/it-eric6/distinfo | 6 +++--- devel/tr-eric6/distinfo | 6 +++--- 9 files changed, 35 insertions(+), 25 deletions(-) (limited to 'devel') diff --git a/devel/cs-eric6/distinfo b/devel/cs-eric6/distinfo index df1f68ce0e07..0a1bee751d3b 100644 --- a/devel/cs-eric6/distinfo +++ b/devel/cs-eric6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1476031012 -SHA256 (eric6-i18n-cs-6.1.10.tar.gz) = 5677820975fcd86b13304fcacac4c09da196bebc6fbb4133bf24c77127b59b9d -SIZE (eric6-i18n-cs-6.1.10.tar.gz) = 565677 +TIMESTAMP = 1479494399 +SHA256 (eric6-i18n-cs-6.1.11.tar.gz) = 0656d0b1c8e9e03617ba5cfc154351c9bf8a2554a3332eac139b956b1d450b10 +SIZE (eric6-i18n-cs-6.1.11.tar.gz) = 565671 diff --git a/devel/eric6/Makefile b/devel/eric6/Makefile index 05ee67b4436f..67f727b6e518 100644 --- a/devel/eric6/Makefile +++ b/devel/eric6/Makefile @@ -35,6 +35,9 @@ PORTDATA= * PORTDOCS= * PORTEXAMPLES= * +post-patch: + ${RM} ${WRKSRC}/eric/i18n/*.qm ${WRKSRC}/eric/i18n/*.ts + do-configure: ${SED} -e 's,PYTHON_SITELIBDIR,${PYTHON_SITELIBDIR},' \ -e 's,PREFIX,${PREFIX},' \ diff --git a/devel/eric6/Makefile.inc b/devel/eric6/Makefile.inc index 7a14de66ffbf..a62a4d51657e 100644 --- a/devel/eric6/Makefile.inc +++ b/devel/eric6/Makefile.inc @@ -6,7 +6,7 @@ # french/eric6, german/eric6, russian/eric6 PORTNAME= eric6 -PORTVERSION= 6.1.10 +PORTVERSION= 6.1.11 MASTER_SITES= SF/eric-ide/${PORTNAME}/stable/${PORTVERSION} DISTNAME?= ${PORTNAME}-i18n-${I18N_LANG}-${PORTVERSION} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -22,7 +22,7 @@ I18N_LANG?= ru INSTALL_CMD?= install-i18n.py -p ${STAGEDIR} MAKE_ENV+= "HOME=${WRKDIR}" -USES+= python:2 +USES+= python NO_BUILD= yes PLIST_FILES?= %%DATADIR%%/i18n/${PORTNAME}_${I18N_LANG}.qm EXTRA_PATCHES?= ${.CURDIR}/../../devel/eric6/files/extra-patch-install-i18n.py @@ -31,10 +31,18 @@ EXTRA_PATCHES?= ${.CURDIR}/../../devel/eric6/files/extra-patch-install-i18n.py NO_ARCH= yes .endif +.include + +.if ${PYTHON_VER} <= 2.7 +PLIST_SUB+= PYTHON2= +.else +PLIST_SUB+= PYTHON2="@comment " +.endif + do-install: @(cd ${WRKSRC}; \ ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_CMD}) DESCR= ${.CURDIR}/../../devel/eric6/pkg-descr -.include +.include diff --git a/devel/eric6/distinfo b/devel/eric6/distinfo index 728b12758b9e..312b900901dc 100644 --- a/devel/eric6/distinfo +++ b/devel/eric6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1476026652 -SHA256 (eric6-6.1.10.tar.gz) = 1fb32fcffad4349a13935c19d4dec6e53af2c11f572d4a9a3bdfc0d341419b4c -SIZE (eric6-6.1.10.tar.gz) = 10897674 +TIMESTAMP = 1479494248 +SHA256 (eric6-6.1.11.tar.gz) = 68297de0c23dde1e8d6a129df4ebd28b977f835e89a0a8483ee3da2368a23240 +SIZE (eric6-6.1.11.tar.gz) = 17033232 diff --git a/devel/eric6/files/extra-patch-install-i18n.py b/devel/eric6/files/extra-patch-install-i18n.py index 817c9356f60c..fa0b56e8aa53 100644 --- a/devel/eric6/files/extra-patch-install-i18n.py +++ b/devel/eric6/files/extra-patch-install-i18n.py @@ -2,7 +2,7 @@ +++ install-i18n.py 2013-10-05 17:55:20.162267518 +0400 @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 -+#!/usr/bin/env python2 ++#!/usr/bin/env python # -*- coding: utf-8 -*- # Copyright (c) 2004 - 2015 Detlev Offenbach @@ -21,7 +21,7 @@ - targetDir = configDir + targetDir = distDir + getConfig('ericTranslationsDir') + if not os.path.exists(targetDir): -+ os.makedirs(targetDir, 0755) ++ os.makedirs(targetDir, 493) # 0o755 else: targetDir = getConfig('ericTranslationsDir') @@ -30,7 +30,7 @@ try: - optlist, args = getopt.getopt(argv[1:], "hp") -+ optlist, args = getopt.getopt(argv[1:],"hp:") ++ optlist, args = getopt.getopt(argv[1:], "hp:") except getopt.GetoptError: usage() diff --git a/devel/eric6/pkg-plist b/devel/eric6/pkg-plist index 69fcc3b0c6fa..94b69b674c4c 100644 --- a/devel/eric6/pkg-plist +++ b/devel/eric6/pkg-plist @@ -19,10 +19,9 @@ bin/eric6_trpreviewer bin/eric6_uipreviewer bin/eric6_unittest bin/eric6_webbrowser -@comment lib/python2.7/site-packages/eric6.pth -lib/python2.7/site-packages/eric6config.py -lib/python2.7/site-packages/eric6config.pyc -lib/python2.7/site-packages/eric6plugins/__init__.py +%%PYTHON_SITELIBDIR%%/eric6config.py +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/eric6config.pyc +%%PYTHON_SITELIBDIR%%/eric6plugins/__init__.py share/applications/eric6.desktop share/pixmaps/eric6.png share/qt4/qsci/api/python/eric6.api diff --git a/devel/es-eric6/distinfo b/devel/es-eric6/distinfo index b3db481acb41..6cec628b02a4 100644 --- a/devel/es-eric6/distinfo +++ b/devel/es-eric6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1476031113 -SHA256 (eric6-i18n-es-6.1.10.tar.gz) = 58816080fc5ec028af01163b8700bea077a75a330f1f3b8183f0cb2aeacf3eda -SIZE (eric6-i18n-es-6.1.10.tar.gz) = 789148 +TIMESTAMP = 1479494457 +SHA256 (eric6-i18n-es-6.1.11.tar.gz) = 2620b43210808372c69b0cf6b9fc8e9eb2a66601a1cac04ddb061011ae8e4417 +SIZE (eric6-i18n-es-6.1.11.tar.gz) = 789161 diff --git a/devel/it-eric6/distinfo b/devel/it-eric6/distinfo index 1a7055b63bb1..9e939850baa7 100644 --- a/devel/it-eric6/distinfo +++ b/devel/it-eric6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1476031209 -SHA256 (eric6-i18n-it-6.1.10.tar.gz) = 7bc809c03b8c127c7f20fc2e349842b08d108402e904437d2644a9f74700932a -SIZE (eric6-i18n-it-6.1.10.tar.gz) = 641916 +TIMESTAMP = 1479494514 +SHA256 (eric6-i18n-it-6.1.11.tar.gz) = dec286a7ab5f26c85893ffe27bd066fec916c232ce525bd0919aa4825fe2ab02 +SIZE (eric6-i18n-it-6.1.11.tar.gz) = 641915 diff --git a/devel/tr-eric6/distinfo b/devel/tr-eric6/distinfo index 8e4f286a5e91..34390196117d 100644 --- a/devel/tr-eric6/distinfo +++ b/devel/tr-eric6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1476031299 -SHA256 (eric6-i18n-tr-6.1.10.tar.gz) = 58621998b81f8908e94f0a11bc5272cbab83a4becdc031be93617b37511f2a51 -SIZE (eric6-i18n-tr-6.1.10.tar.gz) = 491339 +TIMESTAMP = 1479494571 +SHA256 (eric6-i18n-tr-6.1.11.tar.gz) = ad5e62e6e7505082af14d86807eadf6a5c92c7c56ccca7d76326301edc976362 +SIZE (eric6-i18n-tr-6.1.11.tar.gz) = 491344 -- cgit v1.2.3