jauhien     15/04/11 20:41:26

  Modified:             metadata.xml ChangeLog
  Added:                rust-bin-1.0.0_beta.ebuild
  Removed:              rust-bin-1.0.0_alpha2.ebuild
  Log:
  version bump, sync with overlay, cargo support, close bug#541298
  
  (Portage version: 2.2.18/cvs/Linux i686, signed Manifest commit with key 
B2EFA1D4)

Revision  Changes    Path
1.2                  dev-lang/rust-bin/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust-bin/metadata.xml?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust-bin/metadata.xml?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust-bin/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/rust-bin/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml        18 Oct 2014 12:50:48 -0000      1.1
+++ metadata.xml        11 Apr 2015 20:41:26 -0000      1.2
@@ -5,4 +5,8 @@
     <email>jauh...@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+  <use>
+    <flag name="cargo-bundled">Use the bundled cargo
+    instead of <pkg>dev-rust/cargo</pkg></flag>
+  </use>
 </pkgmetadata>



1.5                  dev-lang/rust-bin/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust-bin/ChangeLog?rev=1.5&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust-bin/ChangeLog?rev=1.5&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust-bin/ChangeLog?r1=1.4&r2=1.5

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/rust-bin/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog   31 Mar 2015 19:12:31 -0000      1.4
+++ ChangeLog   11 Apr 2015 20:41:26 -0000      1.5
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/rust-bin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust-bin/ChangeLog,v 1.4 
2015/03/31 19:12:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust-bin/ChangeLog,v 1.5 
2015/04/11 20:41:26 jauhien Exp $
+
+*rust-bin-1.0.0_beta (11 Apr 2015)
+
+  11 Apr 2015;  <jauh...@gentoo.org> +rust-bin-1.0.0_beta.ebuild,
+  -rust-bin-1.0.0_alpha2.ebuild, metadata.xml:
+  version bump, sync with overlay, cargo support, close bug#541298
 
   31 Mar 2015; Ulrich Müller <u...@gentoo.org> rust-bin-1.0.0_alpha2.ebuild:
   Update dependency after package move of eselect modules to app-eselect.



1.1                  dev-lang/rust-bin/rust-bin-1.0.0_beta.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust-bin/rust-bin-1.0.0_beta.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust-bin/rust-bin-1.0.0_beta.ebuild?rev=1.1&content-type=text/plain

Index: rust-bin-1.0.0_beta.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/dev-lang/rust-bin/rust-bin-1.0.0_beta.ebuild,v 1.1 
2015/04/11 20:41:26 jauhien Exp $

EAPI=5

inherit eutils bash-completion-r1

MY_PV="${PV/_/-}"
DESCRIPTION="Systems programming language from Mozilla"
HOMEPAGE="http://www.rust-lang.org/";
SRC_URI="amd64? ( 
http://static.rust-lang.org/dist/rust-${MY_PV}-x86_64-unknown-linux-gnu.tar.gz )
        x86? ( 
http://static.rust-lang.org/dist/rust-${MY_PV}-i686-unknown-linux-gnu.tar.gz )"

LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
SLOT="0"
KEYWORDS="~amd64 ~x86"

IUSE="cargo-bundled doc"

DEPEND=">=app-eselect/eselect-rust-0.2_pre20150206
        !dev-lang/rust:0
        cargo-bundled? ( !dev-rust/cargo )
"
RDEPEND="${DEPEND}"

src_unpack() {
        default

        local postfix
        use amd64 && postfix=x86_64-unknown-linux-gnu
        use x86 && postfix=i686-unknown-linux-gnu
        mv "${WORKDIR}/rust-${MY_PV}-${postfix}" "${S}" || die
}

src_install() {
        local components=rustc
        use cargo-bundled && components="${components},cargo"
        use doc && components="${components},rust-docs"
        ./install.sh \
                --components="${components}" \
                --disable-verify \
                --prefix="${D}/opt/${P}" \
                --mandir="${D}/usr/share/${P}/man" \
                --disable-ldconfig

        local rustc=rustc-bin-${PV}
        local rustdoc=rustdoc-bin-${PV}
        local rustgdb=rust-gdb-bin-${PV}

        mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
        mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
        mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die

        dosym "/opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
        dosym "/opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
        dosym "/opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"

        cat <<-EOF > "${T}"/50${P}
        LDPATH="/opt/${P}/lib"
        MANPATH="/usr/share/${P}/man"
        EOF
        doenvd "${T}"/50${P}

        dodir /etc/env.d/rust
        touch "${D}/etc/env.d/rust/provider-${P}" || die
        if use cargo-bundled ; then
                dosym "/opt/${P}/bin/cargo" /usr/bin/cargo
                dosym "/opt/${P}/share/zsh/site-functions/_cargo" 
/usr/share/zsh/site-functions/_cargo
                newbashcomp "${D}/opt/${P}/etc/bash_completion.d/cargo" cargo
                rm -rf "${D}/opt/${P}/etc"
        fi
}

pkg_postinst() {
        eselect rust update --if-unset

        elog "Rust uses slots now, use 'eselect rust list'"
        elog "and 'eselect rust set' to list and set rust version."
        elog "For more information see 'eselect rust help'"
        elog "and http://wiki.gentoo.org/wiki/Project:Eselect/User_guide";

        elog "Rust installs a helper script for calling GDB now,"
        elog "for your convenience it is installed under 
/usr/bin/rust-gdb-bin-${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-mode 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
}




Reply via email to