From ae701d89437128fff70f710c0cd03777dad0118c Mon Sep 17 00:00:00 2001
From: MichaIng <28480705+MichaIng@users.noreply.github.com>
Date: Sun, 12 May 2019 02:21:01 +0200
Subject: [PATCH] v6.23

+ DietPi-Software | Tomcat8: Disable for non-RPi Buster
+ DietPi-Software | NAA Daemon: libasound2 is installed with ALSA; On Stretch+ rely on G_AGF to resolve dependencies which fixes install on Buster where gcc-6-base is not available (the required libstdc++6 depends on gcc-8-base instead).
---
 dietpi/dietpi-software | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index b9b5993f37..cf153d5bbd 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -1822,7 +1822,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		aSOFTWARE_REQUIRES_PHP[$software_id]=1
 		aSOFTWARE_ONLINEDOC_URL[$software_id]='p=54#p54'
 
-		# APT package not available on Debian Buster (but on Raspbian Buster): https://packages.debian.org/phpmyadmin
+		# - non-RPi Buster: https://packages.debian.org/phpmyadmin
 		(( $G_HW_MODEL > 9 )) && aSOFTWARE_AVAIL_G_DISTRO[$software_id,5]=0
 
 		#------------------
@@ -1852,6 +1852,9 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		aSOFTWARE_ONLINEDOC_URL[$software_id]='p=4316#p4316'
 		aSOFTWARE_REQUIRES_JAVA_JRE_JDK[$software_id]=1
 
+		# - non-RPi Buster: https://packages.debian.org/tomcat8
+		(( $G_HW_MODEL > 9 )) && aSOFTWARE_AVAIL_G_DISTRO[$software_id,5]=0
+
 		#PiHole
 		#--------------------------------------------------------------------------------
 		software_id=93
@@ -4384,7 +4387,7 @@ _EOF_
 
 			Banner_Installing
 
-			# Skip license for NAA daemon
+			# Skip license
 			debconf-set-selections <<< 'networkaudiod networkaudiod/license note false'
 
 			# Packages
@@ -4423,12 +4426,7 @@ _EOF_
 
 			done
 
-			# Pre-reqs
-			DEPS_LIST='libasound2'
-
-			# - Stretch+ additional packages
-			(( $G_DISTRO > 3 )) && DEPS_LIST+=' gcc-6-base libstdc++6'
-
+			# Install
 			for i in "${apackages[@]}"
 			do
 
@@ -12760,7 +12758,7 @@ _EOF_
 
 		fi
 
-		software_id=124
+		software_id=124 # NAA Daemon
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
@@ -12769,7 +12767,7 @@ _EOF_
 
 		fi
 
-		software_id=125
+		software_id=125 # Tomcat8
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling