From f6e0f1f1c519054db99440ab2422f1264c143ad2 Mon Sep 17 00:00:00 2001 From: layman Date: Sat, 24 Feb 2018 19:30:19 -0800 Subject: [PATCH] update app-vim/youcompleteme to give the various USE flags more meaning --- app-vim/youcompleteme/Manifest | 9 +- app-vim/youcompleteme/metadata.xml | 3 + .../youcompleteme-20171020.ebuild | 193 ------------------ .../youcompleteme-20171216.ebuild | 10 +- ...build => youcompleteme-20180219-r1.ebuild} | 24 ++- ...build => youcompleteme-99999999-r3.ebuild} | 18 +- 6 files changed, 42 insertions(+), 215 deletions(-) delete mode 100644 app-vim/youcompleteme/youcompleteme-20171020.ebuild rename app-vim/youcompleteme/{youcompleteme-20180219.ebuild => youcompleteme-20180219-r1.ebuild} (83%) rename app-vim/youcompleteme/{youcompleteme-99999999-r2.ebuild => youcompleteme-99999999-r3.ebuild} (84%) diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest index c2eb1c4..c1bea1c 100644 --- a/app-vim/youcompleteme/Manifest +++ b/app-vim/youcompleteme/Manifest @@ -1,6 +1,5 @@ -EBUILD youcompleteme-20171020.ebuild 5205 SHA256 c5514d8c8761bbd023600f94c6ef69b41115d73daf4c3eb18ee8afb258a5ff4a SHA512 f89c26368caa7c8d758126dbd41d3d22d74490e1c3c153a8568ecae65a5f4d861b2709d22c56aaf08869969f9fb155d2d26f2f8d6d2677365197119b86335730 WHIRLPOOL ba3eff3f02ffbb345b67ba4c368aff11ae7d5a78f94f659b5a43f916b3bed439926dde3c19163e85953585fb9e095dbac902da50414128085d262afba2201870 -EBUILD youcompleteme-20171216.ebuild 5205 SHA256 3d47de77cd691ad60afa09ed4a402757f1e82ea963babf3788d8ab2643732628 SHA512 7f84437a972668201d64e7100873a8c6e6ef73dd060195dbb0e9afd4ce676114d3cabe8b7887c84f5229bbfe621f5e717f9832864b096feed7612cd08da27e5e WHIRLPOOL cef1aaf8223bed068297d8022dbf1099a5d8d44f2a7d4c320b912fac188597bed00dda52edc826a48965950fcdf9d10ae04c4e93b4168df227ba1748413e7c8f -EBUILD youcompleteme-20180219.ebuild 5196 SHA256 292ec25061cb25597421b0205d64cc21e182de11a308bafcbae885a64f3d8af6 SHA512 9dd324d7b736897c5f0a82b1ba753a77af4d36acc27d555a195558ce80d3bed2cd266e13dc5b407785f8b8860596d6936f4b5bc5a9799ff975f5328aea148e98 WHIRLPOOL b797cf6e0ee6649d21f9fcf113ec6d9ab690f55d45be938bfdc8e2fca1e6eb8e8e176b2efe13b11d28b50fa74238dc3bf4838fc428c5185517fcee06ed5f08ef -EBUILD youcompleteme-99999999-r2.ebuild 5138 SHA256 89524e09d4e9624513bdb444f5779fec4ef80859553dcec0be2b283a0bede6fe SHA512 39b3b1496c876dffc566e5d42cef126e4945ec41702ba9cda16ab578169bd369e1310d6a35c2ce8b671c3211e67dfe807c7a3c3a388d7b452614fa897525c18e WHIRLPOOL c60e9ce3e26da94dd10b98cd01fc08210e5d89e2823ae51ffb50b8a440b590487cca0826dce0e5e8312077783bd374292d803c63aa9b02bb11044c674a88da0d +EBUILD youcompleteme-20171216.ebuild 5200 SHA256 807928d3802a0c209cb2dd7a09317f2308533b09b4a9d1705f9266285a227411 SHA512 aea9aed2f1e31d4c434c62cde1159ea1d0312c8da1f9337950fd0b1f2b5804d2d2e6e00eb913cbd26b8fafcd14b069abe5868b53d8c8803b68eede3a5ec3efbf WHIRLPOOL 30884247f37967360e3b5fc4f1ecc2a5d6e53ba6ea5f41567ceb09fb3fd55890a5b50954916a0ad37e2722db71161b01ae09fd211c5f15e45382b8944dc6ff7a +EBUILD youcompleteme-20180219-r1.ebuild 6069 SHA256 63b0431e3d0ae5258ef40dccc9ec1d0a6f4806182cf0cd0a84184616d1638e74 SHA512 0c7e99dbe67a747986b3200023ee5f6d8e1981cfa9eae733b6146525804b8df1c4077e5fbe1c496d3b72ae4fa0004e2457fe0a0ba652f2222b2c9d59006c9366 WHIRLPOOL a17272f093935fea7df78ef9c4f11e06b884fec3d1f6a385012b5f8696d35b0d462cb846d5cb0d0cc1800580e9de4623d34d485734e42b4f2ea8f34fbf9cf7a4 +EBUILD youcompleteme-99999999-r3.ebuild 6014 SHA256 d8347ae54655bedf358465365402be4f07f14df1731d9a1828531393fb19a77d SHA512 002b8b6cbbc372e44b25e0b58b76a94ba0947d7b6809b608f41293c8f18505fe35e7b1a927b9c566c2296c4591896ed088b7916635111152d1a2a1555192a989 WHIRLPOOL 4db94d306414ae9e73da00d7869d031d8faef6ea753ac3d0317b8059bfa2ea71ef24eaf5e1320ce9b5bc4bb1ce2dd445b6e94ef3522c7987b750defee5c29fd9 MISC README.md 1017 SHA256 b5741d484ae2b303937e0bd50ca913dd367dd846d1b211bada7db583541f1a57 SHA512 fb8d02d90df215addc2b13e60975a3d1e41d3cca945294ca1a3013ab337b7dcd834151aabb7712036fb13189a53e69b14a531110cc3820431416cd620404d08f WHIRLPOOL 0f832da37bf55242f006dff821648d68f3ce4329031e5fd1eb56fd57ded3769b86f83d65ac247f81636cfe5b8dc39e9ca97669ae4baa393c75f9a0d98822d901 -MISC metadata.xml 372 SHA256 e3dd72be40b227af12daab42f7c3e887c7cf5f204833873384a155e8bcd065e9 SHA512 3afacd989d495928012e5a1b1c2bb6d14209cbcb1e347a24c1c0881c758642cc8457ee7b6202b8d129e3f08dc21492792715fc5452f8ffc33f719da9a447fdac WHIRLPOOL 2f70b46a70e97e9f8ecec4bf6d5fea40669fa1f92335362a45321f8b3f414228faa2d4152e52846bfbe92d1d659086d1f34bf42970d206a27fcbdeaefa4c9ea9 +MISC metadata.xml 672 SHA256 f6bdb38b04c3e0025a5727ede31d34a7fce98c2182cdbc4069d283edc284b5af SHA512 8cff7a413256f2fed659c9757c6162970d35544ba665c023f3d555b1203d812a3b9caa4e3163a2e708192aaa986435d0f246c76569e30801116ade112a453a70 WHIRLPOOL 636b153ca1e56963eb25f612ab0f0a15173035fc28421da820985075e3da7d1805ed2268e328ba1ca3cc88769d674cfaf495a597bce1b3252e0be56d598bdae3 diff --git a/app-vim/youcompleteme/metadata.xml b/app-vim/youcompleteme/metadata.xml index 1b06697..aeb47e4 100644 --- a/app-vim/youcompleteme/metadata.xml +++ b/app-vim/youcompleteme/metadata.xml @@ -7,5 +7,8 @@ Enable semantic support for C-family languages using sys-devel/clang + Enable semantic support for go language using dev-lang/go + Enable semantic support for rust language using dev-lang/rust + Enable semantic support for nodejs language using net-libs/nodejs diff --git a/app-vim/youcompleteme/youcompleteme-20171020.ebuild b/app-vim/youcompleteme/youcompleteme-20171020.ebuild deleted file mode 100644 index cd8df53..0000000 --- a/app-vim/youcompleteme/youcompleteme-20171020.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils cmake-utils git-r3 multilib python-single-r1 vim-plugin - -DESCRIPTION="vim plugin: a code-completion engine for Vim" -HOMEPAGE="https://valloric.github.io/YouCompleteMe/" -EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe.git" -EGIT_COMMIT="cd4172746279fbe177e18e7731a92ede8054e598" -SRC_URI="" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="clang doc test mono go rust nodejs" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - clang? ( >=sys-devel/clang-3.8:= ) - mono? ( dev-lang/mono ) - go? ( dev-lang/go ) - rust? ( dev-lang/rust - app-vim/rust-vim - ) - nodejs? ( net-libs/nodejs ) - dev-libs/boost[python,threads,${PYTHON_USEDEP}] - || ( - app-editors/vim[python,${PYTHON_USEDEP}] - app-editors/gvim[python,${PYTHON_USEDEP}] - ) -" - -RDEPEND=" - ${COMMON_DEPEND} - dev-python/bottle[${PYTHON_USEDEP}] - dev-python/future[${PYTHON_USEDEP}] - dev-python/jedi[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/sh[${PYTHON_USEDEP}] - dev-python/waitress[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] -" -DEPEND=" - ${COMMON_DEPEND} - test? ( - >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] - >=dev-python/nose-1.3.0[${PYTHON_USEDEP}] - dev-cpp/gmock - dev-cpp/gtest - ) -" - -CMAKE_IN_SOURCE_BUILD=1 -CMAKE_USE_DIR=${S}/third_party/ycmd/cpp - -VIM_PLUGIN_HELPFILES="${PN}" - -src_prepare() { - default - - - if ! use test ; then - sed -i '/^add_subdirectory( tests )/d' third_party/ycmd/cpp/ycm/CMakeLists.txt || die - fi - for third_party_module in pythonfutures; do - rm -r "${S}"/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}" - done - # Argparse is included in python 2.7 - for third_party_module in argparse bottle python-future requests waitress; do - rm -r "${S}"/third_party/ycmd/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}" - done - rm -r "${S}"/third_party/ycmd/third_party/JediHTTP/vendor || die "Failed to remove third_party/ycmd/third_party/JediHTTP/vendor" - rm -r "${S}"/third_party/ycmd/cpp/BoostParts || die "Failed to remove bundled boost" - -} - -src_configure() { - local mycmakeargs=( - -DUSE_CLANG_COMPLETER="$(usex clang)" - -DUSE_SYSTEM_LIBCLANG="$(usex clang)" - -DUSE_SYSTEM_BOOST=ON - -DUSE_SYSTEM_GMOCK=ON - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use rust; - then - cd "${S}"/third_party/ycmd/third_party/racerd || die "no dir third_party/racerd" - cargo build --release || die "cargo build failed" - fi - - if use mono; - then - cd "${S}/third_party/ycmd/third_party/OmniSharpServer" || die "failed cd to OmniSharpServer" - xbuild /property:Configuration=Release || die "xbuild command failed" - fi - - if use go; - then - cd "${S}/third_party/ycmd/third_party/gocode" || die "failed cd to gocode" - go build || die "failed to go build gocode" - cd "${S}/third_party/ycmd/third_party/godef" || die "failed cd to godef" - go build || die "failed to go build godef" - fi - - if use nodejs; - then - cd "${S}/third_party/ycmd/third_party/tern_runtime" || die "no dir third_party/tern_runtime" - npm install --production --python=python2 || die "npm install failed" - fi - -} - -src_test() { - cd "${S}/third_party/ycmd/cpp/ycm/tests" - LD_LIBRARY_PATH="${EROOT}"/usr/$(get_libdir)/llvm \ - ./ycm_core_tests || die - - cd "${S}"/python/ycm - - local dirs=( "${S}"/third_party/*/ "${S}"/third_party/ycmd/third_party/*/ ) - local -x PYTHONPATH=${PYTHONPATH}:$(IFS=:; echo "${dirs[*]}") - - nosetests --verbose || die -} - -src_install() { - - - if use rust; - then - cd "${S}/third_party/ycmd/third_party/racerd" || die "racerd target wasn't built" - for f in $(ls -a | tail -n +3 | grep -v target) - do - rm -rf "${f}" - done - cd "${S}/third_party/ycmd/third_party/racerd/target/release" || die "racerd target wasn't built" - for f in $(ls -a | tail -n +3 | grep -v '^racerd$') - do - rm -rf "${f}" - done - fi - - if use mono; - then - cd "${S}/third_party/ycmd/third_party/OmniSharpServer" - for f in $(ls -a | tail -n +3 | grep -v '^OmniSharp$') - do - rm -rf "${f}" - done - cd "${S}/third_party/ycmd/third_party/OmniSharpServer/OmniSharp" - for f in $(ls -a | tail -n +3 | grep -v '^bin$') - do - rm -rf "${f}" - done - fi - - if use go; - then - cd "${S}/third_party/ycmd/third_party/gocode" - for f in $(ls -a | tail -n +3 | grep -v '^gocode$') - do - rm -rf "${f}" - done - cd "${S}/third_party/ycmd/third_party/godef" - for f in $(ls -a | tail -n +3 | grep -v '^godef$') - do - rm -rf "${f}" - done - fi - - cd "${S}" - use doc && dodoc *.md third_party/ycmd/*.md - rm -r *.md *.sh *.py* *.ini *.yml COPYING.txt ci third_party/ycmd/cpp third_party/ycmd/ci third_party/ycmd/ycmd/tests third_party/ycmd/examples/samples || die - rm -r third_party/ycmd/{*.md,*.sh,*.yml,.coveragerc,.gitignore,.gitmodules,.travis.yml,build.*,*.txt,run_tests.*,*.ini,update*,Vagrantfile} || die - find python -name *test* -exec rm -rf {} + || die - egit_clean - use clang && (rm third_party/ycmd/libclang.so* || die) - - vim-plugin_src_install - - python_optimize "${ED}" - python_fix_shebang "${ED}" -} diff --git a/app-vim/youcompleteme/youcompleteme-20171216.ebuild b/app-vim/youcompleteme/youcompleteme-20171216.ebuild index 9eac793..d128a1a 100644 --- a/app-vim/youcompleteme/youcompleteme-20171216.ebuild +++ b/app-vim/youcompleteme/youcompleteme-20171216.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,7 +24,7 @@ COMMON_DEPEND=" clang? ( >=sys-devel/clang-3.8:= ) mono? ( dev-lang/mono ) go? ( dev-lang/go ) - rust? ( dev-lang/rust + rust? ( dev-lang/rust app-vim/rust-vim ) nodejs? ( net-libs/nodejs ) @@ -63,7 +63,6 @@ VIM_PLUGIN_HELPFILES="${PN}" src_prepare() { default - if ! use test ; then sed -i '/^add_subdirectory( tests )/d' third_party/ycmd/cpp/ycm/CMakeLists.txt || die fi @@ -92,7 +91,7 @@ src_configure() { src_compile() { cmake-utils_src_compile - if use rust; + if use rust; then cd "${S}"/third_party/ycmd/third_party/racerd || die "no dir third_party/racerd" cargo build --release || die "cargo build failed" @@ -100,7 +99,7 @@ src_compile() { if use mono; then - cd "${S}/third_party/ycmd/third_party/OmniSharpServer" || die "failed cd to OmniSharpServer" + cd "${S}/third_party/ycmd/third_party/OmniSharpServer" || die "failed cd to OmniSharpServer" xbuild /property:Configuration=Release || die "xbuild command failed" fi @@ -135,7 +134,6 @@ src_test() { src_install() { - if use rust; then cd "${S}/third_party/ycmd/third_party/racerd" || die "racerd target wasn't built" diff --git a/app-vim/youcompleteme/youcompleteme-20180219.ebuild b/app-vim/youcompleteme/youcompleteme-20180219-r1.ebuild similarity index 83% rename from app-vim/youcompleteme/youcompleteme-20180219.ebuild rename to app-vim/youcompleteme/youcompleteme-20180219-r1.ebuild index 1bcdc7d..8b13ef1 100644 --- a/app-vim/youcompleteme/youcompleteme-20180219.ebuild +++ b/app-vim/youcompleteme/youcompleteme-20180219-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI="" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="clang doc test mono go rust nodejs" +IUSE="clang +doc test mono go rust nodejs" REQUIRED_USE="${PYTHON_REQUIRED_USE}" COMMON_DEPEND=" @@ -24,7 +24,7 @@ COMMON_DEPEND=" clang? ( >=sys-devel/clang-3.8:= ) mono? ( dev-lang/mono ) go? ( dev-lang/go ) - rust? ( dev-lang/rust + rust? ( dev-lang/rust app-vim/rust-vim ) nodejs? ( net-libs/nodejs ) @@ -63,7 +63,6 @@ VIM_PLUGIN_HELPFILES="${PN}" src_prepare() { default - if ! use test ; then sed -i '/^add_subdirectory( tests )/d' third_party/ycmd/cpp/ycm/CMakeLists.txt || die fi @@ -92,7 +91,7 @@ src_configure() { src_compile() { cmake-utils_src_compile - if use rust; + if use rust; then cd "${S}"/third_party/ycmd/third_party/racerd || die "no dir third_party/racerd" cargo build --release || die "cargo build failed" @@ -100,7 +99,7 @@ src_compile() { if use mono; then - cd "${S}/third_party/ycmd/third_party/OmniSharpServer" || die "failed cd to OmniSharpServer" + cd "${S}/third_party/ycmd/third_party/OmniSharpServer" || die "failed cd to OmniSharpServer" xbuild /property:Configuration=Release || die "xbuild command failed" fi @@ -135,7 +134,6 @@ src_test() { src_install() { - if use rust; then cd "${S}/third_party/ycmd/third_party/racerd" || die "racerd target wasn't built" @@ -188,6 +186,18 @@ src_install() { vim-plugin_src_install + use mono || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/OmniSharpServer" + use rust || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/racerd" + use rust || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/rust" + use go || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/gocode" + use go || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/godef" + use go || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/go" + use nodejs || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/tern_runtime" + use nodejs || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/javascript" + find "${D}" -name .gitignore -exec rm -rf {} + || die + find "${D}" -name .travis.yml -exec rm -rf {} + || die + find "${D}" -name README.rst -exec rm -rf {} + || die + python_optimize "${ED}" python_fix_shebang "${ED}" } diff --git a/app-vim/youcompleteme/youcompleteme-99999999-r2.ebuild b/app-vim/youcompleteme/youcompleteme-99999999-r3.ebuild similarity index 84% rename from app-vim/youcompleteme/youcompleteme-99999999-r2.ebuild rename to app-vim/youcompleteme/youcompleteme-99999999-r3.ebuild index 227d457..ae20814 100644 --- a/app-vim/youcompleteme/youcompleteme-99999999-r2.ebuild +++ b/app-vim/youcompleteme/youcompleteme-99999999-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ SRC_URI="" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="clang doc test mono go rust nodejs" +IUSE="clang +doc test mono go rust nodejs" REQUIRED_USE="${PYTHON_REQUIRED_USE}" COMMON_DEPEND=" @@ -62,7 +62,6 @@ VIM_PLUGIN_HELPFILES="${PN}" src_prepare() { default - if ! use test ; then sed -i '/^add_subdirectory( tests )/d' third_party/ycmd/cpp/ycm/CMakeLists.txt || die fi @@ -134,7 +133,6 @@ src_test() { src_install() { - if use rust; then cd "${S}/third_party/ycmd/third_party/racerd" || die "racerd target wasn't built" @@ -187,6 +185,18 @@ src_install() { vim-plugin_src_install + use mono || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/OmniSharpServer" + use rust || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/racerd" + use rust || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/rust" + use go || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/gocode" + use go || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/godef" + use go || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/go" + use nodejs || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/tern_runtime" + use nodejs || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/javascript" + find "${D}" -name .gitignore -exec rm -rf {} + || die + find "${D}" -name .travis.yml -exec rm -rf {} + || die + find "${D}" -name README.rst -exec rm -rf {} + || die + python_optimize "${ED}" python_fix_shebang "${ED}" }