jauhien 14/08/29 14:12:27
Modified: metadata.xml ChangeLog
Added: rust-9999-r2.ebuild rust-999.ebuild
rust-0.11.0-r1.ebuild
Removed: rust-9999.ebuild rust-0.11.0.ebuild
rust-0.10.ebuild
Log:
Add slotting to rust ebuilds
Add these slots:
(major.minor) rust release
(nightly) nightly version
(git) git master branch
Remove old unslotted versions
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key
0xB2EFA1D4)
Revision Changes Path
1.3 dev-lang/rust/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/metadata.xml?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/metadata.xml?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/metadata.xml?r1=1.2&r2=1.3
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/rust/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml 31 Jul 2014 09:52:41 -0000 1.2
+++ metadata.xml 29 Aug 2014 14:12:27 -0000 1.3
@@ -5,8 +5,10 @@
<email>[email protected]</email>
<name>Jauhien Piatlicki</name>
</maintainer>
+ <maintainer>
+ <email>[email protected]</email>
+ </maintainer>
<use>
- <flag name="binary-bootstrap">Download precompiled rust for compilator
bootstrap</flag>
<flag name="clang">Use <pkg>sys-devel/clang</pkg> for building</flag>
<flag name="libcxx">Use <pkg>sys-libs/libcxx</pkg> as standard
library when building with <pkg>sys-devel/clang</pkg></flag>
1.4 dev-lang/rust/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/ChangeLog?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/ChangeLog?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/ChangeLog?r1=1.3&r2=1.4
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/rust/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog 31 Jul 2014 14:29:09 -0000 1.3
+++ ChangeLog 29 Aug 2014 14:12:27 -0000 1.4
@@ -1,6 +1,20 @@
# ChangeLog for dev-lang/rust
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/ChangeLog,v 1.3 2014/07/31
14:29:09 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/ChangeLog,v 1.4 2014/08/29
14:12:27 jauhien Exp $
+
+*rust-0.11.0-r1 (29 Aug 2014)
+*rust-999 (29 Aug 2014)
+*rust-9999-r2 (29 Aug 2014)
+
+ 29 Aug 2014; Jauhien Piatlicki <[email protected]>
+ +files/rust-0.11.0-libdir.patch, +files/rust-9999-libdir.patch,
+ +rust-0.11.0-r1.ebuild, +rust-999.ebuild, +rust-9999-r2.ebuild,
+ -rust-0.10.ebuild, -rust-0.11.0.ebuild, -rust-9999.ebuild,
+ files/50rust-mode-gentoo.el, files/rust-0.12.0-no-ldconfig.patch,
+ metadata.xml:
+ Add slotting to rust ebuilds Add these slots: (major.minor) rust release
+ (nightly) nightly version (git) git master branch Remove old unslotted
+ versions
*rust-9999 (31 Jul 2014)
1.1 dev-lang/rust/rust-9999-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/rust-9999-r2.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/rust-9999-r2.ebuild?rev=1.1&content-type=text/plain
Index: rust-9999-r2.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-9999-r2.ebuild,v 1.1
2014/08/29 14:12:27 jauhien Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
inherit elisp-common eutils git-r3 python-any-r1
DESCRIPTION="Systems programming language from Mozilla"
HOMEPAGE="http://www.rust-lang.org/";
EGIT_REPO_URI="git://github.com/rust-lang/rust.git"
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
SLOT="git"
KEYWORDS=""
IUSE="clang debug emacs libcxx vim-syntax zsh-completion"
REQUIRED_USE="libcxx? ( clang )"
RDEPEND="vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
zsh-completion? ( app-shells/zsh )"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
app-admin/eselect-rust
>=dev-lang/perl-5.0
clang? ( sys-devel/clang )
emacs? ( virtual/emacs )
libcxx? ( sys-libs/libcxx )
!dev-lang/rust:0"
SITEFILE="50${PN}-mode-gentoo.el"
src_unpack() {
git-r3_src_unpack
use amd64 && BUILD_TRIPLE=x86_64-unknown-linux-gnu
use x86 && BUILD_TRIPLE=i686-unknown-linux-gnu
export CFG_SRC_DIR="${S}" && \
cd ${S} && \
mkdir -p "${S}/dl" && \
mkdir -p "${S}/${BUILD_TRIPLE}/stage0/bin" && \
python2 "${S}/src/etc/get-snapshot.py" ${BUILD_TRIPLE} || die
}
src_prepare() {
epatch "${FILESDIR}/${PN}-0.12.0-no-ldconfig.patch"
"${FILESDIR}/${P}-libdir.patch"
local commit_hash=`git rev-parse --short HEAD`
sed -i -e "s/CFG_FILENAME_EXTRA=.*/CFG_FILENAME_EXTRA=${commit_hash}/"
mk/main.mk || die
}
src_configure() {
"${ECONF_SOURCE:-.}"/configure \
--prefix="${EPREFIX}/usr" \
--libdir="${EPREFIX}/usr/lib/${P}" \
--mandir="${EPREFIX}/usr/share/${P}/man" \
$(use_enable clang) \
$(use_enable debug) \
$(use_enable debug llvm-assertions) \
$(use_enable !debug optimize) \
$(use_enable !debug optimize-cxx) \
$(use_enable !debug optimize-llvm) \
$(use_enable !debug optimize-tests) \
$(use_enable libcxx libcpp) \
--disable-manage-submodules \
--disable-verify-install \
|| die
}
src_compile() {
emake VERBOSE=1
if use emacs; then
cd src/etc/emacs || die
elisp-compile *.el
elisp-make-autoload-file "${PN}-mode-autoloads.el" .
fi
}
src_install() {
default
if use emacs; then
local sf="${T}/${SITEFILE}"
local my_elisp_pn=${PN}-mode
insinto "/usr/share/${P}/emacs/site-lisp/${my_elisp_pn}"
doins -r src/etc/emacs/*.el src/etc/emacs/*.elc
cp "${FILESDIR}/${SITEFILE}" "${sf}" || die
sed -i -e "s:@SITELISP@:${EPREFIX}${SITELISP}/${my_elisp_pn}:g"
"${sf}" || die
insinto "/usr/share/${P}/emacs/site-lisp/site-gentoo.d/"
doins "${sf}"
fi
if use vim-syntax; then
insinto /usr/share/${P}/vim/vimfiles
doins -r src/etc/vim/*
fi
if use zsh-completion; then
insinto "/usr/share/${P}/zsh/site-functions"
doins src/etc/zsh/_rust
fi
mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
cat <<-EOF > "${T}"/50${P}
LDPATH="/usr/lib/${P}"
MANPATH="/usr/share/${P}/man"
EOF
doenvd "${T}"/50${P}
}
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";
}
pkg_postrm() {
eselect rust unset --if-invalid
}
1.1 dev-lang/rust/rust-999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/rust-999.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/rust-999.ebuild?rev=1.1&content-type=text/plain
Index: rust-999.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-999.ebuild,v 1.1
2014/08/29 14:12:27 jauhien Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
inherit elisp-common eutils python-any-r1
MY_P=${PN}-nightly
DESCRIPTION="Systems programming language from Mozilla"
HOMEPAGE="http://www.rust-lang.org/";
MY_SRC_URI="http://static.rust-lang.org/dist/${MY_P}.tar.gz";
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
SLOT="nightly"
KEYWORDS=""
IUSE="clang debug emacs libcxx vim-syntax zsh-completion"
REQUIRED_USE="libcxx? ( clang )"
RDEPEND="vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
zsh-completion? ( app-shells/zsh )"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
app-admin/eselect-rust
>=dev-lang/perl-5.0
net-misc/wget
clang? ( sys-devel/clang )
emacs? ( virtual/emacs )
libcxx? ( sys-libs/libcxx )
!dev-lang/rust:0"
S="${WORKDIR}/${MY_P}"
SITEFILE="50${PN}-mode-gentoo.el"
src_unpack() {
wget "${MY_SRC_URI}" || die
unpack ./"${PN}-nightly.tar.gz"
use amd64 && BUILD_TRIPLE=x86_64-unknown-linux-gnu
use x86 && BUILD_TRIPLE=i686-unknown-linux-gnu
export CFG_SRC_DIR="${S}" && \
cd ${S} && \
mkdir -p "${S}/dl" && \
mkdir -p "${S}/${BUILD_TRIPLE}/stage0/bin" && \
python2 "${S}/src/etc/get-snapshot.py" ${BUILD_TRIPLE} || die
}
src_prepare() {
epatch "${FILESDIR}/${PN}-0.12.0-no-ldconfig.patch"
"${FILESDIR}/${PN}-9999-libdir.patch"
}
src_configure() {
"${ECONF_SOURCE:-.}"/configure \
--prefix="${EPREFIX}/usr" \
--libdir="${EPREFIX}/usr/lib/${P}" \
--mandir="${EPREFIX}/usr/share/${P}/man" \
$(use_enable clang) \
$(use_enable debug) \
$(use_enable debug llvm-assertions) \
$(use_enable !debug optimize) \
$(use_enable !debug optimize-cxx) \
$(use_enable !debug optimize-llvm) \
$(use_enable !debug optimize-tests) \
$(use_enable libcxx libcpp) \
--disable-manage-submodules \
--disable-verify-install \
|| die
}
src_compile() {
emake VERBOSE=1
if use emacs; then
cd src/etc/emacs || die
elisp-compile *.el
elisp-make-autoload-file "${PN}-mode-autoloads.el" .
fi
}
src_install() {
default
if use emacs; then
local sf="${T}/${SITEFILE}"
local my_elisp_pn=${PN}-mode
insinto "/usr/share/${P}/emacs/site-lisp/${my_elisp_pn}"
doins -r src/etc/emacs/*.el src/etc/emacs/*.elc
cp "${FILESDIR}/${SITEFILE}" "${sf}" || die
sed -i -e "s:@SITELISP@:${EPREFIX}${SITELISP}/${my_elisp_pn}:g"
"${sf}" || die
insinto "/usr/share/${P}/emacs/site-lisp/site-gentoo.d/"
doins "${sf}"
fi
if use vim-syntax; then
insinto /usr/share/${P}/vim/vimfiles
doins -r src/etc/vim/*
fi
if use zsh-completion; then
insinto "/usr/share/${P}/zsh/site-functions"
doins src/etc/zsh/_rust
fi
mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
cat <<-EOF > "${T}"/50${P}
LDPATH="/usr/lib/${P}"
MANPATH="/usr/share/${P}/man"
EOF
doenvd "${T}"/50${P}
}
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";
}
pkg_postrm() {
eselect rust unset --if-invalid
}
1.1 dev-lang/rust/rust-0.11.0-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/rust-0.11.0-r1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/rust/rust-0.11.0-r1.ebuild?rev=1.1&content-type=text/plain
Index: rust-0.11.0-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-0.11.0-r1.ebuild,v 1.1
2014/08/29 14:12:27 jauhien Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
inherit elisp-common eutils python-any-r1
DESCRIPTION="Systems programming language from Mozilla"
HOMEPAGE="http://www.rust-lang.org/";
ARCH_SRC_URI="amd64? (
http://static.rust-lang.org/dist/${P}-x86_64-unknown-linux-gnu.tar.gz )
x86? (
http://static.rust-lang.org/dist/${P}-i686-unknown-linux-gnu.tar.gz )"
SRC_URI="http://static.rust-lang.org/dist/${P}.tar.gz ${ARCH_SRC_URI}"
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
SLOT="0.11"
KEYWORDS="~amd64 ~x86"
IUSE="clang debug emacs libcxx vim-syntax zsh-completion"
REQUIRED_USE="libcxx? ( clang )"
RDEPEND="vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
zsh-completion? ( app-shells/zsh )"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
app-admin/eselect-rust
>=dev-lang/perl-5.0
clang? ( sys-devel/clang )
emacs? ( virtual/emacs )
libcxx? ( sys-libs/libcxx )
!dev-lang/rust:0"
SITEFILE="50${PN}-mode-gentoo.el"
src_prepare() {
epatch "${FILESDIR}/${P}-stage0.patch" "${FILESDIR}/${P}-libdir.patch"
}
src_configure() {
use amd64 && ARCH_POSTFIX="x86_64"
use x86 && ARCH_POSTFIX="i686"
LOCAL_RUST_PATH="${WORKDIR}/${P}-${ARCH_POSTFIX}-unknown-linux-gnu"
"${ECONF_SOURCE:-.}"/configure \
--prefix="${EPREFIX}/usr" \
--libdir="${EPREFIX}/usr/lib/${P}" \
--mandir="${EPREFIX}/usr/share/${P}/man" \
$(use_enable clang) \
$(use_enable debug) \
$(use_enable debug llvm-assertions) \
$(use_enable !debug optimize) \
$(use_enable !debug optimize-cxx) \
$(use_enable !debug optimize-llvm) \
$(use_enable !debug optimize-tests) \
$(use_enable libcxx libcpp) \
--enable-local-rust \
--local-rust-root="${LOCAL_RUST_PATH}" \
--disable-manage-submodules \
--disable-verify-install \
|| die
}
src_compile() {
emake VERBOSE=1
if use emacs; then
cd src/etc/emacs || die
elisp-compile *.el
elisp-make-autoload-file "${PN}-mode-autoloads.el" .
fi
}
src_install() {
default
if use emacs; then
local sf="${T}/${SITEFILE}"
local my_elisp_pn=${PN}-mode
insinto "/usr/share/${P}/emacs/site-lisp/${my_elisp_pn}"
doins -r src/etc/emacs/*.el src/etc/emacs/*.elc
cp "${FILESDIR}/${SITEFILE}" "${sf}" || die
sed -i -e "s:@SITELISP@:${EPREFIX}${SITELISP}/${my_elisp_pn}:g"
"${sf}" || die
insinto "/usr/share/${P}/emacs/site-lisp/site-gentoo.d/"
doins "${sf}"
fi
if use vim-syntax; then
insinto /usr/share/${P}/vim/vimfiles
doins -r src/etc/vim/*
fi
if use zsh-completion; then
insinto "/usr/share/${P}/zsh/site-functions"
doins src/etc/zsh/_rust
fi
mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
cat <<-EOF > "${T}"/50${P}
LDPATH="/usr/lib/${P}"
MANPATH="/usr/share/${P}/man"
EOF
doenvd "${T}"/50${P}
}
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";
}
pkg_postrm() {
eselect rust unset --if-invalid
}
