commit: a07fda23514aebdb9493894bf96bda2e5c4bb7a5 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Fri Apr 22 06:42:36 2016 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Fri Apr 22 06:42:36 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a07fda23
Drop all refrences to eclipse in intel compiler products Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> dev-lang/icc/icc-13.1.5.192.ebuild | 6 ++---- dev-lang/icc/icc-14.0.3.174.ebuild | 6 ++---- dev-lang/icc/icc-15.0.6.233.ebuild | 6 ++---- dev-lang/icc/metadata.xml | 3 --- dev-lang/idb/idb-13.0.5.192.ebuild | 5 ++--- dev-lang/idb/idb-14.0.3.174.ebuild | 5 ++--- dev-lang/idb/metadata.xml | 3 --- eclass/intel-sdp.eclass | 38 -------------------------------------- 8 files changed, 10 insertions(+), 62 deletions(-) diff --git a/dev-lang/icc/icc-13.1.5.192.ebuild b/dev-lang/icc/icc-13.1.5.192.ebuild index d0acf86..4da1288 100644 --- a/dev-lang/icc/icc-13.1.5.192.ebuild +++ b/dev-lang/icc/icc-13.1.5.192.ebuild @@ -14,12 +14,10 @@ inherit intel-sdp DESCRIPTION="Intel C/C++ Compiler" HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"; -IUSE="eclipse linguas_ja" +IUSE="linguas_ja" KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" -DEPEND=" - !dev-lang/ifc[linguas_ja] - eclipse? ( dev-util/eclipse-sdk )" +DEPEND="!dev-lang/ifc[linguas_ja]" RDEPEND="${DEPEND} ~dev-libs/intel-common-${PV}[compiler,multilib=]" diff --git a/dev-lang/icc/icc-14.0.3.174.ebuild b/dev-lang/icc/icc-14.0.3.174.ebuild index 42e5af9..4999055 100644 --- a/dev-lang/icc/icc-14.0.3.174.ebuild +++ b/dev-lang/icc/icc-14.0.3.174.ebuild @@ -15,12 +15,10 @@ inherit intel-sdp DESCRIPTION="Intel C/C++ Compiler" HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"; -IUSE="eclipse linguas_ja" +IUSE="linguas_ja" KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" -DEPEND=" - !dev-lang/ifc[linguas_ja] - eclipse? ( dev-util/eclipse-sdk )" +DEPEND="!dev-lang/ifc[linguas_ja]" RDEPEND="${DEPEND} ~dev-libs/intel-common-${PV}[compiler,multilib=]" diff --git a/dev-lang/icc/icc-15.0.6.233.ebuild b/dev-lang/icc/icc-15.0.6.233.ebuild index e07df89..e5c9619 100644 --- a/dev-lang/icc/icc-15.0.6.233.ebuild +++ b/dev-lang/icc/icc-15.0.6.233.ebuild @@ -15,12 +15,10 @@ inherit intel-sdp DESCRIPTION="Intel C/C++ Compiler" HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"; -IUSE="eclipse linguas_ja" +IUSE="linguas_ja" KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" -DEPEND=" - !dev-lang/ifc[linguas_ja] - eclipse? ( dev-util/eclipse-sdk )" +DEPEND="!dev-lang/ifc[linguas_ja]" RDEPEND="${DEPEND} ~dev-libs/intel-common-${PV}[compiler,multilib=]" diff --git a/dev-lang/icc/metadata.xml b/dev-lang/icc/metadata.xml index 626352b..4a2545b 100644 --- a/dev-lang/icc/metadata.xml +++ b/dev-lang/icc/metadata.xml @@ -13,7 +13,4 @@ documentation. The product can be installed as a non-commercial as well. License, terms of qualifications can be found on the web site. </longdescription> - <use> - <flag name="eclipse">Install the <pkg>dev-util/eclipse-sdk</pkg> plugins</flag> - </use> </pkgmetadata> diff --git a/dev-lang/idb/idb-13.0.5.192.ebuild b/dev-lang/idb/idb-13.0.5.192.ebuild index fb19410..3038698 100644 --- a/dev-lang/idb/idb-13.0.5.192.ebuild +++ b/dev-lang/idb/idb-13.0.5.192.ebuild @@ -14,13 +14,12 @@ inherit intel-sdp DESCRIPTION="Intel C/C++/FORTRAN debugger" HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"; -IUSE="eclipse" +IUSE="" KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" DEPEND=">=dev-libs/intel-common-13.1[compiler]" RDEPEND="${DEPEND} - virtual/jre - eclipse? ( dev-util/eclipse-sdk )" + virtual/jre" INTEL_BIN_RPMS="idb" INTEL_DAT_RPMS="idb-common idbcdt" diff --git a/dev-lang/idb/idb-14.0.3.174.ebuild b/dev-lang/idb/idb-14.0.3.174.ebuild index 913301e..84036c3 100644 --- a/dev-lang/idb/idb-14.0.3.174.ebuild +++ b/dev-lang/idb/idb-14.0.3.174.ebuild @@ -17,13 +17,12 @@ _INTEL_PV1=14 DESCRIPTION="Intel C/C++/FORTRAN debugger" HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"; -IUSE="eclipse" +IUSE="" KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" DEPEND=">=dev-libs/intel-common-13.1[compiler]" RDEPEND="${DEPEND} - virtual/jre - eclipse? ( dev-util/eclipse-sdk )" + virtual/jre" INTEL_BIN_RPMS="idb" INTEL_DAT_RPMS="idb-common idbcdt" diff --git a/dev-lang/idb/metadata.xml b/dev-lang/idb/metadata.xml index af02a68..8b41ced 100644 --- a/dev-lang/idb/metadata.xml +++ b/dev-lang/idb/metadata.xml @@ -15,7 +15,4 @@ well. License, terms of qualifications can be found on the web site and follow the one received in the Intel compilers. </longdescription> - <use> - <flag name="eclipse">Install the <pkg>dev-util/eclipse-sdk</pkg> plugins</flag> - </use> </pkgmetadata> diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass index d23b003..33ab625 100644 --- a/eclass/intel-sdp.eclass +++ b/eclass/intel-sdp.eclass @@ -170,34 +170,6 @@ QA_PREBUILT="${INTEL_SDP_DIR}/*" # # e.g. amd64-multilib -> INTEL_ARCH="intel64 ia32" -# @FUNCTION: _isdp_link_eclipse_plugins -# @INTERNAL -# @DESCRIPTION: -# Creating necessary links to use intel compiler with eclipse -_isdp_link_eclipse_plugins() { - debug-print-function ${FUNCNAME} "${@}" - - local c f - pushd ${INTEL_SDP_DIR}/eclipse_support > /dev/null || die - for c in cdt*; do - local cv=${c#cdt} ev=3.$(( ${cv:0:1} - 1)) - if has_version "dev-util/eclipse-sdk:${ev}"; then - einfo "Linking eclipse (v${ev}) plugin cdt (v${cv})" - for f in cdt${cv}/eclipse/features/*; do - dodir /usr/$(get_libdir)/eclipse-${ev}/features - dosym "${INTEL_SDP_EDIR}"/eclipse_support/${f} \ - /usr/$(get_libdir)/eclipse-${ev}/features/ || die - done - for f in cdt${cv}/eclipse/plugins/*; do - dodir /usr/$(get_libdir)/eclipse-${ev}/plugins - dosym "${INTEL_SDP_EDIR}"/eclipse_support/${f} \ - /usr/$(get_libdir)/eclipse-${ev}/plugins/ || die - done - fi - done - popd > /dev/null || die -} - # @FUNCTION: _isdp_big-warning # @USAGE: [pre-check | test-failed] # @INTERNAL @@ -458,16 +430,6 @@ intel-sdp_src_install() { eend fi - if path_exists "${INTEL_SDP_DIR}"/eclipse_support; then - if has eclipse ${IUSE} && use eclipse; then - _isdp_link_eclipse_plugins - else - ebegin "Cleaning out eclipse plugin" - find "${INTEL_SDP_DIR}"/eclipse_support -delete || die - eend - fi - fi - if path_exists "${INTEL_SDP_DIR}"/man; then path_exists "${INTEL_SDP_DIR}"/man/en_US/man1/* && \ doman "${INTEL_SDP_DIR}"/man/en_US/man1/*
