From ba704bab081905466fae10f61a0252e44e6752dc Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Fri, 7 Dec 2018 16:11:11 -0500
Subject: [PATCH] PKGBUILDs: Merge tari-cli with tari-core

Realistically, if I'm installing the tari packages, I more often than
not want everything with it. If I am aiming for a minimalist setup
without X11 or Wayland, I will probably not use the tari packages
anyway.
---
 .archlinux/PKGBUILDs/tari-cli/PKGBUILD  | 20 --------------------
 .archlinux/PKGBUILDs/tari-core/PKGBUILD | 23 +++++++++++++++++++----
 2 files changed, 19 insertions(+), 24 deletions(-)
 delete mode 100644 .archlinux/PKGBUILDs/tari-cli/PKGBUILD

diff --git a/.archlinux/PKGBUILDs/tari-cli/PKGBUILD b/.archlinux/PKGBUILDs/tari-cli/PKGBUILD
deleted file mode 100644
index cd2e9fde..00000000
--- a/.archlinux/PKGBUILDs/tari-cli/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=tari-cli
-pkgver=0.1.1
-pkgrel=1
-pkgdesc="Packages for CLI programs I use independent of a desktop environment."
-arch=('any')
-depends=(mpd
-         mpc
-         ncmpcpp
-         htop
-         neofetch
-         fdupes
-         youtube-dl
-         ranger
-         weechat
-         ncdu
-         task
-         cmatrix
-         imagemagick
-         lolcat
-         figlet)
diff --git a/.archlinux/PKGBUILDs/tari-core/PKGBUILD b/.archlinux/PKGBUILDs/tari-core/PKGBUILD
index 85e6e132..f493703b 100644
--- a/.archlinux/PKGBUILDs/tari-core/PKGBUILD
+++ b/.archlinux/PKGBUILDs/tari-core/PKGBUILD
@@ -1,7 +1,7 @@
 pkgname=tari-core
-pkgver=0.2.0
-pkgrel=2
-pkgdesc="Core packages for my Arch setup."
+pkgver=0.3.0
+pkgrel=1
+pkgdesc="My Arch Linux setup"
 arch=('any')
 depends=(stow
          python-pywal
@@ -17,4 +17,19 @@ depends=(stow
          unrar
          borg
          openssh
-         openvpn)
+         openvpn
+         mpd
+         mpc
+         ncmpcpp
+         htop
+         neofetch
+         fdupes
+         youtube-dl
+         ranger
+         weechat
+         ncdu
+         task
+         cmatrix
+         imagemagick
+         lolcat
+         figlet)