Update to 2.18.5, start using arch package

2 files changed, 24 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e775271957a..e0f699ca7570 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,31 @@
-# Generated by mksrcinfo v8
-# Thu Oct 18 03:28:51 UTC 2018
 pkgbase = airvpn-beta-bin
 	pkgdesc = AirVPN client "Eddie" based on OpenVPN, beta version.
-	pkgver = 2.17.2
+	pkgver = 2.18.5
 	pkgrel = 1
-	url = https://airvpn.org/linux/
+	url = https://eddie.website
 	install = airvpn.install
-	arch = i686
 	arch = x86_64
 	license = GPL3
-	depends = sudo
+	makedepends = cmake
 	depends = mono
 	depends = openvpn
-	depends = curl
+	depends = sudo
+	depends = desktop-file-utils
 	depends = libnotify
+	depends = libappindicator-gtk2
 	optdepends = stunnel: VPN over SSL
 	optdepends = openssh: VPN over SSH
 	optdepends = libappindicator-gtk2: Tray icon w/GTK 2
 	optdepends = libappindicator-gtk3: Tray icon w/GTK 3
 	provides = airvpn
+	provides = eddie-ui
 	conflicts = airvpn
 	conflicts = airvpn-bin
-	source_i686 = eddie-ui_2.17.2_linux_x86_debian.deb::https://eddie.website/download/?platform=linux&arch=x86&ui=ui&format=debian.deb&version=experimental
-	md5sums_i686 = bf21f391fd9617df5c2c30ac0a7e1a83
-	sha256sums_i686 = 989a2cba17b4d786152feb7fa1d12c7e240ad8885c350d2c23d09420eea35098
-	source_x86_64 = eddie-ui_2.17.2_linux_x64_debian.deb::https://eddie.website/download/?platform=linux&arch=x64&ui=ui&format=debian.deb&version=experimental
-	md5sums_x86_64 = 46fc6a1c06f297dd897af1b190a3a92f
-	sha256sums_x86_64 = acb05d27b027c7d3cafb9e0bf7c7e406a0b2d6be2ff0d079eab8847bea4c97ce
+	conflicts = airvpn-git
+	conflicts = eddie-ui-git
+	source_x86_64 = eddie-ui_2.18.5_linux_x64_arch.tar.xz::https://airvpn.org/mirrors/eddie.website/download/?platform=linux&arch=x64&ui=ui&format=arch.tar.xz&version=experimental
+	sha256sums_x86_64 = 2ed0b4fdda930de0f39fada76230eeff1bc6e305ef349ff095ea32f8e7de42dc
+	sha512sums_x86_64 = 445b112f414084cea386827d8e1b7f3b72a92e811cb947c760c8035d5c6cb6a291c5462bf325000f8f23b28992b51db7a7119dfaac326943fe40dcc2108401a5
 
 pkgname = airvpn-beta-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 5a9a9f528991..160a7930f7ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,25 @@
 # Maintainer: Uncle Hunto <unclehunto äτ ÝãΗ00 Ð0τ ÇÖΜ>
 
 pkgname=airvpn-beta-bin
-pkgver=2.17.2
+pkgver=2.18.5
 pkgrel=1
 pkgdesc='AirVPN client "Eddie" based on OpenVPN, beta version.'
-arch=('i686' 'x86_64')
-url=https://airvpn.org/linux/
+arch=('x86_64')
+url=https://eddie.website
 license=(GPL3)
-depends=(sudo mono openvpn curl libnotify)
+depends=(mono openvpn sudo desktop-file-utils libnotify libappindicator-gtk2)
 optdepends=('stunnel: VPN over SSL' 'openssh: VPN over SSH' 'libappindicator-gtk2: Tray icon w/GTK 2' 'libappindicator-gtk3: Tray icon w/GTK 3')
-provides=('airvpn')
-conflicts=('airvpn' 'airvpn-bin')
+makedepends=('cmake')
+provides=('airvpn' 'eddie-ui')
+conflicts=('airvpn' 'airvpn-bin' 'airvpn-git' 'eddie-ui-git')
 install=airvpn.install
-source_i686=("eddie-ui_${pkgver}_linux_x86_debian.deb"::'https://eddie.website/download/?platform=linux&arch=x86&ui=ui&format=debian.deb&version=experimental')
-source_x86_64=("eddie-ui_${pkgver}_linux_x64_debian.deb"::'https://eddie.website/download/?platform=linux&arch=x64&ui=ui&format=debian.deb&version=experimental')
-md5sums_i686=('bf21f391fd9617df5c2c30ac0a7e1a83')
-md5sums_x86_64=('46fc6a1c06f297dd897af1b190a3a92f')
-sha256sums_i686=('989a2cba17b4d786152feb7fa1d12c7e240ad8885c350d2c23d09420eea35098')
-sha256sums_x86_64=('acb05d27b027c7d3cafb9e0bf7c7e406a0b2d6be2ff0d079eab8847bea4c97ce')
+source_x86_64=("eddie-ui_${pkgver}_linux_x64_arch.tar.xz"::'https://airvpn.org/mirrors/eddie.website/download/?platform=linux&arch=x64&ui=ui&format=arch.tar.xz&version=experimental')
+sha256sums_x86_64=('2ed0b4fdda930de0f39fada76230eeff1bc6e305ef349ff095ea32f8e7de42dc')
+sha512sums_x86_64=('445b112f414084cea386827d8e1b7f3b72a92e811cb947c760c8035d5c6cb6a291c5462bf325000f8f23b28992b51db7a7119dfaac326943fe40dcc2108401a5')
 
-package() {
-  cd "$srcdir"
-  msg2 "Extracting the data.tar.gz..."
-  bsdtar -xf "$srcdir/data.tar.gz"
 
-  msg2 "Moving stuff in place..."
-  for _file in usr/{bin/*,lib/eddie-ui/*,share/{applications/*,doc/eddie-ui/*,eddie-ui/*,man/man8/*,pixmaps/*,polkit-1/actions/*}}; do
+package() {
+  for _file in usr/{bin/*,lib/eddie-ui/*,share/{applications/*,doc/eddie-ui/*,eddie-ui/{*.pem,*.png,*.json,lang/*,webui/{*.html,css/*,fonts/*,images/{*.gif,*.png,about/*,app-icons/*,buttons/*,flags/*,icons/*,icons-png/*,icons-svg/*,log/*},js/*}},pixmaps/*,polkit-1/actions/*}}; do
     _octal=$(stat -c "%a" "$_file")
     install -Dm"${_octal}" "$_file" "${pkgdir}/$_file"
   done