[gentoo-commits] repo/proj/guru:master commit in: app-backup/timeshift/, app-backup/timeshift/files/

["Arthur Zamarin" <arthurzam@gentoo.org>]

commit:     954ab4ad5ccb7f579176d22066f5a540d0059f05
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Thu Sep 30 18:44:53 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 18:51:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=954ab4ad

app-backup/timeshift: fixed https://bugs.gentoo.org/794637

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>

 .../files/timeshift-20.11.1-fix-util-linux-update.patch   | 15 +++++++++++++++
 app-backup/timeshift/timeshift-20.11.1.ebuild             |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch b/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch
new file mode 100644
index 000000000..0206b9096
--- /dev/null
+++ b/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch
@@ -0,0 +1,15 @@
+--- a/src/Utility/Device.vala
++++ b/src/Utility/Device.vala
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{
+ 
+ 			try{
+ 				if (lsblk_is_ancient){
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
+ 				}
+ 				else{
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
+ 				}
+ 
+ 				if (rex.match (line, 0, out match)){

diff --git a/app-backup/timeshift/timeshift-20.11.1.ebuild b/app-backup/timeshift/timeshift-20.11.1.ebuild
index 4e65c8893..5d88a64b2 100644
--- a/app-backup/timeshift/timeshift-20.11.1.ebuild
+++ b/app-backup/timeshift/timeshift-20.11.1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch" )
+PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch" "${FILESDIR}/${P}-fix-util-linux-update.patch" )
 
 DEPEND="
 	dev-libs/json-glib