From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 63AF21381FB for ; Tue, 25 Dec 2012 15:36:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF8B421C018; Tue, 25 Dec 2012 15:36:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6844621C018 for ; Tue, 25 Dec 2012 15:36:29 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 474AA33D8D6 for ; Tue, 25 Dec 2012 15:36:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DA9A5E543D for ; Tue, 25 Dec 2012 15:36:26 +0000 (UTC) From: "Tiziano Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tiziano Müller" Message-ID: <1356449781.031b9c62a76a85e5f8c3163931339eea8419a56d.dev-zero@gentoo> Subject: [gentoo-commits] dev/dev-zero:master commit in: app-vim/clang_complete/, app-vim/clang_complete/files/ X-VCS-Repository: dev/dev-zero X-VCS-Files: app-vim/clang_complete/Manifest app-vim/clang_complete/clang_complete-scm.ebuild app-vim/clang_complete/files/cache_path.patch app-vim/clang_complete/files/libclang_path.patch app-vim/clang_complete/files/make-cache-path-configureable.patch X-VCS-Directories: app-vim/clang_complete/ app-vim/clang_complete/files/ X-VCS-Committer: dev-zero X-VCS-Committer-Name: Tiziano Müller X-VCS-Revision: 031b9c62a76a85e5f8c3163931339eea8419a56d X-VCS-Branch: master Date: Tue, 25 Dec 2012 15:36:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cbcf5d89-0191-49a1-83aa-a3c3504b51a0 X-Archives-Hash: fb85fecf062d4f88866f10ab6b27cae8 commit: 031b9c62a76a85e5f8c3163931339eea8419a56d Author: Tiziano Müller dev-zero ch> AuthorDate: Tue Dec 25 15:36:21 2012 +0000 Commit: Tiziano Müller gentoo org> CommitDate: Tue Dec 25 15:36:21 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=031b9c62 Fix patch. Drop unneeded patch. --- app-vim/clang_complete/Manifest | 5 +-- app-vim/clang_complete/clang_complete-scm.ebuild | 3 +- app-vim/clang_complete/files/cache_path.patch | 19 ------------ app-vim/clang_complete/files/libclang_path.patch | 13 -------- .../files/make-cache-path-configureable.patch | 31 ++++++++++++++++++++ 5 files changed, 34 insertions(+), 37 deletions(-) diff --git a/app-vim/clang_complete/Manifest b/app-vim/clang_complete/Manifest index e71cb85..9c4c98f 100644 --- a/app-vim/clang_complete/Manifest +++ b/app-vim/clang_complete/Manifest @@ -1,3 +1,2 @@ -AUX cache_path.patch 568 RMD160 b11c030c331081fcd72e38c18e59f683d540611f SHA1 16ecc305f9efb5db7281d0fabfcc61b0a87be3b3 SHA256 eb2190d3df843fe940901cceffdfc4da84f315ab7dedcab69080da1138d31013 -AUX libclang_path.patch 439 RMD160 b2a2109c2b8536975ecb9bb8f77193724a7f0549 SHA1 9be76c99036b6a9259c22cb2643e0cbd2c5dcee7 SHA256 2bf5e74827ab05725df14c2df057c60e54d9a5f2a414ccc2b2efe10681a0a607 -EBUILD clang_complete-scm.ebuild 686 RMD160 5c51fa91d89938de8d5f6c994d2ca97546c92b6c SHA1 99915483b58a7f4ea7522a603676a65e4608a479 SHA256 86155e80ad636bac199de1e56b4dbadf15730322ff9a9dab8c5e5cbc49c233df +AUX make-cache-path-configureable.patch 978 SHA256 1e98f70e6bc5b9f91fc7533cb4c70c54d64ae382ad1a58755856430a3df10eb5 SHA512 e42dc33a6ed70311f1f2ff4e33eadf4d712b267c8086fbdeb878d3ec5921ff77887003bd605568445cba266d4c6a7a9528d8d27483fefc8fc1bded85c8e8dd89 WHIRLPOOL 8f99b8714941f79244c7a51aa3c8b2a6d72dd32de395c3fe4c2e18d7ee3de20587e5b849be4d70b90f122e15506baa97948dcc117fda4db71769a4529e0421a4 +EBUILD clang_complete-scm.ebuild 667 SHA256 b1f82b4b9763e0a38e18519eb514b829158829c31eda6a922ddabc13a9ee145d SHA512 58857310519f6d0873f4fb7fac459a730d587ca570454bb86f4c69ad4f1daab18621d82140659cf77809fe2c557454189505ed7eb2d7bbfe1995a5a760601161 WHIRLPOOL 97fe6012b3a1fa8444939043f322e668e5d52a693f09d9ba8e3028d4b17935d5ad91dca611f90e36cbae6ed4b949fda464170eaddf897ec1ab8ae27048a13548 diff --git a/app-vim/clang_complete/clang_complete-scm.ebuild b/app-vim/clang_complete/clang_complete-scm.ebuild index a854860..bd82289 100644 --- a/app-vim/clang_complete/clang_complete-scm.ebuild +++ b/app-vim/clang_complete/clang_complete-scm.ebuild @@ -24,8 +24,7 @@ VIM_PLUGIN_HELPFILES="clang_complete" src_prepare() { epatch \ - "${FILESDIR}/cache_path.patch" \ - "${FILESDIR}/libclang_path.patch" + "${FILESDIR}/make-cache-path-configureable.patch" rm -r examples Makefile .git* python_convert_shebangs 2 bin/cc_args.py } diff --git a/app-vim/clang_complete/files/cache_path.patch b/app-vim/clang_complete/files/cache_path.patch deleted file mode 100644 index 18532ec..0000000 --- a/app-vim/clang_complete/files/cache_path.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/autoload/getopts/gcc.vim b/autoload/getopts/gcc.vim -index 1bfe1dc..7809a32 100644 ---- a/autoload/getopts/gcc.vim -+++ b/autoload/getopts/gcc.vim -@@ -1,8 +1,12 @@ - " clang_complete gcc's include paths finder - " Author: xaizek - --let s:scr = expand('') --let s:cache_path = fnamemodify(s:scr, ':p:h') -+if exists("g:clang_complete_cache_path") -+ let s:cache_path = g:clang_complete_cache_path -+else -+ let s:scr = expand('') -+ let s:cache_path = fnamemodify(s:scr, ':p:h') -+endif - - function! getopts#gcc#getopts() - call s:DetemineFileType() diff --git a/app-vim/clang_complete/files/libclang_path.patch b/app-vim/clang_complete/files/libclang_path.patch deleted file mode 100644 index fd04c2c..0000000 --- a/app-vim/clang_complete/files/libclang_path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/plugin/clang/cindex.py b/plugin/clang/cindex.py -index 35f1af1..1246b64 100644 ---- a/plugin/clang/cindex.py -+++ b/plugin/clang/cindex.py -@@ -71,7 +71,7 @@ def get_cindex_library(): - # CIndex library. It could be on path or elsewhere, or versioned, etc. - import platform - name = platform.system() -- path = sys.argv[0] -+ path = '/usr/lib/llvm' - if path != '': - path += '/' - if name == 'Darwin': diff --git a/app-vim/clang_complete/files/make-cache-path-configureable.patch b/app-vim/clang_complete/files/make-cache-path-configureable.patch new file mode 100644 index 0000000..7ab75d7 --- /dev/null +++ b/app-vim/clang_complete/files/make-cache-path-configureable.patch @@ -0,0 +1,31 @@ +From 2c090c8cd06fc4eb4c9bb9bf604b9a2d4eafe4d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tiziano=20M=C3=BCller?= +Date: Tue, 25 Dec 2012 16:22:14 +0100 +Subject: [PATCH] Make cache path configureable. + +--- + autoload/getopts/cache.vim | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/autoload/getopts/cache.vim b/autoload/getopts/cache.vim +index 3d867ad..25ddd9f 100644 +--- a/autoload/getopts/cache.vim ++++ b/autoload/getopts/cache.vim +@@ -1,8 +1,12 @@ + " clang_complete include paths caching helper + " Author: xaizek, leszekswirski + +-let s:scr = expand('') +-let s:cache_path = fnamemodify(s:scr, ':p:h') ++if exists("g:clang_complete_cache_path") ++ let s:cache_path = g:clang_complete_cache_path ++else ++ let s:scr = expand('') ++ let s:cache_path = fnamemodify(s:scr, ':p:h') ++endif + + function! getopts#cache#getcachedopts(ext, optfunc) + let s:cache = s:cache_path . '/' . &filetype . '.' . a:ext . '.cache' +-- +1.8.0 +