1 |
commit: 45f3ad5b75ba8bdef00c2b149f8df3c11fdfec79 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 2 02:25:15 2017 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 2 02:25:15 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45f3ad5b |
7 |
|
8 |
app-portage/layman: Re-add 2.2.0-r7 due to missing keywords for g-sorcery |
9 |
|
10 |
Clean up files dir. |
11 |
|
12 |
Package-Manager: Portage-2.3.3_p38, Repoman-2.3.1_p31 |
13 |
|
14 |
app-portage/layman/Manifest | 1 + |
15 |
...yman-2.1.0-incorrect-import-make-conf-fix.patch | 29 ------- |
16 |
.../layman/files/layman-2.1.0-local_overlay.patch | 27 ------- |
17 |
app-portage/layman/layman-2.2.0-r7.ebuild | 89 ++++++++++++++++++++++ |
18 |
4 files changed, 90 insertions(+), 56 deletions(-) |
19 |
|
20 |
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest |
21 |
index 6dd75d6..2064836 100644 |
22 |
--- a/app-portage/layman/Manifest |
23 |
+++ b/app-portage/layman/Manifest |
24 |
@@ -1,3 +1,4 @@ |
25 |
DIST layman-2.0.0.tar.gz 81184 SHA256 5843035ae4cc069693c05cf9821dae3d89d3ea7e2115b8137ea5a4a6c2807f33 SHA512 30756464d71ab1e047036550b6500d7e57999d808ebe3efba1d1ae6c037f8ca777ba704a4981d75a90285133635027a7bc13f1890f34823de33ae991ed99e2da WHIRLPOOL ec362189c4757ee032dc93e079ea0f5b291d5652231a84f1175fb308ca5622882d5008f23fd6a3d5143ff0dc98c91632d19c2e6604dcaa9b6a550bc902d79c1a |
26 |
+DIST layman-2.2.0.tar.gz 116210 SHA256 4a10cfd3eb354e993886369995ae9b1243418e0370c6aabd4d0ef6c5b387b7a2 SHA512 34cac041d7b64274debdbc42cab079fd3bb3aee511ea9e80db726df0f828207d79a5262788483ced5cbf49924e3aa4f19fe21439c98dceea973d8f83473c2e41 WHIRLPOOL 8c5d3cbbfef35c6294dfac899cb42f49e0761745573721e38b7d6c9ac48031f95bbb961c9d8dd9d309e4672cc1e5b050107ba025a9f28127e5d7d6d9a73a6e9a |
27 |
DIST layman-2.4.1.tar.gz 130388 SHA256 545792a15a0a2514c79f1b3090aceef15e413c656f294b6ff84f8a36da7aa2da SHA512 bdb713d4c7d3773129b45a385068278958040759bb564e48cfda4dda9da5224ccaa7833fce3d06151ed1fecddbb6f1a059db6e71534d0e887dff12640af6c806 WHIRLPOOL b6ef18f8f3633e9bb2a08df620306441f8352174dc66f2bbb68613cff0796e0914f7008de4f185167815ba3267c3b63a4fe22d2bcd794f70cd78bc20e706d7d8 |
28 |
DIST layman-2.4.2.tar.gz 137893 SHA256 e84f8b745dd160bacf7b08dfd95b5c6d117dc8721edca370600f29ef0676ff92 SHA512 9d32269f51f896c554e6cbf8a674c50009bce48dd83dfe773b08b75bafd567eb75c26c227ab3a60bc83c1ed511862a3979b8d851befe8ad16fd0847eb91337cf WHIRLPOOL eba1844f2279071947601a8baa9424db24e5bd1ba2d9ac14f90e4ae2c3e0b566dabf10378cf6286225d85d11940add45239df8cb5b150eea227b47223ce65485 |
29 |
|
30 |
diff --git a/app-portage/layman/files/layman-2.1.0-incorrect-import-make-conf-fix.patch b/app-portage/layman/files/layman-2.1.0-incorrect-import-make-conf-fix.patch |
31 |
deleted file mode 100644 |
32 |
index 1396e32..00000000 |
33 |
--- a/app-portage/layman/files/layman-2.1.0-incorrect-import-make-conf-fix.patch |
34 |
+++ /dev/null |
35 |
@@ -1,29 +0,0 @@ |
36 |
-From 8f6005fcfb9d2012bba428863f89b6b9168c8226 Mon Sep 17 00:00:00 2001 |
37 |
-From: Devan Franchini <twitch153@g.o> |
38 |
-Date: Thu, 22 May 2014 22:57:08 -0400 |
39 |
-Subject: [PATCH] updater.py: Fixes incorrect import for make.conf class |
40 |
- |
41 |
-X-Gentoo-Bug: 521724 |
42 |
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/521724 |
43 |
---- |
44 |
- layman/updater.py | 4 ++-- |
45 |
- 1 files changed, 2 insertions(+), 2 deletions(-) |
46 |
- |
47 |
-diff --git a/layman/updater.py b/layman/updater.py |
48 |
-index 26aeed2..b2187e3 100644 |
49 |
---- a/layman/updater.py |
50 |
-+++ b/layman/updater.py |
51 |
-@@ -155,8 +155,8 @@ class Main(object): |
52 |
- self.output.info(" Creating layman's make.conf file") |
53 |
- # create layman's %(storage)s/make.conf |
54 |
- # so portage won't error |
55 |
-- from layman.makeconf import MakeConf |
56 |
-- maker = MakeConf(self.config, None) |
57 |
-+ from layman.makeconf import ConfigHandler |
58 |
-+ maker = ConfigHandler(self.config, None) |
59 |
- maker.write() |
60 |
- |
61 |
- |
62 |
--- |
63 |
-1.8.5.5 |
64 |
- |
65 |
|
66 |
diff --git a/app-portage/layman/files/layman-2.1.0-local_overlay.patch b/app-portage/layman/files/layman-2.1.0-local_overlay.patch |
67 |
deleted file mode 100644 |
68 |
index fbe5cd0..00000000 |
69 |
--- a/app-portage/layman/files/layman-2.1.0-local_overlay.patch |
70 |
+++ /dev/null |
71 |
@@ -1,27 +0,0 @@ |
72 |
-From d0e5d9120c27f678e9039bb2f65cfc0e457be6c7 Mon Sep 17 00:00:00 2001 |
73 |
-From: Douglas Freed <dwfreed@×××.edu> |
74 |
-Date: Sat, 26 Jul 2014 15:54:11 -0700 |
75 |
-Subject: [PATCH] Fix a bug when an overlay isn't in the remote list |
76 |
- |
77 |
-If the overlay isn't in the remote list, it obviously isn't a different |
78 |
-type, nor has its URL changed, so just init those to False so we can |
79 |
-sync the overlay without hitting UnboundLocalError. |
80 |
---- |
81 |
- layman/api.py | 1 + |
82 |
- 1 file changed, 1 insertion(+) |
83 |
- |
84 |
-diff --git a/layman/api.py b/layman/api.py |
85 |
-index a86970f..930f449 100755 |
86 |
---- a/layman/api.py |
87 |
-+++ b/layman/api.py |
88 |
-@@ -426,6 +426,7 @@ class LaymanAPI(object): |
89 |
- message = 'Overlay "%s" could not be found in the remote lists.\n' \ |
90 |
- 'Please check if it has been renamed and re-add if necessary.' % ovl |
91 |
- warnings.append((ovl, message)) |
92 |
-+ (diff_type, update_url) = (False, False) |
93 |
- else: |
94 |
- self.output.debug("API.sync(); else: self._get_remote_db().select(ovl)", 5) |
95 |
- |
96 |
--- |
97 |
-1.8.5.5 |
98 |
- |
99 |
|
100 |
diff --git a/app-portage/layman/layman-2.2.0-r7.ebuild b/app-portage/layman/layman-2.2.0-r7.ebuild |
101 |
new file mode 100644 |
102 |
index 00000000..b947ad8 |
103 |
--- /dev/null |
104 |
+++ b/app-portage/layman/layman-2.2.0-r7.ebuild |
105 |
@@ -0,0 +1,89 @@ |
106 |
+# Copyright 1999-2017 Gentoo Foundation |
107 |
+# Distributed under the terms of the GNU General Public License v2 |
108 |
+# $Id$ |
109 |
+ |
110 |
+EAPI="5" |
111 |
+ |
112 |
+PYTHON_COMPAT=( python{2_7,3_4} pypy ) |
113 |
+PYTHON_REQ_USE="xml(+)" |
114 |
+ |
115 |
+inherit eutils distutils-r1 linux-info prefix |
116 |
+ |
117 |
+DESCRIPTION="Tool to manage Gentoo overlays" |
118 |
+HOMEPAGE="http://layman.sourceforge.net" |
119 |
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
120 |
+ |
121 |
+LICENSE="GPL-2" |
122 |
+SLOT="0" |
123 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
124 |
+IUSE="bazaar cvs darcs +git g-sorcery mercurial squashfs subversion test" |
125 |
+ |
126 |
+DEPEND="test? ( dev-vcs/subversion )" |
127 |
+ |
128 |
+RDEPEND=" |
129 |
+ bazaar? ( dev-vcs/bzr ) |
130 |
+ cvs? ( dev-vcs/cvs ) |
131 |
+ darcs? ( dev-vcs/darcs ) |
132 |
+ git? ( dev-vcs/git ) |
133 |
+ mercurial? ( dev-vcs/mercurial ) |
134 |
+ g-sorcery? ( app-portage/g-sorcery ) |
135 |
+ subversion? ( |
136 |
+ || ( |
137 |
+ >=dev-vcs/subversion-1.5.4[http] |
138 |
+ >=dev-vcs/subversion-1.5.4[webdav-neon] |
139 |
+ >=dev-vcs/subversion-1.5.4[webdav-serf] |
140 |
+ ) |
141 |
+ ) |
142 |
+ sys-apps/portage[${PYTHON_USEDEP}] |
143 |
+ >=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}] |
144 |
+ " |
145 |
+ |
146 |
+layman_check_kernel_config() { |
147 |
+ local CONFIG_CHECK |
148 |
+ use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS" |
149 |
+ [[ -n ${CONFIG_CHECK} ]] && check_extra_config |
150 |
+} |
151 |
+ |
152 |
+pkg_pretend() { |
153 |
+ layman_check_kernel_config |
154 |
+} |
155 |
+ |
156 |
+pkg_setup() { |
157 |
+ layman_check_kernel_config |
158 |
+} |
159 |
+ |
160 |
+python_prepare_all() { |
161 |
+ distutils-r1_python_prepare_all |
162 |
+ epatch "${FILESDIR}"/${P}-removes-doctest-remnants.patch |
163 |
+ epatch "${FILESDIR}"/${P}-change-for-upstream-ssl-fetch.patch |
164 |
+ epatch "${FILESDIR}"/${P}-adds-kwargs-debug.patch |
165 |
+ rm "${S}"/"${PN}"/tests/dtest.py |
166 |
+ eprefixify etc/layman.cfg layman/config.py |
167 |
+} |
168 |
+ |
169 |
+python_test() { |
170 |
+ for suite in layman/tests/external.py ; do |
171 |
+ PYTHONPATH="." "${PYTHON}" ${suite} \ |
172 |
+ || die "test suite '${suite}' failed" |
173 |
+ done |
174 |
+} |
175 |
+ |
176 |
+python_install_all() { |
177 |
+ distutils-r1_python_install_all |
178 |
+ |
179 |
+ insinto /etc/layman |
180 |
+ doins etc/layman.cfg |
181 |
+ |
182 |
+ doman doc/layman.8 |
183 |
+ dohtml doc/layman.8.html |
184 |
+ |
185 |
+ keepdir /var/lib/layman |
186 |
+ keepdir /etc/layman/overlays |
187 |
+} |
188 |
+ |
189 |
+pkg_postinst() { |
190 |
+ # now run layman's update utility |
191 |
+ einfo "Running layman-updater..." |
192 |
+ "${EROOT}"/usr/bin/layman-updater |
193 |
+ einfo |
194 |
+} |