Update the udev removal patch to remove two more rule files, wrt #430872.

Package-Manager: portage-2.2.0_alpha120_p6/cvs/Linux x86_64

3 files changed, 33 insertions, 23 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index a1acf10c57b7..7b382395e7f5 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.38 2012/08/11 00:14:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.39 2012/08/11 07:34:30 mgorny Exp $
+
+  11 Aug 2012; Michał Górny <mgorny@gentoo.org>
+  files/0001-Disable-udev-targets.patch:
+  Update the udev removal patch to remove two more rule files, wrt #430872.
 
 *systemd-188 (11 Aug 2012)
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 6e94ec5766b8..e0af8e7a4347 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 0001-Disable-udev-targets.patch 8267 SHA256 53419139518c593f84655a5d60ad3b6bd7e552ed970afc8ead8897cb93256b9b SHA512 a332a5fd93136e68c9ba16bb03a3626625c2b869e92b4262de8d514ad5179812d763459f9e7d1c7808dbb5f1c82cf695d6d44c587e204a0bdc3281b996915ac5 WHIRLPOOL f3a93ac983c212d9807e59defc8e9c97128259b50ee6a452d012e20a8093c3daac1e658d822fd55556db7a3c2be0d411f5c4ca69c16af9773a0cbb5ead801cb8
+AUX 0001-Disable-udev-targets.patch 8537 SHA256 15a4e721b79744a136008c31f26047567a6f6f4cf7fa30953b22be1b838ab055 SHA512 c07c02b2f5e6af09585b04d13a6cf4504120690803022385baa91e4e90c887434de1b852ce915868faf6edb84a683bed5acca6d7fb8dd916d1fe8b2fda065042 WHIRLPOOL 38b833f0b601e65a2b518826bb075496b3c93298500a7897f7f73324e5ad374c2038d0e498533b35ec8ac6a1a8041293c114d08581bf967016c05830eecc7d81
 AUX 0001-util-never-follow-symlinks-in-rm_rf_children.patch 1262 SHA256 4bf6f7d0312f07614d2addece6b48f3301bb85de5f27c8b9729e11b1f4d9e36a SHA512 8ef4a893ad75522a334a5670426c6065da2225a392cde2f8e133b534a724300cb622813730202467ec108b5f527da1642f61d98bc8e604a0a9e11c727dabc24a WHIRLPOOL 250217791893ad70a4855aa3234b601af018ec0bedb2f61d41d0e623f2e49e42c765d53c0da8ea2bb33aa54c98d7710c9fa440983325551bf4c1c79e7c93f1dc
 AUX 0002-journal-PAGE_SIZE-is-not-known-on-ppc-and-other-arch.patch 2166 SHA256 935665adb6e6b515fe743463be226b109dabfb46491081ad910eb211fe1922f6 SHA512 74d3c25d170678593215f442a9578b327edb2307caa5299fe70137d80a4a9c4750f4c553a5b04e33f2c5994f57b536bf11bd3b53e12ea907fbb7ad439d94531e WHIRLPOOL b0d8b75325acbbe7a1f27401c85d0dc2fc0b4068b4b9648d9ad73423036024f4abccf0a82775ba98dbf053fc9daa46ca8043c091622e6370fb64f57a78a0c8ec
 AUX gentoo-run.conf 226 SHA256 a23fa3b35b4e9d5f1c41dc77cb5be1cec492eb903a57472df3d93a053db28ca7 SHA512 5fe5af27c99426bc1a3494fce9b6f0425cbfe11f6879c95d4efb4ea67b5b036f0573c49ad4396835f15a92a3d7424f6a453d951d63d0ae10d6af92e98e6848db WHIRLPOOL bfaa7425ee4b2c1467bc6fc9dc934d14a4fb43a9b5eaf61a13f5b2229648fe585a6e8d950082e2c2cedab1f938021dd3e29445ecbc72cc4a95056d00b6b7c9ed
