5 files changed, 122 insertions, 45 deletions
diff --git a/pcr/armory/PKGBUILD b/pcr/armory/PKGBUILD
index 0b0482797..631c3d03a 100644
--- a/pcr/armory/PKGBUILD
+++ b/pcr/armory/PKGBUILD
@@ -1,45 +1,77 @@
-# Maintainer  : Aurélien Desbrières <aurelien@hackers.camp>
-# Contributor : 2bluesc <2bluesc at gmail.com>
-# Contributor : mazzolino <maze+aur at strahlungsfrei.de>
-# Contributor : Pieter Kokx <pieter@kokx.nl>
+# Maintainer: Aurélien Desbrières <aurelien@hackers.camp>
+# Maintainer (Arch): Jonathan la Cour <jon@lacour.me>
+# Contributor (Arch): Patrick Glandien <patrick@synix.io>
+# Contributor (Arch): William Grieshaber <me@zee.li>
+# Contributor (Arch): portals <portals at riseup.net> Base on work of: 2bluesc <2bluesc at gmail.com> and mazzolino <maze+aur at strahlungsfrei.de>
+# Contributor (Arch): Pieter Kokx <pieter@kokx.nl>
 
 pkgname=armory
-_pkgname=BitcoinArmory
-pkgver=0.92.3
-_pkgver=0.92.3
-pkgrel=2
-pkgdesc="Python-Based Bitcoin Software"
-arch=('i686' 'x86_64')
-url="https://github.com/etotheipi/BitcoinArmory"
-license=('AGPL3')
-groups=()
-depends=('crypto++' 'swig' 'python2' 'twisted' 'qt4' 'python2-pyqt4' 'python2-bsddb' 'python2-psutil')
-makedepends=('git' 'gcc' 'make')
-provides=('armory')
-conflicts=('armory')
-replaces=()
-backup=()
-options=()
-install=
-source=("run-armory.sh" "build_detect_platform-01.patch" "http://github.com/etotheipi/BitcoinArmory/archive/v$_pkgver.tar.gz")
-noextract=()
+pkgver=0.96.3.99
+pkgrel=1
+pkgdesc="Full-featured Bitcoin wallet management application"
+arch=(i686 x86_64)
+url="https://github.com/goatpig/BitcoinArmory"
+license=(AGPL3 MIT)
+depends=(crypto++ swig qt4 qt5-tools python2 python2-twisted python2-pyqt4 python2-bsddb python2-psutil)
+optdepends=('bitcoin-daemon: Communicate with the Bitcoin network')
+provides=(armory)
+conflicts=(armory armory-git armory-bin armory-goatpig-git)
+install="${pkgname}.install"
+
+# Signed hashes available at
+# https://github.com/goatpig/BitcoinArmory/releases with GPG ID 8C5211764922589A
+source=("https://github.com/goatpig/BitcoinArmory/releases/download/v${pkgver}/armory_${pkgver}_src.tar.gz"
+        'run-armory.sh')
+sha512sums=('afe73e2f52834dead3f085eca3daf27406f64c30678d1b68ee3de47acb7d38a2c5ae2d326e686cce0a91f1cf97ea69e8f81d208da4d0e57a0b6c152482ef7059'
+            'af44a8edfdf751f3343a8bdf6fa21c125389de3435c4b03c7f581b980525a9f32af177f496830f847b70c8e2619c42908536698e0fd28f862f16083cf7396715')
+
+prepare() {
+  msg 'Validating Checksums GPG signature...'
+  curl -sL https://github.com/goatpig/BitcoinArmory/releases/download/v${pkgver}/sha256sum.txt.asc -o sha256sum.txt.asc
+  gpg --recv-key 8C5211764922589A
+  gpg --verify sha256sum.txt.asc
+  msg2 'Checksums GPG signature OK.'
+
+  msg 'Validating Checksums...'
+  grep "${pkgver}_src.tar.gz" 'sha256sum.txt.asc' | tr -d '\r' | sha256sum -c -
+  msg2 'Checksums OK.'
+
+  cd "$srcdir/${pkgname}_${pkgver}-src"
+
+  ## Get Python2 Version
+  _py2longver=$(pacman -Qi python2 | grep "Version" | sed 's/^Version\s*:\s//')
+  _py2ver=${_py2longver%.*}
+  PYTHON_VERSION=${_py2ver} ./autogen.sh
+}
 
 build() {
-    cd $srcdir/BitcoinArmory-$_pkgver/
+  cd "$srcdir/${pkgname}_${pkgver}-src"
 
-    patch -p0 -i $srcdir//build_detect_platform-01.patch
+  ## Get Python2 Version
+  _py2longver=$(pacman -Qi python2 | grep "Version" | sed 's/^Version\s*:\s//')
+  _py2ver=${_py2longver%.*}
+  PYTHON_VERSION=${_py2ver} ./configure
 
-    make PYVER=python2.7
+  ## Build using current python2 version
+  PYTHON_VERSION=${_py2ver} make
 }
 
 package() {
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/dpkgfiles/armory.desktop" "$pkgdir/usr/share/applications/armory.desktop"
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/dpkgfiles/armoryoffline.desktop" "$pkgdir/usr/share/applications/armoryoffline.desktop"
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/dpkgfiles/armorytestnet.desktop" "$pkgdir/usr/share/applications/armorytestnet.desktop"
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/img/armory_icon_64x64.png" "$pkgdir/usr/share/armory/img/armory_icon_64x64.png"
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/img/armory_icon_green_64x64.png" "$pkgdir/usr/share/armory/img/armory_icon_green_64x64.png"
+
   install -Dm 755 "$srcdir/run-armory.sh" "$pkgdir/usr/bin/armory"
 
   mkdir -p "$pkgdir/opt"
-  cp -R "$srcdir/$_pkgname-$_pkgver/" "$pkgdir/opt/"
-  mv "$pkgdir/opt/$_pkgname-$_pkgver" "$pkgdir/opt/$_pkgname"
+  cp -R "$srcdir/${pkgname}_${pkgver}-src/." "$pkgdir/opt/$pkgname/"
+
+  mkdir -p "$pkgdir/usr/local/bin"
+  ln -s "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/local/bin/$pkgname"
 
-  rm -rf "$pkgdir/opt/$_pkgname/cppForSwig/"
-  rm -rf "$pkgdir/opt/$_pkgname/.git/"
-  rm -rf "$pkgdir/opt/$_pkgname/.gitignore"
+  rm -rf "$pkgdir/opt/$pkgname/cppForSwig/"
+  rm -rf "$pkgdir/opt/$pkgname/.git/"
+  rm -rf "$pkgdir/opt/$pkgname/.gitignore"
 }
