commit: 8ebeff72c6d0eefdef7befd9990b5cfca4452cb3 Author: Mathy Vanvoorden <mathy <AT> vanvoorden <DOT> be> AuthorDate: Tue Nov 1 22:16:28 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Nov 3 17:37:23 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ebeff72
app-portage/repoman: revision bump to 2.3.0-r2 Package-Manager: portage-2.3.0 Closes: https://github.com/gentoo/gentoo/pull/2716 Signed-off-by: David Seifert <soap <AT> gentoo.org> .../repoman/files/repoman-2.3.0-bug-586864.patch | 32 ++++++++++ app-portage/repoman/repoman-2.3.0-r2.ebuild | 74 ++++++++++++++++++++++ 2 files changed, 106 insertions(+) diff --git a/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch b/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch new file mode 100644 index 00000000..adba72f --- /dev/null +++ b/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch @@ -0,0 +1,32 @@ +From ef33db45a0c1d462411d4ced1857a322c0ab28f6 Mon Sep 17 00:00:00 2001 +From: Zac Medico <zmed...@gentoo.org> +Date: Thu, 23 Jun 2016 23:22:41 -0700 +Subject: repoman: skip QA checks in manifest mode (bug 586864) + +The relevent Scanner loop control logic broke in commit 4062c69dc27a +because it was relying on the return value from the Manifest module's +"check" method. + +Fixes: 4062c69dc27a ("repoman: Move manifest generation to modules/commit/manifest.py") +X-Gentoo-Bug: 586864 +X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=586864 +--- + pym/repoman/scanner.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py +index d7cd81f..8999751 100644 +--- a/pym/repoman/scanner.py ++++ b/pym/repoman/scanner.py +@@ -294,6 +294,8 @@ class Scanner(object): + + if self.generate_manifest: + manifest.Manifest(**self.kwargs).update_manifest(checkdir) ++ if self.options.mode == 'manifest': ++ continue + checkdirlist = os.listdir(checkdir) + + dynamic_data = { +-- +cgit v0.12 + diff --git a/app-portage/repoman/repoman-2.3.0-r2.ebuild b/app-portage/repoman/repoman-2.3.0-r2.ebuild new file mode 100644 index 00000000..aa0f82a --- /dev/null +++ b/app-portage/repoman/repoman-2.3.0-r2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5} ) +PYTHON_REQ_USE='bzip2(+)' + +inherit distutils-r1 + +DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"; +SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND=" + !<sys-apps/portage-2.3.0_rc + >=dev-python/lxml-3.6.0[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${PN}-2.3.0-bug-586864.patch ) + +python_prepare_all() { + distutils-r1_python_prepare_all + + if [[ -n "${EPREFIX}" ]] ; then + einfo "Prefixing shebangs ..." + + local file + while read -r -d $'\0' file; do + local shebang=$(head -n1 "${file}") + + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${file}" || \ + die "sed failed" + fi + done < <(find . -type f -print0) + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +pkg_postinst() { + einfo "" + einfo "This release of repoman is from the new portage/repoman split" + einfo "release code base." + einfo "This new repoman code base is still being developed. So its API's" + einfo "are not to be considered stable and are subject to change." + einfo "The code released has been tested and considered ready for use." + einfo "This however does not guarantee it to be completely bug free." + einfo "Please report any bugs you may encounter." + einfo "" +}
