mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 04:06:33 +02:00
app-portage/gentoolkit: Sync with Gentoo
It's from Gentoo commit e59bcda0257406a0510c5a4c94e9479078b864b3.
This commit is contained in:
krishjainx
Krzesimir Nowak
parent
080da2bbe9
commit
23b2e4ebfe
@ -1,2 +1 @@
|
||||
DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B a379dcbbaba9d52c241fea020b87c458384e44092539947909e14fd6c63fd9cc06d076b8081874edf17fc50e80fe48ceab3400c90046867dc409e7ac39c17231 SHA512 8a5c344f3a17c4c779abbcaa35b5e3f147106dbc61310d0d1a816ec8080914271fa45c311a8feeb1bfe14195af7cf34c0b29142d6e43e2de232dae96fbd00861
|
||||
DIST gentoolkit-0.5.1.tar.gz 3203805 BLAKE2B de2cd69aec9be79f498b1180a90afb54e77f9d8a47636cd722f2028a906d43874132d55a71bf373b3d10c7c10034f5d8ce0280a35041b0c60a1d5aa2ed6296a1 SHA512 667e464853b17ae297c59fb06e8f4563119a1382470d064c5721ae898e61173e9af5b071c7618d315232e6974fec205e27559785d2816253711de3e83d9e1911
|
||||
DIST gentoolkit-0.6.1.tar.gz 3195781 BLAKE2B 27e370de77586b375dc70caa1abba4c2bc4207e8f08e0a7ea2953097135506949db71ff9102a0ead198e4dea425440c57b94ac7a811ca2d5e0016fc7e234bb0d SHA512 1ffc466b69a9c53f1bbd40f6f4d1eb33d5f0f4287bb65ba1a7b1b2675ad61ecffa55ed9fda7c1ae8148744f0a77e224315eb1903dfd61a2a3dab1600fc672d2d
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
# https://github.com/gentoo/gentoolkit/pull/11
|
||||
# https://bugs.gentoo.org/747034
|
||||
diff --git a/pym/gentoolkit/metadata.py b/pym/gentoolkit/metadata.py
|
||||
index 22c249e..c3dba98 100644
|
||||
--- a/pym/gentoolkit/metadata.py
|
||||
+++ b/pym/gentoolkit/metadata.py
|
||||
@@ -73,8 +73,7 @@ class _Maintainer(object):
|
||||
self.description = None
|
||||
self.restrict = node.get('restrict')
|
||||
self.status = node.get('status')
|
||||
- maint_attrs = node.getchildren()
|
||||
- for attr in maint_attrs:
|
||||
+ for attr in node.iter():
|
||||
setattr(self, attr.tag, attr.text)
|
||||
|
||||
def __repr__(self):
|
||||
@@ -101,7 +100,7 @@ class _Useflag(object):
|
||||
_desc = ''
|
||||
if node.text:
|
||||
_desc = node.text
|
||||
- for child in node.getchildren():
|
||||
+ for child in node.iter():
|
||||
_desc += child.text if child.text else ''
|
||||
_desc += child.tail if child.tail else ''
|
||||
# This takes care of tabs and newlines left from the file
|
||||
@@ -213,7 +212,7 @@ class MetaData(object):
|
||||
if herd in ('no-herd', 'maintainer-wanted', 'maintainer-needed'):
|
||||
return None
|
||||
|
||||
- for node in self._herdstree.getiterator('herd'):
|
||||
+ for node in self._herdstree.iter('herd'):
|
||||
if node.findtext('name') == herd:
|
||||
return node.findtext('email')
|
||||
|
||||
@@ -283,7 +282,7 @@ class MetaData(object):
|
||||
return self._useflags
|
||||
|
||||
self._useflags = []
|
||||
- for node in self._xml_tree.getiterator('flag'):
|
||||
+ for node in self._xml_tree.iter('flag'):
|
||||
self._useflags.append(_Useflag(node))
|
||||
|
||||
return self._useflags
|
||||
@ -1,34 +0,0 @@
|
||||
From f14b6198d1dd9cb7f4a83f3822e4a1782a5581e8 Mon Sep 17 00:00:00 2001
|
||||
From: Brian Dolbec <dolsen@gentoo.org>
|
||||
Date: Tue, 13 Oct 2020 10:04:07 -0400
|
||||
Subject: [PATCH] metadata.py: Fix duplicated use flag text bug 748129
|
||||
|
||||
Regression from commit: 517581df206766
|
||||
link: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=517581df206766fabf10273cde565e0a6dc62829
|
||||
Gentoo bug: https://bugs.gentoo.org/748129
|
||||
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
|
||||
---
|
||||
pym/gentoolkit/metadata.py | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pym/gentoolkit/metadata.py b/pym/gentoolkit/metadata.py
|
||||
index c3dba98..0b58392 100644
|
||||
--- a/pym/gentoolkit/metadata.py
|
||||
+++ b/pym/gentoolkit/metadata.py
|
||||
@@ -101,8 +101,11 @@ class _Useflag(object):
|
||||
if node.text:
|
||||
_desc = node.text
|
||||
for child in node.iter():
|
||||
- _desc += child.text if child.text else ''
|
||||
- _desc += child.tail if child.tail else ''
|
||||
+ # prevent duplicate text
|
||||
+ if child.text and child.text not in _desc:
|
||||
+ _desc += child.text
|
||||
+ if child.tail and not child.tail in _desc:
|
||||
+ _desc += child.tail
|
||||
# This takes care of tabs and newlines left from the file
|
||||
self.description = re.sub(r'\s+', ' ', _desc)
|
||||
|
||||
--
|
||||
libgit2 1.0.1
|
||||
|
||||
@ -0,0 +1,47 @@
|
||||
From 5b52ee6c6efab68111d128d45f386ac21eaf84f6 Mon Sep 17 00:00:00 2001
|
||||
From: Brian Dolbec <dolsen@gentoo.org>
|
||||
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
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
From bf3eb16e451fd1bdee8ef03a0d22e0040e033f19 Mon Sep 17 00:00:00 2001
|
||||
From: Brian Dolbec <dolsen@gentoo.org>
|
||||
Date: Sun, 10 Jul 2022 23:41:33 -0700
|
||||
Subject: [PATCH] eclean/pkgindex.py: Fix typo in function call
|
||||
|
||||
File "/usr/lib/python3.10/site-packages/gentoolkit/eclean/pkgindex.py", line
|
||||
60, in clean_pkgs_index
|
||||
if self.get_emaint_binhost():
|
||||
AttributeError: 'PkgIndex' object has no attribute 'get_emaint_binhost'. Did
|
||||
you mean: '_get_emaint_binhost'?
|
||||
|
||||
Also fix too many parameters in line 68 for the self.controller() call
|
||||
|
||||
Bug: https://bugs.gentoo.org/857555
|
||||
|
||||
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
|
||||
---
|
||||
pym/gentoolkit/eclean/pkgindex.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pym/gentoolkit/eclean/pkgindex.py b/pym/gentoolkit/eclean/pkgindex.py
|
||||
index d0878a1..7d6fade 100644
|
||||
--- a/pym/gentoolkit/eclean/pkgindex.py
|
||||
+++ b/pym/gentoolkit/eclean/pkgindex.py
|
||||
@@ -57,15 +57,15 @@ class PkgIndex:
|
||||
statinfo = os.stat(file_)
|
||||
size1 = statinfo.st_size
|
||||
show_progress = not quiet
|
||||
- if self.get_emaint_binhost():
|
||||
+ if self._get_emaint_binhost():
|
||||
self.taskmaster = TaskHandler(show_progress_bar=show_progress)
|
||||
tasks = [self.binhost]
|
||||
self.taskmaster.run_tasks(tasks)
|
||||
else:
|
||||
self.call_emaint()
|
||||
statinfo = os.stat(file_)
|
||||
clean_size = size1 - statinfo.st_size
|
||||
- self.controller("\n", clean_size, "Packages Index", file_, "Index")
|
||||
+ self.controller(clean_size, "Packages Index", file_, "Index")
|
||||
return clean_size
|
||||
|
||||
def call_emaint(self):
|
||||
--
|
||||
libgit2 1.4.3
|
||||
|
||||
@ -1,82 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DISTUTILS_USE_SETUPTOOLS=no
|
||||
PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
|
||||
PYTHON_REQ_USE="xml(+),threads(+)"
|
||||
|
||||
inherit distutils-r1 tmpfiles
|
||||
|
||||
DESCRIPTION="Collection of administration scripts for Gentoo"
|
||||
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
|
||||
SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
|
||||
DEPEND="
|
||||
sys-apps/portage[${PYTHON_USEDEP}]"
|
||||
RDEPEND="${DEPEND}
|
||||
sys-apps/gawk
|
||||
sys-apps/gentoo-functions"
|
||||
|
||||
distutils_enable_tests setup.py
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-0.5.0-python3_9.patch
|
||||
"${FILESDIR}"/${PN}-0.5.0-r1-python3_9.patch
|
||||
)
|
||||
|
||||
python_prepare_all() {
|
||||
python_setup
|
||||
echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
|
||||
VERSION="${PVR}" "${PYTHON}" setup.py set_version
|
||||
distutils-r1_python_prepare_all
|
||||
|
||||
if use prefix-guest ; then
|
||||
# use correct repo name, bug #632223
|
||||
sed -i \
|
||||
-e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \
|
||||
pym/gentoolkit/profile.py || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
if has_version "<${CATEGORY}/${PN}-0.4.0"; then
|
||||
SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
tmpfiles_process revdep-rebuild.conf
|
||||
|
||||
if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
|
||||
elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
|
||||
elog "part of the gentoolkit package."
|
||||
elog "The gentoolkit-dev package is now deprecated in favor of a single"
|
||||
elog "gentoolkit package. The remaining tools from gentoolkit-dev"
|
||||
elog "are now obsolete/unused with the git based tree."
|
||||
fi
|
||||
|
||||
# Only show the elog information on a new install
|
||||
if [[ ! ${REPLACING_VERSIONS} ]]; then
|
||||
elog
|
||||
elog "For further information on gentoolkit, please read the gentoolkit"
|
||||
elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
|
||||
elog
|
||||
elog "Another alternative to equery is app-portage/portage-utils"
|
||||
elog
|
||||
elog "Additional tools that may be of interest:"
|
||||
elog
|
||||
elog " app-admin/eclean-kernel"
|
||||
elog " app-portage/diffmask"
|
||||
elog " app-portage/flaggie"
|
||||
elog " app-portage/portpeek"
|
||||
elog " app-portage/smart-live-rebuild"
|
||||
fi
|
||||
}
|
||||
@ -1,10 +1,10 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_SETUPTOOLS=no
|
||||
PYTHON_COMPAT=( python3_{7..10} pypy3 )
|
||||
PYTHON_COMPAT=( python3_{9..11} pypy3 )
|
||||
PYTHON_REQ_USE="xml(+),threads(+)"
|
||||
|
||||
inherit distutils-r1 tmpfiles
|
||||
@ -14,7 +14,7 @@ if [[ ${PV} = 9999* ]]; then
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Collection of administration scripts for Gentoo"
|
||||
@ -23,12 +23,18 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
|
||||
# Need newer Portage for XML fix, bug #857537
|
||||
DEPEND="
|
||||
sys-apps/portage[${PYTHON_USEDEP}]"
|
||||
>=sys-apps/portage-3.0.32[${PYTHON_USEDEP}]"
|
||||
RDEPEND="${DEPEND}
|
||||
sys-apps/gawk
|
||||
app-alternatives/awk
|
||||
sys-apps/gentoo-functions"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/gentoolkit-0.6.1-data_files.patch"
|
||||
"${FILESDIR}/gentoolkit-0.6.1-pkgindex.patch"
|
||||
)
|
||||
|
||||
distutils_enable_tests setup.py
|
||||
|
||||
python_prepare_all() {
|
||||
@ -1,10 +1,10 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_SETUPTOOLS=no
|
||||
PYTHON_COMPAT=( python3_{7..10} pypy3 )
|
||||
PYTHON_COMPAT=( python3_{9..11} pypy3 )
|
||||
PYTHON_REQ_USE="xml(+),threads(+)"
|
||||
|
||||
inherit distutils-r1 tmpfiles
|
||||
@ -14,7 +14,7 @@ if [[ ${PV} = 9999* ]]; then
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Collection of administration scripts for Gentoo"
|
||||
@ -23,10 +23,11 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
|
||||
# Need newer Portage for XML fix, bug #857537
|
||||
DEPEND="
|
||||
sys-apps/portage[${PYTHON_USEDEP}]"
|
||||
>=sys-apps/portage-3.0.32[${PYTHON_USEDEP}]"
|
||||
RDEPEND="${DEPEND}
|
||||
sys-apps/gawk
|
||||
app-alternatives/awk
|
||||
sys-apps/gentoo-functions"
|
||||
|
||||
distutils_enable_tests setup.py
|
||||
|
||||
@ -5,10 +5,15 @@
|
||||
<email>tools-portage@gentoo.org</email>
|
||||
<name>Gentoo Portage tools team</name>
|
||||
</maintainer>
|
||||
<stabilize-allarches/>
|
||||
<longdescription>
|
||||
Gentoolkit is a collection of useful adminstration scripts particular to
|
||||
the Gentoo Linux distribution. It contains rough drafts and
|
||||
implementations of features that may in time make it into Portage, or
|
||||
into full-fledged tools in their own right.
|
||||
</longdescription>
|
||||
Gentoolkit is a collection of useful adminstration scripts particular to
|
||||
the Gentoo Linux distribution. It contains rough drafts and
|
||||
implementations of features that may in time make it into Portage, or
|
||||
into full-fledged tools in their own right.
|
||||
</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="gentoo">proj/gentoolkit</remote-id>
|
||||
<remote-id type="github">gentoo/gentoolkit</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user