Updated to version 8

4 files changed, 36 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cbf45bc5215a..a71b8358bbec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,26 @@
 pkgbase = kyocera_universal
-	pkgdesc = Kyocera Printing Package for many Kyocera printers (stripped of kdialog5).
-	pkgver = 5.0.0
+	pkgdesc = Kyocera Printing Package for many Kyocera printers (stripped of kdialog8).
+	pkgver = 8.0.0
 	pkgrel = 1
 	url = https://www.kyocera.com/
 	install = kyodialog-bin.install
-	arch = i686
 	arch = x86_64
+	arch = i686
 	license = other
 	makedepends = unzip
 	makedepends = wget
-	depends = bash-completion
 	depends = cups-filters
+	depends = dbus
 	depends = gcc-libs
+	depends = glibc
 	depends = krb5
 	depends = libcups
 	depends = libgcrypt
-	depends = python2-reportlab
+	depends = python-reportlab
+	depends = python-setuptools
 	depends = zlib
-	depends = python2-pypdf2
-	depends = python2
-	depends = lib32-zlib
-	depends = lib32-libcups
-	depends = lib32-libdbus
-	source = https://cdn.kyostatics.net/dlc/de/driver/all/kyoceralinuxpackages-20160420-upd-v3.-downloadcenteritem-Single-File.downloadcenteritem.tmp/KyoceraLinux_Phase5-2018.08.29
-	source = python2.patch
-	md5sums = 0fbc4ddc4ed392dd92f42a119d01072f
-	md5sums = 9a439ff46454c2b0f7c4d2411ba2237e
+	source = https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_20201222_tar_gz.download.gz
+	md5sums = 3b9819e9e1654cbd3ed837731d87039f
 
 pkgname = kyocera_universal
 
diff --git a/PKGBUILD b/PKGBUILD
index 144a3c7d366e..d294897edc4c 100644..100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,19 @@
 # Maintainer: Dominik Wetzel <dimonok@web.de>
-# Contributor: Julian Eckhardt <julian@eckhardt.fi>
+# Contributors: Julian Eckhardt <julian@eckhardt.fi>, Paulo Marcos <contato-myghi63@protonmail.com>
 pkgname=kyocera_universal
-pkgver=5.0.0
+pkgver=8.0.0
 pkgrel=1
-pkgdesc="Kyocera Printing Package for many Kyocera printers (stripped of kdialog5)."
-arch=('x86_64' 'i386')
+pkgdesc="Kyocera Printing Package for many Kyocera printers (stripped of kdialog8)."
+arch=('x86_64' 'i686')
 url="https://www.kyocera.com/"
 license=('other')
-depends=('bash-completion' 'cups-filters' 'gcc-libs' 'krb5' 'libcups' 'libgcrypt' 'python2-reportlab' 'zlib' 'python2-pypdf2' 'python2' 'lib32-zlib' 'lib32-libcups' 'lib32-libdbus')
-arch=('i686' 'x86_64')
+depends=('cups-filters' 'dbus' 'gcc-libs' 'glibc' 'krb5' 'libcups' 'libgcrypt' 'python-reportlab' 'python-setuptools' 'zlib')
 makedepends=('unzip' 'wget')
 DLAGENTS=("https::/usr/bin/wget")
-toDwnld="KyoceraLinux_Phase5-2018.08.29" 
-source=("https://cdn.kyostatics.net/dlc/de/driver/all/kyoceralinuxpackages-20160420-upd-v3.-downloadcenteritem-Single-File.downloadcenteritem.tmp/${toDwnld}" 
-python2.patch)
+toDwnld="KyoceraLinuxPackages_20201222_tar_gz.download.gz"
+source=("https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/${toDwnld}")
 install=kyodialog-bin.install
-md5sums=('0fbc4ddc4ed392dd92f42a119d01072f'
-	 '9a439ff46454c2b0f7c4d2411ba2237e')
+md5sums=('3b9819e9e1654cbd3ed837731d87039f')
 
 if [ "$arch" == "x86_64" ]; then
   _arch="amd64"
@@ -24,27 +21,28 @@ else
   _arch="i386"
 fi
 
+major=${pkgver%.*.*}
+
 ###########################
 # CHOOSE YOUR REGION HERE #
 ###########################
