Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 823891A921F for ; Tue, 22 Dec 2020 14:39:51 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id DEF3684D9C; Tue, 22 Dec 2020 14:39:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 252A884D9B for ; Tue, 22 Dec 2020 14:39:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id pJr--my1CoeD for ; Tue, 22 Dec 2020 14:39:49 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7F5BE84D93 for ; Tue, 22 Dec 2020 14:39:49 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 73CB0FA9D; Tue, 22 Dec 2020 14:39:49 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1608647989214150" MIME-Version: 1.0 Date: Tue, 22 Dec 2020 14:39:49 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/graphics/py-cairo To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20201222143949.73CB0FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1608647989214150 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Dec 22 14:39:49 UTC 2020 Modified Files: pkgsrc/graphics/py-cairo: Makefile Log Message: py-cairo: Temporarily remove self-conflict as a cautionary measure To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 pkgsrc/graphics/py-cairo/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1608647989214150 Content-Disposition: inline Content-Length: 718 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/py-cairo/Makefile diff -u pkgsrc/graphics/py-cairo/Makefile:1.67 pkgsrc/graphics/py-cairo/Makefile:1.68 --- pkgsrc/graphics/py-cairo/Makefile:1.67 Mon Dec 7 14:42:00 2020 +++ pkgsrc/graphics/py-cairo/Makefile Tue Dec 22 14:39:49 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2020/12/07 14:42:00 wiz Exp $ +# $NetBSD: Makefile,v 1.68 2020/12/22 14:39:49 nia Exp $ DISTNAME= pycairo-1.20.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -15,7 +15,6 @@ LICENSE= gnu-lgpl-v2.1 OR mpl-1.1 USE_TOOLS+= pkg-config PYTHON_VERSIONS_INCOMPATIBLE= 27 -PYTHON_SELF_CONFLICT= yes BUILDLINK_API_DEPENDS.cairo+= cairo>=1.13.1 .include "../../graphics/cairo/buildlink3.mk" --_----------=_1608647989214150--