translate-toolkit: Update to 2.3.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: translate-toolkit: Update to 2.3.1
From: i3enedek <pkgsrc%xn--rvztrtkrfrgp-bbb7j2b8f0b9d7a21oft.com@localhost>
Date: Tue, 25 Dec 2018 03:25:36 +0000
Module Name:	pkgsrc-wip
Committed By:	i3enedek <pkgsrc%xn--rvztrtkrfrgp-bbb7j2b8f0b9d7a21oft.com@localhost>
Pushed By:	i3enedek
Date:		Tue Dec 25 03:25:36 2018 +0000
Changeset:	3a81a73128ef83a8edac8441acbb3be8d3e6c56d

Modified Files:
	translate-toolkit/Makefile
	translate-toolkit/PLIST
	translate-toolkit/distinfo
	translate-toolkit/options.mk
	translate-toolkit/patches/patch-setup.cfg

Log Message:
translate-toolkit: Update to 2.3.1

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3a81a73128ef83a8edac8441acbb3be8d3e6c56d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 translate-toolkit/Makefile                | 28 ++++++++++++++++++++--------
 translate-toolkit/PLIST                   | 21 ++++++++++++---------
 translate-toolkit/distinfo                | 10 +++++-----
 translate-toolkit/options.mk              | 25 +++++++++++++++++--------
 translate-toolkit/patches/patch-setup.cfg | 16 ++++++++--------
 5 files changed, 62 insertions(+), 38 deletions(-)

diffs:
diff --git a/translate-toolkit/Makefile b/translate-toolkit/Makefile
index f0366528d3..80ef6b2eed 100644
--- a/translate-toolkit/Makefile
+++ b/translate-toolkit/Makefile
@@ -1,11 +1,23 @@
 # $NetBSD$
 
