Update to 2.0.0

4 files changed, 44 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d9a3b3e0be5..1cd96d14654d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,32 @@
 pkgbase = pyfa
 	pkgdesc = EVE Online Fitting Assistant
-	pkgver = 1.36.0
-	pkgrel = 2
+	pkgver = 2.0.0
+	pkgrel = 1
 	url = https://github.com/pyfa-org/Pyfa
 	arch = any
 	license = GPL3
 	makedepends = unzip
-	depends = python2
-	depends = wxpython
-	depends = python2-sqlalchemy
-	depends = python2-dateutil
-	depends = python2-requests
-	depends = python2-urllib3
-	depends = python2-logbook
-	optdepends = python2-matplotlib: for graph plotting
-	optdepends = python2-numpy: for graph plotting
-	source = https://github.com/pyfa-org/Pyfa/releases/download/v1.36.0/pyfa-1.36.0-yc120.3-1.8-linux.zip
+	depends = python
+	depends = python-wxpython
+	depends = python-logbook
+	depends = python-matplotlib
+	depends = python-dateutil
+	depends = python-requests
+	depends = python-sqlalchemy
+	depends = python-cryptography
+	depends = python-markdown2
+	depends = python-packaging
+	depends = python-beautifulsoup4
+	depends = python-pyaml
+	depends = python-diskcache
+	depends = python-esipy
+	depends = python-roman
+	source = https://github.com/pyfa-org/Pyfa/archive/v2.0.0.tar.gz
 	source = pyfa.desktop
 	source = pyfa-start.sh
-	sha256sums = d44b2c2e9224c809894f173a207bf05f30bfa9f537dd4ea74a4c4c559077b5dc
+	sha256sums = 73c26002d5c5961257ff39c5fd82a539250efdd22c2c2f1016f5250971d20231
 	sha256sums = 1379bd28eff6d1b658896491de580f83bf2e3921be385bdb36be88ac4b65a394
-	sha256sums = 4d6609b76edab07f08e57b1b343d4c6b5f2e836ddcad28643ba0a6cedab9dd5c
+	sha256sums = ce006f4eb2c799dd88d38179847155737c716cddefa84c9dc3e79a9f64723aac
 
 pkgname = pyfa
 
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')
-
diff --git a/pyfa-start.sh b/pyfa-start.sh
index 68c3f96e768b..d3c7ad4cca99 100755
--- a/pyfa-start.sh
+++ b/pyfa-start.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # Launch pyfa
-python2 /usr/share/pyfa/pyfa.py "$@"
+python /usr/share/pyfa/pyfa.py "$@"
diff --git a/pyfa.desktop b/pyfa.desktop
index 19c8c4a6b245..535dedc2cb7b 100755
--- a/pyfa.desktop
+++ b/pyfa.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=1.36.0
+Version=2.0.0
 Encoding=UTF-8
 Name=Pyfa
 Comment=Python Fitting Assistant