Received: by mail.netbsd.org (Postfix, from userid 605) id 071C884E88; Sun, 25 Jul 2021 18:02:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4330284E80 for ; Sun, 25 Jul 2021 18:02:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id SF9IQ_XLPYoD for ; Sun, 25 Jul 2021 18:02:50 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9BF9284CDF for ; Sun, 25 Jul 2021 18:02:50 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 95047FA95; Sun, 25 Jul 2021 18:02:50 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_162723617058560" MIME-Version: 1.0 Date: Sun, 25 Jul 2021 18:02:50 +0000 From: "Jonathan Schleifer" Subject: CVS commit: pkgsrc/multimedia/sickgear To: pkgsrc-changes@NetBSD.org Reply-To: js@netbsd.org X-Mailer: log_accum Message-Id: <20210725180250.95047FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_162723617058560 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: js Date: Sun Jul 25 18:02:50 UTC 2021 Modified Files: pkgsrc/multimedia/sickgear: Makefile distinfo Added Files: pkgsrc/multimedia/sickgear/patches: patch-sickgear.py Log Message: multimedia/sickgear: Patch out Python version check While upstream quickly does a new release when a new Python is released, keeping up with this is annoying. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 pkgsrc/multimedia/sickgear/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/sickgear/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/sickgear/patches/patch-sickgear.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_162723617058560 Content-Disposition: inline Content-Length: 2968 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/sickgear/Makefile diff -u pkgsrc/multimedia/sickgear/Makefile:1.9 pkgsrc/multimedia/sickgear/Makefile:1.10 --- pkgsrc/multimedia/sickgear/Makefile:1.9 Sun Mar 21 14:20:41 2021 +++ pkgsrc/multimedia/sickgear/Makefile Sun Jul 25 18:02:50 2021 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2021/03/21 14:20:41 js Exp $ +# $NetBSD: Makefile,v 1.10 2021/07/25 18:02:50 js Exp $ DISTNAME= release_${PKGVERSION_NOREV} PKGNAME= sickgear-0.23.14 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GITHUB:=SickGear/} GITHUB_PROJECT= SickGear @@ -37,6 +37,7 @@ INSTALLATION_DIRS+= bin lib/sickgear CHECK_PERMS_SKIP= * do-build: + find ${WRKSRC} -name '*.orig' -exec rm {} \; ${SED} ${FILES_SUBST_SED} ${FILESDIR}/sickgear >${WRKDIR}/sickgear do-install: Index: pkgsrc/multimedia/sickgear/distinfo diff -u pkgsrc/multimedia/sickgear/distinfo:1.5 pkgsrc/multimedia/sickgear/distinfo:1.6 --- pkgsrc/multimedia/sickgear/distinfo:1.5 Sun Mar 21 13:45:34 2021 +++ pkgsrc/multimedia/sickgear/distinfo Sun Jul 25 18:02:50 2021 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.5 2021/03/21 13:45:34 js Exp $ +$NetBSD: distinfo,v 1.6 2021/07/25 18:02:50 js Exp $ SHA1 (SickGear/release_0.23.14.tar.gz) = 7b6691b141063610d3bc538554353e763ff6eb4c RMD160 (SickGear/release_0.23.14.tar.gz) = 21879e0463376a4884fe30addfd9bded5f0f777a SHA512 (SickGear/release_0.23.14.tar.gz) = ae83677034aadbf87702b71974671d654fabfa6e0bde529872ace1ff43fb2c645af1837efb93e2970b2d34a67e47612911d00c1f68d17a4cca111014ef81e423 Size (SickGear/release_0.23.14.tar.gz) = 11906111 bytes +SHA1 (patch-sickgear.py) = 74c33b2c9e7c967e964d9725359350487ebc4c79 Added files: Index: pkgsrc/multimedia/sickgear/patches/patch-sickgear.py diff -u /dev/null pkgsrc/multimedia/sickgear/patches/patch-sickgear.py:1.1 --- /dev/null Sun Jul 25 18:02:50 2021 +++ pkgsrc/multimedia/sickgear/patches/patch-sickgear.py Sun Jul 25 18:02:50 2021 @@ -0,0 +1,18 @@ +$NetBSD: patch-sickgear.py,v 1.1 2021/07/25 18:02:50 js Exp $ + +--- sickgear.py.orig 2021-03-10 02:49:59.000000000 +0000 ++++ sickgear.py +@@ -40,13 +40,6 @@ warnings.filterwarnings('ignore', module + warnings.filterwarnings('ignore', module=r'.*zoneinfo.*', message='.*file or directory.*') + warnings.filterwarnings('ignore', message='.*deprecated in cryptography.*') + +-versions = [((2, 7, 9), (2, 7, 18)), ((3, 7, 1), (3, 8, 8)), ((3, 9, 0), (3, 9, 2))] # inclusive version ranges +-if not any(list(map(lambda v: v[0] <= sys.version_info[:3] <= v[1], versions))) and not int(os.environ.get('PYT', 0)): +- print('Python %s.%s.%s detected.' % sys.version_info[:3]) +- print('Sorry, SickGear requires a Python version %s' % ', '.join(map( +- lambda r: '%s - %s' % tuple(map(lambda v: str(v).replace(',', '.')[1:-1], r)), versions))) +- sys.exit(1) +- + try: + try: + py_cache_path = os.path.normpath(os.path.join(os.path.dirname(__file__), '__pycache__')) --_----------=_162723617058560--