update to 4.8.0,fix all conda functions,re-organize

3 files changed, 36 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9aef0cb75b6..c0d7121358a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,24 @@
 pkgbase = python-conda
 	pkgdesc = OS-agnostic, system-level binary package manager and ecosystem
-	pkgver = 4.7.2
+	pkgver = 4.8.0
 	pkgrel = 1
 	url = http://conda.pydata.org/docs/
 	arch = any
 	license = BSD
+	makedepends = python-setuptools
 	depends = python
 	depends = python-conda-package-handling
 	depends = python-pycosat>=0.6.3
 	depends = python-requests>=2.12.4
 	depends = python-ruamel-yaml
+	depends = python-libarchive-c
+	depends = python-tqdm
 	optdepends = python-conda-build: to use the conda build command
 	provides = python-conda
 	provides = python-conda-env
 	options = !emptydirs
-	source = https://github.com/conda/conda/archive/4.7.2.tar.gz
-	sha512sums = e5216d6be93a7e87dde36d30d159a44af8b735b834de808d01e8c8a99c54d6a3a732c60b74aa6c73f95ffaddde6b13bf535c4c67f9074b21c7f0e2c6f73dcd64
+	source = conda-4.8.0.tar.gz::https://github.com/conda/conda/archive/4.8.0.tar.gz
+	sha512sums = c85ea7b051171479ee387fb6d54204ab59489521ac822797c4dc7b5be120c4b8a6844eb7c36ec85d3238dbb5a1525e8c5371df0d2b478d26e25d2bac5e26a07e
 
 pkgname = python-conda
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..d222a27c93cc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/src/
+/pkg/
+/conda-*.tar.gz
+*.pkg.tar.*
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 86b5d1e3b335..99d3e9d5ba15 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Daniel Maslowski <info@orangecms.org>
 
-_pyname=conda
 pkgname=python-conda
-pkgver=4.7.2
+_name=${pkgname#python-}
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="OS-agnostic, system-level binary package manager and ecosystem"
 arch=('any')
@@ -14,40 +14,46 @@ depends=(
   'python-pycosat>=0.6.3'
   'python-requests>=2.12.4'
   'python-ruamel-yaml'
+  'python-libarchive-c'
+  'python-tqdm'
 )
+makedepends=('python-setuptools')
 optdepends=(
   'python-conda-build: to use the conda build command'
 )
 provides=('python-conda' 'python-conda-env')
 options=(!emptydirs)
 source=(
-  https://github.com/$_pyname/$_pyname/archive/$pkgver.tar.gz
+  $_name-$pkgver.tar.gz::https://github.com/$_name/$_name/archive/$pkgver.tar.gz
 )
-sha512sums=('e5216d6be93a7e87dde36d30d159a44af8b735b834de808d01e8c8a99c54d6a3a732c60b74aa6c73f95ffaddde6b13bf535c4c67f9074b21c7f0e2c6f73dcd64')
+sha512sums=('c85ea7b051171479ee387fb6d54204ab59489521ac822797c4dc7b5be120c4b8a6844eb7c36ec85d3238dbb5a1525e8c5371df0d2b478d26e25d2bac5e26a07e')
 
 prepare() {
-  cd "$srcdir/${_pyname}-$pkgver"
+  cd "$srcdir/${_name}-$pkgver"
+  echo $pkgver > conda/.version
+  sed -i "s/package_files('conda\/shell') + //" setup.py
   sed -i 's/$_CONDA_ROOT//' conda/shell/bin/{de,}activate
   sed -i 's/env python/python3/' conda/shell/bin/conda
+  sed "s/conda.cli/conda_env.cli.main/" conda/shell/bin/conda > conda/shell/bin/conda-env
+  echo 'set -l CONDA_EXE /usr/bin/conda' | cat - conda/shell/etc/fish/conf.d/conda.fish > conda.fish
+  echo 'set _CONDA_EXE=/usr/bin/conda' | cat - conda/shell/etc/profile.d/conda.csh > conda.csh
+  echo 'export CONDA_EXE=/usr/bin/conda' | cat - conda/shell/etc/profile.d/conda.sh > conda.sh
+}
+
+build() {
+  cd "$srcdir/${_name}-$pkgver"
+  python setup.py clean --all
+  python setup.py build
 }
 
 package() {
-  cd "$srcdir/${_pyname}-$pkgver"
-  echo $pkgver > conda/.version
-  python utils/setup-testing.py install --root="$pkgdir/" --optimize=1
-  sed "s/conda.cli/conda_env.cli.main/" conda/shell/bin/conda > conda/shell/bin/conda-env
-  install -Dm 655 conda/shell/bin/activate $pkgdir/usr/bin/activate
-  install -Dm 655 conda/shell/bin/conda $pkgdir/usr/bin/conda
-  install -Dm 655 conda/shell/bin/conda-env $pkgdir/usr/bin/conda-env
-  install -Dm 655 conda/shell/bin/deactivate $pkgdir/usr/bin/deactivate
-  echo 'set _CONDA_EXE /usr/bin/conda
-set _CONDA_ROOT /' | cat - conda/shell/etc/fish/conf.d/conda.fish > conda.fish
-  install -Dm 644 conda.fish $pkgdir/etc/fish/conf.d/conda.fish
-  echo 'set _CONDA_EXE=/usr/bin/conda
-set _CONDA_ROOT=/' | cat - conda/shell/etc/profile.d/conda.csh > conda.csh
+  cd "$srcdir/${_name}-$pkgver"
+  python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+  for _bin in $(ls conda/shell/bin); do
+    install -Dm 655 conda/shell/bin/$_bin $pkgdir/usr/bin/$_bin
+  done
+  install -Dm 644 conda.fish $pkgdir/usr/share/fish/functions/conda.fish
   install -Dm 644 conda.csh $pkgdir/etc/profile.d/conda.csh
-  echo 'export _CONDA_EXE=/usr/bin/conda
-export _CONDA_ROOT=/' | cat - conda/shell/etc/profile.d/conda.sh > conda.sh
   install -Dm 644 conda.sh $pkgdir/etc/profile.d/conda.sh
   install -Dm 644 LICENSE.txt $pkgdir/usr/share/licenses/${pkgname}/LICENSE.txt
 }