diff --git a/pcr/armory/PKGBUILD.old b/pcr/armory/PKGBUILD.old
new file mode 100644
index 000000000..0b0482797
--- /dev/null
+++ b/pcr/armory/PKGBUILD.old
@@ -0,0 +1,45 @@
+# Maintainer  : Aurélien Desbrières <aurelien@hackers.camp>
+# Contributor : 2bluesc <2bluesc at gmail.com>
+# Contributor : mazzolino <maze+aur at strahlungsfrei.de>
+# Contributor : Pieter Kokx <pieter@kokx.nl>
+
+pkgname=armory
+_pkgname=BitcoinArmory
+pkgver=0.92.3
+_pkgver=0.92.3
+pkgrel=2
+pkgdesc="Python-Based Bitcoin Software"
+arch=('i686' 'x86_64')
+url="https://github.com/etotheipi/BitcoinArmory"
+license=('AGPL3')
+groups=()
+depends=('crypto++' 'swig' 'python2' 'twisted' 'qt4' 'python2-pyqt4' 'python2-bsddb' 'python2-psutil')
+makedepends=('git' 'gcc' 'make')
+provides=('armory')
+conflicts=('armory')
+replaces=()
+backup=()
+options=()
+install=
+source=("run-armory.sh" "build_detect_platform-01.patch" "http://github.com/etotheipi/BitcoinArmory/archive/v$_pkgver.tar.gz")
+noextract=()
+
+build() {
+    cd $srcdir/BitcoinArmory-$_pkgver/
+
+    patch -p0 -i $srcdir//build_detect_platform-01.patch
+
+    make PYVER=python2.7
+}
+
+package() {
+  install -Dm 755 "$srcdir/run-armory.sh" "$pkgdir/usr/bin/armory"
+
+  mkdir -p "$pkgdir/opt"
+  cp -R "$srcdir/$_pkgname-$_pkgver/" "$pkgdir/opt/"
+  mv "$pkgdir/opt/$_pkgname-$_pkgver" "$pkgdir/opt/$_pkgname"
+
+  rm -rf "$pkgdir/opt/$_pkgname/cppForSwig/"
+  rm -rf "$pkgdir/opt/$_pkgname/.git/"
+  rm -rf "$pkgdir/opt/$_pkgname/.gitignore"
+}
diff --git a/pcr/armory/armory.install b/pcr/armory/armory.install
new file mode 100644
index 000000000..7bbaf885f
--- /dev/null
+++ b/pcr/armory/armory.install
@@ -0,0 +1,13 @@
+ARMORY_IMG_DIR="/usr/share/armory/img"
+
+post_install() {
+  xdg-icon-resource install --novendor --context apps --size 64 "${ARMORY_IMG_DIR}/armory_icon_64x64.png" armoryicon
+  xdg-icon-resource install --novendor --context apps --size 64 "${ARMORY_IMG_DIR}/armory_icon_64x64.png" armoryofflineicon
+  xdg-icon-resource install --novendor --context apps --size 64 "${ARMORY_IMG_DIR}/armory_icon_green_64x64.png" armorytestneticon
+}
+
+pre_remove() {
+  xdg-icon-resource uninstall --size 64 armoryicon
+  xdg-icon-resource uninstall --size 64 armorytestneticon
+  xdg-icon-resource uninstall --size 64 armoryofflineicon
+}
diff --git a/pcr/armory/build_detect_platform-01.patch b/pcr/armory/build_detect_platform-01.patch
deleted file mode 100644
index ca3a5cc8d..000000000
--- a/pcr/armory/build_detect_platform-01.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- cppForSwig/leveldb/build_detect_platform	2014-04-21 15:57:03.485118965 +0200
-+++ cppForSwig/leveldb/build_detect_platform_fix	2014-04-21 15:59:19.714407671 +0200
-@@ -185,9 +185,7 @@
- 
-     # Test whether Snappy library is installed
-     # http://code.google.com/p/snappy/
--    $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT 2>/dev/null  <<EOF
--      #include <snappy.h>
--      int main() {}
-+
- EOF
-     if [ "$?" = 0 ]; then
-         COMMON_FLAGS="$COMMON_FLAGS -DSNAPPY"
diff --git a/pcr/armory/run-armory.sh b/pcr/armory/run-armory.sh
index fe3368474..aa1b3c315 100644
--- a/pcr/armory/run-armory.sh
+++ b/pcr/armory/run-armory.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-python2 /opt/BitcoinArmory/ArmoryQt.py $@
+python2 /opt/armory/ArmoryQt.py $@