upgpkg: 2.2

2 files changed, 73 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c8928d0e9a7e..dfa9f323d94f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,49 @@
 # Generated by mksrcinfo v8
-# Sun Jun  4 02:37:14 UTC 2017
+# Fri Jul 28 18:21:58 UTC 2017
 pkgbase = gtk-theme-united-gnome
 	pkgdesc = GTK2/3 + GNOME Shell theme based on a Ubuntu 18.04 design concept.
-	pkgver = 2.1.3
+	pkgver = 2.2
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/godlyranchdressing/United-GNOME
 	arch = any
 	license = GPL3
-	source = United-Arch-2.1.3::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.1.3/United-Arch.tar.gz
-	source = United-Fedora-2.1.3::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.1.3/United-Fedora.tar.gz
-	source = United-Manjaro-2.1.3::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.1.3/United-Manjaro.tar.gz
-	source = United-OpenSUSE-2.1.3::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.1.3/United-OpenSUSE.tar.gz
-	source = United-Solus-2.1.3::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.1.3/United-Solus.tar.gz
-	source = United-Ubuntu-2.1.3::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.1.3/United-Ubuntu-alt.tar.gz
-	sha256sums = b4c542df226952ced0c158cfddcb2b3c5a33e078a28ffddf00fae6e185b8abaf
-	sha256sums = d40f6d1092f93de2d924e738bc56dfa51e53e364c2d2cc36cd1ee4f2424949fc
-	sha256sums = 1c573d007fd4ae89a97164199db740b0dc265de93962d08027521a3b3820d0da
-	sha256sums = 39bf989ae61bb2af24855581ffd65ae3315330b90df4d4ffe3bb5ff083a4434f
-	sha256sums = 58683263ebd55ebe07f4fb20089b7aa822b0d9df50692768e08320f5463bd54f
-	sha256sums = 50ed87d670bc2b47f0a7d690eff0146f82bac62c91aba5bfac45e2aec5590248
+	source = United-Antergos-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-Antergos.tar.gz
+	source = United-Antergos-Compact-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-Antergos-Compact.tar.gz
+	source = United-Arch-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-Arch.tar.gz
+	source = United-Arch-Compact-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-Arch-Compact.tar.gz
+	source = United-Debian-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-Debian.tar.gz
+	source = United-Debian-Compact-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-Debian-Compact.tar.gz
+	source = United-Fedora-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-Fedora.tar.gz
+	source = United-Fedora-Compact-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-Fedora-Compact.tar.gz
+	source = United-Latest-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-Latest.tar.gz
+	source = United-Latest-Compact-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-Latest-Compact.tar.gz
+	source = United-Manjaro-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-Manjaro.tar.gz
+	source = United-Manjaro-Compact-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-Manjaro-Compact.tar.gz
+	source = United-OpenSUSE-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-OpenSUSE.tar.gz
+	source = United-OpenSUSE-Compact-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-OpenSUSE-Compact.tar.gz
+	source = United-Solus-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-Solus.tar.gz
+	source = United-Solus-Compact-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-Solus-Compact.tar.gz
+	source = United-Ubuntu-alt-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-Ubuntu-alt.tar.gz
+	source = United-Ubuntu-alt-Compact-2.2::https://github.com/godlyranchdressing/United-GNOME/releases/download/V2.2/United-Ubuntu-alt-Compact.tar.gz
+	sha256sums = 66aba18e52b94e21eacd441627478e1a72493d3913aebae0c8e630f72f8ed3a2
+	sha256sums = e44c211d86f8215901503f7e021b23cf83da0814bd887300d1b2aca392ae91db
+	sha256sums = cb2747bccef45c6a14daf915a9ec5296e5572f2557dbc2408816499f69113a45
+	sha256sums = cc8c7c4317744510bc014bbfd62ce5cb29a525d45fe7d78a6fb797078e6a32de
+	sha256sums = 78d93259d9b79db15d06e8fc54fbdcc289b9340fdde07c2e2416484ee3457b25
+	sha256sums = 5d5060874e4bbdc64167d1fb77da4ecc8ea398d76dbfbeb7ef99b81e2e8644cf
+	sha256sums = 4543a428428ee45a161f6dcc93578a0bc1f99b703c8fb9d6f590338a9330c76c
+	sha256sums = d03f92b577c5453af565312af3b2961a027e7e872e1a7a65ddae1c4d29d29377
+	sha256sums = 9e9cb33f3ca3fe1bb41022202261b6fb0f94285ada01bb5b0e18970c45181a4a
+	sha256sums = 2f45c8826712a0b308c0ce8a29954ddafdf158480ec516ed0162a525d3c6f5fc
+	sha256sums = 8d1d32d9b8862c955909f14d2354ed1db662a18177b9112eec6ca56837b102fa
+	sha256sums = bbf651be4a9b292464b5a606fe735f85deb329ebcbfae503a3aa37b17bc9ae4e
+	sha256sums = 5399e08be5844fa0bb734e5e87c885d33839ab0217242275be33bcfaeecc54b0
+	sha256sums = 3b9fcd219687dbb6531c5c657f1ba4c2118277bad14627c373146f6209fb21a5
+	sha256sums = 2ba5e116977c3346578ea9607ce47396ca2033717ba978f33874b4461f51d336
+	sha256sums = 4f128155c9f10aef93ce5b51ddb2f9a507836ea3eeb7e495e7ab36788b54c990
+	sha256sums = d1a9474e2e3c9b0431429c8c430e31e20daa6e2008cfcf98fe0dc6801fb89ea7
+	sha256sums = 9d116f5561dbff894507bfabae0a03b4c8e934b1db0c79b8f359359c824a5840
 
 pkgname = gtk-theme-united-gnome
 
