[arch-commits] Commit in cargo/trunk (PKGBUILD)

2017-07-21 Thread Johannes Löthberg
Date: Friday, July 21, 2017 @ 12:38:53
  Author: demize
Revision: 245926

upgpkg: cargo 0.20.0-1

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |   46 +++---
 1 file changed, 19 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-21 11:40:33 UTC (rev 245925)
+++ PKGBUILD2017-07-21 12:38:53 UTC (rev 245926)
@@ -4,7 +4,7 @@
 # Contributor: Christopher Reimer 
 
 pkgname=cargo
-pkgver=0.19.0
+pkgver=0.20.0
 pkgrel=1
 
 pkgdesc='Rust package manager'
@@ -19,45 +19,37 @@
 
 options=('!emptydirs')
 
-source=("git+https://github.com/rust-lang/cargo.git#tag=$pkgver;
-"git+https://github.com/rust-lang/rust-installer.git;)
+source=("git+https://github.com/rust-lang/cargo.git#commit=a60d185c878c470876e123b0e40b0ba9f3271163;)
 
-md5sums=('SKIP'
- 'SKIP')
+md5sums=('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
+  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
 
-  make DESTDIR="$pkgdir" install
+  cargo install --root "$pkgdir"/usr
 
-  # 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}
+  rm "$pkgdir"/usr/.crates.toml
 
-  install -d "$pkgdir/usr/share/bash-completion/completions"
-  mv "$pkgdir/usr/etc/bash_completion.d/cargo" \
-"$pkgdir/usr/share/bash-completion/completions/cargo"
+  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


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2017-06-27 Thread Johannes Löthberg
Date: Tuesday, June 27, 2017 @ 17:55:33
  Author: demize
Revision: 241274

upgpkg: cargo 0.19.0-1

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-27 17:51:49 UTC (rev 241273)
+++ PKGBUILD2017-06-27 17:55:33 UTC (rev 241274)
@@ -4,7 +4,7 @@
 # Contributor: Christopher Reimer 
 
 pkgname=cargo
-pkgver=0.18.0
+pkgver=0.19.0
 pkgrel=1
 
 pkgdesc='Rust package manager'


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2017-04-28 Thread Johannes Löthberg
Date: Friday, April 28, 2017 @ 11:06:35
  Author: demize
Revision: 226186

upgpkg: cargo 0.18.0-1

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-28 10:32:46 UTC (rev 226185)
+++ PKGBUILD2017-04-28 11:06:35 UTC (rev 226186)
@@ -4,8 +4,8 @@
 # Contributor: Christopher Reimer 
 
 pkgname=cargo
-pkgver=0.17.0
-pkgrel=2
+pkgver=0.18.0
+pkgrel=1
 
 pkgdesc='Rust package manager'
 url='http://crates.io/'


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2017-03-22 Thread Johannes Löthberg
Date: Wednesday, March 22, 2017 @ 11:08:35
  Author: demize
Revision: 218382

upgpkg: cargo 0.17.0-2 [second openssl1.1 rebuild]

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-22 10:56:18 UTC (rev 218381)
+++ PKGBUILD2017-03-22 11:08:35 UTC (rev 218382)
@@ -5,7 +5,7 @@
 
 pkgname=cargo
 pkgver=0.17.0
-pkgrel=1
+pkgrel=2
 
 pkgdesc='Rust package manager'
 url='http://crates.io/'
@@ -38,7 +38,10 @@
 build() {
   cd cargo
 
-  ./configure --prefix=/usr --enable-optimize
+  ./configure \
+--prefix=/usr \
+--release-channel=stable \
+--enable-optimize
   make
 }
 


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2017-03-20 Thread Johannes Löthberg
Date: Monday, March 20, 2017 @ 21:30:32
  Author: demize
Revision: 217804

upgpkg: cargo 0.17.0-1

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-20 21:25:33 UTC (rev 217803)
+++ PKGBUILD2017-03-20 21:30:32 UTC (rev 217804)
@@ -1,22 +1,27 @@
 # $Id$
-# Maintainer: Alexander F Rødseth 
+# Maintainer: Johannes Löthberg 
+# Contributor: Alexander F Rødseth 
 # Contributor: Christopher Reimer 
 
 pkgname=cargo
-pkgver=0.16.0
-pkgrel=2
+pkgver=0.17.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')
-groups=('rust')
+
 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')
 


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2017-03-04 Thread Johannes Löthberg
Date: Saturday, March 4, 2017 @ 17:55:52
  Author: demize
Revision: 214909

OpenSSL 1.1.0 rebuild

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |   18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-04 16:19:54 UTC (rev 214908)
+++ PKGBUILD2017-03-04 17:55:52 UTC (rev 214909)
@@ -4,28 +4,30 @@
 
 pkgname=cargo
 pkgver=0.16.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Rust package manager'
 url='http://crates.io/'
 arch=('x86_64' 'i686')
 license=('APACHE' 'MIT' 'custom')
 depends=('curl' 'rust')
-makedepends=('git' 'setconf' 'python' 'cmake' 'cargo')
+makedepends=('git' 'python' 'cmake' 'cargo')
 optdepends=('gcc: for compiling C source code with gcc'
 'clang: for compiling C source code with clang')
 groups=('rust')
 options=('!emptydirs')
-source=("git+https://github.com/rust-lang/cargo.git#tag=$pkgver;)
-md5sums=('SKIP')
+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 update --init --recursive
+  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
-
-  # Upstream forgot to bump the version number, FS#51939
-  setconf Makefile.in CFG_RELEASE_NUM="$pkgver"
 }
 
 build() {


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2017-03-03 Thread Johannes Löthberg
Date: Friday, March 3, 2017 @ 14:49:28
  Author: demize
Revision: 214657

upgpkg: cargo 0.16.0-1

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-03 14:46:49 UTC (rev 214656)
+++ PKGBUILD2017-03-03 14:49:28 UTC (rev 214657)
@@ -3,7 +3,7 @@
 # Contributor: Christopher Reimer 
 
 pkgname=cargo
-pkgver=0.15.0
+pkgver=0.16.0
 pkgrel=1
 pkgdesc='Rust package manager'
 url='http://crates.io/'
@@ -19,7 +19,7 @@
 md5sums=('SKIP')
 
 prepare() {
-  cd "$pkgname"
+  cd cargo
 
   git submodule update --init --recursive
   sed 's^share/doc^share/licenses^g' -i Makefile.in
@@ -29,7 +29,7 @@
 }
 
 build() {
-  cd "$pkgname"
+  cd cargo
 
   ./configure --prefix=/usr --enable-optimize
   make
@@ -36,7 +36,7 @@
 }
 
 package() {
-  cd "$pkgname"
+  cd cargo
 
   make DESTDIR="$pkgdir" install
 


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-12-24 Thread Alexander Rødseth
Date: Saturday, December 24, 2016 @ 11:24:29
  Author: arodseth
Revision: 201432

upgpkg: cargo 0.15.0-1

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-24 11:24:24 UTC (rev 201431)
+++ PKGBUILD2016-12-24 11:24:29 UTC (rev 201432)
@@ -3,14 +3,14 @@
 # Contributor: Christopher Reimer 
 
 pkgname=cargo
-pkgver=0.14.0
-pkgrel=3
+pkgver=0.15.0
+pkgrel=1
 pkgdesc='Rust package manager'
 url='http://crates.io/'
 arch=('x86_64' 'i686')
 license=('APACHE' 'MIT' 'custom')
 depends=('curl' 'rust')
-makedepends=('git' 'setconf' 'python' 'cmake')
+makedepends=('git' 'setconf' 'python' 'cmake' 'cargo')
 optdepends=('gcc: for compiling C source code with gcc'
 'clang: for compiling C source code with clang')
 groups=('rust')


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-12-11 Thread Alexander Rødseth
Date: Sunday, December 11, 2016 @ 18:13:36
  Author: arodseth
Revision: 198802

upgpkg: cargo 0.14.0-3

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-11 17:59:55 UTC (rev 198801)
+++ PKGBUILD2016-12-11 18:13:36 UTC (rev 198802)
@@ -4,7 +4,7 @@
 
 pkgname=cargo
 pkgver=0.14.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Rust package manager'
 url='http://crates.io/'
 arch=('x86_64' 'i686')
@@ -11,6 +11,8 @@
 license=('APACHE' 'MIT' 'custom')
 depends=('curl' 'rust')
 makedepends=('git' 'setconf' 'python' 'cmake')
+optdepends=('gcc: for compiling C source code with gcc'
+'clang: for compiling C source code with clang')
 groups=('rust')
 options=('!emptydirs')
 source=("git+https://github.com/rust-lang/cargo.git#tag=$pkgver;)


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-11-28 Thread Alexander Rødseth
Date: Tuesday, November 29, 2016 @ 00:05:40
  Author: arodseth
Revision: 197208

upgpkg: cargo 0.14.0-2

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-28 23:36:30 UTC (rev 197207)
+++ PKGBUILD2016-11-29 00:05:40 UTC (rev 197208)
@@ -4,13 +4,13 @@
 
 pkgname=cargo
 pkgver=0.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Rust package manager'
 url='http://crates.io/'
 arch=('x86_64' 'i686')
 license=('APACHE' 'MIT' 'custom')
 depends=('curl' 'rust')
-makedepends=('git' 'python' 'cmake')
+makedepends=('git' 'setconf' 'python' 'cmake')
 groups=('rust')
 options=('!emptydirs')
 source=("git+https://github.com/rust-lang/cargo.git#tag=$pkgver;)
@@ -21,6 +21,9 @@
 
   git submodule update --init --recursive
   sed 's^share/doc^share/licenses^g' -i Makefile.in
+
+  # Upstream forgot to bump the version number, FS#51939
+  setconf Makefile.in CFG_RELEASE_NUM="$pkgver"
 }
 
 build() {


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-11-14 Thread Alexander Rødseth
Date: Monday, November 14, 2016 @ 18:52:27
  Author: arodseth
Revision: 195897

upgpkg: cargo 0.14.0-1

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-14 18:51:31 UTC (rev 195896)
+++ PKGBUILD2016-11-14 18:52:27 UTC (rev 195897)
@@ -3,7 +3,7 @@
 # Contributor: Christopher Reimer 
 
 pkgname=cargo
-pkgver=0.13.0
+pkgver=0.14.0
 pkgrel=1
 pkgdesc='Rust package manager'
 url='http://crates.io/'
@@ -42,6 +42,10 @@
   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:


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-09-30 Thread Alexander Rødseth
Date: Friday, September 30, 2016 @ 20:17:50
  Author: arodseth
Revision: 191108

upgpkg: cargo 0.13.0-1

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-09-30 20:16:44 UTC (rev 191107)
+++ PKGBUILD2016-09-30 20:17:50 UTC (rev 191108)
@@ -3,7 +3,7 @@
 # Contributor: Christopher Reimer 
 
 pkgname=cargo
-pkgver=0.12.0
+pkgver=0.13.0
 pkgrel=1
 pkgdesc='Rust package manager'
 url='http://crates.io/'
@@ -11,13 +11,16 @@
 license=('APACHE' 'MIT' 'custom')
 depends=('curl' 'rust')
 makedepends=('git' 'python' 'cmake')
+groups=('rust')
 options=('!emptydirs')
 source=("git+https://github.com/rust-lang/cargo.git#tag=$pkgver;)
 md5sums=('SKIP')
 
 prepare() {
-  for cmd in init update; do (cd "$pkgname"; git submodule "$cmd"); done
-  sed 's^share/doc^share/licenses^g' -i "$pkgname/Makefile.in"
+  cd "$pkgname"
+
+  git submodule update --init --recursive
+  sed 's^share/doc^share/licenses^g' -i Makefile.in
 }
 
 build() {


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-08-24 Thread Alexander Rødseth
Date: Wednesday, August 24, 2016 @ 20:06:03
  Author: arodseth
Revision: 187473

upgpkg: cargo 0.12.0-1

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-24 20:03:09 UTC (rev 187472)
+++ PKGBUILD2016-08-24 20:06:03 UTC (rev 187473)
@@ -3,8 +3,8 @@
 # Contributor: Christopher Reimer 
 
 pkgname=cargo
-pkgver=0.11.0
-pkgrel=2
+pkgver=0.12.0
+pkgrel=1
 pkgdesc='Rust package manager'
 url='http://crates.io/'
 arch=('x86_64' 'i686')


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-07-31 Thread Alexander Rødseth
Date: Monday, August 1, 2016 @ 00:57:18
  Author: arodseth
Revision: 184730

upgpkg: cargo 0.11.0-2

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-01 00:27:01 UTC (rev 184729)
+++ PKGBUILD2016-08-01 00:57:18 UTC (rev 184730)
@@ -34,7 +34,7 @@
 
   # 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}"
+  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" \


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-07-31 Thread Alexander Rødseth
Date: Monday, August 1, 2016 @ 00:27:01
  Author: arodseth
Revision: 184729

Fix removal of conflicting files

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-01 00:03:02 UTC (rev 184728)
+++ PKGBUILD2016-08-01 00:27:01 UTC (rev 184729)
@@ -34,11 +34,7 @@
 
   # Remove files that contains references to $srcdir or $pkgdir,
   # or that conflicts with the rust package.
-  find "$pkgdir" \
--name install.log \
--o -name manifest-cargo \
--o -name uninstall.sh \
--delete
+  rm -f "$pkgdir/usr/lib/rustlib/{install.log,manifest-cargo}"
 
   install -d "$pkgdir/usr/share/bash-completion/completions"
   mv "$pkgdir/usr/etc/bash_completion.d/cargo" \


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-07-31 Thread Alexander Rødseth
Date: Monday, August 1, 2016 @ 00:03:02
  Author: arodseth
Revision: 184728

Path fix

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-31 23:32:01 UTC (rev 184727)
+++ PKGBUILD2016-08-01 00:03:02 UTC (rev 184728)
@@ -18,7 +18,6 @@
 prepare() {
   for cmd in init update; do (cd "$pkgname"; git submodule "$cmd"); done
   sed 's^share/doc^share/licenses^g' -i "$pkgname/Makefile.in"
-  sed 's^bash_completion.d/^bash-completion/completions/^g' -i 
"$pkgname/Makefile.in"
 }
 
 build() {
@@ -40,6 +39,10 @@
 -o -name manifest-cargo \
 -o -name uninstall.sh \
 -delete
+
+  install -d "$pkgdir/usr/share/bash-completion/completions"
+  mv "$pkgdir/usr/etc/bash_completion.d/cargo" \
+"$pkgdir/usr/share/bash-completion/completions/cargo"
 }
 
 # vim:set ts=2 sw=2 et:


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-07-31 Thread Alexander Rødseth
Date: Sunday, July 31, 2016 @ 23:32:01
  Author: arodseth
Revision: 184727

FS#48606

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |   34 +-
 1 file changed, 13 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-31 22:10:15 UTC (rev 184726)
+++ PKGBUILD2016-07-31 23:32:01 UTC (rev 184727)
@@ -4,22 +4,21 @@
 
 pkgname=cargo
 pkgver=0.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Rust package manager'
 url='http://crates.io/'
 arch=('x86_64' 'i686')
 license=('APACHE' 'MIT' 'custom')
-depends=('curl' 'rust' 'clang')
-makedepends=('cmake' 'git' 'python')
+depends=('curl' 'rust')
+makedepends=('git' 'python' 'cmake')
 options=('!emptydirs')
 source=("git+https://github.com/rust-lang/cargo.git#tag=$pkgver;)
 md5sums=('SKIP')
 
 prepare() {
-  cd "$pkgname"
-
-  git submodule init
-  git submodule update
+  for cmd in init update; do (cd "$pkgname"; git submodule "$cmd"); done
+  sed 's^share/doc^share/licenses^g' -i "$pkgname/Makefile.in"
+  sed 's^bash_completion.d/^bash-completion/completions/^g' -i 
"$pkgname/Makefile.in"
 }
 
 build() {
@@ -34,20 +33,13 @@
 
   make DESTDIR="$pkgdir" install
 
-  # Contains reference to $srcdir and $pkgdir
-  find "$pkgdir" -name install.log -delete
-  find "$pkgdir" -name manifest-cargo -delete
-
-  # Conflicts with the rust package
-  find "$pkgdir" -name uninstall.sh -delete
-
-  install -d "$pkgdir/usr/share/bash-completion/completions"
-  mv "$pkgdir/usr/etc/bash_completion.d/cargo" \
-"$pkgdir/usr/share/bash-completion/completions/cargo"
-
-  install -d "$pkgdir/usr/share/licenses/$pkgname"
-  mv "$pkgdir/usr/share/doc/cargo/LICENSE"* \
-"$pkgdir/usr/share/licenses/$pkgname"
+  # Remove files that contains references to $srcdir or $pkgdir,
+  # or that conflicts with the rust package.
+  find "$pkgdir" \
+-name install.log \
+-o -name manifest-cargo \
+-o -name uninstall.sh \
+-delete
 }
 
 # vim:set ts=2 sw=2 et:


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-07-09 Thread Alexander Rødseth
Date: Saturday, July 9, 2016 @ 21:09:11
  Author: arodseth
Revision: 182596

upgpkg: cargo 0.11.0-1

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-09 19:28:13 UTC (rev 182595)
+++ PKGBUILD2016-07-09 21:09:11 UTC (rev 182596)
@@ -3,8 +3,8 @@
 # Contributor: Christopher Reimer 
 
 pkgname=cargo
-pkgver=0.10.0
-pkgrel=2
+pkgver=0.11.0
+pkgrel=1
 pkgdesc='Rust package manager'
 url='http://crates.io/'
 arch=('x86_64' 'i686')


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-04-23 Thread Alexander Rødseth
Date: Saturday, April 23, 2016 @ 19:48:31
  Author: arodseth
Revision: 171638

upgpkg: cargo 0.10.0-2

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-23 17:47:16 UTC (rev 171637)
+++ PKGBUILD2016-04-23 17:48:31 UTC (rev 171638)
@@ -4,11 +4,11 @@
 
 pkgname=cargo
 pkgver=0.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Rust package manager'
 url='http://crates.io/'
 arch=('x86_64' 'i686')
-license=('custom')
+license=('APACHE' 'MIT' 'custom')
 depends=('curl' 'rust' 'clang')
 makedepends=('cmake' 'git' 'python')
 options=('!emptydirs')


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-04-18 Thread Alexander Rødseth
Date: Monday, April 18, 2016 @ 20:31:45
  Author: arodseth
Revision: 171366

upgpkg: cargo 0.10.0-1

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-18 17:53:34 UTC (rev 171365)
+++ PKGBUILD2016-04-18 18:31:45 UTC (rev 171366)
@@ -3,8 +3,8 @@
 # Contributor: Christopher Reimer 
 
 pkgname=cargo
-pkgver=0.9.0
-pkgrel=4
+pkgver=0.10.0
+pkgrel=1
 pkgdesc='Rust package manager'
 url='http://crates.io/'
 arch=('x86_64' 'i686')


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-03-19 Thread Alexander Rødseth
Date: Friday, March 18, 2016 @ 00:40:38
  Author: arodseth
Revision: 167052

upgpkg: cargo 0.9.0-4

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-17 23:37:48 UTC (rev 167051)
+++ PKGBUILD2016-03-17 23:40:38 UTC (rev 167052)
@@ -4,12 +4,12 @@
 
 pkgname=cargo
 pkgver=0.9.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Rust package manager'
 url='http://crates.io/'
 arch=('x86_64' 'i686')
 license=('custom')
-depends=('curl' 'rust')
+depends=('curl' 'rust' 'clang')
 makedepends=('cmake' 'git' 'python')
 options=('!emptydirs')
 source=("git+https://github.com/rust-lang/cargo.git#tag=$pkgver;)


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-03-06 Thread Evangelos Foutras
Date: Sunday, March 6, 2016 @ 12:16:48
  Author: foutrelis
Revision: 165347

upgpkg: cargo 0.9.0-3

OpenSSL 1.0.2g rebuild

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-06 11:14:53 UTC (rev 165346)
+++ PKGBUILD2016-03-06 11:16:48 UTC (rev 165347)
@@ -4,7 +4,7 @@
 
 pkgname=cargo
 pkgver=0.9.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Rust package manager'
 url='http://crates.io/'
 arch=('x86_64' 'i686')


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-03-05 Thread Alexander Rødseth
Date: Saturday, March 5, 2016 @ 17:21:03
  Author: arodseth
Revision: 165156

upgpkg: cargo 0.9.0-2

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-05 15:55:53 UTC (rev 165155)
+++ PKGBUILD2016-03-05 16:21:03 UTC (rev 165156)
@@ -4,7 +4,7 @@
 
 pkgname=cargo
 pkgver=0.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Rust package manager'
 url='http://crates.io/'
 arch=('x86_64' 'i686')


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-03-04 Thread Bartłomiej Piotrowski
Date: Friday, March 4, 2016 @ 17:52:49
  Author: bpiotrowski
Revision: 164824

upgpkg: cargo 0.9.0-1

OpenSSL 1.0.2g rebuild

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-04 16:39:37 UTC (rev 164823)
+++ PKGBUILD2016-03-04 16:52:49 UTC (rev 164824)
@@ -3,7 +3,7 @@
 # Contributor: Christopher Reimer 
 
 pkgname=cargo
-pkgver=0.8.0
+pkgver=0.9.0
 pkgrel=1
 pkgdesc='Rust package manager'
 url='http://crates.io/'


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2016-01-23 Thread Sven-Hendrik Haase
Date: Saturday, January 23, 2016 @ 14:46:43
  Author: svenstaro
Revision: 158688

upgpkg: cargo 0.8.0-1

upstream release 0.8.0

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-23 10:47:57 UTC (rev 158687)
+++ PKGBUILD2016-01-23 13:46:43 UTC (rev 158688)
@@ -3,7 +3,7 @@
 # Contributor: Christopher Reimer 
 
 pkgname=cargo
-pkgver=0.7.0
+pkgver=0.8.0
 pkgrel=1
 pkgdesc='Rust package manager'
 url='http://crates.io/'


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2015-12-12 Thread Alexander Rødseth
Date: Saturday, December 12, 2015 @ 18:28:00
  Author: arodseth
Revision: 153139

upgpkg: cargo 0.7.0-1

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-12 15:28:05 UTC (rev 153138)
+++ PKGBUILD2015-12-12 17:28:00 UTC (rev 153139)
@@ -3,7 +3,7 @@
 # Contributor: Christopher Reimer 
 
 pkgname=cargo
-pkgver=0.6.0
+pkgver=0.7.0
 pkgrel=1
 pkgdesc='Rust package manager'
 url='http://crates.io/'
@@ -16,7 +16,7 @@
 md5sums=('SKIP')
 
 prepare() {
-  cd "$srcdir/$pkgname"
+  cd "$pkgname"
 
   git submodule init
   git submodule update
@@ -23,7 +23,7 @@
 }
 
 build() {
-  cd "$srcdir/$pkgname"
+  cd "$pkgname"
 
   ./configure --prefix=/usr --enable-optimize
   make
@@ -30,15 +30,15 @@
 }
 
 package() {
-  cd "$srcdir/$pkgname"
+  cd "$pkgname"
 
   make DESTDIR="$pkgdir" install
 
-  #Contains reference to $srcdir and $pkgdir
+  # Contains reference to $srcdir and $pkgdir
   find "$pkgdir" -name install.log -delete
   find "$pkgdir" -name manifest-cargo -delete
 
-  #Conflict with rust package
+  # Conflicts with the rust package
   find "$pkgdir" -name uninstall.sh -delete
 
   install -d "$pkgdir/usr/share/bash-completion/completions"


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2015-10-30 Thread Alexander Rødseth
Date: Friday, October 30, 2015 @ 21:37:06
  Author: arodseth
Revision: 145328

upgpkg: cargo 0.6.0-1

Modified:
  cargo/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-30 20:09:09 UTC (rev 145327)
+++ PKGBUILD2015-10-30 20:37:06 UTC (rev 145328)
@@ -3,7 +3,7 @@
 # Contributor: Christopher Reimer 
 
 pkgname=cargo
-pkgver=0.5.0
+pkgver=0.6.0
 pkgrel=1
 pkgdesc='Rust package manager'
 url='http://crates.io/'


[arch-commits] Commit in cargo/trunk (PKGBUILD)

2015-10-24 Thread Alexander Rødseth
Date: Saturday, October 24, 2015 @ 17:14:02
  Author: arodseth
Revision: 144899

svn id

Modified:
  cargo/trunk/PKGBUILD  (contents, properties)

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-24 15:13:43 UTC (rev 144898)
+++ PKGBUILD2015-10-24 15:14:02 UTC (rev 144899)
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $
+# $Id$
 # Maintainer: Alexander F Rødseth 
 # Contributor: Christopher Reimer 
 


Property changes on: cargo/trunk/PKGBUILD
___
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property