From 2ae0cf4e1950a643283b74fb63441a96b4ce7e46 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 27 May 2013 17:06:15 +0200
Subject: [PATCH] pm-utils: dont install unneeded hooks and video quirks

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/pm-utils/install            |   6 -
 .../quirks/20-video-quirk-pm-acer.quirkdb     | 158 -------
 .../quirks/20-video-quirk-pm-apple.quirkdb    |  25 --
 .../quirks/20-video-quirk-pm-asus.quirkdb     | 114 -----
 .../quirks/20-video-quirk-pm-dell.quirkdb     | 172 --------
 .../quirks/20-video-quirk-pm-fujitsu.quirkdb  | 107 -----
 .../quirks/20-video-quirk-pm-hp.quirkdb       | 312 --------------
 .../quirks/20-video-quirk-pm-ibm.quirkdb      | 120 ------
 .../quirks/20-video-quirk-pm-lenovo.quirkdb   | 100 -----
 .../quirks/20-video-quirk-pm-misc.quirkdb     | 389 ------------------
 .../quirks/20-video-quirk-pm-samsung.quirkdb  |  26 --
 .../quirks/20-video-quirk-pm-sony.quirkdb     |  54 ---
 .../quirks/20-video-quirk-pm-toshiba.quirkdb  | 130 ------
 packages/sysutils/pm-utils/quirks/url.txt     |   1 -
 14 files changed, 1714 deletions(-)
 delete mode 100644 packages/sysutils/pm-utils/quirks/20-video-quirk-pm-acer.quirkdb
 delete mode 100644 packages/sysutils/pm-utils/quirks/20-video-quirk-pm-apple.quirkdb
 delete mode 100644 packages/sysutils/pm-utils/quirks/20-video-quirk-pm-asus.quirkdb
 delete mode 100644 packages/sysutils/pm-utils/quirks/20-video-quirk-pm-dell.quirkdb
 delete mode 100644 packages/sysutils/pm-utils/quirks/20-video-quirk-pm-fujitsu.quirkdb
 delete mode 100644 packages/sysutils/pm-utils/quirks/20-video-quirk-pm-hp.quirkdb
 delete mode 100644 packages/sysutils/pm-utils/quirks/20-video-quirk-pm-ibm.quirkdb
 delete mode 100644 packages/sysutils/pm-utils/quirks/20-video-quirk-pm-lenovo.quirkdb
 delete mode 100644 packages/sysutils/pm-utils/quirks/20-video-quirk-pm-misc.quirkdb
 delete mode 100644 packages/sysutils/pm-utils/quirks/20-video-quirk-pm-samsung.quirkdb
 delete mode 100644 packages/sysutils/pm-utils/quirks/20-video-quirk-pm-sony.quirkdb
 delete mode 100644 packages/sysutils/pm-utils/quirks/20-video-quirk-pm-toshiba.quirkdb
 delete mode 100644 packages/sysutils/pm-utils/quirks/url.txt

diff --git a/packages/sysutils/pm-utils/install b/packages/sysutils/pm-utils/install
index 40cbdde892..1125616f1b 100755
--- a/packages/sysutils/pm-utils/install
+++ b/packages/sysutils/pm-utils/install
@@ -67,20 +67,14 @@ mkdir -p $INSTALL/usr/lib/pm-utils/power.d
 mkdir -p $INSTALL/usr/lib/pm-utils/sleep.d
   cp $PKG_BUILD/pm/sleep.d/00logging $INSTALL/usr/lib/pm-utils/sleep.d
   cp $PKG_BUILD/pm/sleep.d/00powersave $INSTALL/usr/lib/pm-utils/sleep.d
-  cp $PKG_BUILD/pm/sleep.d/01grub $INSTALL/usr/lib/pm-utils/sleep.d
   cp $PKG_BUILD/pm/sleep.d/49bluetooth $INSTALL/usr/lib/pm-utils/sleep.d
-  cp $PKG_BUILD/pm/sleep.d/55NetworkManager $INSTALL/usr/lib/pm-utils/sleep.d
   cp $PKG_BUILD/pm/sleep.d/75modules $INSTALL/usr/lib/pm-utils/sleep.d
   cp $PKG_BUILD/pm/sleep.d/90clock $INSTALL/usr/lib/pm-utils/sleep.d
   cp $PKG_BUILD/pm/sleep.d/94cpufreq $INSTALL/usr/lib/pm-utils/sleep.d
   cp $PKG_BUILD/pm/sleep.d/95led $INSTALL/usr/lib/pm-utils/sleep.d
-  cp $PKG_BUILD/pm/sleep.d/98video-quirk-db-handler $INSTALL/usr/lib/pm-utils/sleep.d
   cp $PKG_BUILD/pm/sleep.d/99video $INSTALL/usr/lib/pm-utils/sleep.d
   chmod +x $INSTALL/usr/lib/pm-utils/sleep.d/*
 
-mkdir -p $INSTALL/usr/lib/pm-utils/video-quirks/
-  cp $PKG_DIR/quirks/*.quirkdb $INSTALL/usr/lib/pm-utils/video-quirks/
-
 mkdir -p $INSTALL/usr/sbin
   cp $PKG_BUILD/src/pm-powersave $INSTALL/usr/sbin
     ln -sf /usr/lib/pm-utils/bin/pm-action $INSTALL/usr/sbin/pm-hibernate
diff --git a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-acer.quirkdb b/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-acer.quirkdb
deleted file mode 100644
index f42701212c..0000000000
--- a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-acer.quirkdb
+++ /dev/null
@@ -1,158 +0,0 @@
-# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
- match system.hardware.vendor regex_ncase ^Acer
-  match system.hardware.product regex ^TravelMate
-   match system.hardware.product regex C300
-    addquirk --quirk-vbestate-restore
-   endmatch
-   match system.hardware.product regex 2350|2410|2420|2490|3220|4000|4650|5320
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-   endmatch
-   match system.hardware.product regex 3000|4100
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbestate-restore
-   endmatch
-   match system.hardware.product regex 2300|2310|3010|3020|6291
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-   match system.hardware.product regex 3260
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-    addquirk --quirk-pci-save
-   endmatch
-   match system.hardware.product regex 7520|8000
-    addquirk --quirk-s3-bios
-   endmatch
-   match system.hardware.product regex C100|6460
-    addquirk --quirk-vbe-post
-   endmatch
-   match system.hardware.product regex C200|2450|4400|6492
-    addquirk --quirk-none
-   endmatch
-  # <!-- Acer TravalMate 4002 Wlmi with ATI RadeOn Mobility 9700. mashine suspends, wakes up, but "vbetool post" hangs -->
-   match system.hardware.product regex 4000
-    match system.hardware.primary_video.product numeric_compare_eq 20048
-     match system.hardware.primary_video.vendor numeric_compare_eq 4098
-      addquirk --quirk-vbe-post
-      addquirk --quirk-vbemode-restore
-      addquirk --quirk-dpms-on
-     endmatch
-    endmatch
-   endmatch
-  # <!-- these need the full name to prevent mixes with other machines
-  # NOTE: HAL removes whitespaces at the end of the sysfs and dmidecode output,
-  # we need to do exact string matches.
-  # -->
-   match system.hardware.product regex ^(TravelMate 240|TravelMate 250|TravelMate 650)$
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbestate-restore
-   endmatch
-   match system.hardware.product regex ^TravelMate 380$
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbestate-restore
-    addquirk --quirk-s3-mode
-   endmatch
-  # <!-- TravelMate 630Lci -->
-   match system.hardware.product regex ^(TravelMate 630|TravelMate 230)$
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-   endmatch
-   match system.hardware.product regex ^TravelMate 660$
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-   match system.hardware.product regex ^TravelMate 800$
-    addquirk --quirk-vbe-post
-   endmatch
-  endmatch
-  match system.hardware.product regex ^Aspire
-   match system.hardware.product regex 5050
-    addquirk --quirk-s3-bios
-   endmatch
-   match system.hardware.product regex 1670|3610|3620|3690|5630
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-   endmatch
-   match system.hardware.product regex 5610
-   # <!-- report from s2ram for a 5610Z, not sure if the 5610 is the same, so do this check -->
-    match system.hardware.product regex 5610Z
-     addquirk --quirk-s3-bios
-     addquirk --quirk-s3-mode
-    endmatch
-    match system.hardware.product regex_inverse 5610Z
-     addquirk --quirk-vbe-post
-    endmatch
-   endmatch
-   match system.hardware.product regex 5000|5020|5500
-    addquirk --quirk-vbe-post
-   endmatch
-   match system.hardware.product regex 1640
-    addquirk --quirk-vbestate-restore
-   endmatch
-   match system.hardware.product regex 1500|3000
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbestate-restore
-   endmatch
-   match system.hardware.product regex 1520|1650|5100|5110|5570|5920
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-   match system.hardware.product regex 1690|1694
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbestate-restore
-    addquirk --quirk-no-fb
-   endmatch
-   match system.hardware.product regex 1350$
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-    addquirk --quirk-no-fb
-   endmatch
-   match system.hardware.product regex 2010|2920|3100|4520|5500Z|5580|5920G
-    addquirk --quirk-none
-   endmatch
-  endmatch
-  match system.hardware.product regex ^Extensa
-   match system.hardware.product regex 6220
-    addquirk --quirk-s3-bios
-   endmatch
-   match system.hardware.product regex 2900|3000|4150|5620
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-   endmatch
-   match system.hardware.product regex 5220
-    addquirk --quirk-s3-bios
-    addquirk --quirk-vbe-post
-   endmatch
-  endmatch
-  match system.hardware.product regex ^Ferrari
-   match system.hardware.product regex 4000
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbestate-restore
-    addquirk --quirk-no-fb
-   endmatch
-   match system.hardware.product regex 1000
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbestate-restore
-   endmatch
-  # <!-- does not work with fglrx -->
-   match system.hardware.product regex 5000
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-  endmatch
-  match system.hardware.product regex ^Xspire
-   match system.hardware.product regex 1650
-    addquirk --quirk-none
-   endmatch
-  endmatch
-  match system.hardware.product regex ^AcerPower
-   match system.hardware.product regex 2000
-    addquirk --quirk-none
-   endmatch
-  endmatch
- # <!-- Aspire One 110 -->
-  match system.hardware.product regex ^(AOA110|AOA150)
-   addquirk --quirk-none
-  endmatch
- endmatch
diff --git a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-apple.quirkdb b/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-apple.quirkdb
deleted file mode 100644
index e33bdf8a64..0000000000
--- a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-apple.quirkdb
+++ /dev/null
@@ -1,25 +0,0 @@
-# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
- match system.hardware.vendor regex ^Apple
-  match system.hardware.product regex ^MacBook2,1$
-   match system.hardware.vendor regex ^Apple Inc\.
-    match system.hardware.version regex ^1\.0$
-    # <!-- needs VBE_SAVE from console, but that slows resuming -->
-     addquirk --quirk-none
-    endmatch
-   endmatch
-   match system.hardware.vendor regex Computer, Inc\.
-    addquirk --quirk-vbe-post
-   endmatch
-  endmatch
-  match system.hardware.product regex ^(MacBook1,1|MacBook3,1)$
-  # <!-- s2ram uses vbe_post + vbemode_restore for MacBook1,1 -->
-   addquirk --quirk-vbestate-restore
-  endmatch
-  match system.hardware.product regex ^MacBookPro1,1$
-   addquirk --quirk-vbe-post
-  endmatch
-  match system.hardware.product regex ^MacBookPro2,2$
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbemode-restore
-  endmatch
- endmatch
diff --git a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-asus.quirkdb b/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-asus.quirkdb
deleted file mode 100644
index 7378a0063c..0000000000
--- a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-asus.quirkdb
+++ /dev/null
@@ -1,114 +0,0 @@
-# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
- match system.hardware.vendor regex ^ASUS
-  match system.hardware.product regex ^(U5F |M2000E|F2J )
-   addquirk --quirk-s3-bios
-  endmatch
-  match system.hardware.product regex ^(K8N-E-Deluxe|L2000D|M6Ne|M51Sr |U6S|A8N)
-   addquirk --quirk-s3-mode
-  endmatch
- # <!--NOTE: s2ram list the F3F with power_management.quirk.none=true -->
-  match system.hardware.product regex ^(M6VA|M6N |M5N|M7A|S6F|S5N |W3A|W5A |M2N |A2D |F3F |V6V|A8He|A6Kt |F3JC |F3Sc)
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-  endmatch
-  match system.hardware.product regex ^Z35FM 
-   addquirk --quirk-s3-bios
-   addquirk --quirk-pci-save
-  endmatch
-  match system.hardware.product regex ^(A6M|Z84F)
-   addquirk --quirk-vbe-post
-  endmatch
-  match system.hardware.product regex ^W7J
-   addquirk --quirk-vbemode-restore
-  endmatch
-  match system.hardware.product regex ^(L3000D|M3N |U3S |X51RL )
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbestate-restore
-  endmatch
-  match system.hardware.product regex ^F3Ka
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbestate-restore
-   addquirk --quirk-no-fb
-  endmatch
-  match system.hardware.product regex ^V1J 
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbemode-restore
-   addquirk --quirk-no-fb
-  endmatch
- # <!-- Z91E is identified as A3E -->
-  match system.hardware.product regex ^(A6J |A6U|A3E|F3JP)
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbemode-restore
-  endmatch
- # <!-- Asus Eee PC (Note: there is a report from s2ram to use vbe_post, vbemode_restore)-->
-  match system.hardware.product regex ^(701|900)$
-   addquirk --quirk-s3-bios
-   addquirk --quirk-dpms-on
-  endmatch
-  match system.hardware.product regex ^901$
-   addquirk --quirk-vbe-post
-  endmatch
- # <!-- these need no quirks, whitelist them -->
-  match system.hardware.product regex ^(A2H/L|A6Km|A6JC |A6K |A6T|A6G|A6VA|A8JS |F3Sg|F3T|F9E |G1S|K8V-MX|1000H|F2JE)
-   addquirk --quirk-none
-  endmatch
- endmatch
-# <!-- ASUS Laptop with different vendor string (M2400N) -->
- match system.hardware.vendor regex ^ERGOUK
-  match system.hardware.product regex ^M2N 
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-  endmatch
- endmatch
-# <!-- ASUS Mainboard with different vendor string -->
- match system.hardware.vendor regex ^System manufacturer$
-  match system.hardware.product regex ^P5Q DELUXE$
-   match system.firmware.version regex ^System Version
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-   endmatch
-  endmatch
-  match system.hardware.version regex ^P5KR
-   match system.hardware.product regex ^System Version
-    addquirk --quirk-none
-   endmatch
-  endmatch
- endmatch
-# <!-- Board with broken system.hardware.* fields. Use system.board.* instead -->
- match system.board.product regex ^P5LD2
-  addquirk --quirk-s3-bios
- endmatch
-# <!-- ASUS a7v600 motherboard, has no usable sys_* entries besides bios_version -->
- match system.firmware.version regex ^ASUS A7V600
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
-# <!-- another ASUS Mainboard -->
- match system.firmware.version regex ^(ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1201|ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1101|ASUS M2A-VM HDMI ACPI BIOS Revision 1603|ASUS A7V8X-X ACPI BIOS Revision)
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbemode-restore
- endmatch
- match system.firmware.version regex ^ASUS M2A-VM ACPI BIOS Revision
-  match system.firmware.version regex  1101
-   addquirk --quirk-s3-bios
-   addquirk --quirk-vbemode-restore
-  endmatch
-  match system.firmware.version regex_inverse  1101
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbemode-restore
-  endmatch
- endmatch
- match system.firmware.version regex ^ASUS P4B266 ACPI BIOS Revision
-  match system.firmware.version regex  1010
-   match system.hardware.primary_video.vendor numeric_compare_eq 0x1002
-    match system.hardware.primary_video.product numeric_compare_eq 0x4966
-     addquirk --quirk-s3-bios
-     addquirk --quirk-s3-mode
-    endmatch
-   endmatch
-  endmatch
- endmatch
-# <!-- another ASUS Mainboard, this need no quirk -->
- match system.firmware.version regex ^(ASUS M2N-E ACPI BIOS Revision|ASUS Striker ACPI BIOS Revision|ASUS A7V ACPI BIOS Revision)
-  addquirk --quirk-none
- endmatch
diff --git a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-dell.quirkdb b/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-dell.quirkdb
deleted file mode 100644
index 3dc5a39e8d..0000000000
--- a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-dell.quirkdb
+++ /dev/null
@@ -1,172 +0,0 @@
-# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
- match system.hardware.vendor regex ^Dell
- # <!-- Dell Latitude -->
-  match system.hardware.product regex ^Latitude
-   match system.hardware.product regex C500
-    addquirk --quirk-dpms-suspend
-    addquirk --quirk-vbe-post
-   endmatch
-   match system.hardware.product regex C600
-    addquirk --quirk-radeon-off
-   endmatch
-   match system.hardware.product regex C800
-    addquirk --quirk-vbemode-restore
-   endmatch
-   match system.hardware.product regex X300|D820
-   # <!-- the Dell D820 is also reported to work with vbe_post+vbemode_restore and
-   # need may dpms_on -->
-    addquirk --quirk-vbestate-restore
-   endmatch
-   match system.hardware.product regex CPx J800GT|D400|D410|D420|D430|D520|D530|C610|D620|D830
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-   match system.hardware.product regex C400|C840|D500|D505|D800|X200
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbestate-restore
-   endmatch
-   match system.hardware.product regex D600|D610
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbestate-restore
-    addquirk --quirk-no-fb
-   endmatch
-   match system.hardware.product regex D630
-    match system.firmware.version compare_lt A12
-     addquirk --quirk-vbe-post
-     addquirk --quirk-vbestate-restore
-     addquirk --quirk-no-fb
-    endmatch
-    match system.firmware.version compare_ge A12
-     addquirk --quirk-vbemode-restore
-    endmatch
-   endmatch
-   match system.hardware.product regex X1$
-    addquirk --quirk-vbe-post
-   endmatch
-  # <!-- these need no quirks -->
-   match system.hardware.product regex CPx J650GT|LS |D810
-    addquirk --quirk-none
-   endmatch
-  endmatch
- # <!-- Dell Inspiron -->
-  match system.hardware.product regex ^Inspiron
-   match system.hardware.product regex 1501|8600
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-    match system.hardware.primary_video.vendor numeric_compare_eq 0x1002
-     addquirk --quirk-radeon-off
-    endmatch
-   endmatch
-   match system.hardware.product regex 9300
-    addquirk --quirk-s3-bios
-   endmatch
-   match system.hardware.product regex  510m 
-    addquirk --quirk-vbe-post
-   endmatch
-   match system.hardware.product regex  5100 
-    match system.firmware.version regex ^Revision A0$
-     addquirk --quirk-vbe-post
-     addquirk --quirk-vbestate-restore
-     addquirk --quirk-pci-save
-    endmatch
-    match system.firmware.version regex_inverse Revision A0
-     addquirk --quirk-no-fb
-    endmatch
-   endmatch
-   match system.hardware.product regex 5150|8000|8500
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbestate-restore
-   endmatch
-   match system.hardware.product regex 500m|600m|1100|1420|1525|2200|5160
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-   match system.hardware.product regex 700m
-   # <!-- ONLY needed with i810 X.org driver 1.x versions,
-   # DO NOT use with intel X.org driver 2.x version (not needed and causes problems)
-   # <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
-   # <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
-   # <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
-   # <merge key="power_management.quirk.vga_mode3" type="bool">true</merge> -->
-    addquirk --quirk-none
-   endmatch
-  # <!-- these need no quirks -->
-   match system.hardware.product regex  1011| 1150| 1520| 1720
-    addquirk --quirk-none
-   endmatch
-  endmatch
- # <!-- Dell Precision -->
-  match system.hardware.product regex ^Precision
-   match system.hardware.product regex M20
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbestate-restore
-   endmatch
-   match system.hardware.product regex M6300 
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-   match system.hardware.product regex  M60
-    addquirk --quirk-vbestate-restore
-   endmatch
-   match system.hardware.product regex M65
-    addquirk --quirk-dpms-on
-    addquirk --quirk-vbe-post
-   endmatch
-  # <!-- these need no quirks -->
-   match system.hardware.product regex  M90 |WorkStation 360| M4300
-    addquirk --quirk-none
-   endmatch
-  endmatch
- # <!-- Dell Dimension -->
-  match system.hardware.product regex ^Dimension
-   match system.hardware.product regex 2400|3000|9100
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-  endmatch
- # <!-- Dell Vostro -->
-  match system.hardware.product regex ^Vostro
-   match system.hardware.product regex  1000 
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-   endmatch
-   match system.hardware.product regex  1500
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-   match system.hardware.product regex 1710
-    addquirk --quirk-none
-   endmatch
-  endmatch
- # <!-- Dell OptiPlex -->
-  match system.hardware.product regex_ncase ^OptiPlex
-   match system.hardware.product regex GX520|GX260
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-   match system.hardware.product regex 755
-    addquirk --quirk-vbe-post
-    addquirk --quirk-no-fb
-   endmatch
-   match system.hardware.product regex_ncase fx160
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-   endmatch
-   match system.hardware.product regex 170L|GX620
-    addquirk --quirk-none
-   endmatch
-  endmatch
- # <!-- Dell Inspiron 640m, XPS M1210 -->
-  match system.hardware.product regex MXC061|MXC062
-   addquirk --quirk-vbe-post
-  endmatch
- # <!-- Dell XPS M1330, MM061 = Inspiron E1505 or/and 6400 -->
-  match system.hardware.product regex XPS M1330|MM061
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbemode-restore
-  endmatch
- # <!-- these need no quirks : Dimension E520, DXP051, Inspiron: 1300, E1702/E1705, 630m, M1710 (only resumes with vesafb) -->
-  match system.hardware.product regex DM061 |DXP051|ME051|MP061|MXC051|MXG061|XPS M1530
-   addquirk --quirk-none
-  endmatch
- endmatch
diff --git a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-fujitsu.quirkdb b/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-fujitsu.quirkdb
deleted file mode 100644
index 4d78e7a203..0000000000
--- a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-fujitsu.quirkdb
+++ /dev/null
@@ -1,107 +0,0 @@
-# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
- match system.hardware.vendor regex ^FUJITSU
-  match system.hardware.product regex_ncase amilo
-   match system.hardware.product regex A1667G Serie|Pa 1510|Li 1718|M1425
-    addquirk --quirk-s3-bios
-   endmatch
-   match system.hardware.product regex Pro V3205|Pro Edition V3405|Pro Edition V3505|Xi 1546|Si 1520|A7640|Pi 1505|A1645
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-   endmatch
-   match system.hardware.product regex A1650G
-    addquirk --quirk-vbemode-restore
-   endmatch
-   match system.hardware.product regex ^M Series$
-    addquirk --quirk-vbestate-restore
-   endmatch
-   match system.hardware.product regex Amilo D Series|PRO V2030|PRO V2035|PRO V8010|Pi 1536|Pi 2515| L Series
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-   match system.hardware.product regex AMILO M|A Series
-    match system.hardware.version regex -1 |0\.01
-     addquirk --quirk-vbe-post
-     addquirk --quirk-vbestate-restore
-     match system.firmware.version regex ^R01-S0N
-      addquirk --quirk-pci-save
-     endmatch
-    endmatch
-   endmatch
-   match system.hardware.product regex A7645
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-    addquirk --quirk-vbestate-restore
-   endmatch
-   match system.hardware.product regex Pro V2040|Pro Series V3525
-    addquirk --quirk-none
-   endmatch
-  endmatch
-  match system.hardware.product regex_ncase lifebook
-   match system.hardware.product regex P7010D|S2110
-    addquirk --quirk-s3-bios
-   endmatch
-   match system.hardware.product regex E8410|T4010|S2210|P8010
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-   endmatch
-  # <!-- S7020 is also reported with s3_bios/s3_mode/pci_save -->
-   match system.hardware.product regex S7020
-    addquirk --quirk-vbe-post
-    addquirk --quirk-reset-brightness
-   endmatch
-   match system.hardware.product regex E4010|P7120
-    addquirk --quirk-vbestate-restore
-   endmatch
-   match system.hardware.product regex E8020|S6410
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-   match system.hardware.product regex T2010
-    match system.hardware.product regex ^FUJITSU SIEMENS$
-     addquirk --quirk-vbe-post
-     addquirk --quirk-vbestate-restore
-     addquirk --quirk-pci-save
-    endmatch
-    match system.hardware.product regex ^FUJITSU$
-     addquirk --quirk-s3-bios
-     addquirk --quirk-s3-mode
-    endmatch
-   endmatch
-   match system.hardware.product regex T4210|P7230
-    addquirk --quirk-pci-save
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-   endmatch
-   match system.hardware.product regex B Series|T Series|S7010|S7110|E8110|T301|T3010
-    addquirk --quirk-none
-   endmatch
-  endmatch
-  match system.hardware.product regex ^SCENIC
-   match system.hardware.product regex N300/N600|W300/W600|P / SCENICO P
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-   match system.hardware.product regex  W$
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-  endmatch
-  match system.hardware.product regex ^(ESPRIMO P|ESPRIMO Mobile M9400|ESPRIMO Mobile D9500)
-   addquirk --quirk-none
-  endmatch
-  match system.hardware.product regex ^Stylistic ST5000$
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-  endmatch
-  match system.hardware.product regex ^P6VAP-AP$
-   addquirk --quirk-none
-  endmatch
- endmatch
-# <!-- different vendor string -->
- match system.hardware.vendor regex ^FUJITSO
-  match system.hardware.product regex ^FMVLT70R$
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-   addquirk --quirk-pci-save
-  endmatch
- endmatch
diff --git a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-hp.quirkdb b/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-hp.quirkdb
deleted file mode 100644
index c4f39ae554..0000000000
--- a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-hp.quirkdb
+++ /dev/null
@@ -1,312 +0,0 @@
-# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-# <!-- Old Compaq machines. Add them to the HP file -->
- match system.hardware.vendor regex ^Compaq
- # <!-- Compaq Amada -->
-  match system.hardware.product regex ^Armada
-   match system.hardware.product regex     E500  |     M70  |    M700 
-    addquirk --quirk-none
-   endmatch
-  # <!-- This Armada m300 seems not to have a useful model description, so to make sure also check the bios_version-->
-   match system.hardware.product regex                                      
-    match system.firmware.version regex ^1\.35$
-     addquirk --quirk-none
-    endmatch
-   endmatch
-  endmatch
-  match system.hardware.product regex ^Evo
-   match system.hardware.product regex N600c
-    addquirk --quirk-vbe-post
-   endmatch
-   match system.hardware.product regex N800w 
-    addquirk --quirk-vbe-post
-   # <!-- VBE_MODE does not work, text size changes -->
-    match system.hardware.version regex ^F\.05$
-     addquirk --quirk-vbestate-restore
-    endmatch
-   # <!-- has a later BIOS and needs different Options -->
-    match system.hardware.version regex_inverse F\.05
-     addquirk --quirk-s3-bios
-     addquirk --quirk-s3-mode
-     addquirk --quirk-vbemode-restore
-    endmatch
-   endmatch
-   match system.hardware.product regex D510 USDT| N400c
-    addquirk --quirk-none
-   endmatch
-  endmatch
-  match system.hardware.product regex ^Presario
-   match system.hardware.product regex 2701EA
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbestate-restore
-    addquirk --quirk-no-fb
-   endmatch
-   match system.hardware.product regex V3000 \(EZ674UA#|V3700 Notebook PC
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-   endmatch
-   match system.hardware.product regex  X1000 
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbestate-restore
-   endmatch
-   match system.hardware.product regex  V2000 
-    addquirk --quirk-dpms-on
-   endmatch
-   match system.hardware.product regex V3000 \(EZ755UA#|V5000 \(ET826UA#|2100 \(DP835E\)|F500 \(GF596UA#|2200 \(PR309UA#|C700 \(GV681LA#
-    addquirk --quirk-none
-   endmatch
-  endmatch
-  match system.hardware.product regex ^N620c 
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-  endmatch
- endmatch
- match system.hardware.vendor regex ^Hewlett Packard$
-  match system.hardware.version regex ^HP OmniBook XE3 GF
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbestate-restore
-  endmatch
- endmatch
- match system.hardware.vendor regex ^Hewlett-Packard
-  match system.hardware.product regex ^COMPAQ MINI 500$
-   addquirk --quirk-s3-mode
-  endmatch
-  match system.hardware.product regex V2000 \(EP381UA#|X1000 \(DK454AV\)| 6715s|6820s
-   addquirk --quirk-s3-bios
-  endmatch
-  match system.hardware.product regex  8510w
-   match system.hardware.primary_video.vendor numeric_compare_eq 0x1002
-    addquirk --quirk-s3-bios
-   endmatch
-  endmatch
-  match system.hardware.product regex HP OmniBook XT1000
-   addquirk --quirk-s3-mode
-  endmatch
-  match system.hardware.product regex V3000 \(RL377PA#|EW434AVABA|R3000|R4100|nc6000
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-  endmatch
-  match system.hardware.product regex nx6125|nc6230|nx8220
-   addquirk --quirk-vbestate-restore
-   addquirk --quirk-no-fb
-  endmatch
-  match system.hardware.product regex OmniBook XE3 G|R3200|nx5000|nx7000|nc6120|nx6325|2510p
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbestate-restore
-  endmatch
- # <!-- yes, system.hardware.version is correct for this machine -->
-  match system.hardware.version regex ^HP OmniBook 6100 EB$
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbestate-restore
-  endmatch
- # <!-- Note: PY507ET# is a nc6120 -->
-  match system.hardware.product regex nc2400|nx6110|nc6120|nc6320|nx7300|6720s|2710p|8510p|PY507ET#|6715b
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbemode-restore
-  endmatch
-  match system.hardware.product regex 4410s
-  # <!-- ATI 0x1002:0x9552-->
-   match system.hardware.primary_video.vendor numeric_compare_eq 0x1002
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-  endmatch
-  match system.hardware.product regex M2000 \(EQ547PA
-   addquirk --quirk-s3-bios
-   addquirk --quirk-vbemode-restore
-  endmatch
-  match system.hardware.product regex tc4400|nc4400|tc4200|nx6120|nc4200|HP 530 Notebook PC
-   addquirk --quirk-vbe-post
-  endmatch
-  match system.hardware.product regex HP Compaq nc6400 
-   match system.hardware.version regex ^68YCU
-    match system.hardware.product regex \(EH522AV\)|\(EY582ES|\(RH560EA
-     addquirk --quirk-vbemode-restore
-     addquirk --quirk-vbe-post
-    endmatch
-   endmatch
-  endmatch
-  match system.hardware.product regex nx 7010
-   addquirk --quirk-s3-bios
-   match system.hardware.product regex DU394T#
-    addquirk --quirk-s3-mode
-   endmatch
-  endmatch
-  match system.hardware.product regex nx7400
-   addquirk --quirk-vbe-post
-   match system.firmware.version regex_inverse 68YGU
-    addquirk --quirk-vbemode-restore
-   endmatch
-  endmatch
-  match system.hardware.product regex HP Compaq dc5800 Small Form Factor|HP d330 uT| nw9440|nw8440
-   addquirk --quirk-none
-  endmatch
-  match system.hardware.product regex HP Compaq 2133|HP 2133
-   match system.firmware.version regex 68VGU
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-   endmatch
-  endmatch
- # <!-- Handle machines which have the same product string, but differ -->
-  match system.hardware.product regex 6510b
-   match system.hardware.product regex KE134EA
-    addquirk --quirk-none
-   endmatch
-   match system.hardware.product regex_inverse KE134EA
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbestate-restore
-   endmatch
-  endmatch
-  match system.hardware.product regex 6710b
-   match system.hardware.product regex KE123EA
-    addquirk --quirk-none
-   endmatch
-   match system.hardware.product regex KE124EA
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-  endmatch
-  match system.hardware.product regex 6710s
-   match system.firmware.version regex 68DDU
-    match system.hardware.product regex GC014ET
-     addquirk --quirk-vbe-post
-     addquirk --quirk-vbestate-restore
-    endmatch
-    match system.hardware.product regex_inverse GC014ET
-     addquirk --quirk-vbe-post
-     addquirk --quirk-dpms-on
-    endmatch
-   endmatch
-  endmatch
-  match system.hardware.product regex 6715b
-   match system.hardware.product regex GB835EA|RK156AV
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-   endmatch
-   match system.hardware.product regex GB834EA
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-   match system.hardware.product regex RM174UT
-    addquirk --quirk-s3-bios
-    addquirk --quirk-vbemode-restore
-   endmatch
-  endmatch
-  match system.hardware.product regex 6910p
-   match system.firmware.version regex 68MCD
-    match system.hardware.product regex GB951EA
-     addquirk --quirk-vbemode-restore
-    endmatch
-    match system.hardware.product regex ^HP Compaq 6910p$
-     addquirk --quirk-s3-bios
-     addquirk --quirk-s3-mode
-    endmatch
-   endmatch
-   match system.firmware.version regex_inverse 68MCD
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-  endmatch
-  match system.hardware.product regex nc4400
-   match system.firmware.version regex ^68YHV
-    addquirk --quirk-vbe-post
-    match system.firmware.version regex F\.08
-     addquirk --quirk-vbestate-restore
-    endmatch
-    match system.firmware.version regex_inverse F\.08
-     addquirk --quirk-vbemode-restore
-    endmatch
-   endmatch
-  endmatch
-  match system.hardware.product regex nx6310
-   match system.firmware.version regex ^68YDU
-    addquirk --quirk-none
-   endmatch
-   match system.firmware.version regex_inverse 68YDU
-    addquirk --quirk-vbe-post
-   endmatch
-  endmatch
-  match system.hardware.product regex_ncase Pavilion 
-   match system.hardware.product regex dv4000 \(ES973EA#
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbestate-restore
-    addquirk --quirk-no-fb
-   endmatch
-   match system.hardware.product regex dv4000 \(EB911EA#| dv2600| dv6500
-    addquirk --quirk-s3-bios
-   endmatch
-   match system.hardware.product regex dv4000 \(PX306UA#| dv6700 
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-   endmatch
-   match system.hardware.product regex zd8000 \(EL030EA#
-    addquirk --quirk-vbe-post
-   endmatch
-   match system.hardware.product regex ze2000
-    match system.hardware.product regex \(EK791EA#
-     addquirk --quirk-none
-    endmatch
-    match system.hardware.product regex_inverse \(EK791EA#
-     addquirk --quirk-s3-bios
-     addquirk --quirk-s3-mode
-    endmatch
-   endmatch
-   match system.hardware.product regex zt3300
-    match system.firmware.version regex 68BAL
-     addquirk --quirk-s3-bios
-    endmatch
-    match system.hardware.product regex PF083UA#
-     addquirk --quirk-none
-    endmatch
-   endmatch
-   match system.hardware.product regex  dv6000 
-    match system.hardware.version regex \(GA378UA#|\(GH907EA#
-     addquirk --quirk-s3-mode
-    endmatch
-   # <!-- note: (RP153UA#: suspend maybe only with binary nvidia module -->
-    match system.hardware.version regex \(EW434AV#|\(RP153UA#
-     addquirk --quirk-s3-bios
-     addquirk --quirk-s3-mode
-    endmatch
-    match system.hardware.version regex \(EY798AV#|\(GF688EA|\(RM469EA|\(RP980EA#
-     addquirk --quirk-none
-    endmatch
-   endmatch
-   match system.hardware.product regex ^HP Pavilion Notebook PC$
-    match system.hardware.version regex ^HP Pavilion Notebook$
-     match system.firmware.vendor regex ^Insyde Software$
-     # <!-- HP Pavilion ZT1000-IC -->
-      match system.firmware.version regex ^ IC\.M1\.04$
-       addquirk --quirk-s3-bios
-       addquirk --quirk-s3-mode
-       addquirk --quirk-vbemode-restore
-      endmatch
-     # <!-- HP Pavilion xz275  -->
-      match system.firmware.version regex ^ IC\.M1\.02$
-       addquirk --quirk-none
-      endmatch
-     endmatch
-    endmatch
-   endmatch
-   match system.hardware.product regex 8710p|dv2000|dv2500|tx1000|dv5000 \(EZ535UA#|HP d530 SFF|ze4900| dv9700 
-    addquirk --quirk-none
-   endmatch
-  endmatch
- endmatch
-# <!-- HP Media Center PC m7330n w/ ATI RS480 [Radeon Xpress 200G Series] -->
- match system.hardware.vendor regex ^HP Pavilion
-  match system.hardware.product regex M7330N
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbestate-restore
-  endmatch
-  match system.hardware.product regex ^(D7223K-ABA A650E|EJ192AA-ABS t3250\.se|EP198AA-UUZ t3335\.ch|ES061AA-ABD t3320|PC098A-ABA M1070N)$
-   addquirk --quirk-none
-  endmatch
- endmatch
- match system.hardware.vendor regex ^HP-Pavilion
-  match system.hardware.product regex RZ418AA-ABH s3020
-   addquirk --quirk-vbemode-restore
-  endmatch
-  match system.hardware.product regex ^RP829AV-ABA d4790y$
-   addquirk --quirk-none
-  endmatch
- endmatch
diff --git a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-ibm.quirkdb b/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-ibm.quirkdb
deleted file mode 100644
index a125b93e28..0000000000
--- a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-ibm.quirkdb
+++ /dev/null
@@ -1,120 +0,0 @@
-# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
- match system.hardware.vendor regex ^IBM$
-  match system.hardware.version regex ^ThinkPad R50e$
-   addquirk --quirk-save-pci
-   addquirk --quirk-dpms-on
-  endmatch
-  match system.hardware.version regex ^ThinkPad R51$
-   addquirk --quirk-none
-  endmatch
-  match system.hardware.version regex ^ThinkPad R51e$
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-  endmatch
- # <!-- 600e -->
-  match system.hardware.product regex ^2645
-   match system.firmware.version regex ^INET17WW$
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-   match system.firmware.version regex_inverse INET17WW
-    addquirk --quirk-vbestate-restore
-   endmatch
-  endmatch
- # <!-- A31-->
-  match system.hardware.product regex ^2652
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-  # <!--
-  # There are reports that this quirk makes 2652 crash/fail on second suspend (bnc#309742)
-  # <merge key="power_management.quirk.radeon_off" type="bool">true</merge>
-  # -->
-   addquirk --quirk-dpms-suspend
-  endmatch
- # <!-- X31, T30 , A31p-->
-  match system.hardware.product regex ^(2366|2367|2653)
-   addquirk --quirk-radeon-off
-  endmatch
- # <!-- X22, X40, X32 -->
-  match system.hardware.product regex ^(2662|2672|2673)
-   addquirk --quirk-radeon-off
-   match system.hardware.version regex_inverse X31
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-   endmatch
-  endmatch
- # <!-- X31 -->
-  match system.hardware.product regex ^(2672|2673|2884|2885|2890|2891)
-   match system.hardware.version regex X31
-    addquirk --quirk-dpms-suspend
-    addquirk --quirk-radeon-off
-   endmatch
-   match system.hardware.version regex X32
-    addquirk --quirk-dpms-suspend
-   endmatch
-  endmatch
- # <!-- T23(2647) -->
-  match system.hardware.product regex ^2647
-   addquirk --quirk-vbe-post
-  endmatch
- # <!-- R50p, R52, X41t, X40, T30, T41p, T41p, T42, X40, Z60t, X41, Z60m-->
-  match system.hardware.product regex ^(1832|1860|1869|2371|2373|2374|2376|2382|2386|2511|2513|2525|2526|2529|2530)
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-  endmatch
- # <!-- R52 ATI Mobility Radeon X300, G41 -->
-  match system.hardware.product regex ^(1846|1847|2886)
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbemode-restore
-  endmatch
- # <!-- T41 -->
-  match system.hardware.version regex ^ThinkPad T41$
-   addquirk --quirk-s3-bios
-  endmatch
- # <!-- T42, T42p -->
-  match system.hardware.product regex ^(2378|2379)
-   match system.hardware.version regex ^ThinkPad T42
-    addquirk --quirk-s3-bios
-   endmatch
-  endmatch
- # <!-- T43 -->
-  match system.hardware.version regex ^ThinkPad T43$
-  # <!-- ATI graphics -->
-   match system.hardware.primary_video.vendor numeric_compare_eq 0x1002
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbemode-restore
-   endmatch
-  # <!-- Intel graphics -->
-   match system.hardware.primary_video.vendor numeric_compare_eq 0x8086
-    addquirk --quirk-s3-bios
-    addquirk --quirk-s3-mode
-   endmatch
-  endmatch
- # <!-- G40 -->
-  match system.hardware.product regex ^2388
-   addquirk --quirk-vbestate-restore
-  endmatch
- # <!-- need no quirks: A21m, A21p, R32, R40 (2x)-->
-  match system.hardware.product regex ^(2628|2629|2658|2681|2722)
-   addquirk --quirk-none
-  endmatch
- # <!-- need no quirks: a X40, T40 -->
-  match system.hardware.version regex ^ThinkPad X40$
-   match system.firmware.version regex ^1UETD2WW
-   # <!-- one particular X40 was reported to need above quirks -->
-    addquirk --quirk-none
-   endmatch
-  endmatch
- endmatch
- match system.hardware.version regex ^ThinkPad T40 $
-  match system.firmware.version regex ^1RETDRWW
-   addquirk --quirk-none
-  endmatch
- endmatch
-endmatch
-match system.hardware.vendor regex ^IBM CORPORATION$
- match system.hardware.product regex ^(4800723|4800743|4800783|4800C43)$
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
-endmatch
diff --git a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-lenovo.quirkdb b/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-lenovo.quirkdb
deleted file mode 100644
index ffa794ae0c..0000000000
--- a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-lenovo.quirkdb
+++ /dev/null
@@ -1,100 +0,0 @@
-# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-match system.hardware.vendor regex ^LENOVO$
-# <!-- ThinkPads -->
-# <!-- X60 / X60s / T61 / T61p / R61 / R61s / X61(s/Tablet) / X300 -->
-# <!-- NOTE: there is a report that 6458 needs vbe_post/vbemode_restore -->
- match system.hardware.product regex ^(1702|1704|1706|1709|2007|2478|2479|4108|4141|4143|6088|6363|6364|6365|6378|6379|6480|6458|6463|6464|6465|6466|6467|6468|6471|6476|6477|6478|7642|7643|7644|7645|7646|7647|7648|7649|7650|7657|7658|7659|7660|7661|7666|7667|7668|7673|7732|7733|7734|7735|7736|7737|7738|7762|7763|7764|7767|7768|7669|7670|7671|7673|7674|7675|7676|7678|7679|8808|8895|8896|8897|8898|8899|8900|8919|8930|8932|8933|8934|8935|8936|8937|8938|8939|8942|8943|8944|8945|8946|8947|8948|9452)
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
- match system.hardware.product regex ^(63664DU|1705CTO)
-  addquirk --quirk-vbe-post
- endmatch
- match system.hardware.product regex ^6457
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbemode-restore
- endmatch
-# <!-- R60 -->
- match system.hardware.version regex_ncase ^ThinkPad R60
-  addquirk --quirk-s3-bios
- # <!-- R60e 32bit works with S3_MODE, 64bit needs VBE_MODE -->
-  match system.hardware.product regex ^0657
-   addquirk --quirk-vbemode-restore
-  endmatch
-  match system.hardware.product regex_inverse 0657
-   addquirk --quirk-s3-mode
-  endmatch
- endmatch
- match system.hardware.version regex ^ThinkPad 
- # <!-- T60* -->
-  match system.hardware.version regex T60$
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-  endmatch
- # <!-- Z61*, R61e ... -->
-  match system.hardware.version regex T60p|Z61m|Z61t|Z60m|Z61p|R61e
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-  endmatch
- # <!-- W500 -->
-  match system.hardware.version regex W500$
-   addquirk --quirk-vbe-post
-  endmatch
- endmatch
-# <!-- T61 -->
- match system.hardware.product regex ^7663
-  addquirk --quirk-s3-mode
- endmatch
-# <!-- T61 (8895), intel card 32bit works with S3_MODE, but 64bit needs VBE_MODE
-# T61p (6460), does not work with the NVidia driver-->
- match system.hardware.product regex ^(6460|6465)
-  addquirk --quirk-s3-bios
-  addquirk --quirk-vbemode-restore
- endmatch
-# <!-- T500 -->
- match system.hardware.product regex ^2242CTO$
-  match system.hardware.version regex ^ThinkPad T500$
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbestate-restore
-  endmatch
- endmatch
-# <!-- These Thinkpads don't need a quirk: 6459 (T61p), 7664 (T60) see s2ram -->
- match system.hardware.product regex ^(6459|7664|8918)
-  addquirk --quirk-none
- endmatch
-# <!-- Lenovos non-ThinkPads -->
- match system.hardware.version regex_ncase ^3000 C100
-  match system.hardware.product regex ^0761
-   addquirk --quirk-none
-  endmatch
- endmatch
- match system.hardware.version regex_ncase ^3000 N100
-  match system.hardware.product regex ^(068928U|07686VG|076831G|076835U|0768BYG)
-   addquirk --quirk-none
-  endmatch
-  match system.hardware.product regex ^07687MM
-   addquirk --quirk-s3-mode
-  endmatch
-  match system.hardware.product regex ^076804U$
-   addquirk --quirk-s3-bios
-   addquirk --quirk-vbemode-restore
-  endmatch
- endmatch
- match system.hardware.version regex_ncase ^3000 N200
-  match system.hardware.product regex ^(0769BBG|0769AC6)$
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-  endmatch
-  match system.hardware.product regex ^(0769B9G|0769BEG|0769AH9)$
-   addquirk --quirk-none
-  endmatch
- endmatch
- match system.hardware.version regex ^LENOVO3000 V100$
-  match system.hardware.product regex ^0763
-   addquirk --quirk-none
-  endmatch
- endmatch
- match system.hardware.product regex ^Soleil E660P
-  addquirk --quirk-none
- endmatch
-endmatch
diff --git a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-misc.quirkdb b/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-misc.quirkdb
deleted file mode 100644
index 26cda34887..0000000000
--- a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-misc.quirkdb
+++ /dev/null
@@ -1,389 +0,0 @@
-# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-match system.hardware.vendor regex ^AIRIS$
- match system.hardware.version regex ^VT6413A$
-  addquirk --quirk-s3-bios
- endmatch
-endmatch
-match system.hardware.vendor regex ^AnabelleB$
-# <!-- ASI Claro TW7M Notebook -->
- match system.hardware.version regex ^Claro TW7M$
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
-endmatch
-match system.hardware.vendor regex ^COMPAL
- match system.hardware.product regex HEL80C|HEL80I|HEL81I
-  addquirk --quirk-none
- endmatch
-endmatch
-match system.hardware.vendor regex DIXONSXP
- match system.hardware.product regex To be filled by O\.E\.M\.
-  match system.firmware.version regex ^Ver\.001$
-   addquirk --quirk-none
-  endmatch
- endmatch
-endmatch
-match system.hardware.vendor regex ERGOUK
- match system.hardware.product regex M2N
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
-endmatch
-match system.hardware.vendor regex ^JVC$
- match system.hardware.product regex ^J2N       $
-  addquirk --quirk-vbestate-restore
- endmatch
-endmatch
-match system.hardware.vendor regex ^LG
- match system.hardware.product regex ^(M1-3DGBG|W1-JDGBG|LM50-DGHE|LW75-SGGV1)$
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
- match system.hardware.product regex ^R500-U\.CPCBG$
-  addquirk --quirk-none
- endmatch
-endmatch
-match system.hardware.vendor regex MAXDATA
- match system.hardware.product regex ^PRO600IW$
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
- match system.hardware.product regex Pro 6100X
-  addquirk --quirk-vbe-post
- endmatch
- match system.hardware.product regex IMPERIO4045A
-  addquirk --quirk-none
- endmatch
-endmatch
-match system.hardware.vendor regex ^Matsushita
- match system.hardware.product regex ^CF-Y
-  addquirk --quirk-vbe-post
- endmatch
- match system.hardware.product regex CF-51E|CF-R3E|CF-R2C|CF-R6A|CF-R6M
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbemode-restore
- endmatch
- match system.hardware.product regex ^CF-W4G
-  addquirk --quirk-none
- endmatch
-endmatch
-# <!-- VIA EPIA M Mini-ITX Motherboard with onboard gfx -->
-match system.hardware.vendor regex ^VIA
- match system.hardware.product regex ^VT8623-8235$
-  addquirk --quirk-s3-mode
- endmatch
- match system.hardware.product regex ^K8N800$
-  match system.firmware.version regex ^VT8204B $
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbestate-restore
-  endmatch
- endmatch
- match system.hardware.product regex ^K8T400$
-  match system.hardware.version regex ^VT8204B $
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-  endmatch
- endmatch
- match system.hardware.product regex ^(KT400-8235|KT400A-8235)$
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
-endmatch
-match system.hardware.vendor regex ^AVERATEC$
- match system.hardware.product regex ^(3700 Series|1000 Series)$
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
- match system.hardware.product regex ^3200$
-  addquirk --quirk-vbestate-restore
- endmatch
- match system.hardware.product regex ^5500 Series$
-  addquirk --quirk-s3-mode
- endmatch
-endmatch
-match system.hardware.vendor regex ^BenQ
- match system.hardware.product regex ^Joybook R42$
-  addquirk --quirk-vbe-post
- endmatch
- match system.hardware.product regex ^(Joybook R22|Joybook R23|JoyBook 7000)$
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
- match system.hardware.product regex ^(Joybook S52|Joybook S32)$
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbemode-restore
- endmatch
-endmatch
-match system.hardware.vendor regex ^Elonex PLC
- match system.hardware.product regex M5A
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
-endmatch
-match system.hardware.vendor regex ^GERICOM
- match system.hardware.product regex HUMMER
-  match system.firmware.version regex ^1\.03   $
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbemode-restore
-  endmatch
- endmatch
- match system.hardware.product regex 259IA1
-  addquirk --quirk-none
- endmatch
-# <!-- work only from X, models from vendor: Gericom and MTC -->
- match system.hardware.product regex ^Montara-GML $
-  match system.hardware.version regex ^FAB-2$
-   addquirk --quirk-none
-  endmatch
- endmatch
-endmatch
-match system.hardware.vendor regex ^MTC
- match system.hardware.product regex ^Montara-GML$
-  addquirk --quirk-s3-bios
- endmatch
-endmatch
-match system.hardware.vendor regex_ncase ^micro-star
- match system.hardware.product regex ^(MS-1012|MS-1013)$
-  addquirk --quirk-s3-bios
- endmatch
- match system.hardware.product regex ^(MS-1057|U-100)$
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
- match system.hardware.product regex ^PR210$
-  match system.hardware.version regex ^MS-1222X$
-   addquirk --quirk-vbe-post
-  endmatch
- endmatch
- match system.hardware.product regex ^EX610$
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbemode-restore
- endmatch
- match system.hardware.product regex ^MS-1412$
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbestate-restore
-  addquirk --quirk-no-fb
- endmatch
- match system.hardware.product regex ^MS-1003$
-  addquirk --quirk-none
- endmatch
-endmatch
-match system.hardware.vendor regex ^MSI
- match system.hardware.product regex ^(MS-7350|MS-7207PV|MS-6417|MS-6702)$
-  addquirk --quirk-none
- endmatch
-endmatch
-match system.hardware.vendor regex ^MiTAC$
-# <!-- Mitac 8350
-# system.hardware.product = ''  (string)
-# system.hardware.serial = ''  (string)
-# system.hardware.uuid = '64DBBBB4-5631-DA11-8000-4E45435F4349'  (string)
-# system.hardware.vendor = 'MiTAC'  (string)
-# system.hardware.version = '5a'  (string)
-# -->
- addquirk --quirk-s3-bios
- addquirk --quirk-s3-mode
-endmatch
-match system.hardware.vendor regex ^MEDION
- match system.hardware.product regex WID2010
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbemode-restore
- endmatch
- match system.hardware.product regex MS-6714
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
- match system.hardware.product regex ^(MS-7012|M295M|WIM 2000 |WIM 2140)$
-  addquirk --quirk-none
- endmatch
-endmatch
-match system.hardware.vendor regex ^NEC
- match system.hardware.product regex B7 
-  addquirk --quirk-vbestate-restore
- endmatch
- match system.hardware.product regex ^VC2$
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
- match system.hardware.product regex ^NEC Versa Premium$
-  addquirk --quirk-none
- endmatch
-endmatch
-match system.hardware.vendor regex_ncase ^packard bell
-# <!-- this machines are strange, check also for rest of the vendor string -->
- match system.hardware.vendor regex  NEC
-  match system.hardware.product regex ^00000000000000000000000$
-   match system.hardware.version regex ^P820008416$
-    addquirk --quirk-none
-   endmatch
-   match system.firmware.version regex ^A03 $
-    addquirk --quirk-none
-   endmatch
-  endmatch
- endmatch
- match system.hardware.product regex ^EasyNote_SJ51$
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
-endmatch
-match system.hardware.vendor regex ^4MBOL
- match system.hardware.product regex ^7521 
-  match system.hardware.version regex ^REV\. A0$
-   addquirk --quirk-none
-  endmatch
- endmatch
-endmatch
-match system.hardware.vendor regex ^CLEVO$
- match system.hardware.product regex ^D500P$
-  addquirk --quirk-vbe-post
-  addquirk --quirk-no-fb
- endmatch
- match system.hardware.product regex ^M5X0JE$
-  addquirk --quirk-s3-bios
- endmatch
- match system.hardware.product regex ^M720SR$
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbemode-restore
-  addquirk --quirk-vbestate-restore
- endmatch
- match system.hardware.product regex ^TN120R$
-  addquirk --quirk-none
- endmatch
-endmatch
-# <!-- Clevo D410J laptop reports hardware vendor "VIA", product "K8N800" and version "VT8204B" -->
-match system.hardware.vendor regex ^VIA$
- match system.hardware.product regex ^K8N800$
-  match system.hardware.version regex ^VT8204B$
-   match system.firmware.version regex ^4\.06CJ15$
-    addquirk --quirk-vbe-post
-    addquirk --quirk-vbestate-restore
-   endmatch
-  endmatch
- endmatch
-endmatch
-match system.hardware.vendor regex ^ECS$
- match system.hardware.product regex ^536$
-  addquirk --quirk-vbe-post
-  addquirk --quirk-no-fb
- endmatch
-endmatch
-match system.hardware.vendor regex ^Elitegroup$
- match system.hardware.product regex ^ECS G320$
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbemode-restore
- endmatch
-endmatch
-match system.hardware.vendor regex ^Gigabyte Technology
- match system.hardware.product regex ^(945GCMX-S2|P35-DS4)$
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbemode-restore
- endmatch
- match system.hardware.product regex ^(945GZM-S2|945GCM-S2L)$
-  addquirk --quirk-none
- endmatch
-endmatch
-match system.hardware.vendor regex ^Infomash$
- match system.hardware.product regex ^RoverBook$
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbemode-restore
- endmatch
-endmatch
-match system.hardware.vendor regex ^Gateway
- match system.hardware.product regex MT6707
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
- match system.hardware.product regex ^MT6920
-  addquirk --quirk-vbe-post
- endmatch
- match system.hardware.product regex MX6922B 
-  addquirk --quirk-none
- endmatch
-endmatch
-match system.hardware.vendor regex ^MaxSelect$
- match system.hardware.product regex ^Mission_A330$
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbestate-restore
- endmatch
-endmatch
-# <!-- medion md 96400 -->
-match system.hardware.vendor regex ^NOTEBOOK$
- match system.hardware.product regex ^SAM2000$
-  match system.hardware.version regex ^0131$
-   addquirk --quirk-none
-  endmatch
- endmatch
-# <!-- medion MIM2080 -->
- match system.hardware.product regex ^MIM2080$
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
-endmatch
-match system.hardware.vendor regex ^NCA_GROUP_LTD$
- match system.hardware.product regex ^iRU_Notebook$
-  match system.hardware.version regex ^0106$
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbemode-restore
-  endmatch
- endmatch
-endmatch
-match system.hardware.vendor regex ^transtec AG
- match system.hardware.product regex ^(MS-1057|MS-1034)$
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
-endmatch
-match system.hardware.vendor regex ^To Be Filled By O\.E\.M\.$
- match system.hardware.product regex ^259IA1$
-  match system.hardware.version regex ^To Be Filled By O\.E\.M\.$
-   match system.firmware.version regex ^080010 $
-    addquirk --quirk-s3-mode
-   endmatch
-  endmatch
- endmatch
- match system.hardware.product regex ^MS-7210$
-  match system.hardware.version regex ^100$
-   addquirk --quirk-none
-  endmatch
- endmatch
-endmatch
-match system.hardware.vendor regex ^OEM$
-# <!-- rebranded Uniwill P53IN -->
- match system.hardware.product regex ^P53IN4$
-  addquirk --quirk-none
- endmatch
-endmatch
-match system.hardware.vendor regex ^OQO$
- match system.hardware.product regex ^ZEPTO$
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbestate-restore
- endmatch
-endmatch
-match system.hardware.vendor regex ^SHARP$
- match system.hardware.product regex ^PC-AR10 
-  addquirk --quirk-none
- endmatch
-endmatch
-match system.hardware.vendor regex ^Shuttle Inc$
- match system.hardware.product regex ^SD11V10$
-  addquirk --quirk-s3-bios
- endmatch
- match system.hardware.product regex ^SD30V10$
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
- match system.hardware.product regex ^SN41UV10$
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbemode-restore
- endmatch
- match system.hardware.product regex ^SN85V10$
-  addquirk --quirk-none
- endmatch
-endmatch
-match system.hardware.vendor regex ^ZEPTO$
- match system.hardware.product regex ^ZNOTE
-  match system.hardware.version regex ^3215W
-   addquirk --quirk-none
-  endmatch
- endmatch
-endmatch
diff --git a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-samsung.quirkdb b/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-samsung.quirkdb
deleted file mode 100644
index 0fee8fb81a..0000000000
--- a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-samsung.quirkdb
+++ /dev/null
@@ -1,26 +0,0 @@
-# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-match system.hardware.vendor regex_ncase ^Samsung
- match system.hardware.product regex ^(Q35/Q36|SM40S|SQ45S70S)$
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
- match system.hardware.product regex ^(SQ30|SQ35S|SX50S)$
-  addquirk --quirk-vbe-post
- endmatch
-# <!-- Samsung UMPC, P35 (NOTE: there is a s2ram report for CoronaR to need no quirks)-->
- match system.hardware.product regex ^(R40/R41|CoronaR|SX22S)$
-  addquirk --quirk-vbestate-restore
- endmatch
- match system.hardware.product regex ^(SX20S|SENS V25|NX05S)$
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbemode-restore
- endmatch
- match system.hardware.product regex ^SQ10$
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbestate-restore
- endmatch
-# <!-- these need no quirks to suspend/resume -->
- match system.hardware.product regex R50/R51|R55S|SR700
-  addquirk --quirk-none
- endmatch
-endmatch
diff --git a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-sony.quirkdb b/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-sony.quirkdb
deleted file mode 100644
index 0ce980be7d..0000000000
--- a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-sony.quirkdb
+++ /dev/null
@@ -1,54 +0,0 @@
-# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-match system.hardware.vendor regex ^Sony Corporation$
- match system.hardware.product regex ^VGN-FS115Z$
-  addquirk --quirk-s3-mode
- endmatch
- match system.hardware.product regex VGN-FS730|PCG-FX405|VGN-C2S_G|VGN-B1XP|VGN-FE21B|VGN-B100B||VGN-B1VP
-  addquirk --quirk-s3-bios
- endmatch
- match system.hardware.product regex ^(VGN-FS115B|VGN-C140G|VGN-TX3XP_L|VGN-T250P|VGN-AR31S|PCV-RX612|VGN-FS485B|VGN-SZ61XN_C|VGN-TZ37|VGN-TZ170N|VGN-FS920|VGN-C240E|PCG-FX601|VGN-SR11M)$
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
- endmatch
- match system.hardware.product regex ^VGN-NR120E$
-  addquirk --quirk-vbe-post
- endmatch
- match system.hardware.product regex ^(VGN-TX5MN_W|PCG-TR2A\(UC\)|VGN-UX50)$
-  addquirk --quirk-vbemode-restore
- endmatch
- match system.hardware.product regex PCG-FX340
-  addquirk --quirk-vbestate-restore
- endmatch
- match system.hardware.product regex PCG-FX802
-  addquirk --quirk-vbestate-restore
-  addquirk --quirk-vbemode-restore
- endmatch
- match system.hardware.product regex PCG-Z1MP
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbemode-restore
-  addquirk --quirk-vbestate-restore
- endmatch
- match system.hardware.product regex PCG-Z1RMP|VGN-TX770P|VGN-FW11|VGN-TX670P|PCG-V505ECP
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbemode-restore
- endmatch
- match system.hardware.product regex PCG-FX805
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbestate-restore
- endmatch
- match system.hardware.product regex PCG-FX905
-  addquirk --quirk-s3-bios
-  addquirk --quirk-s3-mode
-  addquirk --quirk-dpms-on
- endmatch
-# <!-- machines which need no quirks -->
-# <!-- Note:
-# - VGN-FE31M: only from X, S3_MODE hangs the machine, all other leave the screen blank
-# - VGN-SZ5XN_C: machine has two gfx cards, works only well with the intel, not with the nvidia -->
- match system.hardware.product regex ^(VGN-TX3HP|VGN-B55G\(I\)|VGN-FE31M|VGN-FS215B|VGN-FS660_W|VGN-SZ5XN_C|VGN-TZ21XN_B|PCG-FR215E|VGN-SZ340P|VGN-FE11M|VGN-TZ91HS|PCG-Z505HSK\(UC\)|VGN-FZ39VN|VGN-A115B|VGN-FE890E|VGN-N320E|VGN-C2S_H|VGN-FS215M|VGN-Z90S)$
-  addquirk --quirk-none
- endmatch
- match system.hardware.product regex VGN-TZ11|PCG-F430\(UC\)|PCG-GRT916Z|PCG-GRT995MP|PCG-GR7_K\(J\) 
-  addquirk --quirk-none
- endmatch
-endmatch
diff --git a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-toshiba.quirkdb b/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-toshiba.quirkdb
deleted file mode 100644
index 6922c6ddef..0000000000
--- a/packages/sysutils/pm-utils/quirks/20-video-quirk-pm-toshiba.quirkdb
+++ /dev/null
@@ -1,130 +0,0 @@
-# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-match system.hardware.vendor regex ^TOSHIBA$
-# <!-- Satellite Laptops -->
- match system.hardware.product regex ^Satellite
-  match system.hardware.product regex  M30X
-   addquirk --quirk-s3-bios
-  endmatch
-  match system.hardware.product regex Pro A120|M35X|P100|P200| P205D| A100| A105| A135| A200| A205| A210| L30| M105|M70|P30
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-  endmatch
-  match system.hardware.product regex  A215
-   addquirk --quirk-pci-save
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-  endmatch
- # <!-- need exact match for this machine to prevent mixup with M30x -->
-  match system.hardware.product regex ^Satellite Pro M30$
-   addquirk --quirk-dpms-on
-  endmatch
- # <!-- need exact match for this machine to prevent mixup with P105 or A100-->
-  match system.hardware.product regex ^(Satellite P10|Satellite A10)$
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-  endmatch
-  match system.hardware.product regex P105
-   addquirk --quirk-vbe-post
-  endmatch
-  match system.hardware.product regex L10|U305|M55
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbemode-restore
-  endmatch
-  match system.hardware.product regex A300D
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbestate-restore
-  endmatch
-  match system.hardware.product regex A30| 1130
-   addquirk --quirk-vbestate-restore
-  endmatch
-  match system.hardware.product regex Pro 6100
-   addquirk --quirk-dpms-on
-  endmatch
- # <!-- these need no quirks-->
-  match system.hardware.product regex A80|Pro4600| U200|Pro U300| U300
-   addquirk --quirk-none
-  endmatch
- endmatch
-# <!-- Tecra Laptops -->
- match system.hardware.product regex ^TECRA
-  match system.hardware.product regex 8100|8200| M9
-   addquirk --quirk-s3-mode
-  endmatch
-  match system.hardware.product regex ^T9000$
-   addquirk --quirk-vbemode-restore
-  endmatch
-  match system.hardware.product regex  M4
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbemode-restore
-  endmatch
-  match system.hardware.product regex  S2
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbestate-restore
-  endmatch
- # <!-- these need no quirks-->
-  match system.hardware.product regex  A8| A9| S3| S1
-   addquirk --quirk-none
-  endmatch
- endmatch
-# <!-- Portege Laptops -->
- match system.hardware.product regex ^PORTEGE
-  match system.hardware.product regex R200|R205|R500
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-  endmatch
-  match system.hardware.product regex M300
-   addquirk --quirk-s3-mode
-  endmatch
-  match system.hardware.product regex A100
-   addquirk --quirk-vbe-post
-   addquirk --quirk-vbestate-restore
-  endmatch
-  match system.hardware.product regex R100
-   addquirk --quirk-vbestate-restore
-  endmatch
- # <!-- these need no quirks-->
-  match system.hardware.product regex M400|4000
-   addquirk --quirk-none
-  endmatch
- endmatch
-# <!-- EQUIUM -->
- match system.hardware.product regex ^EQUIUM
-  match system.hardware.product regex  A100$
-   addquirk --quirk-s3-bios
-   addquirk --quirk-s3-mode
-  endmatch
- endmatch
-# <!-- Toshiba Portege 3490CT -->
- match system.hardware.product regex ^P3490$
-  addquirk --quirk-vbestate-restore
- endmatch
-# <!-- Toshiba Satellite S1110 -->
- match system.hardware.product regex ^S1110$
-  addquirk --quirk-s3-bios
- endmatch
- match system.hardware.product regex ^Portable PC$
-  match system.hardware.version regex ^Version 1\.0$
-  # <!-- PORTEGE 100, Toshiba Satellite 4080XCDT -->
-   match system.firmware.version regex ^(Version 1\.60|Version 7\.80)$
-    addquirk --quirk-s3-mode
-   endmatch
-  # <!-- Tecra A2 PTA20E-4M301VGR -->
-   match system.firmware.version regex ^Version 1\.20$
-    addquirk --quirk-none
-   endmatch
-  endmatch
- endmatch
- match system.hardware.product regex ^(P2000|P4000)
-  addquirk --quirk-vbe-post
-  addquirk --quirk-vbestate-restore
- endmatch
-# <!-- these need no quirks-->
- match system.hardware.product regex Libretto L5/TNK
-  addquirk --quirk-none
- endmatch
- match system.hardware.product regex ^SP4600$
-  match system.hardware.version regex ^Version 1\.0$
-   addquirk --quirk-none
-  endmatch
- endmatch
-endmatch
diff --git a/packages/sysutils/pm-utils/quirks/url.txt b/packages/sysutils/pm-utils/quirks/url.txt
deleted file mode 100644
index 8ad362e08a..0000000000
--- a/packages/sysutils/pm-utils/quirks/url.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://pm-utils.freedesktop.org/releases/pm-quirks-20100619.tar.gz
\ No newline at end of file