Update to 2.0.0

1 files changed, 22 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0f1e5b8b91ea..0fec347dec82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,32 +3,40 @@
 # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
 
 pkgname=pyfa
-pkgver=1.36.0
-pkgrel=2
-_everelname="yc120.3"
-_everelver=1.8
+pkgver=2.0.0
+pkgrel=1
+_distname="Pyfa-${pkgver}"
 pkgdesc="EVE Online Fitting Assistant"
 arch=('any')
 url="https://github.com/pyfa-org/Pyfa"
 license=('GPL3')
 makedepends=('unzip')
-depends=('python2' 'wxpython' 'python2-sqlalchemy' 'python2-dateutil' 'python2-requests' 'python2-urllib3' 'python2-logbook')
-optdepends=('python2-matplotlib: for graph plotting'
-        'python2-numpy: for graph plotting')
-source=(https://github.com/pyfa-org/Pyfa/releases/download/v$pkgver/pyfa-$pkgver-$_everelname-$_everelver-linux.zip pyfa.desktop pyfa-start.sh)
+depends=('python' 'python-wxpython' 'python-logbook' 'python-matplotlib' 'python-dateutil' 'python-requests' 'python-sqlalchemy' 'python-cryptography' 'python-markdown2' 'python-packaging' 'python-beautifulsoup4' 'python-pyaml' 'python-diskcache' 'python-esipy' 'python-roman')
+optdepends=()
+source=(https://github.com/pyfa-org/Pyfa/archive/v$pkgver.tar.gz pyfa.desktop pyfa-start.sh)
+
+sha256sums=('73c26002d5c5961257ff39c5fd82a539250efdd22c2c2f1016f5250971d20231'
+            '1379bd28eff6d1b658896491de580f83bf2e3921be385bdb36be88ac4b65a394'
+            'ce006f4eb2c799dd88d38179847155737c716cddefa84c9dc3e79a9f64723aac')
 
 package() {
   install -dm755 "${pkgdir}"/usr/share/pyfa
-  cp -R "${srcdir}"/pyfa/* "${pkgdir}"/usr/share/pyfa
+
+  install -Dm644 "${srcdir}"/"${_distname}"/config.py "${pkgdir}"/usr/share/pyfa
+  install -Dm644 "${srcdir}"/"${_distname}"/eve.db "${pkgdir}"/usr/share/pyfa
+  install -Dm755 "${srcdir}"/"${_distname}"/pyfa.py "${pkgdir}"/usr/share/pyfa
+  install -Dm644 "${srcdir}"/"${_distname}"/README.md "${pkgdir}"/usr/share/pyfa
+
+  cp -a "${srcdir}"/"${_distname}"/eos "${pkgdir}"/usr/share/pyfa
+  cp -a "${srcdir}"/"${_distname}"/gui "${pkgdir}"/usr/share/pyfa
+  cp -a "${srcdir}"/"${_distname}"/imgs "${pkgdir}"/usr/share/pyfa
+  cp -a "${srcdir}"/"${_distname}"/service "${pkgdir}"/usr/share/pyfa
+  cp -a "${srcdir}"/"${_distname}"/utils "${pkgdir}"/usr/share/pyfa
   
   install -dm755 "${pkgdir}"/usr/share/pixmaps
-  unzip -p "${srcdir}"/pyfa/imgs.zip gui/pyfa64.png > "${pkgdir}"/usr/share/pixmaps/pyfa.png
+  install -Dm644 "${srcdir}"/"${_distname}"/imgs/gui/pyfa64.png "${pkgdir}"/usr/share/pixmaps/pyfa.png
 
   install -Dm644 "${srcdir}"/pyfa.desktop "${pkgdir}"/usr/share/applications/pyfa.desktop
   install -Dm755 "${srcdir}"/pyfa-start.sh "${pkgdir}"/usr/bin/pyfa
 }
 
-sha256sums=('d44b2c2e9224c809894f173a207bf05f30bfa9f537dd4ea74a4c4c559077b5dc'
-            '1379bd28eff6d1b658896491de580f83bf2e3921be385bdb36be88ac4b65a394'
-            '4d6609b76edab07f08e57b1b343d4c6b5f2e836ddcad28643ba0a6cedab9dd5c')
-