upgpkg: jcryptool 0.9.9-3

Completely rewrite to fix numerous PKGBUILD violations.
- using weekly nonchecksummed devel snapshots as sources
- install script used to create symlink in "$pkgdir"/usr/bin
- architecture-independent variables are a thing and should be used
- nothing anywhere uses python
- unquoted "$srcdir" and "$pkgdir"
- missing HTTPS
- provide upstream icons in multiple sizes
- do not depend on jdk when only jre is needed

5 files changed, 63 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3e8772d8b651..3c2441f4ffbc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,37 @@
 pkgbase = jcryptool
-	pkgdesc = A cryptographer's e-learning application. You can use it to apply and analyse cryptographic algorithms.
+	pkgdesc = e-learning application for applying and analysing cryptographic algorithms
 	pkgver = 0.9.9
-	pkgrel = 2
-	url = http://www.cryptool.org/en/jcryptool
-	install = jcryptool.install
+	pkgrel = 3
+	url = https://www.cryptool.org/en/jcryptool
 	arch = i686
 	arch = x86_64
 	license = EPL
-	depends = glibc
-	depends = java-environment
-	depends = python2
+	depends = java-runtime
 	depends = libxext
 	depends = libxrender
 	depends = fontconfig
-	source = http://www.cryptool.org/jctdownload/Builds/downloads/weekly/jcryptool-0.9.9-linux.gtk.x86_64.tar.gz
-	source = jcryptool.install
+	noextract = jcryptool-0.9.9-linux.gtk.x86.tar.gz
+	noextract = jcryptool-0.9.9-linux.gtk.x86_64.tar.gz
 	source = jcryptool.desktop
-	source = jcryptool.png
-	sha512sums = SKIP
-	sha512sums = 1e68d9326091fec6877541c8579cf2f1325428b1920c776b7fa0d604d28015fbfdfe7e3d429ca200047c0329e4b5d8299c5d671568be405efeb0b727f8683f64
-	sha512sums = d0bd2e8b4a52b52280c9dcf45ae1e1db11876dfe6cefd34e095f5218c4c9fabb1abefcd38c92f74e3ef1b825794d720655dc45a03f08cbfc3f5b01f1f5994302
-	sha512sums = e5e0ac2721ad3919b85fdf7da2fc14d491e89965aabf4c7ca6db840b70bd72ca37ddb63222ee21727607348651125fb34c5e62c2cb9d49e5856678187cb35f6c
+	source = jcryptool-16.png::https://github.com/jcryptool/doc/raw/bfc66c1e952809edada1936dc5122f45400170de/Graphics/Icons/png/JCT_Icon_png_16x16.png
+	source = jcryptool-24.png::https://github.com/jcryptool/doc/raw/bfc66c1e952809edada1936dc5122f45400170de/Graphics/Icons/png/JCT_Icon_png_24x24.png
+	source = jcryptool-32.png::https://github.com/jcryptool/doc/raw/bfc66c1e952809edada1936dc5122f45400170de/Graphics/Icons/png/JCT_Icon_png_32x32.png
+	source = jcryptool-48.png::https://github.com/jcryptool/doc/raw/bfc66c1e952809edada1936dc5122f45400170de/Graphics/Icons/png/JCT_Icon_png_48x48.png
+	source = jcryptool-128.png::https://github.com/jcryptool/doc/raw/bfc66c1e952809edada1936dc5122f45400170de/Graphics/Icons/png/JCT_Icon_png_128x128.png
+	source = jcryptool-256.png::https://github.com/jcryptool/doc/raw/bfc66c1e952809edada1936dc5122f45400170de/Graphics/Icons/png/JCT_Icon_png_256x256.png
+	source = jcryptool-512.png::https://github.com/jcryptool/doc/raw/bfc66c1e952809edada1936dc5122f45400170de/Graphics/Icons/png/JCT_Icon_png_512x512.png
+	sha512sums = 4b08c526016f27fa78bdcbe0f499236757c9e14e0548da8736d99b0d6f3e85fa7f84ac27b7f4922b2064802e92ec0e508848fb327a519b55f49bc5a0a9bda5e8
+	sha512sums = 02c728049ff612f4c77575aa557850d826fbf40b09e885a9de6e80429020b742f7193d7e0e572dff21a6bf091006f7d8fa7c377ea68b96ac01a60384b1dd1aff
+	sha512sums = 3df55b87975dc5ed5b475fc2cf9c55d21b29d1ec6ef34b8773b7e9c72ff39225c0ab6c34464b04ea57dd5b4d856d63686d78e0741c3f3a1300e276192c72a4c4
+	sha512sums = 1501993e1e992a6bb8b6d8ab7f8c072bc5f73917b3b51d82dd2b0f4da8036efa96098d703e36886bc2170fc51e56714a8999bcc88afa51b23b496c5eaa101b17
+	sha512sums = 45f642f77a0351f029f81c976aee322d165f38da3e10c94d3f8e29e87afe5831bb3cd5b276a8a20518782b1f9e73d4a9c40b2d52b465d95fd19bd2b6fdce6d52
+	sha512sums = 2515930d70709955f920d2c587c9363b3b36467d89b84fa961e65c943e9dd4841f53d47db12599876e722a7f402a12639934fb41548c4bb7e191450aa67598ac
+	sha512sums = 27bbfbce3d38f7ebbaa3e00d0f15626c9598fccef3d080e3ee3f20ec5de41c1d137d6dd0f2fcc605532fb5dd0615108f3d6ee098ad25be3ec35f765cb50fa1ea
+	sha512sums = 4b638f8df703fe670bc2f3b3b2d719249841e9c08665aece21b4bddaa8197ca06775799d44c6dcb6fbb74c3c8b858bd97f751c59478c17b558accec430a53c8e
+	source_i686 = https://www.cryptool.org/jctdownload/Builds/downloads/stable/jcryptool-0.9.9-linux.gtk.x86.tar.gz
+	sha512sums_i686 = e2a68ac69f19424f4e8c5079dde1d7f6fad9efefc2179cd59fe5acd6690b55afb55e5b39233bd389d6dbd477beaf1b3fb3f57690b3cb59c8363d62c77410a394
+	source_x86_64 = https://www.cryptool.org/jctdownload/Builds/downloads/stable/jcryptool-0.9.9-linux.gtk.x86_64.tar.gz
+	sha512sums_x86_64 = d05787f704c2cb3cbdac6b1b6eaf9c57f386eaae40039e947e2a1d37279d26dafeea8ac80c73cf98aae5fb534a550a0208539e085fcc6df3180080a2977af800
 
 pkgname = jcryptool
 
