diff --git a/app-vim/youcompleteme/patches/youcompleteme-20180809.patchset b/app-vim/youcompleteme/patches/youcompleteme-20180809.patchset deleted file mode 100644 index 123bbe793..000000000 --- a/app-vim/youcompleteme/patches/youcompleteme-20180809.patchset +++ /dev/null @@ -1,44 +0,0 @@ -From 5ae29af9eefebcbffaad9cec0790280a038f1d0a Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Fri, 10 Aug 2018 20:39:55 +0200 -Subject: Force use of Python 3.6 for the server on Haiku. - -It is not possible to use Python 2 which is built with gcc2, as the -server embeds a clang based .so file. - -diff --git a/python/ycm/paths.py b/python/ycm/paths.py -index a135e3a..01285a4 100644 ---- a/python/ycm/paths.py -+++ b/python/ycm/paths.py -@@ -57,23 +57,12 @@ def PathToPythonInterpreter(): - if python_interpreter and utils.GetExecutable( python_interpreter ): - return python_interpreter - -- # On UNIX platforms, we use sys.executable as the Python interpreter path. -- # We cannot use sys.executable on Windows because for unknown reasons, it -- # returns the Vim executable. Instead, we use sys.exec_prefix to deduce the -- # interpreter path. -- python_interpreter = ( WIN_PYTHON_PATH if utils.OnWindows() else -- sys.executable ) -- if _EndsWithPython( python_interpreter ): -- return python_interpreter -- -- # As a last resort, we search python in the PATH. We prefer Python 2 over 3 -- # for the sake of backwards compatibility with ycm_extra_conf.py files out -- # there; few people wrote theirs to work on py3. -- # So we check 'python2' before 'python' because on some distributions (Arch -- # Linux for example), python refers to python3. -- python_interpreter = utils.PathToFirstExistingExecutable( [ 'python2', -+ # On Haiku we look for python3 first, our python2 is built with gcc2 so it -+ # cannot load the ycm native library. -+ python_interpreter = utils.PathToFirstExistingExecutable( [ 'python3.6', -+ 'python3', - 'python', -- 'python3' ] ) -+ 'python2' ] ) - if python_interpreter: - return python_interpreter - --- -2.21.0 - diff --git a/app-vim/youcompleteme/youcompleteme-20190107.recipe b/app-vim/youcompleteme/youcompleteme-20190107.recipe deleted file mode 100644 index 962d92403..000000000 --- a/app-vim/youcompleteme/youcompleteme-20190107.recipe +++ /dev/null @@ -1,97 +0,0 @@ -SUMMARY="Code-completion engine for Vim" -DESCRIPTION="YouCompleteMe is a fast, as-you-type, fuzzy-search code \ -completion engine for Vim. It has several completion engines: -* an identifier-based engine that works with every programming language, -* a Clang-based engine that provides native semantic code completion for \ -C/C++/Objective-C/Objective-C++ (from now on referred to as \"the C-family \ -languages\"), -* a Jedi-based completion engine for Python 2 and 3 (using the JediHTTP wrapper), -* an OmniSharp-based completion engine for C#, -* a combination of Gocode and Godef semantic engines for Go, -* a TSServer-based completion engine for TypeScript, -* a Tern-based completion engine for JavaScript, -* a racer-based completion engine for Rust, -* a jdt.ls-based experimental completion engine for Java. -* and an omnifunc-based completer that uses data from Vim's omnicomplete \ -system to provide semantic completions for many other languages (Ruby, PHP \ -etc.)." -HOMEPAGE="http://ycm-core.github.io/YouCompleteMe/" -COPYRIGHT="2015-2019 YouCompleteMe contributors" -LICENSE="GNU GPL v3" -REVISION="3" -SOURCE_URI="https://github.com/Valloric/YouCompleteMe/archive/ccc06c2c423e7ee7008f7439ff99c604d474cec1.zip" -CHECKSUM_SHA256="8a1eb18bd7a063a8b6d950aaadca0b15717d3f37f3297ed1233dc0ef7cafdda9" -SOURCE_DIR="YouCompleteMe-ccc06c2c423e7ee7008f7439ff99c604d474cec1" -PATCHES="youcompleteme-20180809.patchset" -SOURCE_URI_2="https://github.com/Valloric/ycmd/archive/7f4ff5639ce95575d04e346833bef586ed564bbd.zip" -SOURCE_DIR_2="ycmd-7f4ff5639ce95575d04e346833bef586ed564bbd" -CHECKSUM_SHA256_2="4a707a7c697b3bc76d9ecc68ea6469378c6f1d9f1368c08f758b3706e9d149ff" - -ARCHITECTURES="?all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - youcompleteme$secondaryArchSuffix = $portVersion - " - -# Yes, this needs both python (for vim embedded parts) and python3 (for the -# ycmd server) packages. -REQUIRES=" - haiku$secondaryArchSuffix - cmd:vim >= 8.1 - bottle_python3 - certifi_python - certifi_python3 - frozendict_python - frozendict_python3 - future_python - future_python3 - futures_python - requests_futures_python - requests_python - requests_python3 - waitress_python3 - lib:libclang$secondaryArchSuffix >= 7 - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libboost_filesystem$secondaryArchSuffix - devel:libboost_regex$secondaryArchSuffix - devel:libboost_system$secondaryArchSuffix - devel:libclang$secondaryArchSuffix >= 7 - devel:libpython3.6m$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:gcc$secondaryArchSuffix - cmd:ninja - cmd:pkg_config$secondaryArchSuffix - " - -BUILD() -{ - mkdir -p ycm_build - mkdir -p $developLibDir - cd ycm_build - - rm -rf ../third_party/ycmd - ln -s ../../../sources-2/ycmd-* ../third_party/ycmd - - cmake -GNinja $cmakeDirArgs ../third_party/ycmd/cpp -DUSE_SYSTEM_BOOST=ON \ - -DUSE_SYSTEM_LIBCLANG=ON \ - -DPYTHON_INCLUDE_DIR=/system/develop/headers/python3.6m \ - -DUSE_PYTHON2=OFF - ninja $jobArgs ycm_core -} - -INSTALL() -{ - mkdir -p $dataDir/vim/vim81 - cp -r autoload doc python plugin $dataDir/vim/vim81 - - mkdir -p $dataDir/vim/vim81/third_party/ycmd - cp -r third_party/ycmd/ycm_core.so $dataDir/vim/vim81/third_party/ycmd - cp -r third_party/ycmd/ycmd $dataDir/vim/vim81/third_party/ycmd/ycmd - cp third_party/ycmd/CORE_VERSION $dataDir/vim/vim81/third_party/ycmd/ -} diff --git a/app-vim/youcompleteme/youcompleteme-20190724.recipe b/app-vim/youcompleteme/youcompleteme-20190724.recipe deleted file mode 100644 index db8227fd1..000000000 --- a/app-vim/youcompleteme/youcompleteme-20190724.recipe +++ /dev/null @@ -1,97 +0,0 @@ -SUMMARY="Code-completion engine for Vim" -DESCRIPTION="YouCompleteMe is a fast, as-you-type, fuzzy-search code \ -completion engine for Vim. It has several completion engines: -* an identifier-based engine that works with every programming language, -* a Clang-based engine that provides native semantic code completion for \ -C/C++/Objective-C/Objective-C++ (from now on referred to as \"the C-family \ -languages\"), -* a Jedi-based completion engine for Python 2 and 3 (using the JediHTTP wrapper), -* an OmniSharp-based completion engine for C#, -* a combination of Gocode and Godef semantic engines for Go, -* a TSServer-based completion engine for TypeScript, -* a Tern-based completion engine for JavaScript, -* a racer-based completion engine for Rust, -* a jdt.ls-based experimental completion engine for Java. -* and an omnifunc-based completer that uses data from Vim's omnicomplete \ -system to provide semantic completions for many other languages (Ruby, PHP \ -etc.)." -HOMEPAGE="http://ycm-core.github.io/YouCompleteMe/" -COPYRIGHT="2015-2019 YouCompleteMe contributors" -LICENSE="GNU GPL v3" -REVISION="1" -SOURCE_URI="https://github.com/ycm-core/YouCompleteMe/archive/fa92f40d0209469a037196fdc3d949ae29d0c30a.zip" -SOURCE_DIR="YouCompleteMe-fa92f40d0209469a037196fdc3d949ae29d0c30a" -CHECKSUM_SHA256="498982a0129fe8f506d2700e6427695b5b73f7e18ad0ba372d56d4bb673352b0" -PATCHES="youcompleteme-20180809.patchset" -SOURCE_URI_2="https://github.com/ycm-core/ycmd/archive/be84d443f2afd4eff72b3eb420656de6155eca20.zip" -SOURCE_DIR_2="ycmd-be84d443f2afd4eff72b3eb420656de6155eca20" -CHECKSUM_SHA256_2="38e096934868eb8e834fabb57ccf89c39ecb00acd95fee03aa885fc9be15b99e" - -ARCHITECTURES="?all !x86_gcc2" -SECONDARY_ARCHITECTURES="!x86" - -PROVIDES=" - youcompleteme$secondaryArchSuffix = $portVersion - " - -# Yes, this needs both python (for vim embedded parts) and python3 (for the -# ycmd server) packages. -REQUIRES=" - haiku$secondaryArchSuffix - cmd:vim >= 8.1 - bottle_python3 - certifi_python - certifi_python3 - frozendict_python - frozendict_python3 - future_python - future_python3 - futures_python - requests_futures_python - requests_python - requests_python3 - waitress_python3 - lib:libclang$secondaryArchSuffix >= 7 - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libboost_filesystem$secondaryArchSuffix - devel:libboost_regex$secondaryArchSuffix - devel:libboost_system$secondaryArchSuffix - devel:libclang$secondaryArchSuffix >= 7 - devel:libpython3.6m$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:gcc$secondaryArchSuffix - cmd:ninja - cmd:pkg_config$secondaryArchSuffix - " - -BUILD() -{ - mkdir -p ycm_build - mkdir -p $developLibDir - cd ycm_build - - rm -rf ../third_party/ycmd - ln -s ../../../sources-2/ycmd-* ../third_party/ycmd - - cmake -GNinja $cmakeDirArgs ../third_party/ycmd/cpp -DUSE_SYSTEM_BOOST=ON \ - -DUSE_SYSTEM_LIBCLANG=ON \ - -DPYTHON_INCLUDE_DIR=/system/develop/headers/python3.6m \ - -DUSE_PYTHON2=OFF - ninja $jobArgs ycm_core -} - -INSTALL() -{ - mkdir -p $dataDir/vim/vim81 - cp -r autoload doc python plugin $dataDir/vim/vim81 - - mkdir -p $dataDir/vim/vim81/third_party/ycmd - cp -r third_party/ycmd/ycm_core.so $dataDir/vim/vim81/third_party/ycmd - cp -r third_party/ycmd/ycmd $dataDir/vim/vim81/third_party/ycmd/ycmd - cp third_party/ycmd/CORE_VERSION $dataDir/vim/vim81/third_party/ycmd/ -}