@@ -12,14 +12,14 @@ DIST systemd-188.tar.xz 1348144 SHA256 e839ed6061db57933b956f5d6952d9ad9b5ec1608
 DIST systemd-44.tar.xz 885636 SHA256 7a5aac4b4b8b3a82bf59292f10e43d8f2c2d7039f34e95714f81d8edcb42233c SHA512 e1b9b69ce5381da04cd25154de45945cfbdbac061ff663c30a9d5ba063facfb6e42b876b7c12d72c217e71de812e95c7135683b2389dad292827a9711f746c5e WHIRLPOOL 684c00d1d63522264e999cb8eda7a4d28c76e4b7af77fe1da46a8706a95904d2abe20399ccec5443dca2c6a5f5e6ecc80620fd89431111244b66cb1a6cb3724e
 EBUILD systemd-188.ebuild 5195 SHA256 d40d4f3bb221414263abcfb57aa35190e0e3296e336df597d9296b74de94791a SHA512 8502ee1a40f6c50363dd7edddaaaa1ace5d9c10f90a05877d089e02f1bccb416297585a0348eca3a12b224b849a29f42ca9ce675f7bd5d3e3eaedbb99647f23c WHIRLPOOL 2c9c67f4a847ab150858899546106768006697c1cf8a86d1f40f312ff3f6980bb5f14b906e0bc04298799aac469793a81d344a1c0747cac17f353b36cd207c03
 EBUILD systemd-44-r2.ebuild 5802 SHA256 6fc03a866b72d522355b6e8231fb8c500e897a382868fd130d5247dcd5681115 SHA512 e7dcf76c7c55e6a7cce2944ed8615830b597b9f82a06d8ef54264dc09b3366d5abd7fdd21db769d3cb9ae183e266dc5a2fe5eeb6893a797ea92f8454f30775a9 WHIRLPOOL 56348c43ed186754d67acd50dd67cd9860a3724f560dd40ea4ea00eb046010a090f6cf7ea51fefd4476587d2b36a3217adcfb83906b9915be6ba8ce1ca0a40bb
-MISC ChangeLog 7504 SHA256 95ef109c74f5a6f6b672eeda9efe987337ae824d8681f1118f53495a9d881ca6 SHA512 5735bd20b918c30333c76b43ebcdb5141dee3cd97896909e776a5ef4b70bc34467547f5f5f11ce3697313d2f1957ff06cf36ac57875db752954d8f82c5559f0b WHIRLPOOL 1933ba0c8dfb3ceef08a2399ef91d2e5bf4004bc01d4f5ffdd565acacad795762221d0b36ea80dbe18f336b1bb73df1d76ef2d1960b8f108bd4ad7091e185f63
+MISC ChangeLog 7672 SHA256 2ff31caac4f3375bd001447a8d68764e88ca56a39ed1dcb39c1579b9e783a577 SHA512 351385a06676654db5d8bc5e15f04f1c74138c70041c9f303a3ba7a3ae3b0b21eb213098b56275f706e152fbd8a6cf9a9c0c73448fa25b36540cc81dc2215c94 WHIRLPOOL 8126520a62a5abd9ce85e50cf851d19e0d31a999bb1df710650b68488e872757cf05923a299f02c9a3fa4efd2e60cd9076cfc2d40fa76437f878ae8cbb32abcf
 MISC metadata.xml 715 SHA256 f76cb6cf763712acb350c2d55e73ec25f647bd745635f8d02882c6b33566970b SHA512 823838cbb6a5f3244de9860482c848675c2db51c4c79cd8a35942e396a5b7ab70019a8063acbc88cbacfacecdacf08b30736d50c1f75e0b87f0753d5101d9a15 WHIRLPOOL 99c3c0feeef834d7577129a40e0623b583c3951fc37bcce27513d74c3df2049e15b1d3c0acc7a897bbb305d1232247f7287d4123a535006fbc1ca3d135aeafdc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlAlpAQACgkQfXuS5UK5QB1ogQP/bxHidGdMrWJRMBZo1jQt6nxh
