commit: 7b94e297700033dc4fd0331280e5717b48cff9a2
Author: Vladimir Smirnov <civil <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 29 18:28:55 2018 +0000
Commit: Vladimir Smirnov <civil <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 18:28:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b94e297
dev-db/clickhouse: version bump to 1.1.54388
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-db/clickhouse/Manifest | 2 +-
...54385-r1.ebuild => clickhouse-1.1.54388.ebuild} | 1 -
.../files/clickhouse-concatenate-python3.patch | 38 ----------------------
3 files changed, 1 insertion(+), 40 deletions(-)
diff --git a/dev-db/clickhouse/Manifest b/dev-db/clickhouse/Manifest
index 1247154568d..8eaeb040288 100644
--- a/dev-db/clickhouse/Manifest
+++ b/dev-db/clickhouse/Manifest
@@ -1,2 +1,2 @@
DIST cctz-4f9776a.tar.gz 290009 BLAKE2B
532eb7d590f9814c05cc7fdd3c75efe0a6b3f81d85201b14163a9600dd858c4fbac592270d0afccd7d5eef0080d7e70e9d716023bdb60d55479585e2cd3d3f59
SHA512
ba0dfc404cc70f03ef2be29fa3b0c70ea881c92a92525ea4ba1b5bcfc9e45df1b62a5eec180f498293e64bdd5cb9b41f97361cbb7e8baf299dcfdcd1557ca205
-DIST clickhouse-1.1.54385.tar.gz 5833821 BLAKE2B
48441aa28dd03c0b3282fe577849902ba29eded5dc90fe83159fdce3be1f93a6e48e48049e62febc2272f9b7ca1c143c1021900daaae9e5b43eab229418becff
SHA512
eb3c02e6a094221374eca70b6cf6020414f31cbb196a521214d3c31b4266f5f251d431460025d9e644c83d61a3aa7ac2c266c9fa14db312ce42aa0cc8fc20d7c
+DIST clickhouse-1.1.54388.tar.gz 5608073 BLAKE2B
b64fd5b794da3e7eba028be9cd79f6e143a1c7534373ffd69135e3ea0d2518f6dff730dd912991943bd6cee497bd62938198647cec780697d6e77aa0b935bb9c
SHA512
69eb294df9a9e61a095e631847e2ba9f98060400aad52306f0e673b90bd31320bf72b0e945033885e42e880caf46d2e49241790e903a1d6994d6070c0ac62a96
diff --git a/dev-db/clickhouse/clickhouse-1.1.54385-r1.ebuild
b/dev-db/clickhouse/clickhouse-1.1.54388.ebuild
similarity index 98%
rename from dev-db/clickhouse/clickhouse-1.1.54385-r1.ebuild
rename to dev-db/clickhouse/clickhouse-1.1.54388.ebuild
index dbab7e9ea07..09bc728e219 100644
--- a/dev-db/clickhouse/clickhouse-1.1.54385-r1.ebuild
+++ b/dev-db/clickhouse/clickhouse-1.1.54388.ebuild
@@ -96,7 +96,6 @@ DEPEND="${RDEPEND}
)
"
-PATCHES=( ${FILESDIR}/clickhouse-concatenate-python3.patch )
S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
_clang_fullversion() {
diff --git a/dev-db/clickhouse/files/clickhouse-concatenate-python3.patch
b/dev-db/clickhouse/files/clickhouse-concatenate-python3.patch
deleted file mode 100644
index 155ec758a74..00000000000
--- a/dev-db/clickhouse/files/clickhouse-concatenate-python3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- ClickHouse-1.1.54381-stable/docs/concatenate.py.bak 2018-05-20
20:30:45.958356001 +0200
-+++ ClickHouse-1.1.54381-stable/docs/concatenate.py 2018-05-20
20:45:29.442341203 +0200
-@@ -20,12 +20,12 @@
- import os
-
- if len(sys.argv) < 2:
-- print "Usage: concatenate.py language_dir"
-- print "Example: concatenate.py ru"
-+ print("Usage: concatenate.py language_dir")
-+ print("Example: concatenate.py ru")
- sys.exit(1)
-
- if not os.path.exists(sys.argv[1]):
-- print "Pass language_dir correctly. For example, 'ru'."
-+ print("Pass language_dir correctly. For example, 'ru'.")
- sys.exit(2)
-
- # Configuration
-@@ -43,8 +43,8 @@
- path = (l[l.index(':') + 1:]).strip(" '\n")
- files_to_concatenate.append(path)
-
--print str(len(files_to_concatenate)) + " files will be concatenated into
single md-file.\nFiles:"
--print files_to_concatenate
-+print(str(len(files_to_concatenate)) + " files will be concatenated into
single md-file.\nFiles:")
-+print(files_to_concatenate)
-
- # 2. Concatenate all of the files in the list
-
-@@ -68,7 +68,7 @@
- if sharp_pos > -1:
- return '[' + text + '](' + link[sharp_pos:] + ')'
- else:
-- print 'ERROR: Link [' + text + '](' + link + ') in file ' +
path + ' has no anchor. Please provide it.'
-+ print('ERROR: Link [' + text + '](' + link + ') in file ' +
path + ' has no anchor. Please provide it.')
- # return '['+text+'](#'+link.replace('/','-')+')'
-
- for l in file:
