From b27f2a199a5ac051b1a70aa4f02f7fb1534f0696 Mon Sep 17 00:00:00 2001
From: Ronald Farrer <canutethegreat@gmail.com>
Date: Mon, 26 Aug 2024 21:24:44 -0700
Subject: [PATCH] Version bump.

---
 dev-libs/libwacom-surface/Manifest            |  1 +
 .../0001-Add-support-for-BUS_VIRTUAL.patch}   | 67 +++++++++++--------
 ...ort-for-Intel-Management-Engine-bus.patch} | 65 +++++++++++-------
 ...003-data-Add-Microsoft-Surface-Pro-3.patch | 33 +++++++++
 ...04-data-Add-Microsoft-Surface-Pro-4.patch} | 10 +--
 ...05-data-Add-Microsoft-Surface-Pro-5.patch} | 10 +--
 ...06-data-Add-Microsoft-Surface-Pro-6.patch} | 11 +--
 ...07-data-Add-Microsoft-Surface-Pro-7.patch} | 10 +--
 ...008-data-Add-Microsoft-Surface-Pro-7.patch | 34 ++++++++++
 ...009-data-Add-Microsoft-Surface-Pro-8.patch | 34 ++++++++++
 ...010-data-Add-Microsoft-Surface-Pro-9.patch | 34 ++++++++++
 ...011-data-Add-Microsoft-Surface-Book.patch} | 10 +--
 ...a-Add-Microsoft-Surface-Book-2-13.5.patch} | 10 +--
 ...ata-Add-Microsoft-Surface-Book-2-15.patch} | 10 +--
 ...a-Add-Microsoft-Surface-Book-3-13.5.patch} | 10 +--
 ...ata-Add-Microsoft-Surface-Book-3-15.patch} | 10 +--
 ...-Add-Microsoft-Surface-Laptop-Studio.patch | 34 ++++++++++
 ....ebuild => libwacom-surface-2.12.2.ebuild} | 34 ++++++----
 18 files changed, 315 insertions(+), 112 deletions(-)
 create mode 100644 dev-libs/libwacom-surface/Manifest
 rename dev-libs/libwacom-surface/files/{1.9/01.patch => v2/0001-Add-support-for-BUS_VIRTUAL.patch} (59%)
 rename dev-libs/libwacom-surface/files/{1.9/02.patch => v2/0002-Add-support-for-Intel-Management-Engine-bus.patch} (58%)
 create mode 100644 dev-libs/libwacom-surface/files/v2/0003-data-Add-Microsoft-Surface-Pro-3.patch
 rename dev-libs/libwacom-surface/files/{1.9/03.patch => v2/0004-data-Add-Microsoft-Surface-Pro-4.patch} (72%)
 rename dev-libs/libwacom-surface/files/{1.9/04.patch => v2/0005-data-Add-Microsoft-Surface-Pro-5.patch} (75%)
 rename dev-libs/libwacom-surface/files/{1.9/05.patch => v2/0006-data-Add-Microsoft-Surface-Pro-6.patch} (74%)
 rename dev-libs/libwacom-surface/files/{1.9/06.patch => v2/0007-data-Add-Microsoft-Surface-Pro-7.patch} (75%)
 create mode 100644 dev-libs/libwacom-surface/files/v2/0008-data-Add-Microsoft-Surface-Pro-7.patch
 create mode 100644 dev-libs/libwacom-surface/files/v2/0009-data-Add-Microsoft-Surface-Pro-8.patch
 create mode 100644 dev-libs/libwacom-surface/files/v2/0010-data-Add-Microsoft-Surface-Pro-9.patch
 rename dev-libs/libwacom-surface/files/{1.9/07.patch => v2/0011-data-Add-Microsoft-Surface-Book.patch} (75%)
 rename dev-libs/libwacom-surface/files/{1.9/08.patch => v2/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch} (75%)
 rename dev-libs/libwacom-surface/files/{1.9/09.patch => v2/0013-data-Add-Microsoft-Surface-Book-2-15.patch} (75%)
 rename dev-libs/libwacom-surface/files/{1.9/10.patch => v2/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch} (75%)
 rename dev-libs/libwacom-surface/files/{1.9/11.patch => v2/0015-data-Add-Microsoft-Surface-Book-3-15.patch} (75%)
 create mode 100644 dev-libs/libwacom-surface/files/v2/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch
 rename dev-libs/libwacom-surface/{libwacom-surface-1.9.ebuild => libwacom-surface-2.12.2.ebuild} (51%)

diff --git a/dev-libs/libwacom-surface/Manifest b/dev-libs/libwacom-surface/Manifest
new file mode 100644
index 0000000..3b37d58
--- /dev/null
+++ b/dev-libs/libwacom-surface/Manifest
@@ -0,0 +1 @@
+DIST libwacom-2.12.2.tar.xz 153600 BLAKE2B f2a965d1990e8d2aa248d9d81f31f50e2602c66e3cbc41dd0638994c955b30a5e4be445041e8ac5240b336611f6fb3217779142e95fc3c5265860ebc4f918c41 SHA512 34f80f6c5bdb62938874978b2761d71a1da4629969550ac87b08eb132e88bfb67b56a4f5fcd687e4607a18ef8b34262ba9c4cfc0fcf6a1a6bb98c1a05ded0b08
diff --git a/dev-libs/libwacom-surface/files/1.9/01.patch b/dev-libs/libwacom-surface/files/v2/0001-Add-support-for-BUS_VIRTUAL.patch
similarity index 59%
rename from dev-libs/libwacom-surface/files/1.9/01.patch
rename to dev-libs/libwacom-surface/files/v2/0001-Add-support-for-BUS_VIRTUAL.patch
index 562b2f5..9b5c07e 100644
--- a/dev-libs/libwacom-surface/files/1.9/01.patch
+++ b/dev-libs/libwacom-surface/files/v2/0001-Add-support-for-BUS_VIRTUAL.patch
@@ -1,7 +1,7 @@
-From c0eaf576f68b2a34136a7c1c3977ff8531d37504 Mon Sep 17 00:00:00 2001
+From b89d3ac556baafbf88b34ae2feadbcffc87bc3e4 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sat, 27 Jun 2020 18:21:11 +0200
-Subject: [PATCH 01/11] Add support for BUS_VIRTUAL
+Subject: [PATCH 01/16] Add support for BUS_VIRTUAL
 
 This is needed to support IPTS devices through the iptsd userspace
 daemon. It exposes the touchscreen / stylus as uinput, since the parsing
@@ -12,34 +12,23 @@ as BUS_VIRTUAL.
 
 Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
 ---
- data/test_data_files.py      | 2 +-
  libwacom/libwacom-database.c | 4 ++++
  libwacom/libwacom.c          | 5 +++++
  libwacom/libwacom.h          | 1 +
  test/test-tablet-validity.c  | 1 +
- 5 files changed, 12 insertions(+), 1 deletion(-)
+ test/test_data_files.py      | 1 +
+ tools/debug-device.c         | 1 +
+ 6 files changed, 13 insertions(+)
 
-diff --git a/data/test_data_files.py b/data/test_data_files.py
-index 5acdbac..cb5ca6d 100755
---- a/data/test_data_files.py
-+++ b/data/test_data_files.py
-@@ -29,6 +29,6 @@ def test_device_match(tabletfile):
-             continue
- 
-         bus, vid, pid = match.split(':')[:3]  # skip the name part of the match
--        assert bus in ['usb', 'bluetooth', 'i2c', 'serial'], f'{tabletfile}: unknown bus type'
-+        assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt'], f'{tabletfile}: unknown bus type'
-         assert re.match('[0-9a-f]{4}', vid), f'{tabletfile}: {vid} must be lowercase hex'
-         assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index d57ef2d..17571b6 100644
+index eb47510..c5e2fcf 100644
 --- a/libwacom/libwacom-database.c
 +++ b/libwacom/libwacom-database.c
 @@ -130,6 +130,8 @@ bus_from_str (const char *str)
  		return WBUSTYPE_BLUETOOTH;
- 	if (streq(str, "i2c"))
+ 	if (g_str_equal(str, "i2c"))
  		return WBUSTYPE_I2C;
-+	if (streq(str, "virt"))
++	if (g_str_equal(str, "virt"))
 +		return WBUSTYPE_VIRTUAL;
  	return WBUSTYPE_UNKNOWN;
  }
@@ -54,10 +43,10 @@ index d57ef2d..17571b6 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index 062b313..7b97bb1 100644
+index 1ffb910..c028bde 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
-@@ -147,6 +147,10 @@ get_bus_vid_pid (GUdevDevice  *device,
+@@ -149,6 +149,10 @@ get_bus_vid_pid (GUdevDevice  *device,
  		*bus = WBUSTYPE_I2C;
  		retval = TRUE;
  		break;
@@ -68,7 +57,7 @@ index 062b313..7b97bb1 100644
  	}
  
  out:
-@@ -765,6 +769,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -1022,6 +1026,7 @@ static void print_match(int fd, const WacomMatch *match)
  		case WBUSTYPE_USB:		bus_name = "usb";	break;
  		case WBUSTYPE_SERIAL:		bus_name = "serial";	break;
  		case WBUSTYPE_I2C:		bus_name = "i2c";	break;
@@ -77,10 +66,10 @@ index 062b313..7b97bb1 100644
  		default:			g_assert_not_reached(); break;
  	}
 diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index 1b9bc2c..24e99cd 100644
+index c0d380c..a4fbb17 100644
 --- a/libwacom/libwacom.h
 +++ b/libwacom/libwacom.h