-edyrPFw5JZxNFrzOiQZVnIlVUU+st0or4ap9wJ8BKnSuUzH/v6RiMKPCTHCyKacp
-vUZZjbaA+yaJg15E6vahZiQyW3moWXN0lVc/GeWVMXv39qIaBkoPT9PXBLMDBgUy
-0Sn8QQENvt/C+TgSotM=
-=LOvM
+iJwEAQEIAAYFAlAmC0AACgkQfXuS5UK5QB1MuQP/UFDX8R9gMgUvJFphmlYG/H+4
+KUmQ9pcZoaDMv0Tt3IQsCEaQsM+Nwp0e2TjkDbJF183Zl7xqlMJRZunBNCJU+oyV
+mqm5i1pF2JxM7R5i7G/AGCzZEnaeP0LOLWECr6Fkc4bCvICH2/p/t37AfSr8ussr
+g1ZBto8eKHUgotPkF8c=
+=fbmZ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/files/0001-Disable-udev-targets.patch b/sys-apps/systemd/files/0001-Disable-udev-targets.patch
index 931d5fc9b029..8e1f0e99a387 100644
--- a/sys-apps/systemd/files/0001-Disable-udev-targets.patch
+++ b/sys-apps/systemd/files/0001-Disable-udev-targets.patch
@@ -1,14 +1,14 @@
-From 4d6860efaaaf14a99d18812c15aa063b43fe2834 Mon Sep 17 00:00:00 2001
+From 86f115fa46ed6af9717899e1e2251b68abd96d5b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Sat, 11 Aug 2012 01:38:23 +0200
 Subject: [PATCH] Disable udev targets.
 
 ---
- Makefile.am | 183 +-----------------------------------------------------------
- 1 file changed, 1 insertion(+), 182 deletions(-)
+ Makefile.am | 189 +-----------------------------------------------------------
+ 1 file changed, 1 insertion(+), 188 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 39afb62..2126383 100644
+index 39afb62..de22af7 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1588,12 +1588,6 @@ SUBDIRS += \
@@ -165,27 +165,33 @@ index 39afb62..2126383 100644
  EXTRA_DIST += \
  	src/udev/scsi_id/README
  
-@@ -1911,9 +1837,6 @@ v4l_id_SOURCES = \
+@@ -1911,12 +1837,6 @@ v4l_id_SOURCES = \
  v4l_id_LDADD = \
  	-ludev
  
 -udevlibexec_PROGRAMS += \
 -	v4l_id
 -
- dist_udevrules_DATA += \
- 	rules/60-persistent-v4l.rules
- 
-@@ -1925,9 +1848,6 @@ accelerometer_LDADD = \
+-dist_udevrules_DATA += \
+-	rules/60-persistent-v4l.rules
+-
+ # ------------------------------------------------------------------------------
+ accelerometer_SOURCES = \
+ 	src/udev/accelerometer/accelerometer.c
+@@ -1925,12 +1845,6 @@ accelerometer_LDADD = \
  	-ludev -lm \
  	libsystemd-shared.la
  
 -udevlibexec_PROGRAMS += \
 -	accelerometer
 -
- dist_udevrules_DATA += \
- 	rules/61-accelerometer.rules
- 
-@@ -2111,98 +2031,11 @@ nodist_keymap_SOURCES = \
+-dist_udevrules_DATA += \
+-	rules/61-accelerometer.rules
+-
+ # ------------------------------------------------------------------------------
+ if ENABLE_GUDEV
+ if ENABLE_GTK_DOC
+@@ -2111,98 +2025,11 @@ nodist_keymap_SOURCES = \
  BUILT_SOURCES += \
  	$(nodist_keymap_SOURCES)
  
@@ -284,7 +290,7 @@ index 39afb62..2126383 100644
  src/udev/keymap/keys.txt: Makefile
  	$(AM_V_at)$(MKDIR_P) $(dir $@)
  	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
-@@ -2230,12 +2063,6 @@ mtd_probe_SOURCES =  \
+@@ -2230,12 +2057,6 @@ mtd_probe_SOURCES =  \
  mtd_probe_CPPFLAGS = \
  	$(AM_CPPFLAGS)
  
@@ -297,7 +303,7 @@ index 39afb62..2126383 100644
  # ------------------------------------------------------------------------------
  libsystemd_id128_la_SOURCES = \
  	src/libsystemd-id128/sd-id128.c
-@@ -3244,14 +3071,6 @@ systemd_multi_seat_x_LDADD = \
+@@ -3244,14 +3065,6 @@ systemd_multi_seat_x_LDADD = \
  rootlibexec_PROGRAMS += \
  	systemd-multi-seat-x