diff --git a/PKGBUILD b/PKGBUILD
index c990ab41723f..15a4390e1442 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,40 +5,45 @@
 
 pkgname=jcryptool
 pkgver=0.9.9
-pkgrel=2
-pkgdesc="A cryptographer's e-learning application. You can use it to apply and analyse cryptographic algorithms."
+pkgrel=3
+pkgdesc="e-learning application for applying and analysing cryptographic algorithms"
 arch=('i686' 'x86_64')
+url="https://www.cryptool.org/en/jcryptool"
 license=('EPL')
-url="http://www.cryptool.org/en/jcryptool"
-depends=('glibc' 'java-environment' 'python2' 'libxext' 'libxrender' 'fontconfig')
-install=jcryptool.install
-_arch='x86_64'
-[ "$CARCH" = 'i686' ] && _arch='x86'
-[ "$CARCH" = 'i686' ] && sha512sums[0]='44fd4bd14965a00901b30619ad2ca0b18b63d0bfc22d64a68a5a638ec9eb8091cc7c6217b368461b41215f08345825e87d5af84da46bea8927e6ec5a538f78b0'
+depends=('java-runtime' 'libxext' 'libxrender' 'fontconfig')
+_iconsrc='https://github.com/jcryptool/doc/raw/bfc66c1e952809edada1936dc5122f45400170de/Graphics/Icons/png/JCT_Icon_png_'
+source=('jcryptool.desktop'
+        "jcryptool-16.png::${_iconsrc}16x16.png"
+        "jcryptool-24.png::${_iconsrc}24x24.png"
+        "jcryptool-32.png::${_iconsrc}32x32.png"
+        "jcryptool-48.png::${_iconsrc}48x48.png"
+        "jcryptool-128.png::${_iconsrc}128x128.png"
+        "jcryptool-256.png::${_iconsrc}256x256.png"
+        "jcryptool-512.png::${_iconsrc}512x512.png")
+source_i686=("https://www.cryptool.org/jctdownload/Builds/downloads/stable/${pkgname}-${pkgver}-linux.gtk.x86.tar.gz")
+source_x86_64=("https://www.cryptool.org/jctdownload/Builds/downloads/stable/${pkgname}-${pkgver}-linux.gtk.x86_64.tar.gz")
+noextract=("${pkgname}-${pkgver}-linux.gtk.x86.tar.gz" "${pkgname}-${pkgver}-linux.gtk.x86_64.tar.gz")
+sha512sums=('4b08c526016f27fa78bdcbe0f499236757c9e14e0548da8736d99b0d6f3e85fa7f84ac27b7f4922b2064802e92ec0e508848fb327a519b55f49bc5a0a9bda5e8'
+            '02c728049ff612f4c77575aa557850d826fbf40b09e885a9de6e80429020b742f7193d7e0e572dff21a6bf091006f7d8fa7c377ea68b96ac01a60384b1dd1aff'
+            '3df55b87975dc5ed5b475fc2cf9c55d21b29d1ec6ef34b8773b7e9c72ff39225c0ab6c34464b04ea57dd5b4d856d63686d78e0741c3f3a1300e276192c72a4c4'
+            '1501993e1e992a6bb8b6d8ab7f8c072bc5f73917b3b51d82dd2b0f4da8036efa96098d703e36886bc2170fc51e56714a8999bcc88afa51b23b496c5eaa101b17'
+            '45f642f77a0351f029f81c976aee322d165f38da3e10c94d3f8e29e87afe5831bb3cd5b276a8a20518782b1f9e73d4a9c40b2d52b465d95fd19bd2b6fdce6d52'
+            '2515930d70709955f920d2c587c9363b3b36467d89b84fa961e65c943e9dd4841f53d47db12599876e722a7f402a12639934fb41548c4bb7e191450aa67598ac'
+            '27bbfbce3d38f7ebbaa3e00d0f15626c9598fccef3d080e3ee3f20ec5de41c1d137d6dd0f2fcc605532fb5dd0615108f3d6ee098ad25be3ec35f765cb50fa1ea'
+            '4b638f8df703fe670bc2f3b3b2d719249841e9c08665aece21b4bddaa8197ca06775799d44c6dcb6fbb74c3c8b858bd97f751c59478c17b558accec430a53c8e')
+sha512sums_i686=('e2a68ac69f19424f4e8c5079dde1d7f6fad9efefc2179cd59fe5acd6690b55afb55e5b39233bd389d6dbd477beaf1b3fb3f57690b3cb59c8363d62c77410a394')
+sha512sums_x86_64=('d05787f704c2cb3cbdac6b1b6eaf9c57f386eaae40039e947e2a1d37279d26dafeea8ac80c73cf98aae5fb534a550a0208539e085fcc6df3180080a2977af800')
 
-# Weekly build version keep us up-to-date 
-source=(
-http://www.cryptool.org/jctdownload/Builds/downloads/weekly/${pkgname}-${pkgver}-linux.gtk.${_arch}.tar.gz
-jcryptool.install
-jcryptool.desktop
-jcryptool.png
-)
-
-prepare() {
-    cd "$srcdir/$pkgname"
-    find . -type f -iname "*.py" -exec sed -i "s#/usr/bin/python#/usr/bin/env python2#g" {} \;
-}
+[[ $CARCH = x86_64 ]] && _arch=$CARCH || _arch=x86
 
 package() {
-	install -dm644 ${pkgdir}/opt/${pkgname}
-	cp -ar ${pkgname} ${pkgdir}/opt
+    mkdir -p "${pkgdir}"/{opt,usr/bin}
+    bsdtar -xf ${pkgname}-${pkgver}-linux.gtk.${_arch}.tar.gz -C "${pkgdir}"/opt
+    ln -s /opt/jcryptool/JCrypTool "${pkgdir}"/usr/bin/jcryptool
 
-	install -Dm644 ${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
-	install -Dm644 ${pkgname}.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png
+    install -Dm644 ${pkgname}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop
 
+    for _pic in 16 24 32 48 128 256 512; do
+        install -Dm644 jcryptool-${_pic}.png "${pkgdir}"/usr/share/icons/hicolor/${_pic}x${_pic}/apps/${pkgname}.png
+    done
 }
-
-sha512sums=(SKIP
-            '1e68d9326091fec6877541c8579cf2f1325428b1920c776b7fa0d604d28015fbfdfe7e3d429ca200047c0329e4b5d8299c5d671568be405efeb0b727f8683f64'
-            'd0bd2e8b4a52b52280c9dcf45ae1e1db11876dfe6cefd34e095f5218c4c9fabb1abefcd38c92f74e3ef1b825794d720655dc45a03f08cbfc3f5b01f1f5994302'
-            'e5e0ac2721ad3919b85fdf7da2fc14d491e89965aabf4c7ca6db840b70bd72ca37ddb63222ee21727607348651125fb34c5e62c2cb9d49e5856678187cb35f6c')
diff --git a/jcryptool.desktop b/jcryptool.desktop
index 54fa3662b0ea..720d09238dcb 100644
--- a/jcryptool.desktop
+++ b/jcryptool.desktop
@@ -1,9 +1,10 @@
 [Desktop Entry]
+Version=1.0
 Type=Application
-Exec=jcryptool
 Name=JCrypTool
+GenericName=Cryptography e-learning platform
+TryExec=jcryptool
+Exec=jcryptool
 Icon=jcryptool
-GenericName=Crypthography e-learning platform
 Terminal=false
 Categories=Education;
-Version=1.0
diff --git a/jcryptool.install b/jcryptool.install
deleted file mode 100644
index 66523d845b98..000000000000
--- a/jcryptool.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-	ln -s /opt/jcryptool/JCrypTool /usr/bin/jcryptool
-}
-
-post_remove() {
-	rm /usr/bin/jcryptool
-}
diff --git a/jcryptool.png b/jcryptool.png
deleted file mode 100644
index f4d89e9d8ac9..000000000000
--- a/jcryptool.png
+++ /dev/null