From 8e426ccff148220423503c9a1c6c512c9b63ddfa Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Tue, 13 Oct 2020 10:27:14 -0400 Subject: app-portage/gentoolkit: Fix use flag desc. in 0.5.0-r1 bug 748129 Fix duplicated text in some use flag descriptions caused by the -r1 py3.9 patch. Closes: https://bugs.gentoo.org/748129 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Brian Dolbec --- .../files/gentoolkit-0.5.0-r1-python3_9.patch | 34 ++++++++++ app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild | 75 --------------------- app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild | 78 ++++++++++++++++++++++ 3 files changed, 112 insertions(+), 75 deletions(-) create mode 100644 app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch delete mode 100644 app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild create mode 100644 app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild (limited to 'app-portage') diff --git a/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch b/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch new file mode 100644 index 000000000000..a9dae6150454 --- /dev/null +++ b/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch @@ -0,0 +1,34 @@ +From f14b6198d1dd9cb7f4a83f3822e4a1782a5581e8 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec +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 +--- + 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 + diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild deleted file mode 100644 index 18ac36af8767..000000000000 --- a/app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 ) -PYTHON_REQ_USE="xml(+),threads(+)" - -inherit distutils-r1 - -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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) - -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 -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.4.0"; then - SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1 - fi -} - -pkg_postinst() { - # Create cache directory for revdep-rebuild - mkdir -p -m 0755 "${EROOT}"/var/cache - mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild - - 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/install-mask" - elog " app-portage/portpeek" - elog " app-portage/smart-live-rebuild" - fi -} diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild new file mode 100644 index 000000000000..77fdfb33cf18 --- /dev/null +++ b/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 ) +PYTHON_REQ_USE="xml(+),threads(+)" + +inherit distutils-r1 + +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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-0.4.0"; then + SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1 + fi +} + +pkg_postinst() { + # Create cache directory for revdep-rebuild + mkdir -p -m 0755 "${EROOT}"/var/cache + mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild + + 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/install-mask" + elog " app-portage/portpeek" + elog " app-portage/smart-live-rebuild" + fi +} -- cgit v1.2.3-65-gdbad