1 |
commit: 8ebeff72c6d0eefdef7befd9990b5cfca4452cb3 |
2 |
Author: Mathy Vanvoorden <mathy <AT> vanvoorden <DOT> be> |
3 |
AuthorDate: Tue Nov 1 22:16:28 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 3 17:37:23 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ebeff72 |
7 |
|
8 |
app-portage/repoman: revision bump to 2.3.0-r2 |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/2716 |
12 |
|
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
.../repoman/files/repoman-2.3.0-bug-586864.patch | 32 ++++++++++ |
16 |
app-portage/repoman/repoman-2.3.0-r2.ebuild | 74 ++++++++++++++++++++++ |
17 |
2 files changed, 106 insertions(+) |
18 |
|
19 |
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 |
20 |
new file mode 100644 |
21 |
index 00000000..adba72f |
22 |
--- /dev/null |
23 |
+++ b/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch |
24 |
@@ -0,0 +1,32 @@ |
25 |
+From ef33db45a0c1d462411d4ced1857a322c0ab28f6 Mon Sep 17 00:00:00 2001 |
26 |
+From: Zac Medico <zmedico@g.o> |
27 |
+Date: Thu, 23 Jun 2016 23:22:41 -0700 |
28 |
+Subject: repoman: skip QA checks in manifest mode (bug 586864) |
29 |
+ |
30 |
+The relevent Scanner loop control logic broke in commit 4062c69dc27a |
31 |
+because it was relying on the return value from the Manifest module's |
32 |
+"check" method. |
33 |
+ |
34 |
+Fixes: 4062c69dc27a ("repoman: Move manifest generation to modules/commit/manifest.py") |
35 |
+X-Gentoo-Bug: 586864 |
36 |
+X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=586864 |
37 |
+--- |
38 |
+ pym/repoman/scanner.py | 2 ++ |
39 |
+ 1 file changed, 2 insertions(+) |
40 |
+ |
41 |
+diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py |
42 |
+index d7cd81f..8999751 100644 |
43 |
+--- a/pym/repoman/scanner.py |
44 |
++++ b/pym/repoman/scanner.py |
45 |
+@@ -294,6 +294,8 @@ class Scanner(object): |
46 |
+ |
47 |
+ if self.generate_manifest: |
48 |
+ manifest.Manifest(**self.kwargs).update_manifest(checkdir) |
49 |
++ if self.options.mode == 'manifest': |
50 |
++ continue |
51 |
+ checkdirlist = os.listdir(checkdir) |
52 |
+ |
53 |
+ dynamic_data = { |
54 |
+-- |
55 |
+cgit v0.12 |
56 |
+ |
57 |
|
58 |
diff --git a/app-portage/repoman/repoman-2.3.0-r2.ebuild b/app-portage/repoman/repoman-2.3.0-r2.ebuild |
59 |
new file mode 100644 |
60 |
index 00000000..aa0f82a |
61 |
--- /dev/null |
62 |
+++ b/app-portage/repoman/repoman-2.3.0-r2.ebuild |
63 |
@@ -0,0 +1,74 @@ |
64 |
+# Copyright 1999-2016 Gentoo Foundation |
65 |
+# Distributed under the terms of the GNU General Public License v2 |
66 |
+# $Id$ |
67 |
+ |
68 |
+EAPI=6 |
69 |
+ |
70 |
+PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
71 |
+PYTHON_REQ_USE='bzip2(+)' |
72 |
+ |
73 |
+inherit distutils-r1 |
74 |
+ |
75 |
+DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds" |
76 |
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
77 |
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2" |
78 |
+ |
79 |
+LICENSE="GPL-2" |
80 |
+SLOT="0" |
81 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
82 |
+IUSE="" |
83 |
+ |
84 |
+RDEPEND=" |
85 |
+ !<sys-apps/portage-2.3.0_rc |
86 |
+ >=dev-python/lxml-3.6.0[${PYTHON_USEDEP}] |
87 |
+" |
88 |
+DEPEND="${RDEPEND}" |
89 |
+ |
90 |
+PATCHES=( "${FILESDIR}"/${PN}-2.3.0-bug-586864.patch ) |
91 |
+ |
92 |
+python_prepare_all() { |
93 |
+ distutils-r1_python_prepare_all |
94 |
+ |
95 |
+ if [[ -n "${EPREFIX}" ]] ; then |
96 |
+ einfo "Prefixing shebangs ..." |
97 |
+ |
98 |
+ local file |
99 |
+ while read -r -d $'\0' file; do |
100 |
+ local shebang=$(head -n1 "${file}") |
101 |
+ |
102 |
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then |
103 |
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${file}" || \ |
104 |
+ die "sed failed" |
105 |
+ fi |
106 |
+ done < <(find . -type f -print0) |
107 |
+ fi |
108 |
+} |
109 |
+ |
110 |
+python_test() { |
111 |
+ esetup.py test |
112 |
+} |
113 |
+ |
114 |
+python_install() { |
115 |
+ # Install sbin scripts to bindir for python-exec linking |
116 |
+ # they will be relocated in pkg_preinst() |
117 |
+ distutils-r1_python_install \ |
118 |
+ --system-prefix="${EPREFIX}/usr" \ |
119 |
+ --bindir="$(python_get_scriptdir)" \ |
120 |
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
121 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
122 |
+ --sbindir="$(python_get_scriptdir)" \ |
123 |
+ --sysconfdir="${EPREFIX}/etc" \ |
124 |
+ "${@}" |
125 |
+} |
126 |
+ |
127 |
+pkg_postinst() { |
128 |
+ einfo "" |
129 |
+ einfo "This release of repoman is from the new portage/repoman split" |
130 |
+ einfo "release code base." |
131 |
+ einfo "This new repoman code base is still being developed. So its API's" |
132 |
+ einfo "are not to be considered stable and are subject to change." |
133 |
+ einfo "The code released has been tested and considered ready for use." |
134 |
+ einfo "This however does not guarantee it to be completely bug free." |
135 |
+ einfo "Please report any bugs you may encounter." |
136 |
+ einfo "" |
137 |
+} |