1 |
commit: f670386bd4a330a24ea5da640fbaf52a13389e36 |
2 |
Author: Rafael Martins <rafaelmartins <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 28 23:04:36 2020 +0000 |
4 |
Commit: Rafael Martins <rafaelmartins <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 28 23:36:48 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f670386b |
7 |
|
8 |
app-portage/g-octave: python3 support and more from git (bug #706214) |
9 |
|
10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.16 |
11 |
Signed-off-by: Rafael Martins <rafaelmartins <AT> gentoo.org> |
12 |
|
13 |
app-portage/g-octave/Manifest | 1 + |
14 |
.../files/g-octave-0.4.1-add_cave_support.patch | 88 ---------------------- |
15 |
.../files/g-octave-0.4.1-fix-Makefile.patch | 12 --- |
16 |
.../g-octave-0.4.1-fix-sourceforge-svn-root.patch | 36 --------- |
17 |
...ve-0.4.1-r6.ebuild => g-octave-0.4.1-r7.ebuild} | 20 ++--- |
18 |
5 files changed, 11 insertions(+), 146 deletions(-) |
19 |
|
20 |
diff --git a/app-portage/g-octave/Manifest b/app-portage/g-octave/Manifest |
21 |
index df89e8b399c..f50b4166cf1 100644 |
22 |
--- a/app-portage/g-octave/Manifest |
23 |
+++ b/app-portage/g-octave/Manifest |
24 |
@@ -1,2 +1,3 @@ |
25 |
DIST g-octave-0.4.1.tar.gz 52285 BLAKE2B d1e39931471c527c5542683c976487c56bca2a4666a437e110fa41b504287c0dd87aad94bf98298544c374c6d3faa0722fb3fab43228c56425be19b450ae0dd4 SHA512 424b95e626981aa5685795ffb3df1a1d608e5293adba074cc67f7dcf08d4a0c94a0174005f97a8da1ba1ae4233299e6a530af96ba3b9fd0d8b224915e947efb3 |
26 |
DIST g-octave-db-bdf02cb.tar.gz 39836 BLAKE2B fadc374e69bbf785f9e9ecae02eeba6f1c048d11503e5d97db2b4cc65c820ec829615be72ce823ef44ecb0e59e1b68dd40f7310d19d0b7706a2ff47ab95c0851 SHA512 5eae00e18b6d4633ed0feda3a2eea6b36da049c133bcd49e54481443ff435bfcab0f303ab9f0e8c3f48fad707625ee13b4564c510d89fa196e737c7599ea5fa6 |
27 |
+DIST g-octave-patches-0.4.1-r7.tar.xz 8800 BLAKE2B 514b154d7cbb816f15d88a2efe0d0b8503a5a09dedfcc79ab61fdb2fca8be193752ffb477ad7ea7be167e341a91e8d83c5b70fa20ed9d55da6f668acc8743e6c SHA512 cb03afd16bb7f2f0ddf2c4f11bdde2748b8ee0124642cfed4697e19adda30b141b3217afa55e996acf3e295d06af0636ba235a631039e65ca7920eef3243e267 |
28 |
|
29 |
diff --git a/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch b/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch |
30 |
deleted file mode 100644 |
31 |
index 27468c1bba5..00000000000 |
32 |
--- a/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch |
33 |
+++ /dev/null |
34 |
@@ -1,88 +0,0 @@ |
35 |
---- g-octave-0.4.1/g_octave/package_manager.py 2010-10-23 23:37:26.000000000 +0200 |
36 |
-+++ g-octave-0.4.1/g_octave/package_manager.py 2011-05-25 12:52:10.510019006 +0200 |
37 |
-@@ -15,6 +15,7 @@ |
38 |
- 'Portage', |
39 |
- 'Pkgcore', |
40 |
- 'Paludis', |
41 |
-+ 'Cave', |
42 |
- ] |
43 |
- |
44 |
- import grp |
45 |
-@@ -243,3 +244,56 @@ |
46 |
- packages.append(line.strip()) |
47 |
- return packages |
48 |
- |
49 |
-+class Cave(Base): |
50 |
-+ |
51 |
-+ _client = '/usr/bin/cave' |
52 |
-+ _group = 'paludisbuild' |
53 |
-+ |
54 |
-+ post_uninstall = [ |
55 |
-+ 'You may want to remove the dependencies too, using:', |
56 |
-+ '# cave purge', |
57 |
-+ ] |
58 |
-+ |
59 |
-+ def __init__(self, ask=False, verbose=False, pretend=False, oneshot=False, nocolor=False): |
60 |
-+ self._fullcommand = [self._client] |
61 |
-+ self._cmd = ['-z'] |
62 |
-+ oneshot and self._cmd.append('-1') |
63 |
-+ not pretend and self._cmd.append('-x') |
64 |
-+ #if verbose: |
65 |
-+ # self._fullcommand += [ |
66 |
-+ # '--show-descriptions', 'all', |
67 |
-+ # '--show-option-descriptions', 'all', |
68 |
-+ # ] |
69 |
-+ #cave doesn't support '--ask' |
70 |
-+ #cave doesn't support '--no-color' |
71 |
-+ |
72 |
-+ def run_command(self, command): |
73 |
-+ return subprocess.call(self._fullcommand + command + self._cmd) |
74 |
-+ |
75 |
-+ def install_package(self, pkgatom, catpkg): |
76 |
-+ return self.run_command(['resolve'] + [pkgatom]) |
77 |
-+ |
78 |
-+ def uninstall_package(self, pkgatom, catpkg): |
79 |
-+ return self.run_command(['uninstall'] + [pkgatom]) |
80 |
-+ |
81 |
-+ def update_package(self, pkgatom=None, catpkg=None): |
82 |
-+ cmd = ['-1','-K','s','-k','s'] |
83 |
-+ if pkgatom is None: |
84 |
-+ pkgatom = self.installed_packages() |
85 |
-+ else: |
86 |
-+ pkgatom = [pkgatom] |
87 |
-+ self.do_ebuilds(pkgatom) |
88 |
-+ return self.run_command(['resolve'] + cmd + pkgatom) |
89 |
-+ |
90 |
-+ def installed_packages(self): |
91 |
-+ packages = [] |
92 |
-+ p = subprocess.Popen([ |
93 |
-+ 'cave', |
94 |
-+ 'print-ids', |
95 |
-+ '--matching', 'g-octave/*::installed', |
96 |
-+ '--format', '%c/%p\n', |
97 |
-+ ], stdout=subprocess.PIPE) |
98 |
-+ if p.wait() == os.EX_OK: |
99 |
-+ for line in p.stdout: |
100 |
-+ packages.append(line.strip()) |
101 |
-+ return packages |
102 |
---- g-octave-0.4.1/scripts/g-octave 2011-05-25 12:00:25.740019020 +0200 |
103 |
-+++ g-octave-0.4.1/scripts/g-octave 2011-05-25 12:00:39.434019008 +0200 |
104 |
-@@ -217,7 +217,7 @@ |
105 |
- return os.EX_DATAERR |
106 |
- return os.EX_OK |
107 |
- |
108 |
-- from g_octave.package_manager import Portage, Pkgcore, Paludis |
109 |
-+ from g_octave.package_manager import Portage, Pkgcore, Paludis, Cave |
110 |
- |
111 |
- if conf_prefetch.package_manager == 'portage': |
112 |
- log.info('Your package manager is: Portage') |
113 |
-@@ -228,6 +228,9 @@ |
114 |
- elif conf_prefetch.package_manager == 'paludis': |
115 |
- log.info('Your package manager is: Paludis') |
116 |
- pkg_manager = Paludis(options.ask, options.verbose, options.pretend, options.oneshot, not options.colors) |
117 |
-+ elif conf_prefetch.package_manager == 'cave': |
118 |
-+ log.info('Your package manager is: Paludis (Cave)') |
119 |
-+ pkg_manager = Cave(options.ask, options.verbose, options.pretend, options.oneshot, not options.colors) |
120 |
- else: |
121 |
- log.error('Invalid package manager: %s' % conf_prefetch.package_manager) |
122 |
- out.eerror('Invalid package manager: %s' % conf_prefetch.package_manager) |
123 |
|
124 |
diff --git a/app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch b/app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch |
125 |
deleted file mode 100644 |
126 |
index af56b4f75d9..00000000000 |
127 |
--- a/app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch |
128 |
+++ /dev/null |
129 |
@@ -1,12 +0,0 @@ |
130 |
---- g-octave-0.4.1/share/g-octave.eclass 2013-05-30 19:01:07.980521612 +0200 |
131 |
-+++ g-octave-0.4.1/share/g-octave.eclass.new 2013-05-30 19:03:38.933514388 +0200 |
132 |
-@@ -48,6 +48,9 @@ |
133 |
- for filename in Makefile configure; do |
134 |
- cp "${DISTDIR}/g-octave_${filename}" "${S}/${filename}" |
135 |
- done |
136 |
-+ |
137 |
-+ sed -i -e 's@libexec@lib@g' "${S}/Makefile" || die 'sed failed.' |
138 |
-+ |
139 |
- chmod 0755 "${S}/configure" |
140 |
- if [ -e "${S}"/src/autogen.sh ]; then |
141 |
- cd "${S}"/src && ./autogen.sh || die 'failed to run autogen.sh' |
142 |
|
143 |
diff --git a/app-portage/g-octave/files/g-octave-0.4.1-fix-sourceforge-svn-root.patch b/app-portage/g-octave/files/g-octave-0.4.1-fix-sourceforge-svn-root.patch |
144 |
deleted file mode 100644 |
145 |
index 2700f3b100d..00000000000 |
146 |
--- a/app-portage/g-octave/files/g-octave-0.4.1-fix-sourceforge-svn-root.patch |
147 |
+++ /dev/null |
148 |
@@ -1,36 +0,0 @@ |
149 |
---- a/contrib/manage_pkgdb.py |
150 |
-+++ b/contrib/manage_pkgdb.py |
151 |
-@@ -50,7 +50,7 @@ class SfUpdates: |
152 |
- # feed url from 'http://sourceforge.net/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/' |
153 |
- feed_url = u'http://sourceforge.net/api/file/index/project-id/2888/mtime/desc/rss?path=%2FOctave%20Forge%20Packages%2FIndividual%20Package%20Releases' |
154 |
- |
155 |
-- svnroot_url = u'https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/' |
156 |
-+ svnroot_url = u'http://svn.code.sf.net/p/octave/code/trunk/octave-forge' |
157 |
- categories = [u'main', u'extra', u'language', u'nonfree'] |
158 |
- |
159 |
- _timestamp = None |
160 |
---- a/g_octave/description.py |
161 |
-+++ b/g_octave/description.py |
162 |
-@@ -269,7 +269,7 @@ def __getattr__(self, name): |
163 |
- |
164 |
- class SvnDescription(Description): |
165 |
- |
166 |
-- _url = 'https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge' |
167 |
-+ _url = 'http://svn.code.sf.net/p/octave/code/trunk/octave-forge' |
168 |
- |
169 |
- def __init__(self, category, package): |
170 |
- temp_desc = config_file = tempfile.mkstemp()[1] |
171 |
---- a/share/g-octave.eclass |
172 |
-+++ b/share/g-octave.eclass |
173 |
-@@ -13,7 +13,7 @@ |
174 |
- G_OCTAVE_CAT="${G_OCTAVE_CAT:-main}" |
175 |
- |
176 |
- |
177 |
--REPO_URI="https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge" |
178 |
-+REPO_URI="http://svn.code.sf.net/p/octave/code/trunk/octave-forge" |
179 |
- if [[ ${PV} = 9999* ]]; then |
180 |
- inherit subversion autotools |
181 |
- ESVN_REPO_URI="${REPO_URI}/${G_OCTAVE_CAT}/${PN}" |
182 |
--- |
183 |
-1.7.10 |
184 |
- |
185 |
|
186 |
diff --git a/app-portage/g-octave/g-octave-0.4.1-r6.ebuild b/app-portage/g-octave/g-octave-0.4.1-r7.ebuild |
187 |
similarity index 81% |
188 |
rename from app-portage/g-octave/g-octave-0.4.1-r6.ebuild |
189 |
rename to app-portage/g-octave/g-octave-0.4.1-r7.ebuild |
190 |
index dbf8ea63a92..12d1e45780d 100644 |
191 |
--- a/app-portage/g-octave/g-octave-0.4.1-r6.ebuild |
192 |
+++ b/app-portage/g-octave/g-octave-0.4.1-r7.ebuild |
193 |
@@ -1,9 +1,10 @@ |
194 |
-# Copyright 1999-2019 Gentoo Authors |
195 |
+# Copyright 1999-2020 Gentoo Authors |
196 |
# Distributed under the terms of the GNU General Public License v2 |
197 |
|
198 |
-EAPI=6 |
199 |
+EAPI=7 |
200 |
|
201 |
-PYTHON_COMPAT=( python2_7 ) |
202 |
+PYTHON_COMPAT=( python3_{6,7} ) |
203 |
+DISTUTILS_USE_SETUPTOOLS=no |
204 |
|
205 |
DB_COMMIT="bdf02cbf0a8d017c6c1bddeffd6f03d5d90695ed" |
206 |
DB_DIR="rafaelmartins-${PN}-db-${DB_COMMIT:0:7}" |
207 |
@@ -15,7 +16,8 @@ HOMEPAGE="https://github.com/rafaelmartins/g-octave" |
208 |
|
209 |
SRC_URI="https://github.com/downloads/rafaelmartins/${PN}/${P}.tar.gz |
210 |
https://github.com/rafaelmartins/${PN}-db/tarball/${DB_COMMIT} -> |
211 |
- ${PN}-db-${DB_COMMIT:0:7}.tar.gz" |
212 |
+ ${PN}-db-${DB_COMMIT:0:7}.tar.gz |
213 |
+ https://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-patches-${PVR}.tar.xz" |
214 |
|
215 |
LICENSE="GPL-2" |
216 |
SLOT="0" |
217 |
@@ -27,11 +29,7 @@ DEPEND="doc? ( >=dev-python/sphinx-1.0 )" |
218 |
RDEPEND="sys-apps/portage" |
219 |
|
220 |
python_prepare_all() { |
221 |
- local PATCHES=( |
222 |
- "${FILESDIR}/${P}-add_cave_support.patch" |
223 |
- "${FILESDIR}/${P}-fix-sourceforge-svn-root.patch" |
224 |
- "${FILESDIR}/${P}-fix-Makefile.patch" |
225 |
- ) |
226 |
+ eapply "${WORKDIR}/${PN}-patches-${PVR}" |
227 |
sed -i -e 's/^has_fetch.*$/has_fetch = False/' scripts/g-octave \ |
228 |
|| die 'failed to patch the g-octave main script' |
229 |
distutils-r1_python_prepare_all |
230 |
@@ -50,6 +48,8 @@ python_install_all() { |
231 |
mv docs/_build/{html,sphinx} || die 'mv failed.' |
232 |
HTML_DOCS+=( docs/_build/sphinx ) |
233 |
fi |
234 |
+ insinto /usr/share/g-octave |
235 |
+ doins "${DISTDIR}/${PN}-db-${DB_COMMIT:0:7}.tar.gz" |
236 |
distutils-r1_python_install_all |
237 |
} |
238 |
|
239 |
@@ -74,7 +74,7 @@ pkg_config() { |
240 |
local db="$(g-octave --config db)" |
241 |
mkdir -p "${db}" || die 'mkdir failed.' |
242 |
einfo "Extracting g-octave database files to: ${db}" |
243 |
- tar -xzf "${DISTDIR}/${PN}-db-${DB_COMMIT:0:7}.tar.gz" -C "${db}" || die 'tar failed.' |
244 |
+ tar -xzf "${EROOT}/usr/share/g-octave/${PN}-db-${DB_COMMIT:0:7}.tar.gz" -C "${db}" || die 'tar failed.' |
245 |
rm -rf "${db}"/{patches,octave-forge,info.json,manifest.json,timestamp} || die 'rm db files failed.' |
246 |
mv -f "${db}/${DB_DIR}"/* "${db}" || die 'mv failed.' |
247 |
rm -rf "${db}/${DB_DIR}" || die 'rm db dir failed.' |