Upstream: 20180228

2 files changed, 37 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ab38b2cac81..2dbbfc3c9821 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = matcha-gtk-theme
-	pkgdesc = A flat design theme for GNOME, MATE, Openbox, Unity, XFCE, Budgie
-	pkgver = 20180224
+	pkgdesc = A flat design themes for GNOME, MATE, Openbox, Unity, XFCE, Budgie
+	pkgver = 20180228
 	pkgrel = 1
 	url = https://www.gnome-look.org/p/1187179
 	arch = any
@@ -8,10 +8,18 @@ pkgbase = matcha-gtk-theme
 	depends = gtk-engine-murrine
 	depends = gtk-engines
 	depends = gtk3
-	source = matcha-gtk-theme-20180224.tar.xz::https://dl.opendesktop.org/api/files/downloadfile/id/1519452930/s/04d198f21a36fae978d0b27fe7a34f96/t/1519476084/Matcha.tar.xz
-	source = matcha-gtk-theme-dark-20180224.tar.xz::https://dl.opendesktop.org/api/files/downloadfile/id/1519452934/s/04d198f21a36fae978d0b27fe7a34f96/t/1519476084/Matcha-dark.tar.xz
-	sha256sums = 93b5b1ebf43e4bf5ae75f93181a59fd54c2a72afccaa2ccec38418c48238dc2a
-	sha256sums = ec61f755258a76d783b4b0995074de0ebe4f10d2e1773f943e457228080d2528
+	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519752012/s/715cc90911d17d6eddfa1edafa2c2c5c/t/1519766283/Matcha-sea.tar.xz
+	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519752000/s/715cc90911d17d6eddfa1edafa2c2c5c/t/1519766283/Matcha-azul.tar.xz
+	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519751997/s/715cc90911d17d6eddfa1edafa2c2c5c/t/1519766283/Matcha-aliz.tar.xz
+	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519752010/s/715cc90911d17d6eddfa1edafa2c2c5c/t/1519766283/Matcha-dark-sea.tar.xz
+	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519752007/s/715cc90911d17d6eddfa1edafa2c2c5c/t/1519766283/Matcha-dark-azul.tar.xz
+	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519752002/s/715cc90911d17d6eddfa1edafa2c2c5c/t/1519766283/Matcha-dark-aliz.tar.xz
+	sha256sums = 47131a6c86fa874a4455118e4bca6fb25bd23d18b8b125930fe5e7f6114d13a1
+	sha256sums = f68d4fc043aacddfcdcc324145ca850fcc5469f93b6cfbd9deac895e45fbaa51
+	sha256sums = 07bc015150e9b957e884c5aed80769f6ba91a100ceb6d16b2a5a8377e72600e0
+	sha256sums = 407c390147ab812418708a79c89a269a3f7af96db83713d5d2d3208932649b4e
+	sha256sums = 54923fa331a5e23baacee4f8e62173a262804dd389ffa9dd223fc9a1547dd4ba
+	sha256sums = 36f6281df90ec3b9632ef9797aa0bbc014f3a59ac0f21072e3327253af2ea9ba
 
 pkgname = matcha-gtk-theme
 
diff --git a/PKGBUILD b/PKGBUILD
index 349743dca681..cd58e5186025 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,42 @@
 # Maintainer: grimi <grimi at poczta dot fm>
 
 pkgname=matcha-gtk-theme
-pkgver=20180224
+pkgver=20180228
 pkgrel=1
-pkgdesc="A flat design theme for GNOME, MATE, Openbox, Unity, XFCE, Budgie"
+pkgdesc="A flat design themes for GNOME, MATE, Openbox, Unity, XFCE, Budgie"
 arch=('any')
 url='https://www.gnome-look.org/p/1187179'
 license=('GPL3')
 depends=('gtk-engine-murrine' 'gtk-engines' 'gtk3')
 _hash_time=($(curl -s "$url"|grep -e "hash =" -e "timetamp ="|sed "s/.*= '\(.*\)';/\1/"))
