Accomodate changed upstream directory structure

2 files changed, 20 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fbffa62d01eb..661dd416a300 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gtk-theme-bubble-git
 	pkgdesc = A GTK theme based on Arc-Theme
-	pkgver = r97.9f15632
+	pkgver = r140.60cd4f9
 	pkgrel = 1
 	url = https://github.com/i-mint/Bubble
 	arch = any
@@ -10,33 +10,18 @@ pkgbase = gtk-theme-bubble-git
 	source = gtk-theme-bubble-git::git+https://github.com/i-mint/Bubble
 	sha256sums = SKIP
 
-pkgname = gtk-theme-bubble-dark-blue-git
-	provides = gtk-theme-bubble-dark-blue
+pkgname = gtk-theme-bubble-dark-git
+	provides = gtk-theme-bubble-dark
 	provides = gtk-theme-bubble
-	conflicts = gtk-theme-bubble-dark-blue
+	conflicts = gtk-theme-bubble-dark
 
-pkgname = gtk-theme-bubble-dark-red-git
-	provides = gtk-theme-bubble-dark-red
+pkgname = gtk-theme-bubble-darker-git
+	provides = gtk-theme-bubble-darker
 	provides = gtk-theme-bubble
-	conflicts = gtk-theme-bubble-dark-red
+	conflicts = gtk-theme-bubble-darker
 
-pkgname = gtk-theme-bubble-darker-blue-git
-	provides = gtk-theme-bubble-darker-blue
+pkgname = gtk-theme-bubble-light-git
+	provides = gtk-theme-bubble-light
 	provides = gtk-theme-bubble
-	conflicts = gtk-theme-bubble-darker-blue
-
-pkgname = gtk-theme-bubble-darker-red-git
-	provides = gtk-theme-bubble-darker-red
-	provides = gtk-theme-bubble
-	conflicts = gtk-theme-bubble-darker-red
-
-pkgname = gtk-theme-bubble-light-blue-git
-	provides = gtk-theme-bubble-light-blue
-	provides = gtk-theme-bubble
-	conflicts = gtk-theme-bubble-light-blue
-
-pkgname = gtk-theme-bubble-light-red-git
-	provides = gtk-theme-bubble-light-red
-	provides = gtk-theme-bubble
-	conflicts = gtk-theme-bubble-light-red
+	conflicts = gtk-theme-bubble-light
 
diff --git a/PKGBUILD b/PKGBUILD
index 5547917475aa..41e384627041 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,9 @@
 # Maintainer: Luis Martinez <luis dot martinez at tuta dot io>
 pkgbase=gtk-theme-bubble-git
-pkgname=('gtk-theme-bubble-dark-blue-git'
-         'gtk-theme-bubble-dark-red-git'
-         'gtk-theme-bubble-darker-blue-git'
-         'gtk-theme-bubble-darker-red-git'
-         'gtk-theme-bubble-light-blue-git'
-         'gtk-theme-bubble-light-red-git')
-pkgver=r97.9f15632
+pkgname=('gtk-theme-bubble-dark-git'
+         'gtk-theme-bubble-darker-git'
+         'gtk-theme-bubble-lighter-git')
+pkgver=r140.60cd4f9
 pkgrel=1
 pkgdesc="A GTK theme based on Arc-Theme"
 arch=('any')
@@ -22,57 +19,30 @@ pkgver()  {
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-package_gtk-theme-bubble-dark-blue-git()  {
+package_gtk-theme-bubble-dark-git()  {
   provides=("${pkgname%-git}" "${pkgbase%-git}")
   conflicts=("${pkgname%-git}")
 
   cd "$pkgbase"
-  find Bubble-Dark-Blue \
+  find Bubble-Dark \
     -type f -exec install -Dm 644 '{}' "$pkgdir/usr/share/themes/{}" \;
 }
 
-package_gtk-theme-bubble-dark-red-git()  {
+package_gtk-theme-bubble-darker-git()  {
   provides=("${pkgname%-git}" "${pkgbase%-git}")
   conflicts=("${pkgname%-git}")
 
   cd "$pkgbase"
-  find Bubble-Dark-Red \
+  find Bubble-Darker \
     -type f -exec install -Dm 644 '{}' "$pkgdir/usr/share/themes/{}" \;
 }
 
-package_gtk-theme-bubble-darker-blue-git()  {
+package_gtk-theme-bubble-lighter-git()  {
   provides=("${pkgname%-git}" "${pkgbase%-git}")
   conflicts=("${pkgname%-git}")
 
   cd "$pkgbase"
-  find Bubble-Darker-Blue \
-    -type f -exec install -Dm 644 '{}' "$pkgdir/usr/share/themes/{}" \;
-}
-
-package_gtk-theme-bubble-darker-red-git()  {
-  provides=("${pkgname%-git}" "${pkgbase%-git}")
-  conflicts=("${pkgname%-git}")
-
-  cd "$pkgbase"
-  find Bubble-Darker-Red \
-    -type f -exec install -Dm 644 '{}' "$pkgdir/usr/share/themes/{}" \;
-}
-
-package_gtk-theme-bubble-light-blue-git()  {
-  provides=("${pkgname%-git}" "${pkgbase%-git}")
-  conflicts=("${pkgname%-git}")
-
-  cd "$pkgbase"
-  find Bubble-Light-Blue \
-    -type f -exec install -Dm 644 '{}' "$pkgdir/usr/share/themes/{}" \;
-}
-
-package_gtk-theme-bubble-light-red-git()  {
-  provides=("${pkgname%-git}" "${pkgbase%-git}")
-  conflicts=("${pkgname%-git}")
-
-  cd "$pkgbase"
-  find Bubble-Light-Red \
+  find Bubble-Lighter \
     -type f -exec install -Dm 644 '{}' "$pkgdir/usr/share/themes/{}" \;
 }