diff --git a/PKGBUILD b/PKGBUILD
index 183651837f2f..8e38e234b108 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,58 @@
 # Maintainer: Ainola
 
 pkgname=gtk-theme-united-gnome
-pkgver=2.1.3
+pkgver=2.2
 pkgrel=1
 epoch=1
 pkgdesc="GTK2/3 + GNOME Shell theme based on a Ubuntu 18.04 design concept."
 arch=(any)
 url="https://github.com/godlyranchdressing/United-GNOME"
 license=('GPL3')
-source=("United-Arch-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Arch.tar.gz"
+source=("United-Antergos-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Antergos.tar.gz"
+        "United-Antergos-Compact-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Antergos-Compact.tar.gz"
+        "United-Arch-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Arch.tar.gz"
+        "United-Arch-Compact-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Arch-Compact.tar.gz"
+        "United-Debian-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Debian.tar.gz"
+        "United-Debian-Compact-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Debian-Compact.tar.gz"
         "United-Fedora-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Fedora.tar.gz"
+        "United-Fedora-Compact-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Fedora-Compact.tar.gz"
+        "United-Latest-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Latest.tar.gz"
+        "United-Latest-Compact-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Latest-Compact.tar.gz"
         "United-Manjaro-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Manjaro.tar.gz"
+        "United-Manjaro-Compact-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Manjaro-Compact.tar.gz"
         "United-OpenSUSE-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-OpenSUSE.tar.gz"
+        "United-OpenSUSE-Compact-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-OpenSUSE-Compact.tar.gz"
         "United-Solus-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Solus.tar.gz"
-        "United-Ubuntu-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Ubuntu-alt.tar.gz")
-sha256sums=('b4c542df226952ced0c158cfddcb2b3c5a33e078a28ffddf00fae6e185b8abaf'
-            'd40f6d1092f93de2d924e738bc56dfa51e53e364c2d2cc36cd1ee4f2424949fc'
-            '1c573d007fd4ae89a97164199db740b0dc265de93962d08027521a3b3820d0da'
-            '39bf989ae61bb2af24855581ffd65ae3315330b90df4d4ffe3bb5ff083a4434f'
-            '58683263ebd55ebe07f4fb20089b7aa822b0d9df50692768e08320f5463bd54f'
-            '50ed87d670bc2b47f0a7d690eff0146f82bac62c91aba5bfac45e2aec5590248')
+        "United-Solus-Compact-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Solus-Compact.tar.gz"
+        "United-Ubuntu-alt-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Ubuntu-alt.tar.gz"
+        "United-Ubuntu-alt-Compact-$pkgver"::"https://github.com/godlyranchdressing/United-GNOME/releases/download/V$pkgver/United-Ubuntu-alt-Compact.tar.gz")
+sha256sums=('66aba18e52b94e21eacd441627478e1a72493d3913aebae0c8e630f72f8ed3a2'
+            'e44c211d86f8215901503f7e021b23cf83da0814bd887300d1b2aca392ae91db'
+            'cb2747bccef45c6a14daf915a9ec5296e5572f2557dbc2408816499f69113a45'
+            'cc8c7c4317744510bc014bbfd62ce5cb29a525d45fe7d78a6fb797078e6a32de'
+            '78d93259d9b79db15d06e8fc54fbdcc289b9340fdde07c2e2416484ee3457b25'
+            '5d5060874e4bbdc64167d1fb77da4ecc8ea398d76dbfbeb7ef99b81e2e8644cf'
+            '4543a428428ee45a161f6dcc93578a0bc1f99b703c8fb9d6f590338a9330c76c'
+            'd03f92b577c5453af565312af3b2961a027e7e872e1a7a65ddae1c4d29d29377'
+            '9e9cb33f3ca3fe1bb41022202261b6fb0f94285ada01bb5b0e18970c45181a4a'
+            '2f45c8826712a0b308c0ce8a29954ddafdf158480ec516ed0162a525d3c6f5fc'
+            '8d1d32d9b8862c955909f14d2354ed1db662a18177b9112eec6ca56837b102fa'
+            'bbf651be4a9b292464b5a606fe735f85deb329ebcbfae503a3aa37b17bc9ae4e'
+            '5399e08be5844fa0bb734e5e87c885d33839ab0217242275be33bcfaeecc54b0'
+            '3b9fcd219687dbb6531c5c657f1ba4c2118277bad14627c373146f6209fb21a5'
+            '2ba5e116977c3346578ea9607ce47396ca2033717ba978f33874b4461f51d336'
+            '4f128155c9f10aef93ce5b51ddb2f9a507836ea3eeb7e495e7ab36788b54c990'
+            'd1a9474e2e3c9b0431429c8c430e31e20daa6e2008cfcf98fe0dc6801fb89ea7'
+            '9d116f5561dbff894507bfabae0a03b4c8e934b1db0c79b8f359359c824a5840')
 
 package() {
   install -dm755 "$pkgdir/usr/share/themes"
   # Upstream names tend to differ between releases: So that users don't have to
   # constantly re-apply their themes, let's just agree on the following format
   # in case it changes again: United-<distro><-variant> (e.g. United-Arch or
-  # United-Arch-Darker)
+  # United-Arch-Darker).
 
-  # Upstream started calling "United-Ubuntu" "United-Ubuntu-alt". If this
-  # sticks for long enough then this manual renaming should be removed.
-  for dir in "$srcdir"/United-Ubuntu-alt*; do
-    mv "$dir" "${dir/-alt/}"
-  done
+  # Note that 'United-Latest' means 'Ubuntu'
 
   # Dirs in $srcdir are installable themes; however, we want to ignore symlinks
   find "$srcdir" -mindepth 1 -maxdepth 1 -type d -exec \