-source=("${pkgname}-${pkgver}.tar.xz::https://dl.opendesktop.org/api/files/downloadfile/id/1519452930/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha.tar.xz"
-        "${pkgname}-dark-${pkgver}.tar.xz::https://dl.opendesktop.org/api/files/downloadfile/id/1519452934/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-dark.tar.xz")
+source=("https://dl.opendesktop.org/api/files/downloadfile/id/1519752012/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-sea.tar.xz"
+        "https://dl.opendesktop.org/api/files/downloadfile/id/1519752000/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-azul.tar.xz"
+        "https://dl.opendesktop.org/api/files/downloadfile/id/1519751997/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-aliz.tar.xz"
+        "https://dl.opendesktop.org/api/files/downloadfile/id/1519752010/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-dark-sea.tar.xz"
+        "https://dl.opendesktop.org/api/files/downloadfile/id/1519752007/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-dark-azul.tar.xz"
+        "https://dl.opendesktop.org/api/files/downloadfile/id/1519752002/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-dark-aliz.tar.xz")
 
-sha256sums=('93b5b1ebf43e4bf5ae75f93181a59fd54c2a72afccaa2ccec38418c48238dc2a'
-            'ec61f755258a76d783b4b0995074de0ebe4f10d2e1773f943e457228080d2528')
+sha256sums=('47131a6c86fa874a4455118e4bca6fb25bd23d18b8b125930fe5e7f6114d13a1'
+            'f68d4fc043aacddfcdcc324145ca850fcc5469f93b6cfbd9deac895e45fbaa51'
+            '07bc015150e9b957e884c5aed80769f6ba91a100ceb6d16b2a5a8377e72600e0'
+            '407c390147ab812418708a79c89a269a3f7af96db83713d5d2d3208932649b4e'
+            '54923fa331a5e23baacee4f8e62173a262804dd389ffa9dd223fc9a1547dd4ba'
+            '36f6281df90ec3b9632ef9797aa0bbc014f3a59ac0f21072e3327253af2ea9ba')
 
 
 prepare() {
-   sed -i 's/\(menu.border.width:\).*$/\1 1/' Matcha{,-dark}/openbox-3/themerc
+   local ori="#2f9b85" sea="#2eb398" azul="#3498db" aliz="#f0544c"
+   #sed -i 's/\(menu.border.width:\).*$/\1 1/' Matcha-*/openbox-3/themerc
    sed -i 's/\(menu.items.text.color:\).*$/\1 #d3c2c5/; s/\(menu.items.bg.color:\).*$/\1 #1f2729/;
-         s/\(menu.border.color:\).*$/\1 #2d3036/; s/\(menu.seperator.color:\).*$/\1 #32353b/' \
-         Matcha-dark/openbox-3/themerc
+        s/\(menu.border.color:\).*$/\1 #2d3036/; s/\(menu.seperator.color:\).*$/\1 #32353b/' \
+        Matcha-dark-*/openbox-3/themerc
+   sed -i "s/$ori/$sea/Ig" Matcha{,-dark}-sea/openbox-3/themerc
+   sed -i "s/$ori/$azul/Ig" Matcha{,-dark}-azul/openbox-3/themerc
+   sed -i "s/$ori/$aliz/Ig" Matcha{,-dark}-aliz/openbox-3/themerc
 }
 
 package() {
-   find Matcha{,-dark}/ -type f ! -name thumbnail.png -exec install -Dm644 "{}" "${pkgdir}/usr/share/themes/{}" \;
-   find Matcha{,-dark}/ -type l -exec cp -d  "{}" "${pkgdir}/usr/share/themes/{}" \;
+   find Matcha{,-dark}-{sea,azul,aliz}/ -type f ! -name thumbnail.png -exec install -Dm644 "{}" "${pkgdir}/usr/share/themes/{}" \;
+   find Matcha{,-dark}-{sea,azul,aliz}/ -type l -exec cp -d  "{}" "${pkgdir}/usr/share/themes/{}" \;
 }