-DISTNAME=	translate-toolkit-2.3.0
+#*grumble about reasons for not having nice things*
+GIT_PKG=	translate-toolkit
+GIT_LEVEL=	2.3.1
+
+DISTNAME=	${GIT_LEVEL}
+PKGNAME=	${GIT_PKG}-${GIT_LEVEL}
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GITHUB:=translate/}
-GITHUB_PROJECT=	translate
-GITHUB_RELEASE=	${PKGVERSION_NOREV}
-EXTRACT_SUFX=	.tar.gz
+MASTER_SITES=	https://github.com/translate/translate/archive/
+WRKSRC=		${WRKDIR}/translate-${GIT_LEVEL}
+
+
+
+#DISTNAME=		translate-toolkit-2.3.0
+#CATEGORIES=		textproc
+#MASTER_SITES=		${MASTER_SITE_GITHUB:=translate/}
+#GITHUB_PROJECT=	translate
+#GITHUB_RELEASE=	${PKGVERSION_NOREV}
+#EXTRACT_SUFX=		.tar.gz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://toolkit.translatehouse.org/
@@ -23,10 +35,10 @@ REPLACE_BASH=	tools/*
 
 PYTHON_VERSIONS_ACCEPTED=	37 36 35 34 27
 
+# We do not want to setup a build env to translate
+# Firefox and Firefox Mobile.
 post-extract:
-	${RM} ${WRKSRC}/tools/mozilla/build_firefox.sh
-	${RM} ${WRKSRC}/tools/mozilla/buildxpi.py
-	${RM} ${WRKSRC}/tools/mozilla/get_moz_enUS.py
+	${RM} ${WRKSRC}/tools/mozilla/*
 	${RMDIR} ${WRKSRC}/tools/mozilla/
 
 .include "options.mk"
diff --git a/translate-toolkit/PLIST b/translate-toolkit/PLIST
index c2a6d9f058..4fe4bbdd00 100644
--- a/translate-toolkit/PLIST
+++ b/translate-toolkit/PLIST
@@ -718,9 +718,9 @@ ${PYSITELIB}/translate/lang/zh_tw.pyo
 ${PYSITELIB}/translate/misc/__init__.py
 ${PYSITELIB}/translate/misc/__init__.pyc
 ${PYSITELIB}/translate/misc/__init__.pyo
-${PYSITELIB}/translate/misc/csv_utils.py
-${PYSITELIB}/translate/misc/csv_utils.pyc
-${PYSITELIB}/translate/misc/csv_utils.pyo
+${PLIST.csv}${PYSITELIB}/translate/misc/csv_utils.py
+${PLIST.csv}${PYSITELIB}/translate/misc/csv_utils.pyc
+${PLIST.csv}${PYSITELIB}/translate/misc/csv_utils.pyo
 ${PYSITELIB}/translate/misc/deprecation.py
 ${PYSITELIB}/translate/misc/deprecation.pyc
 ${PYSITELIB}/translate/misc/deprecation.pyo
@@ -754,6 +754,9 @@ ${PYSITELIB}/translate/misc/quote.pyo
 ${PYSITELIB}/translate/misc/selector.py
 ${PYSITELIB}/translate/misc/selector.pyc
 ${PYSITELIB}/translate/misc/selector.pyo
+${PYSITELIB}/translate/misc/test_deprecation.py
+${PYSITELIB}/translate/misc/test_deprecation.pyc
+${PYSITELIB}/translate/misc/test_deprecation.pyo
 ${PYSITELIB}/translate/misc/test_dictutils.py
 ${PYSITELIB}/translate/misc/test_dictutils.pyc
 ${PYSITELIB}/translate/misc/test_dictutils.pyo
@@ -1372,10 +1375,10 @@ ${PYSITELIB}/translate/tools/test_pretranslate.pyo
 ${PYSITELIB}/translate/tools/test_pypo2phppo.py
 ${PYSITELIB}/translate/tools/test_pypo2phppo.pyc
 ${PYSITELIB}/translate/tools/test_pypo2phppo.pyo
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/translate_toolkit-${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/translate_toolkit-${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/translate_toolkit-${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/translate_toolkit-${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/translate_toolkit-${EGG_INFODIR}/requires.txt
+${PYSITELIB}/translate_toolkit-${EGG_INFODIR}/top_level.txt
 ${PLIST.doc}man/man1/translatetoolkit.1
diff --git a/translate-toolkit/distinfo b/translate-toolkit/distinfo
index f890376c54..8fbabb0d7c 100644
--- a/translate-toolkit/distinfo
+++ b/translate-toolkit/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-SHA1 (translate-toolkit-2.3.0.tar.gz) = 92e5df209a133215976f595b5b61ea39891fec99
-RMD160 (translate-toolkit-2.3.0.tar.gz) = 90aeefb3404760d9b63a471389e32957c35f6124
-SHA512 (translate-toolkit-2.3.0.tar.gz) = 04c335d17c989c12343b7cd6fdad98252931d1096f47c18591b578f241878e6c956280f35062676c9a976b4f065d79fe359f57f4444b2dbc44b894a82ff9c82d
-Size (translate-toolkit-2.3.0.tar.gz) = 7635702 bytes
-SHA1 (patch-setup.cfg) = 0003d00a7d6225b6b7229acdebbddbdb222d78fb
+SHA1 (2.3.1.tar.gz) = ebd7e07b05425b89e490ad015d0fdcff82f04404
+RMD160 (2.3.1.tar.gz) = 8c2cb6cdbbdb948eef27fcc63aaf986243856521
+SHA512 (2.3.1.tar.gz) = 6a9ba972026d8d5bb43231bb2aa8b140a12b92adeecd355be5f8f6793f71263abc451b54392067883e03b272323a09073a4e28d63fc66769306ea8ad456c029b
+Size (2.3.1.tar.gz) = 1132544 bytes
+SHA1 (patch-setup.cfg) = c0a72e9a8a5ea35bc1d7e5ea707ac88bbf3bc706
 SHA1 (patch-setup.py) = b6d82dfc90c0ab8c0efba24991381c025ab9ac2c
diff --git a/translate-toolkit/options.mk b/translate-toolkit/options.mk
index a69a97e4c0..198bea8cca 100644
--- a/translate-toolkit/options.mk
+++ b/translate-toolkit/options.mk
@@ -1,9 +1,9 @@
 # $NetBSD$
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.translate-toolkit
-PKG_SUPPORTED_OPTIONS+=		lxml levenshtein chardet tradostm pycountry doc ical ini
-PKG_SUGGESTED_OPTIONS=		lxml levenshtein chardet tradostm pycountry doc
-PLIST_VARS+=			doc
+PKG_SUPPORTED_OPTIONS+=		lxml levenshtein chardet tradostm pycountry doc ical ini csv
+PKG_SUGGESTED_OPTIONS=		lxml levenshtein chardet tradostm pycountry doc ical ini csv
+PLIST_VARS+=			csv doc
 
 
 .include "../../mk/bsd.options.mk"
@@ -33,7 +33,16 @@ DEPENDS+=	${PYPKGPREFIX}-vobject>=0.9.6:../../textproc/py-vobject
 .endif
 
 .if !empty(PKG_OPTIONS:Mini)
+.  if empty(_PYTHON_VERSION:M3*)
 DEPENDS+=	${PYPKGPREFIX}-iniparse>=0.4:../../textproc/py-iniparse
+.  endif
+.endif
+
+.if !empty(PKG_OPTIONS:Mcsv)
+.  if empty(_PYTHON_VERSION:M3*)
+DEPENDS+=	${PYPKGPREFIX}-backports.csv>=1.0.6:../../wip/py-backports.csv
+PLIST.csv=	yes
+.  endif
 .endif
 
 .if !empty(PKG_OPTIONS:Mdoc)
@@ -47,11 +56,11 @@ INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 PLIST.doc=		yes
 
 pre-build:
-		cd ${WRKSRC}/docs && ${MAKE} man
+	cd ${WRKSRC}/docs && ${MAKE} man
 pre-install:
-		${INSTALL_MAN} ${WRKSRC}/docs/_build/man/translatetoolkit.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-		${RM} -rf ${WRKSRC}/docs
-		${RM} -rf ${DESTDIR}${PREFIX}/${PYSITELIB}/translate/docs/
+	${INSTALL_MAN} ${WRKSRC}/docs/_build/man/translatetoolkit.1 \
+	${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${RM} -rf ${WRKSRC}/docs
+	${RM} -rf ${DESTDIR}${PREFIX}/${PYSITELIB}/translate/docs/
 
 .endif
diff --git a/translate-toolkit/patches/patch-setup.cfg b/translate-toolkit/patches/patch-setup.cfg
index ba9d871f5d..95fefa4d1b 100644
--- a/translate-toolkit/patches/patch-setup.cfg
+++ b/translate-toolkit/patches/patch-setup.cfg
@@ -2,13 +2,13 @@ $NetBSD$
 
 A don't test for docs.
 
---- setup.cfg.orig	2016-11-02 20:03:55.000000000 +0000
+--- setup.cfg.orig	2018-10-06 18:01:59.000000000 +0000
 +++ setup.cfg
-@@ -35,6 +35,7 @@ lines_after_imports = 2
+@@ -111,6 +111,7 @@ lines_after_imports=2
  [coverage:run]
- omit = 
- 	tests/*
-+	docs/*
- 	translate/test_*
- 	translate/*/test_*
- 	translate/*/*/test_*
+ omit =
+     tests/*
++    docs/*
+     translate/test_*
+     translate/*/test_*
+     translate/*/*/test_*
Prev by Date: Import backports.csv; Backport of Python 3 csv module
Next by Date: R-hms: Pretty time of day formatter
Previous by Thread: Import backports.csv; Backport of Python 3 csv module
Next by Thread: R-hms: Pretty time of day formatter
Indexes:
Home | Main Index | Thread Index | Old Index