1 |
commit: 7b94e297700033dc4fd0331280e5717b48cff9a2 |
2 |
Author: Vladimir Smirnov <civil <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 29 18:28:55 2018 +0000 |
4 |
Commit: Vladimir Smirnov <civil <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 29 18:28:55 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b94e297 |
7 |
|
8 |
dev-db/clickhouse: version bump to 1.1.54388 |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
dev-db/clickhouse/Manifest | 2 +- |
13 |
...54385-r1.ebuild => clickhouse-1.1.54388.ebuild} | 1 - |
14 |
.../files/clickhouse-concatenate-python3.patch | 38 ---------------------- |
15 |
3 files changed, 1 insertion(+), 40 deletions(-) |
16 |
|
17 |
diff --git a/dev-db/clickhouse/Manifest b/dev-db/clickhouse/Manifest |
18 |
index 1247154568d..8eaeb040288 100644 |
19 |
--- a/dev-db/clickhouse/Manifest |
20 |
+++ b/dev-db/clickhouse/Manifest |
21 |
@@ -1,2 +1,2 @@ |
22 |
DIST cctz-4f9776a.tar.gz 290009 BLAKE2B 532eb7d590f9814c05cc7fdd3c75efe0a6b3f81d85201b14163a9600dd858c4fbac592270d0afccd7d5eef0080d7e70e9d716023bdb60d55479585e2cd3d3f59 SHA512 ba0dfc404cc70f03ef2be29fa3b0c70ea881c92a92525ea4ba1b5bcfc9e45df1b62a5eec180f498293e64bdd5cb9b41f97361cbb7e8baf299dcfdcd1557ca205 |
23 |
-DIST clickhouse-1.1.54385.tar.gz 5833821 BLAKE2B 48441aa28dd03c0b3282fe577849902ba29eded5dc90fe83159fdce3be1f93a6e48e48049e62febc2272f9b7ca1c143c1021900daaae9e5b43eab229418becff SHA512 eb3c02e6a094221374eca70b6cf6020414f31cbb196a521214d3c31b4266f5f251d431460025d9e644c83d61a3aa7ac2c266c9fa14db312ce42aa0cc8fc20d7c |
24 |
+DIST clickhouse-1.1.54388.tar.gz 5608073 BLAKE2B b64fd5b794da3e7eba028be9cd79f6e143a1c7534373ffd69135e3ea0d2518f6dff730dd912991943bd6cee497bd62938198647cec780697d6e77aa0b935bb9c SHA512 69eb294df9a9e61a095e631847e2ba9f98060400aad52306f0e673b90bd31320bf72b0e945033885e42e880caf46d2e49241790e903a1d6994d6070c0ac62a96 |
25 |
|
26 |
diff --git a/dev-db/clickhouse/clickhouse-1.1.54385-r1.ebuild b/dev-db/clickhouse/clickhouse-1.1.54388.ebuild |
27 |
similarity index 98% |
28 |
rename from dev-db/clickhouse/clickhouse-1.1.54385-r1.ebuild |
29 |
rename to dev-db/clickhouse/clickhouse-1.1.54388.ebuild |
30 |
index dbab7e9ea07..09bc728e219 100644 |
31 |
--- a/dev-db/clickhouse/clickhouse-1.1.54385-r1.ebuild |
32 |
+++ b/dev-db/clickhouse/clickhouse-1.1.54388.ebuild |
33 |
@@ -96,7 +96,6 @@ DEPEND="${RDEPEND} |
34 |
) |
35 |
" |
36 |
|
37 |
-PATCHES=( ${FILESDIR}/clickhouse-concatenate-python3.patch ) |
38 |
S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}" |
39 |
|
40 |
_clang_fullversion() { |
41 |
|
42 |
diff --git a/dev-db/clickhouse/files/clickhouse-concatenate-python3.patch b/dev-db/clickhouse/files/clickhouse-concatenate-python3.patch |
43 |
deleted file mode 100644 |
44 |
index 155ec758a74..00000000000 |
45 |
--- a/dev-db/clickhouse/files/clickhouse-concatenate-python3.patch |
46 |
+++ /dev/null |
47 |
@@ -1,38 +0,0 @@ |
48 |
---- ClickHouse-1.1.54381-stable/docs/concatenate.py.bak 2018-05-20 20:30:45.958356001 +0200 |
49 |
-+++ ClickHouse-1.1.54381-stable/docs/concatenate.py 2018-05-20 20:45:29.442341203 +0200 |
50 |
-@@ -20,12 +20,12 @@ |
51 |
- import os |
52 |
- |
53 |
- if len(sys.argv) < 2: |
54 |
-- print "Usage: concatenate.py language_dir" |
55 |
-- print "Example: concatenate.py ru" |
56 |
-+ print("Usage: concatenate.py language_dir") |
57 |
-+ print("Example: concatenate.py ru") |
58 |
- sys.exit(1) |
59 |
- |
60 |
- if not os.path.exists(sys.argv[1]): |
61 |
-- print "Pass language_dir correctly. For example, 'ru'." |
62 |
-+ print("Pass language_dir correctly. For example, 'ru'.") |
63 |
- sys.exit(2) |
64 |
- |
65 |
- # Configuration |
66 |
-@@ -43,8 +43,8 @@ |
67 |
- path = (l[l.index(':') + 1:]).strip(" '\n") |
68 |
- files_to_concatenate.append(path) |
69 |
- |
70 |
--print str(len(files_to_concatenate)) + " files will be concatenated into single md-file.\nFiles:" |
71 |
--print files_to_concatenate |
72 |
-+print(str(len(files_to_concatenate)) + " files will be concatenated into single md-file.\nFiles:") |
73 |
-+print(files_to_concatenate) |
74 |
- |
75 |
- # 2. Concatenate all of the files in the list |
76 |
- |
77 |
-@@ -68,7 +68,7 @@ |
78 |
- if sharp_pos > -1: |
79 |
- return '[' + text + '](' + link[sharp_pos:] + ')' |
80 |
- else: |
81 |
-- print 'ERROR: Link [' + text + '](' + link + ') in file ' + path + ' has no anchor. Please provide it.' |
82 |
-+ print('ERROR: Link [' + text + '](' + link + ') in file ' + path + ' has no anchor. Please provide it.') |
83 |
- # return '['+text+'](#'+link.replace('/','-')+')' |
84 |
- |
85 |
- for l in file: |