[arch-commits] Commit in cargo/repos (4 files)

Johannes Löthberg demize at archlinux.org
Fri Jul 21 12:39:04 UTC 2017


    Date: Friday, July 21, 2017 @ 12:39:03
  Author: demize
Revision: 245927

archrelease: copy trunk to community-x86_64, community-i686

Added:
  cargo/repos/community-i686/PKGBUILD
    (from rev 245926, cargo/trunk/PKGBUILD)
  cargo/repos/community-x86_64/PKGBUILD
    (from rev 245926, cargo/trunk/PKGBUILD)
Deleted:
  cargo/repos/community-i686/PKGBUILD
  cargo/repos/community-x86_64/PKGBUILD

---------------------------+
 /PKGBUILD                 |  116 ++++++++++++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD   |   66 -------------------------
 community-x86_64/PKGBUILD |   66 -------------------------
 3 files changed, 116 insertions(+), 132 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-07-21 12:38:53 UTC (rev 245926)
+++ community-i686/PKGBUILD	2017-07-21 12:39:03 UTC (rev 245927)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Johannes Löthberg <johannes at kyrisis.com>
-# Contributor: Alexander F Rødseth <xyproto at archlinux.org>
-# Contributor: Christopher Reimer <mail+aur at c-reimer.de>
-
-pkgname=cargo
-pkgver=0.19.0
-pkgrel=1
-
-pkgdesc='Rust package manager'
-url='http://crates.io/'
-arch=('x86_64' 'i686')
-license=('APACHE' 'MIT' 'custom')
-
-depends=('curl' 'rust')
-makedepends=('git' 'python' 'cmake' 'cargo')
-optdepends=('gcc: for compiling C source code with gcc'
-            'clang: for compiling C source code with clang')
-
-options=('!emptydirs')
-
-source=("git+https://github.com/rust-lang/cargo.git#tag=$pkgver"
-        "git+https://github.com/rust-lang/rust-installer.git")
-
-md5sums=('SKIP'
-         'SKIP')
-
-prepare() {
-  cd cargo
-
-  git submodule init
-  git config submodule.src/rust-installer.url "$srcdir"/rust-installer
-  git submodule update
-
-  sed 's^share/doc^share/licenses^g' -i Makefile.in
-}
-
-build() {
-  cd cargo
-
-  ./configure \
-    --prefix=/usr \
-    --release-channel=stable \
-    --enable-optimize
-  make
-}
-
-package() {
-  cd cargo
-
-  make DESTDIR="$pkgdir" install
-
-  # Remove files that contains references to $srcdir or $pkgdir,
-  # or that conflicts with the rust package.
-  rm -f "$pkgdir/usr/lib/rustlib/"{install.log,manifest-cargo,uninstall.sh}
-
-  install -d "$pkgdir/usr/share/bash-completion/completions"
-  mv "$pkgdir/usr/etc/bash_completion.d/cargo" \
-    "$pkgdir/usr/share/bash-completion/completions/cargo"
-
-  for f in LICENSE-APACHE LICENSE-MIT LICENSE-THIRD-PARTY; do
-    install -Dm644 "$f" "$pkgdir/usr/share/licenses/$pkgname/$f"
-  done
-}
-
-# vim:set ts=2 sw=2 et:

Copied: cargo/repos/community-i686/PKGBUILD (from rev 245926, cargo/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-07-21 12:39:03 UTC (rev 245927)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Johannes Löthberg <johannes at kyrisis.com>
+# Contributor: Alexander F Rødseth <xyproto at archlinux.org>
+# Contributor: Christopher Reimer <mail+aur at c-reimer.de>
+
+pkgname=cargo
+pkgver=0.20.0
+pkgrel=1
+
+pkgdesc='Rust package manager'
+url='http://crates.io/'
+arch=('x86_64' 'i686')
+license=('APACHE' 'MIT' 'custom')
+
+depends=('curl' 'rust')
+makedepends=('git' 'python' 'cmake' 'cargo')
+optdepends=('gcc: for compiling C source code with gcc'
+            'clang: for compiling C source code with clang')
+
+options=('!emptydirs')
+
+source=("git+https://github.com/rust-lang/cargo.git#commit=a60d185c878c470876e123b0e40b0ba9f3271163")
+
+md5sums=('SKIP')
+
+build() {
+  cd cargo
+
+  cargo build --release
+}
+
+package() {
+  # cargo upstream deleted the old autotools scripts in favor of their own
+  # distribution tarball creation tools in the rust repo, which aren't suitable
+  # for our use right now, so we'll have to install things manually for now.
+
+  cd cargo
+
+  cargo install --root "$pkgdir"/usr
+
+  rm "$pkgdir"/usr/.crates.toml
+
+  install -Dm644 src/etc/_cargo \
+    "$pkgdir"/usr/share/zsh/site-functions/_cargo
+  install -Dm644 src/etc/cargo.bashcomp.sh \
+    "$pkgdir"/usr/share/bash-completion/completions/cargo
+
+  install -d "$pkgdir"/usr/share/man/man1/
+  for f in src/etc/man/*; do
+    cp "$f" "$pkgdir"/usr/share/man/man1/
+  done
+
+  for f in LICENSE-APACHE LICENSE-MIT LICENSE-THIRD-PARTY; do
+    install -Dm644 "$f" "$pkgdir/usr/share/licenses/$pkgname/$f"
+  done
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-07-21 12:38:53 UTC (rev 245926)
+++ community-x86_64/PKGBUILD	2017-07-21 12:39:03 UTC (rev 245927)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Johannes Löthberg <johannes at kyrisis.com>
-# Contributor: Alexander F Rødseth <xyproto at archlinux.org>
-# Contributor: Christopher Reimer <mail+aur at c-reimer.de>
-
-pkgname=cargo
-pkgver=0.19.0
-pkgrel=1
-
-pkgdesc='Rust package manager'
-url='http://crates.io/'
-arch=('x86_64' 'i686')
-license=('APACHE' 'MIT' 'custom')
-
-depends=('curl' 'rust')
-makedepends=('git' 'python' 'cmake' 'cargo')
-optdepends=('gcc: for compiling C source code with gcc'
-            'clang: for compiling C source code with clang')
-
-options=('!emptydirs')
-
-source=("git+https://github.com/rust-lang/cargo.git#tag=$pkgver"
-        "git+https://github.com/rust-lang/rust-installer.git")
-
-md5sums=('SKIP'
-         'SKIP')
-
-prepare() {
-  cd cargo
-
-  git submodule init
-  git config submodule.src/rust-installer.url "$srcdir"/rust-installer
-  git submodule update
-
-  sed 's^share/doc^share/licenses^g' -i Makefile.in
-}
-
-build() {
-  cd cargo
-
-  ./configure \
-    --prefix=/usr \
-    --release-channel=stable \
-    --enable-optimize
-  make
-}
-
-package() {
-  cd cargo
-
-  make DESTDIR="$pkgdir" install
-
-  # Remove files that contains references to $srcdir or $pkgdir,
-  # or that conflicts with the rust package.
-  rm -f "$pkgdir/usr/lib/rustlib/"{install.log,manifest-cargo,uninstall.sh}
-
-  install -d "$pkgdir/usr/share/bash-completion/completions"
-  mv "$pkgdir/usr/etc/bash_completion.d/cargo" \
-    "$pkgdir/usr/share/bash-completion/completions/cargo"
-
-  for f in LICENSE-APACHE LICENSE-MIT LICENSE-THIRD-PARTY; do
-    install -Dm644 "$f" "$pkgdir/usr/share/licenses/$pkgname/$f"
-  done
-}
-
-# vim:set ts=2 sw=2 et:

Copied: cargo/repos/community-x86_64/PKGBUILD (from rev 245926, cargo/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-07-21 12:39:03 UTC (rev 245927)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Johannes Löthberg <johannes at kyrisis.com>
+# Contributor: Alexander F Rødseth <xyproto at archlinux.org>
+# Contributor: Christopher Reimer <mail+aur at c-reimer.de>
+
+pkgname=cargo
+pkgver=0.20.0
+pkgrel=1
+
+pkgdesc='Rust package manager'
+url='http://crates.io/'
+arch=('x86_64' 'i686')
+license=('APACHE' 'MIT' 'custom')
+
+depends=('curl' 'rust')
+makedepends=('git' 'python' 'cmake' 'cargo')
+optdepends=('gcc: for compiling C source code with gcc'
+            'clang: for compiling C source code with clang')
+
+options=('!emptydirs')
+
+source=("git+https://github.com/rust-lang/cargo.git#commit=a60d185c878c470876e123b0e40b0ba9f3271163")
+
+md5sums=('SKIP')
+
+build() {
+  cd cargo
+
+  cargo build --release
+}
+
+package() {
+  # cargo upstream deleted the old autotools scripts in favor of their own
+  # distribution tarball creation tools in the rust repo, which aren't suitable
+  # for our use right now, so we'll have to install things manually for now.
+
+  cd cargo
+
+  cargo install --root "$pkgdir"/usr
+
+  rm "$pkgdir"/usr/.crates.toml
+
+  install -Dm644 src/etc/_cargo \
+    "$pkgdir"/usr/share/zsh/site-functions/_cargo
+  install -Dm644 src/etc/cargo.bashcomp.sh \
+    "$pkgdir"/usr/share/bash-completion/completions/cargo
+
+  install -d "$pkgdir"/usr/share/man/man1/
+  for f in src/etc/man/*; do
+    cp "$f" "$pkgdir"/usr/share/man/man1/
+  done
+
+  for f in LICENSE-APACHE LICENSE-MIT LICENSE-THIRD-PARTY; do
+    install -Dm644 "$f" "$pkgdir/usr/share/licenses/$pkgname/$f"
+  done
+}
+
+# vim:set ts=2 sw=2 et:



More information about the arch-commits mailing list