From f94d4af3dbeded39520f5cbd465999492537721b Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Sat, 8 Dec 2018 01:15:43 -0500
Subject: [PATCH] PKGBUILDs: Merge tari-plasma and tari-gnome with tari-core

Since I don't have to worry about the completeness of individual desktop
environments, this makes it easier for me to tailor the tools I use to
my use cases.
---
 .archlinux/PKGBUILDs/tari-core/PKGBUILD   | 59 ++++++++++++++++++++++-
 .archlinux/PKGBUILDs/tari-gnome/PKGBUILD  | 29 -----------
 .archlinux/PKGBUILDs/tari-plasma/PKGBUILD | 36 --------------
 3 files changed, 57 insertions(+), 67 deletions(-)
 delete mode 100644 .archlinux/PKGBUILDs/tari-gnome/PKGBUILD
 delete mode 100644 .archlinux/PKGBUILDs/tari-plasma/PKGBUILD

diff --git a/.archlinux/PKGBUILDs/tari-core/PKGBUILD b/.archlinux/PKGBUILDs/tari-core/PKGBUILD
index 8e1f2a65..4123f441 100644
--- a/.archlinux/PKGBUILDs/tari-core/PKGBUILD
+++ b/.archlinux/PKGBUILDs/tari-core/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=tari-core
-pkgver=0.5.0
+pkgver=0.6.0
 pkgrel=1
 pkgdesc="My Arch Linux setup"
 arch=('any')
@@ -93,4 +93,59 @@ depends=(stow
          bspwm
          sxhkd
          dunst
-         compton)
+         compton
+         plasma-desktop
+         plasma-pa
+         kscreen
+         kleopatra
+         obs-studio
+         baka-mplayer
+         dolphin
+         ark
+         okular
+         gwenview
+         cantata
+         kwrite
+         kcolorchooser
+         kolourpaint
+         kmag
+         spectacle
+         kdenlive
+         krita
+         texstudio
+         kwave
+         kmplot
+         kalzium
+         kwordquiz
+         kollision
+         bovo
+         blinken
+         virtualbox
+         virtualbox-host-modules-arch
+         kimageformats
+         ffmpegthumbs
+         kdegraphics-thumbnailers
+         gnome-shell
+         gnome-shell-extensions
+         gnome-backgrounds
+         gnome-control-center
+         evince
+         file-roller
+         nautilus
+         gnome-mpv
+         l3afpad
+         gthumb
+         lollypop
+         evolution
+         ghex
+         liferea
+         libreoffice-fresh
+         poedit
+         gnome-clocks
+         gnome-characters
+         gnome-maps
+         gnome-system-monitor
+         gnome-disk-utility
+         gnome-screenshot
+         gnome-weather
+         gnome-break-timer)
diff --git a/.archlinux/PKGBUILDs/tari-gnome/PKGBUILD b/.archlinux/PKGBUILDs/tari-gnome/PKGBUILD
deleted file mode 100644
index f0218fdb..00000000
--- a/.archlinux/PKGBUILDs/tari-gnome/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-pkgname=tari-gnome
-pkgver=0.1.0
-pkgrel=1
-pkgdesc="Packages for my GNOME setup"
-arch=('any')
-depends=(gnome-shell
-         gnome-shell-extensions
-         gnome-backgrounds
-         gnome-control-center
-         evince
-         file-roller
-         nautilus
-         gnome-mpv
-         l3afpad
-         gthumb
-         lollypop
-         evolution
-         ghex
-         liferea
-         libreoffice-fresh
-         poedit
-         gnome-clocks
-         gnome-characters
-         gnome-maps
-         gnome-system-monitor
-         gnome-disk-utility
-         gnome-screenshot
-         gnome-weather
-         gnome-break-timer)
diff --git a/.archlinux/PKGBUILDs/tari-plasma/PKGBUILD b/.archlinux/PKGBUILDs/tari-plasma/PKGBUILD
deleted file mode 100644
index 51a35770..00000000
--- a/.archlinux/PKGBUILDs/tari-plasma/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-pkgname=tari-plasma
-pkgver=0.1.0
-pkgrel=1
-pkgdesc="Packages for my Plasma setup"
-arch=('any')
-depends=(plasma-desktop
-         plasma-pa
-         kscreen
-         kleopatra
-         obs-studio
-         baka-mplayer
-         dolphin
-         ark
-         okular
-         gwenview
-         cantata
-         kwrite
-         kcolorchooser
-         kolourpaint
-         kmag
-         spectacle
-         kdenlive
-         krita
-         texstudio
-         kwave
-         kmplot
-         kalzium
-         kwordquiz
-         kollision
-         bovo
-         blinken
-         virtualbox
-         virtualbox-host-modules-arch
-         kimageformats
-         ffmpegthumbs
-         kdegraphics-thumbnailers)