-@@ -117,6 +117,7 @@ typedef enum {
+@@ -154,6 +154,7 @@ typedef enum {
  	WBUSTYPE_SERIAL,	/**< Serial tablet */
  	WBUSTYPE_BLUETOOTH,	/**< Bluetooth tablet */
  	WBUSTYPE_I2C,		/**< I2C tablet */
@@ -89,10 +78,10 @@ index 1b9bc2c..24e99cd 100644
  
  /**
 diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
-index 9e5b02f..3883341 100644
+index 69d34c8..964fce0 100644
 --- a/test/test-tablet-validity.c
 +++ b/test/test-tablet-validity.c
-@@ -179,6 +179,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
+@@ -177,6 +177,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
  			break;
  		case WBUSTYPE_BLUETOOTH:
  		case WBUSTYPE_I2C:
@@ -100,6 +89,30 @@ index 9e5b02f..3883341 100644
  			g_assert_cmpint(vid, >, 0);
  			g_assert_cmpint(pid, >, 0);
  			break;
+diff --git a/test/test_data_files.py b/test/test_data_files.py
+index 9385b1c..f76c3f3 100755
+--- a/test/test_data_files.py
++++ b/test/test_data_files.py
+@@ -47,6 +47,7 @@ def test_device_match(tabletfile):
+             "bluetooth",
+             "i2c",
+             "serial",
++            "virt",
+         ], f"{tabletfile}: unknown bus type"
+         assert re.match(
+             "[0-9a-f]{4}", vid
+diff --git a/tools/debug-device.c b/tools/debug-device.c
+index 2cdac20..51ec53e 100644
+--- a/tools/debug-device.c
++++ b/tools/debug-device.c
+@@ -122,6 +122,7 @@ handle_device(WacomDeviceDatabase *db, const char *path)
+ 			case WBUSTYPE_SERIAL: busstr = "SERIAL"; break;
+ 			case WBUSTYPE_BLUETOOTH: busstr = "BLUETOOTH"; break;
+ 			case WBUSTYPE_I2C: busstr = "I2C"; break;
++			case WBUSTYPE_VIRTUAL: busstr = "VIRTUAL"; break;
+ 		}
+ 		func(libwacom_get_bustype, "%s", busstr);
+ 	}
 -- 
-2.30.1
+2.45.1
 
diff --git a/dev-libs/libwacom-surface/files/1.9/02.patch b/dev-libs/libwacom-surface/files/v2/0002-Add-support-for-Intel-Management-Engine-bus.patch
similarity index 58%
rename from dev-libs/libwacom-surface/files/1.9/02.patch
rename to dev-libs/libwacom-surface/files/v2/0002-Add-support-for-Intel-Management-Engine-bus.patch
index 7868073..04f6199 100644
--- a/dev-libs/libwacom-surface/files/1.9/02.patch
+++ b/dev-libs/libwacom-surface/files/v2/0002-Add-support-for-Intel-Management-Engine-bus.patch
@@ -1,38 +1,27 @@
-From 02df4e0f272dff001ee280ab93e8e1c4600375ff Mon Sep 17 00:00:00 2001
+From b8dae24b8f4bf24c3d1aeccc3efef81fc0f8b08d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 1 Jun 2019 21:17:15 +0200
-Subject: [PATCH 02/11] Add support for Intel Management Engine bus
+Subject: [PATCH 02/16] Add support for Intel Management Engine bus
 
 Add support for devices connected via the Intel Management Engine (MEI).
 This is required to support IPTS based devices, such as (among others)
 the Microsoft Surface Books, Surface Pro 5 and 6, and Surface Laptops.
 ---
- data/test_data_files.py      | 2 +-
  libwacom/libwacom-database.c | 4 ++++
  libwacom/libwacom.c          | 5 +++++
  libwacom/libwacom.h          | 1 +
  test/test-tablet-validity.c  | 1 +
- 5 files changed, 12 insertions(+), 1 deletion(-)
+ test/test_data_files.py      | 1 +
+ tools/debug-device.c         | 1 +
+ 6 files changed, 13 insertions(+)
 
-diff --git a/data/test_data_files.py b/data/test_data_files.py
-index cb5ca6d..466b18a 100755
---- a/data/test_data_files.py
-+++ b/data/test_data_files.py
-@@ -29,6 +29,6 @@ def test_device_match(tabletfile):
-             continue
- 
-         bus, vid, pid = match.split(':')[:3]  # skip the name part of the match
--        assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt'], f'{tabletfile}: unknown bus type'
-+        assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt', 'mei'], f'{tabletfile}: unknown bus type'
-         assert re.match('[0-9a-f]{4}', vid), f'{tabletfile}: {vid} must be lowercase hex'
-         assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index 17571b6..4c6df4e 100644
+index c5e2fcf..d9fc0c4 100644
 --- a/libwacom/libwacom-database.c
 +++ b/libwacom/libwacom-database.c
 @@ -132,6 +132,8 @@ bus_from_str (const char *str)
  		return WBUSTYPE_I2C;
- 	if (streq(str, "virt"))
+ 	if (g_str_equal(str, "virt"))
  		return WBUSTYPE_VIRTUAL;
 +	if (strcmp (str, "mei") == 0)
 +		return WBUSTYPE_MEI;
@@ -49,10 +38,10 @@ index 17571b6..4c6df4e 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index 7b97bb1..d84e8fa 100644
+index c028bde..0d34227 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
-@@ -151,6 +151,10 @@ get_bus_vid_pid (GUdevDevice  *device,
+@@ -153,6 +153,10 @@ get_bus_vid_pid (GUdevDevice  *device,
  		*bus = WBUSTYPE_VIRTUAL;
  		retval = TRUE;
  		break;
@@ -63,7 +52,7 @@ index 7b97bb1..d84e8fa 100644
  	}
  
  out:
-@@ -770,6 +774,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -1027,6 +1031,7 @@ static void print_match(int fd, const WacomMatch *match)
  		case WBUSTYPE_SERIAL:		bus_name = "serial";	break;
  		case WBUSTYPE_I2C:		bus_name = "i2c";	break;
  		case WBUSTYPE_VIRTUAL:		bus_name = "virt";	break;
@@ -72,10 +61,10 @@ index 7b97bb1..d84e8fa 100644
  		default:			g_assert_not_reached(); break;
  	}
 diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index 24e99cd..0eee2fd 100644
+index a4fbb17..dfc6d7b 100644
 --- a/libwacom/libwacom.h
 +++ b/libwacom/libwacom.h
-@@ -118,6 +118,7 @@ typedef enum {
+@@ -155,6 +155,7 @@ typedef enum {
  	WBUSTYPE_BLUETOOTH,	/**< Bluetooth tablet */
  	WBUSTYPE_I2C,		/**< I2C tablet */
  	WBUSTYPE_VIRTUAL,	/**< Virtual (uinput) tablet */
@@ -84,10 +73,10 @@ index 24e99cd..0eee2fd 100644
  
  /**
 diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
-index 3883341..352bc43 100644
+index 964fce0..5178583 100644
 --- a/test/test-tablet-validity.c
 +++ b/test/test-tablet-validity.c
-@@ -180,6 +180,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
+@@ -178,6 +178,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
  		case WBUSTYPE_BLUETOOTH:
  		case WBUSTYPE_I2C:
  		case WBUSTYPE_VIRTUAL:
@@ -95,6 +84,30 @@ index 3883341..352bc43 100644
  			g_assert_cmpint(vid, >, 0);
  			g_assert_cmpint(pid, >, 0);
  			break;
+diff --git a/test/test_data_files.py b/test/test_data_files.py
+index f76c3f3..f7cf9bc 100755
+--- a/test/test_data_files.py
++++ b/test/test_data_files.py
+@@ -48,6 +48,7 @@ def test_device_match(tabletfile):
+             "i2c",
+             "serial",
+             "virt",
++            "mei",
+         ], f"{tabletfile}: unknown bus type"
+         assert re.match(
+             "[0-9a-f]{4}", vid
+diff --git a/tools/debug-device.c b/tools/debug-device.c
+index 51ec53e..6a00f9d 100644
+--- a/tools/debug-device.c
++++ b/tools/debug-device.c
+@@ -123,6 +123,7 @@ handle_device(WacomDeviceDatabase *db, const char *path)
+ 			case WBUSTYPE_BLUETOOTH: busstr = "BLUETOOTH"; break;
+ 			case WBUSTYPE_I2C: busstr = "I2C"; break;
+ 			case WBUSTYPE_VIRTUAL: busstr = "VIRTUAL"; break;
++			case WBUSTYPE_MEI: busstr = "MEI"; break;
+ 		}
+ 		func(libwacom_get_bustype, "%s", busstr);
+ 	}
 -- 
-2.30.1
+2.45.1
 
diff --git a/dev-libs/libwacom-surface/files/v2/0003-data-Add-Microsoft-Surface-Pro-3.patch b/dev-libs/libwacom-surface/files/v2/0003-data-Add-Microsoft-Surface-Pro-3.patch
new file mode 100644
index 0000000..d149d73
--- /dev/null
+++ b/dev-libs/libwacom-surface/files/v2/0003-data-Add-Microsoft-Surface-Pro-3.patch
@@ -0,0 +1,33 @@
+From 2e5f077c87daeeae2dcc841c886668ab596ab952 Mon Sep 17 00:00:00 2001
+From: "Antony Jordan (Tablet)" <wiccan.two@gmail.com>
+Date: Wed, 8 Jun 2022 22:03:33 +0200
+Subject: [PATCH 03/16] data: Add Microsoft Surface Pro 3
+
+---
+ data/surface-pro3.tablet | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+ create mode 100644 data/surface-pro3.tablet
+
+diff --git a/data/surface-pro3.tablet b/data/surface-pro3.tablet
+new file mode 100644
+index 0000000..2f53541
+--- /dev/null
++++ b/data/surface-pro3.tablet
+@@ -0,0 +1,14 @@
++# This is for the Microsoft Surface Pro 3
++
++[Device]
++Name=Microsoft Surface Pro 3
++Class=PenDisplay
++DeviceMatch=i2c|1b96|1b05
++Width=10
++Height=6
++IntegratedIn=Display;System;
++
++[Features]
++Stylus=true
++Touch=true
++Buttons=0
+-- 
+2.45.1
+
diff --git a/dev-libs/libwacom-surface/files/1.9/03.patch b/dev-libs/libwacom-surface/files/v2/0004-data-Add-Microsoft-Surface-Pro-4.patch
similarity index 72%
rename from dev-libs/libwacom-surface/files/1.9/03.patch
rename to dev-libs/libwacom-surface/files/v2/0004-data-Add-Microsoft-Surface-Pro-4.patch
index 2fe0ed9..6857f53 100644
--- a/dev-libs/libwacom-surface/files/1.9/03.patch
+++ b/dev-libs/libwacom-surface/files/v2/0004-data-Add-Microsoft-Surface-Pro-4.patch
@@ -1,7 +1,7 @@
-From 29c9b7283741e717b61f07bdf14b678c13a6768d Mon Sep 17 00:00:00 2001
+From dc9e16bc247d513f1f468e7c8a7f71506941a320 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:18:55 +0200
-Subject: [PATCH 03/11] data: Add Microsoft Surface pro 4
+Subject: [PATCH 04/16] data: Add Microsoft Surface Pro 4
 
 ---
  data/surface-pro4.tablet | 14 ++++++++++++++
@@ -10,7 +10,7 @@ Subject: [PATCH 03/11] data: Add Microsoft Surface pro 4
 
 diff --git a/data/surface-pro4.tablet b/data/surface-pro4.tablet
 new file mode 100644
-index 0000000..1e0c67c
+index 0000000..f77f3a2
 --- /dev/null
 +++ b/data/surface-pro4.tablet
 @@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..1e0c67c
 +[Device]
 +Name=Microsoft Surface Pro 4
 +Class=PenDisplay
-+DeviceMatch=virt:1b96:006a;virt:1b96:0021;mei:1b96:006a;mei:1b96:0021
++DeviceMatch=virt|1b96|006a;virt|1b96|0021;mei|1b96|006a;mei|1b96|0021
 +Width=10
 +Height=6
 +IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..1e0c67c
 +Touch=true
 +Buttons=0
 -- 
-2.30.1
+2.45.1
 
diff --git a/dev-libs/libwacom-surface/files/1.9/04.patch b/dev-libs/libwacom-surface/files/v2/0005-data-Add-Microsoft-Surface-Pro-5.patch
similarity index 75%
rename from dev-libs/libwacom-surface/files/1.9/04.patch
rename to dev-libs/libwacom-surface/files/v2/0005-data-Add-Microsoft-Surface-Pro-5.patch
index ad295a5..c49e49c 100644
--- a/dev-libs/libwacom-surface/files/1.9/04.patch
+++ b/dev-libs/libwacom-surface/files/v2/0005-data-Add-Microsoft-Surface-Pro-5.patch
@@ -1,7 +1,7 @@
-From ccfc97812543a3db11a2c3dcd0ed25903730dfe3 Mon Sep 17 00:00:00 2001
+From 2ade3bb0de43ade8d0f5d3f326cae2efedbdc015 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:02 +0200
-Subject: [PATCH 04/11] data: Add Microsoft Surface pro 5
+Subject: [PATCH 05/16] data: Add Microsoft Surface Pro 5
 
 ---
  data/surface-pro5.tablet | 14 ++++++++++++++
@@ -10,7 +10,7 @@ Subject: [PATCH 04/11] data: Add Microsoft Surface pro 5
 
 diff --git a/data/surface-pro5.tablet b/data/surface-pro5.tablet
 new file mode 100644
-index 0000000..b26af3a
+index 0000000..410a0d3
 --- /dev/null
 +++ b/data/surface-pro5.tablet
 @@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..b26af3a
 +[Device]
 +Name=Microsoft Surface Pro 5
 +Class=PenDisplay
-+DeviceMatch=virt:1b96:001f;mei:1b96:001f
++DeviceMatch=virt|1b96|001f;mei|1b96|001f
 +Width=10
 +Height=6
 +IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..b26af3a
 +Touch=true
 +Buttons=0
 -- 
-2.30.1
+2.45.1
 
diff --git a/dev-libs/libwacom-surface/files/1.9/05.patch b/dev-libs/libwacom-surface/files/v2/0006-data-Add-Microsoft-Surface-Pro-6.patch
similarity index 74%
rename from dev-libs/libwacom-surface/files/1.9/05.patch
rename to dev-libs/libwacom-surface/files/v2/0006-data-Add-Microsoft-Surface-Pro-6.patch
index 45f4e4a..364fe9a 100644
--- a/dev-libs/libwacom-surface/files/1.9/05.patch
+++ b/dev-libs/libwacom-surface/files/v2/0006-data-Add-Microsoft-Surface-Pro-6.patch
@@ -1,7 +1,7 @@
-From df44bc318ba3be62d71a02f7ae5f7945e1bc84d1 Mon Sep 17 00:00:00 2001
+From 83765f93b8586c5e152593254d9ac55b5d4a8ba9 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:07 +0200
-Subject: [PATCH 05/11] data: Add Microsoft Surface pro 6
+Subject: [PATCH 06/16] data: Add Microsoft Surface Pro 6
 
 ---
  data/surface-pro6.tablet | 14 ++++++++++++++
@@ -10,7 +10,7 @@ Subject: [PATCH 05/11] data: Add Microsoft Surface pro 6
 
 diff --git a/data/surface-pro6.tablet b/data/surface-pro6.tablet
 new file mode 100644
-index 0000000..e97fad8
+index 0000000..eb89df0
 --- /dev/null
 +++ b/data/surface-pro6.tablet
 @@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..e97fad8
 +[Device]
 +Name=Microsoft Surface Pro 6
 +Class=PenDisplay
-+DeviceMatch=virt:045e:001f;mei:045e:001f
++DeviceMatch=virt|045e|001f;mei|045e|001f
 +Width=10
 +Height=6
 +IntegratedIn=Display;System;
@@ -29,4 +29,5 @@ index 0000000..e97fad8
 +Touch=true
 +Buttons=0
 -- 
-2.31.1
+2.45.1
+
diff --git a/dev-libs/libwacom-surface/files/1.9/06.patch b/dev-libs/libwacom-surface/files/v2/0007-data-Add-Microsoft-Surface-Pro-7.patch
similarity index 75%
rename from dev-libs/libwacom-surface/files/1.9/06.patch
rename to dev-libs/libwacom-surface/files/v2/0007-data-Add-Microsoft-Surface-Pro-7.patch
index 23f744e..a049930 100644
--- a/dev-libs/libwacom-surface/files/1.9/06.patch
+++ b/dev-libs/libwacom-surface/files/v2/0007-data-Add-Microsoft-Surface-Pro-7.patch
@@ -1,7 +1,7 @@
-From 0b12a623e70d877fa6bf1df615d06229f7b2eb83 Mon Sep 17 00:00:00 2001
+From 8725c66f88c0bca79542e1069fbbdef98227de1a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:13 +0200
-Subject: [PATCH 06/11] data: Add Microsoft Surface pro 7
+Subject: [PATCH 07/16] data: Add Microsoft Surface Pro 7
 
 ---
  data/surface-pro7.tablet | 14 ++++++++++++++
@@ -10,7 +10,7 @@ Subject: [PATCH 06/11] data: Add Microsoft Surface pro 7
 
 diff --git a/data/surface-pro7.tablet b/data/surface-pro7.tablet
 new file mode 100644
-index 0000000..7961379
+index 0000000..f960107
 --- /dev/null
 +++ b/data/surface-pro7.tablet
 @@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..7961379
 +[Device]
 +Name=Microsoft Surface Pro 7
 +Class=PenDisplay
-+DeviceMatch=virt:045e:099f;mei:045e:099f
++DeviceMatch=virt|045e|099f;mei|045e|099f
 +Width=10
 +Height=6
 +IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..7961379
 +Touch=true
 +Buttons=0
 -- 
-2.30.1
+2.45.1
 
diff --git a/dev-libs/libwacom-surface/files/v2/0008-data-Add-Microsoft-Surface-Pro-7.patch b/dev-libs/libwacom-surface/files/v2/0008-data-Add-Microsoft-Surface-Pro-7.patch
new file mode 100644
index 0000000..1e661d8
--- /dev/null
+++ b/dev-libs/libwacom-surface/files/v2/0008-data-Add-Microsoft-Surface-Pro-7.patch
@@ -0,0 +1,34 @@
+From fd315e255704f1172ec4940277ba5e28fd66990e Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Fri, 26 May 2023 12:32:21 +0200
+Subject: [PATCH 08/16] data: Add Microsoft Surface Pro 7+
+
+Based on https://github.com/linux-surface/libwacom-surface/issues/12
+---
+ data/surface-pro7-plus.tablet | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+ create mode 100644 data/surface-pro7-plus.tablet
+
+diff --git a/data/surface-pro7-plus.tablet b/data/surface-pro7-plus.tablet
+new file mode 100644
+index 0000000..5c4e540
+--- /dev/null
++++ b/data/surface-pro7-plus.tablet
+@@ -0,0 +1,14 @@
++# This is for the Microsoft Surface Pro 7+
++
++[Device]
++Name=Microsoft Surface Pro 7+
++Class=PenDisplay
++DeviceMatch=virt|045e|0c1a
++Width=10
++Height=6
++IntegratedIn=Display;System;
++
++[Features]
++Stylus=false
++Touch=true
++Buttons=0
+-- 
+2.45.1
+
diff --git a/dev-libs/libwacom-surface/files/v2/0009-data-Add-Microsoft-Surface-Pro-8.patch b/dev-libs/libwacom-surface/files/v2/0009-data-Add-Microsoft-Surface-Pro-8.patch
new file mode 100644
index 0000000..145c296
--- /dev/null
+++ b/dev-libs/libwacom-surface/files/v2/0009-data-Add-Microsoft-Surface-Pro-8.patch
@@ -0,0 +1,34 @@
+From 3ebad373725ed6d9415e000b5feffaba301fc4a4 Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Sun, 11 Jun 2023 21:29:52 +0200
+Subject: [PATCH 09/16] data: Add Microsoft Surface Pro 8
+
+Based on https://github.com/linux-surface/libwacom-surface/issues/13
+---
+ data/surface-pro8.tablet | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+ create mode 100644 data/surface-pro8.tablet
+
+diff --git a/data/surface-pro8.tablet b/data/surface-pro8.tablet
+new file mode 100644
+index 0000000..dcfef11
+--- /dev/null
++++ b/data/surface-pro8.tablet
+@@ -0,0 +1,14 @@
++# This is for the Microsoft Surface Pro 8
++
++[Device]
++Name=Microsoft Surface Pro 8
++Class=PenDisplay
++DeviceMatch=virt|045e|0c37
++Width=10
++Height=6
++IntegratedIn=Display;System;
++
++[Features]
++Stylus=false
++Touch=true
++Buttons=0
+-- 
+2.45.1
+
diff --git a/dev-libs/libwacom-surface/files/v2/0010-data-Add-Microsoft-Surface-Pro-9.patch b/dev-libs/libwacom-surface/files/v2/0010-data-Add-Microsoft-Surface-Pro-9.patch
new file mode 100644
index 0000000..f38f6a9
--- /dev/null
+++ b/dev-libs/libwacom-surface/files/v2/0010-data-Add-Microsoft-Surface-Pro-9.patch
@@ -0,0 +1,34 @@
+From f6b54c01d9167b8caca4e6c986a477efd1d5f62b Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Wed, 14 Jun 2023 21:11:36 +0200
+Subject: [PATCH 10/16] data: Add Microsoft Surface Pro 9
+
+IDs taken from https://github.com/quo/ithc-linux/issues/5
+---
+ data/surface-pro9.tablet | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+ create mode 100644 data/surface-pro9.tablet
+
+diff --git a/data/surface-pro9.tablet b/data/surface-pro9.tablet
+new file mode 100644
+index 0000000..ee2b3ee
+--- /dev/null
++++ b/data/surface-pro9.tablet
+@@ -0,0 +1,14 @@
++# This is for the Microsoft Surface Pro 9
++
++[Device]
++Name=Microsoft Surface Pro 9
++Class=PenDisplay
++DeviceMatch=virt|045e|0c52
++Width=10
++Height=6
++IntegratedIn=Display;System;
++
++[Features]
++Stylus=false
++Touch=true
++Buttons=0
+-- 
+2.45.1
+
diff --git a/dev-libs/libwacom-surface/files/1.9/07.patch b/dev-libs/libwacom-surface/files/v2/0011-data-Add-Microsoft-Surface-Book.patch
similarity index 75%
rename from dev-libs/libwacom-surface/files/1.9/07.patch
rename to dev-libs/libwacom-surface/files/v2/0011-data-Add-Microsoft-Surface-Book.patch
index cd594b9..cc03747 100644
--- a/dev-libs/libwacom-surface/files/1.9/07.patch
+++ b/dev-libs/libwacom-surface/files/v2/0011-data-Add-Microsoft-Surface-Book.patch
@@ -1,7 +1,7 @@
-From da5c0255ab397bc5537861f9b48d3036f2fc8e98 Mon Sep 17 00:00:00 2001
+From 51b2a3a1d62175da158ea8cd6332683e86a0aaee Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:38 +0200
-Subject: [PATCH 07/11] data: Add Microsoft Surface Book
+Subject: [PATCH 11/16] data: Add Microsoft Surface Book
 
 ---
  data/surface-book.tablet | 14 ++++++++++++++
@@ -10,7 +10,7 @@ Subject: [PATCH 07/11] data: Add Microsoft Surface Book
 
 diff --git a/data/surface-book.tablet b/data/surface-book.tablet
 new file mode 100644
-index 0000000..e2a5401
+index 0000000..6daf5b6
 --- /dev/null
 +++ b/data/surface-book.tablet
 @@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..e2a5401
 +[Device]
 +Name=Microsoft Surface Book
 +Class=PenDisplay
-+DeviceMatch=virt:1b96:005e;mei:1b96:005e
++DeviceMatch=virt|1b96|005e;mei|1b96|005e
 +Width=11
 +Height=7
 +IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..e2a5401
 +Touch=true
 +Buttons=0
 -- 
-2.30.1
+2.45.1
 
diff --git a/dev-libs/libwacom-surface/files/1.9/08.patch b/dev-libs/libwacom-surface/files/v2/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch
similarity index 75%
rename from dev-libs/libwacom-surface/files/1.9/08.patch
rename to dev-libs/libwacom-surface/files/v2/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch
index 2da32dd..89b25e8 100644
--- a/dev-libs/libwacom-surface/files/1.9/08.patch
+++ b/dev-libs/libwacom-surface/files/v2/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch
@@ -1,7 +1,7 @@
-From 3779329faa2e5e4d974ef2ad92dee3e0a8c90888 Mon Sep 17 00:00:00 2001
+From 4afaa31b2cf6475d2687b9f9e0bab25ab2262f83 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:04 +0200
-Subject: [PATCH 08/11] data: Add Microsoft Surface Book 2 (13.5")
+Subject: [PATCH 12/16] data: Add Microsoft Surface Book 2 (13.5")
 
 ---
  data/surface-book2-13.tablet | 14 ++++++++++++++
@@ -10,7 +10,7 @@ Subject: [PATCH 08/11] data: Add Microsoft Surface Book 2 (13.5")
 
 diff --git a/data/surface-book2-13.tablet b/data/surface-book2-13.tablet
 new file mode 100644
-index 0000000..b13cb07
+index 0000000..7cf7ba3
 --- /dev/null
 +++ b/data/surface-book2-13.tablet
 @@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..b13cb07
 +[Device]
 +Name=Microsoft Surface Book 2 (13.5")
 +Class=PenDisplay
-+DeviceMatch=virt:045e:0021;mei:045e:0021
++DeviceMatch=virt|045e|0021;mei|045e|0021
 +Width=11
 +Height=7
 +IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..b13cb07
 +Touch=true
 +Buttons=0
 -- 
-2.30.1
+2.45.1
 
diff --git a/dev-libs/libwacom-surface/files/1.9/09.patch b/dev-libs/libwacom-surface/files/v2/0013-data-Add-Microsoft-Surface-Book-2-15.patch
similarity index 75%
rename from dev-libs/libwacom-surface/files/1.9/09.patch
rename to dev-libs/libwacom-surface/files/v2/0013-data-Add-Microsoft-Surface-Book-2-15.patch
index 676ac52..aabb20d 100644
--- a/dev-libs/libwacom-surface/files/1.9/09.patch
+++ b/dev-libs/libwacom-surface/files/v2/0013-data-Add-Microsoft-Surface-Book-2-15.patch
@@ -1,7 +1,7 @@
-From 13e81b74340251dba524b6f414e3452e93458929 Mon Sep 17 00:00:00 2001
+From 7c7ec57b1aed65386dd7388979099f9a428f9275 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:13 +0200
-Subject: [PATCH 09/11] data: Add Microsoft Surface Book 2 (15")
+Subject: [PATCH 13/16] data: Add Microsoft Surface Book 2 (15")
 
 ---
  data/surface-book2-15.tablet | 14 ++++++++++++++
@@ -10,7 +10,7 @@ Subject: [PATCH 09/11] data: Add Microsoft Surface Book 2 (15")
 
 diff --git a/data/surface-book2-15.tablet b/data/surface-book2-15.tablet
 new file mode 100644
-index 0000000..ad98cc7
+index 0000000..3266fca
 --- /dev/null
 +++ b/data/surface-book2-15.tablet
 @@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..ad98cc7
 +[Device]
 +Name=Microsoft Surface Book 2 (15")
 +Class=PenDisplay
-+DeviceMatch=virt:045e:0020;mei:045e:0020
++DeviceMatch=virt|045e|0020;mei|045e|0020
 +Width=12
 +Height=8
 +IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..ad98cc7
 +Touch=true
 +Buttons=0
 -- 
-2.30.1
+2.45.1
 
diff --git a/dev-libs/libwacom-surface/files/1.9/10.patch b/dev-libs/libwacom-surface/files/v2/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch
similarity index 75%
rename from dev-libs/libwacom-surface/files/1.9/10.patch
rename to dev-libs/libwacom-surface/files/v2/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch
index 3013c7c..83b52e7 100644
--- a/dev-libs/libwacom-surface/files/1.9/10.patch
+++ b/dev-libs/libwacom-surface/files/v2/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch
@@ -1,7 +1,7 @@
-From 84f8519285c39cf3b35175f94a38cd48b3a7d922 Mon Sep 17 00:00:00 2001
+From 9d213e720946ea4bc7a815ce273d68c3a534a09c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:29 +0200
-Subject: [PATCH 10/11] data: Add Microsoft Surface Book 3 (13.5")
+Subject: [PATCH 14/16] data: Add Microsoft Surface Book 3 (13.5")
 
 ---
  data/surface-book3-13.tablet | 14 ++++++++++++++
@@ -10,7 +10,7 @@ Subject: [PATCH 10/11] data: Add Microsoft Surface Book 3 (13.5")
 
 diff --git a/data/surface-book3-13.tablet b/data/surface-book3-13.tablet
 new file mode 100644
-index 0000000..a33c9cb
+index 0000000..e363f33
 --- /dev/null
 +++ b/data/surface-book3-13.tablet
 @@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..a33c9cb
 +[Device]
 +Name=Microsoft Surface Book 3 (13.5")
 +Class=PenDisplay
-+DeviceMatch=virt:045e:09b2;mei:045e:09b2
++DeviceMatch=virt|045e|09b2;mei|045e|09b2
 +Width=11
 +Height=7
 +IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..a33c9cb
 +Touch=true
 +Buttons=0
 -- 
-2.30.1
+2.45.1
 
diff --git a/dev-libs/libwacom-surface/files/1.9/11.patch b/dev-libs/libwacom-surface/files/v2/0015-data-Add-Microsoft-Surface-Book-3-15.patch
similarity index 75%
rename from dev-libs/libwacom-surface/files/1.9/11.patch
rename to dev-libs/libwacom-surface/files/v2/0015-data-Add-Microsoft-Surface-Book-3-15.patch
index 41e2537..72c4ac8 100644
--- a/dev-libs/libwacom-surface/files/1.9/11.patch
+++ b/dev-libs/libwacom-surface/files/v2/0015-data-Add-Microsoft-Surface-Book-3-15.patch
@@ -1,7 +1,7 @@
-From d105e4c6fd7512eefa4c703224a24cea19e0f457 Mon Sep 17 00:00:00 2001
+From cb410da1d83550efcd2a7a25286fc3a4bf5e8b86 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:42 +0200
-Subject: [PATCH 11/11] data: Add Microsoft Surface Book 3 (15")
+Subject: [PATCH 15/16] data: Add Microsoft Surface Book 3 (15")
 
 ---
  data/surface-book3-15.tablet | 14 ++++++++++++++
@@ -10,7 +10,7 @@ Subject: [PATCH 11/11] data: Add Microsoft Surface Book 3 (15")
 
 diff --git a/data/surface-book3-15.tablet b/data/surface-book3-15.tablet
 new file mode 100644
-index 0000000..291321f
+index 0000000..4954b61
 --- /dev/null
 +++ b/data/surface-book3-15.tablet
 @@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..291321f
 +[Device]
 +Name=Microsoft Surface Book 3 (15")
 +Class=PenDisplay
-+DeviceMatch=virt:045e:09b1;mei:045e:09b1
++DeviceMatch=virt|045e|09b1;mei|045e|09b1
 +Width=12
 +Height=8
 +IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..291321f
 +Touch=true
 +Buttons=0
 -- 
-2.30.1
+2.45.1
 
diff --git a/dev-libs/libwacom-surface/files/v2/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch b/dev-libs/libwacom-surface/files/v2/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch
new file mode 100644
index 0000000..433f7cf
--- /dev/null
+++ b/dev-libs/libwacom-surface/files/v2/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch
@@ -0,0 +1,34 @@
+From 9a6737f4aae99f5fcad86c0843fc68f3123cee2f Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Wed, 14 Jun 2023 21:12:41 +0200
+Subject: [PATCH 16/16] data: Add Microsoft Surface Laptop Studio
+
+IDs taken from https://github.com/quo/ithc-linux/issues/5
+---
+ data/surface-laptop-studio.tablet | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+ create mode 100644 data/surface-laptop-studio.tablet
+
+diff --git a/data/surface-laptop-studio.tablet b/data/surface-laptop-studio.tablet
+new file mode 100644
+index 0000000..6077403
+--- /dev/null
++++ b/data/surface-laptop-studio.tablet
+@@ -0,0 +1,14 @@
++# This is for the Microsoft Surface Laptop Studio
++
++[Device]
++Name=Microsoft Surface Laptop Studio
++Class=PenDisplay
++DeviceMatch=virt|045e|0c1b
++Width=10
++Height=6
++IntegratedIn=Display;System;
++
++[Features]
++Stylus=false
++Touch=true
++Buttons=0
+-- 
+2.45.1
+
diff --git a/dev-libs/libwacom-surface/libwacom-surface-1.9.ebuild b/dev-libs/libwacom-surface/libwacom-surface-2.12.2.ebuild
similarity index 51%
rename from dev-libs/libwacom-surface/libwacom-surface-1.9.ebuild
rename to dev-libs/libwacom-surface/libwacom-surface-2.12.2.ebuild
index 7e90a1e..7e71c33 100644
--- a/dev-libs/libwacom-surface/libwacom-surface-1.9.ebuild
+++ b/dev-libs/libwacom-surface/libwacom-surface-2.12.2.ebuild
@@ -3,13 +3,14 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7..11} )
+PYTHON_COMPAT=( python3_{7..13} )
 
+###inherit eutils meson python-any-r1 toolchain-funcs udev
 inherit meson python-any-r1 toolchain-funcs udev
 
 DESCRIPTION="Library for identifying Wacom tablets and their model-specific features with patches from linux-surface"
 HOMEPAGE="https://github.com/linux-surface/linux-surface"
-SRC_URI="https://github.com/linuxwacom/libwacom/releases/download/libwacom-${PV}/libwacom-${PV}.tar.bz2"
+SRC_URI="https://github.com/linuxwacom/libwacom/releases/download/libwacom-${PV}/libwacom-${PV}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -19,7 +20,7 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
+	doc? ( app-text/doxygen )
 	test? (
 		${PYTHON_DEPS}
 		$(python_gen_any_dep '
@@ -54,17 +55,22 @@ pkg_setup() {
 S="${WORKDIR}/libwacom-${PV}"
 
 src_prepare() {
-	eapply "${FILESDIR}/1.9/01.patch"
-	eapply "${FILESDIR}/1.9/02.patch"
-	eapply "${FILESDIR}/1.9/03.patch"
-	eapply "${FILESDIR}/1.9/04.patch"
-	eapply "${FILESDIR}/1.9/05.patch"
-	eapply "${FILESDIR}/1.9/06.patch"
-	eapply "${FILESDIR}/1.9/07.patch"
-	eapply "${FILESDIR}/1.9/08.patch"
-	eapply "${FILESDIR}/1.9/09.patch"
-	eapply "${FILESDIR}/1.9/10.patch"
-	eapply "${FILESDIR}/1.9/11.patch"
+	eapply "${FILESDIR}/v2/0001-Add-support-for-BUS_VIRTUAL.patch"
+	eapply "${FILESDIR}/v2/0002-Add-support-for-Intel-Management-Engine-bus.patch"
+	eapply "${FILESDIR}/v2/0003-data-Add-Microsoft-Surface-Pro-3.patch"
+	eapply "${FILESDIR}/v2/0004-data-Add-Microsoft-Surface-Pro-4.patch"
+	eapply "${FILESDIR}/v2/0005-data-Add-Microsoft-Surface-Pro-5.patch"
+	eapply "${FILESDIR}/v2/0006-data-Add-Microsoft-Surface-Pro-6.patch"
+	eapply "${FILESDIR}/v2/0007-data-Add-Microsoft-Surface-Pro-7.patch"
+	eapply "${FILESDIR}/v2/0008-data-Add-Microsoft-Surface-Pro-7.patch"
+	eapply "${FILESDIR}/v2/0009-data-Add-Microsoft-Surface-Pro-8.patch"
+	eapply "${FILESDIR}/v2/0010-data-Add-Microsoft-Surface-Pro-9.patch"
+	eapply "${FILESDIR}/v2/0011-data-Add-Microsoft-Surface-Book.patch"
+	eapply "${FILESDIR}/v2/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch"
+	eapply "${FILESDIR}/v2/0013-data-Add-Microsoft-Surface-Book-2-15.patch"
+	eapply "${FILESDIR}/v2/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch"
+	eapply "${FILESDIR}/v2/0015-data-Add-Microsoft-Surface-Book-3-15.patch"
+	eapply "${FILESDIR}/v2/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch"
 
 	eapply_user
 }