-Region="EU"
-# Region="Global"
+# Region="EU"
+Region="Global"
 
 prepare() {
   cd $srcdir
-  tar xzf KyoceraLinux-Phase5-2018.08.29.tar.gz -C .
-  ar xv Debian/${Region}/kyodialog_${_arch}/kyodialog_5.0-0_${_arch}.deb
+  tar xzf ${toDwnld} -C .
+  ar xv Debian/${Region}/kyodialog_${_arch}/kyodialog_${major}.0-0_${_arch}.deb
   tar xzf data.tar.gz -C .
-  patch -Np0 -i python2.patch
 }
 
 package() {
   # Remove unnecessary stuff
   cd $srcdir
-  rm -r usr/share/kyocera5/Python
+  rm -r usr/share/kyocera${major}/Python
   rm -r usr/share/applications
-  rm usr/share/kyocera5/appicon_F.png
-  rm usr/bin/kyodialog5
+  rm usr/share/kyocera${major}/appicon_G.png
+  rm usr/bin/kyodialog${major}
   install -D -m644 "usr/share/doc/kyodialog/copyright" "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
   rm -r ${srcdir}/usr/share/doc
   cd $pkgdir
diff --git a/kyodialog-bin.install b/kyodialog-bin.install
index f93ae60b5534..53f1fd524b4a 100644..100755
--- a/kyodialog-bin.install
+++ b/kyodialog-bin.install
@@ -18,21 +18,19 @@ post_install() {
 
 	ALTERNATE_PPD_DIRECTORY=/usr/share/cups/model/kyocera
 	PRIMARY_PPD_DIRECTORY=/usr/share/ppd/kyocera/
-	INSTALLED_PPD_DIRECTORY=/usr/share/kyocera/ppd4
-
-	PYTHON_DIRECTORY=/usr/share/kyocera/Python/
+	INSTALLED_PPD_DIRECTORY=/usr/share/kyocera8/ppd8
 
 	mkdir -p $PRIMARY_PPD_DIRECTORY
 	cp -r $INSTALLED_PPD_DIRECTORY/* $PRIMARY_PPD_DIRECTORY
 
-	chmod 777 /usr/share/kyocera
-	chmod 755 /usr/bin/kyoPPDWrite_E
+	chmod 777 /usr/share/kyocera8
+	chmod 755 /usr/bin/kyoPPDWrite_G
 
 	if [ ! -h $ALTERNATE_PPD_DIRECTORY ]; then
 	    ln -s $PRIMARY_PPD_DIRECTORY $ALTERNATE_PPD_DIRECTORY
 	fi
 
-	mime_line="application/postscript      application/vnd.cups-pdf 66  pstopdf"
+	mime_line="application/postscript      application/vnd.cups-pdf 66  gstopdf"
 	cups_conf='/etc/cups/local.convs'
 	if [ -e $cups_conf ]; then
 	    grep -q -F "$mime_line" $cups_conf || echo "$mime_line" >> $cups_conf
@@ -53,10 +51,10 @@ post_upgrade() {
 post_remove() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 
-	KYOCERA_CONFIG="/usr/share/kyocera"
+	KYOCERA_CONFIG="/usr/share/kyocera8"
 
 	uninstall_printers(){
-	    files=`grep -l "kyofilter_E\|kyofilter_ras_E\|kyofilter_pdf_E" /etc/cups/ppd/* 2>/dev/null`
+	    files=`grep -l "kyofilter_G\|kyofilter_ras_G\|kyofilter_pdf_G" /etc/cups/ppd/* 2>/dev/null`
 	    if [ ! -z "$files" ]; then
 	        for file in ${files}; do
 	            if matches $file .ppd; then
@@ -97,9 +95,9 @@ post_remove() {
 
 	uninstall_config_files(){
 	    #For each user, uninstall the config files in
-	    #/usr/share/kyocera/<username> and ~/.cups/lpoptions
+	    #/usr/share/kyocera8/<username> and ~/.cups/lpoptions
 	    if [ -d $KYOCERA_CONFIG ]; then
-	        users=`ls $KYOCERA_CONFIG | grep -v 'ppd4\|appicon\|Python'`
+	        users=`ls $KYOCERA_CONFIG | grep -v 'ppd8\|appicon\|Python'`
 	        if [ ! -z "$users" ]; then
 	            for user in ${users}; do
 	                is_appicon=`matches $user appicon.png`
@@ -119,8 +117,8 @@ post_remove() {
 	    if [ -d /usr/share/ppd/kyocera ]; then
 	        rm -rf "/usr/share/ppd/kyocera"
 	    fi
-	    if [ -d /usr/share/kyocera/Python ]; then
-	        rm -rf "/usr/share/kyocera/Python"
+	    if [ -d /usr/share/kyocera8/Python ]; then
+	        rm -rf "/usr/share/kyocera8/Python"
 	    fi
 	}
 
@@ -133,7 +131,6 @@ post_remove() {
 
 	uninstall_printers
 	uninstall_config_files
-	remove_directories
 
 	#echo ""
 	update-desktop-database -q
diff --git a/python2.patch b/python2.patch
deleted file mode 100644
index 438a0a0d988c..000000000000
--- a/python2.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ura --color usr/lib/cups/filter/kyofilter_pre_E usr.new/lib/cups/filter/kyofilter_pre_E
---- usr/lib/cups/filter/kyofilter_pre_F	2018-08-29 23:29:10.000000000 +0200
-+++ usr.new/lib/cups/filter/kyofilter_pre_F	2018-10-19 18:44:58.088191826 +0200
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python2
- '''
- Created on Mar 1, 2016
-