From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AF7A0158094 for ; Sun, 10 Jul 2022 21:19:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5736E0D38; Sun, 10 Jul 2022 21:19:23 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B6B68E0D38 for ; Sun, 10 Jul 2022 21:19:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DCB7F340F5F for ; Sun, 10 Jul 2022 21:19:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F521391 for ; Sun, 10 Jul 2022 21:19:21 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1657487952.98494dea065dd498addba76b72c3bdfb1c8aa53f.dolsen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/gentoolkit/files/, app-portage/gentoolkit/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild app-portage/gentoolkit/gentoolkit-0.6.1.ebuild app-portage/gentoolkit/gentoolkit-9999.ebuild X-VCS-Directories: app-portage/gentoolkit/ app-portage/gentoolkit/files/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 98494dea065dd498addba76b72c3bdfb1c8aa53f X-VCS-Branch: master Date: Sun, 10 Jul 2022 21:19:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d4b51962-a38a-4511-82d4-a50f43b39b20 X-Archives-Hash: 76de9edddd6fbc82fa1c5d7b752a4067 commit: 98494dea065dd498addba76b72c3bdfb1c8aa53f Author: Brian Dolbec gentoo org> AuthorDate: Sun Jul 10 20:52:57 2022 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sun Jul 10 21:19:12 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98494dea app-portage/gentoolkit: Bump to 0.6.1-r1, update 9999 Revert setuptools use due to incorrect data_files location Go back tio using distutils for now. Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Brian Dolbec gentoo.org> .../files/gentoolkit-0.6.1-data_files.patch | 47 ++++++++++++++++++++++ ...kit-0.6.1.ebuild => gentoolkit-0.6.1-r1.ebuild} | 6 ++- app-portage/gentoolkit/gentoolkit-9999.ebuild | 2 +- 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch b/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch new file mode 100644 index 000000000000..8039864d69f9 --- /dev/null +++ b/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch @@ -0,0 +1,47 @@ +From 5b52ee6c6efab68111d128d45f386ac21eaf84f6 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec +Date: Sun, 10 Jul 2022 13:41:36 -0700 +Subject: [PATCH] Revert "setup.py: migrate to setuptools" + +This reverts commit bbbde97b5e625a49a1a66e307931548cb33f260b. +setuptools only installs data files to the python pkg directory +--- + setup.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/setup.py b/setup.py +index 36995de..23e9b36 100755 +--- a/setup.py ++++ b/setup.py +@@ -3,8 +3,8 @@ + import re + import sys + import subprocess +- +-from setuptools import setup, Command ++from distutils import core ++from distutils.cmd import Command + from glob import glob + + import os +@@ -67,7 +67,7 @@ manpages = [ + ] + + +-class set_version(Command): ++class set_version(core.Command): + """Set python __version__ and bash VERSION to our __version__.""" + + description = "hardcode scripts' version using VERSION from environment" +@@ -130,7 +130,7 @@ test_data = { + ] + } + +-setup( ++core.setup( + name="gentoolkit", + version=__version__, + description="Set of tools that work with and enhance portage.", +-- +libgit2 1.4.3 + diff --git a/app-portage/gentoolkit/gentoolkit-0.6.1.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild similarity index 95% rename from app-portage/gentoolkit/gentoolkit-0.6.1.ebuild rename to app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild index c9406219f5e3..d176540989f7 100644 --- a/app-portage/gentoolkit/gentoolkit-0.6.1.ebuild +++ b/app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -DISTUTILS_USE_PEP517=setuptools +DISTUTILS_USE_SETUPTOOLS=no PYTHON_COMPAT=( python3_{8..11} pypy3 ) PYTHON_REQ_USE="xml(+),threads(+)" @@ -29,6 +29,10 @@ RDEPEND="${DEPEND} virtual/awk sys-apps/gentoo-functions" +PATCHES=( + "${FILESDIR}/gentoolkit-0.6.1-data_files.patch" +) + distutils_enable_tests setup.py python_prepare_all() { diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild index d030b9327a92..00ccd192438d 100644 --- a/app-portage/gentoolkit/gentoolkit-9999.ebuild +++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -DISTUTILS_USE_PEP517=setuptools +DISTUTILS_USE_SETUPTOOLS=no PYTHON_COMPAT=( python3_{8..11} pypy3 ) PYTHON_REQ_USE="xml(+),threads(+)"