From e17e7cd7ba155df99ad84370bb97bb3ae805dad5 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 17 Apr 2018 12:54:21 -0400 Subject: [PATCH] dev-lang/rust: Move back to portage-stable --- .../coreos-overlay/dev-lang/rust/Manifest | 3 - .../coreos-overlay/dev-lang/rust/metadata.xml | 17 -- .../dev-lang/rust/rust-1.23.0-r1.ebuild | 177 ------------------ .../md5-cache/dev-lang/rust-1.23.0-r1 | 14 -- 4 files changed, 211 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/rust/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.23.0-r1.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/rust-1.23.0-r1 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest deleted file mode 100644 index 3427384032..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST rust-1.22.0-i686-unknown-linux-gnu.tar.gz 151889962 SHA256 4def030b03dcdb1a82bbb3aff63deac6f2745d870b6b358083abb69c841e0bcf SHA512 b46eb37f918833f1dbf3700fe156f26eff19dc90534434add5aa2d86b8ccc02aef273cba6a8291deaa89d27d2bd4af1529655b6463f44736a9f521a67cccc4f0 WHIRLPOOL ac8bab4817c543ae56fd52553481878b880fab9bbc5cfa210715606668f831392e10066941a493f97e729a52c3baf1d84dc09ff9bfcec369915a3a3b8b8630f0 -DIST rust-1.22.0-x86_64-unknown-linux-gnu.tar.gz 160427151 SHA256 11118f670343f3ebdd4790f845fd68f38db65b19261b81b3ab580d8425d0a7c6 SHA512 30206d5ccec432a6a92aeffb34170290109d65973a6d1cd91e7e1aa82781a0da00023275b5a3a3effad79d539d2f4829d1eea5fc3d0c1c58a7f3a4855a84785c WHIRLPOOL 503dad91f402f244f94675ae4e85bc59526534cf744ae4c17ff7472fd3b691f5c0212a62a090937cf5764f8de92cfb3a0ae1ad534a1f14ab69027a77d3763ba7 -DIST rustc-1.23.0-src.tar.gz 60010149 SHA256 7464953871dcfdfa8afcc536916a686dd156a83339d8ec4d5cb4eb2fe146cb91 SHA512 a1dbb1a625c6d8dfe9708e1cf478a49154b1eb0aba5ba67ac85518a8c7d1c70d2d86ac4d441156e9bfd0fd77ca241fb5491a2bd68aefcf0b3c2e164c3cc29e4e WHIRLPOOL 6e6d0eaa2f1b7f336f5a15f1f98327ad04df1a1b00d9d583de33068ee6412200bf101e4bdb007ae0e9681d54c041edd639f68a299009110c8b754c7ca17f0042 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/metadata.xml deleted file mode 100644 index 050e235f71..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - rust@gentoo.org - Rust Project - - - Use sys-devel/clang for building - Use sys-libs/libcxx as standard - library when building with sys-devel/clang - Use system sys-devel/llvm in - place of the bundled one - Use sys-libs/jemalloc as the - standard memory allocator - - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.23.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.23.0-r1.ebuild deleted file mode 100644 index 116376fe5a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.23.0-r1.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 versionator toolchain-funcs - -if [[ ${PV} = *beta* ]]; then - betaver=${PV//*beta} - BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}" - MY_P="rustc-beta" - SLOT="beta/${PV}" - SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.gz" - KEYWORDS="" -else - ABI_VER="$(get_version_component_range 1-2)" - SLOT="stable/${ABI_VER}" - MY_P="rustc-${PV}" - SRC="${MY_P}-src.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -CHOST_amd64=x86_64-unknown-linux-gnu -CHOST_x86=i686-unknown-linux-gnu - -RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0" -RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}" -RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}" - -CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0" - -DESCRIPTION="Systems programming language from Mozilla" -HOMEPAGE="http://www.rust-lang.org/" - -SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz - amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz ) - x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz ) -" - -LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" - -IUSE="debug doc +jemalloc" - -RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425 - jemalloc? ( dev-libs/jemalloc )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - || ( - >=sys-devel/gcc-4.7 - >=sys-devel/clang-3.5 - ) - dev-util/cmake -" -PDEPEND=">=dev-util/cargo-${CARGO_DEPEND_VERSION}" - -S="${WORKDIR}/${MY_P}-src" - -toml_usex() { - usex "$1" true false -} - -src_prepare() { - local rust_stage0_root="${WORKDIR}"/rust-stage0 - - local rust_stage0_name="RUST_STAGE0_${ARCH}" - local rust_stage0="${!rust_stage0_name}" - - sed -i -e /-Werror/d src/binaryen/CMakeLists.txt - - "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die - - default -} - -src_configure() { - local rust_stage0_root="${WORKDIR}"/rust-stage0 - - local rust_target_name="CHOST_${ARCH}" - local rust_target="${!rust_target_name}" - - cat <<- EOF > "${S}"/config.toml - [llvm] - optimize = $(toml_usex !debug) - release-debuginfo = $(toml_usex debug) - assertions = $(toml_usex debug) - [build] - build = "${rust_target}" - host = ["${rust_target}"] - target = ["${rust_target}"] - cargo = "${rust_stage0_root}/bin/cargo" - rustc = "${rust_stage0_root}/bin/rustc" - docs = $(toml_usex doc) - submodules = false - python = "${EPYTHON}" - locked-deps = true - vendor = true - verbose = 2 - [install] - prefix = "${EPREFIX}/usr" - libdir = "$(get_libdir)" - docdir = "share/doc/${P}" - mandir = "share/${P}/man" - [rust] - optimize = $(toml_usex !debug) - debuginfo = $(toml_usex debug) - debug-assertions = $(toml_usex debug) - use-jemalloc = $(toml_usex jemalloc) - default-linker = "$(tc-getCC)" - rpath = false - [target.${rust_target}] - cc = "$(tc-getBUILD_CC)" - cxx = "$(tc-getBUILD_CXX)" - linker = "$(tc-getCC)" - ar = "$(tc-getAR)" - EOF -} - -src_compile() { - ./x.py build --verbose --config="${S}"/config.toml || die -} - -src_install() { - env DESTDIR="${D}" ./x.py install || die - - mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die - mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die - mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die - mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die - - dodoc COPYRIGHT - - if use doc ; then - dodir "/usr/share/doc/rust-${PV}/" - mv "${D}/usr/share/doc/rust"/* "${D}/usr/share/doc/rust-${PV}/" || die - rmdir "${D}/usr/share/doc/rust/" || die - fi - - cat <<-EOF > "${T}"/50${P} - LDPATH="/usr/$(get_libdir)/${P}" - MANPATH="/usr/share/${P}/man" - EOF - doenvd "${T}"/50${P} - - cat <<-EOF > "${T}/provider-${P}" - /usr/bin/rustdoc - /usr/bin/rust-gdb - /usr/bin/rust-lldb - EOF - dodir /etc/env.d/rust - insinto /etc/env.d/rust - doins "${T}/provider-${P}" -} - -pkg_postinst() { - eselect rust update --if-unset - - elog "Rust installs a helper script for calling GDB and LLDB," - elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}." - - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then - elog "install app-emacs/rust-mode to get emacs support for rust." - fi - - if has_version app-editors/gvim || has_version app-editors/vim; then - elog "install app-vim/rust-vim to get vim support for rust." - fi - - if has_version 'app-shells/zsh'; then - elog "install app-shells/rust-zshcomp to get zsh completion for rust." - fi -} - -pkg_postrm() { - eselect rust unset --if-invalid -} diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/rust-1.23.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/rust-1.23.0-r1 deleted file mode 100644 index 1b5bb1a580..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/rust-1.23.0-r1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup -DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake -DESCRIPTION=Systems programming language from Mozilla -EAPI=6 -HOMEPAGE=http://www.rust-lang.org/ -IUSE=debug doc +jemalloc -KEYWORDS=~amd64 ~x86 -LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA -PDEPEND=>=dev-util/cargo-0.24.0 -RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) -SLOT=stable/1.23 -SRC_URI=https://static.rust-lang.org/dist/rustc-1.23.0-src.tar.gz -> rustc-1.23.0-src.tar.gz amd64? ( https://static.rust-lang.org/dist/rust-1.22.0-x86_64-unknown-linux-gnu.tar.gz ) x86? ( https://static.rust-lang.org/dist/rust-1.22.0-i686-unknown-linux-gnu.tar.gz ) -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=952875a39677cdf7006c0e53e0fa44b6