add back original patch for #397953.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux i686

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 6517f31a4b616f71e5c2354ca507922475944941..1b61b5f952a70d75e6c1bdb99c1277a5c0e50566 100644 (file)
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.632 2012/01/04 00:36:37 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.633 2012/01/12 16:29:22 williamh Exp $
+
+  12 Jan 2012; William Hubbs <williamh@gentoo.org> files/udev-175-zlib.patch:
+  add back original patch for #397953.
 
   04 Jan 2012; William Hubbs <williamh@gentoo.org> -files/udev-175-zlib.patch,
   udev-175-r1.ebuild:

diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 514b9a0cca9fe06c4fe0c429ed7a97a9dc088797..2b1799f764a676ca4e8bf147a1c9131bde38c389 100644 (file)
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -84,7 +84,7 @@ AUX udev-150-fix-missing-firmware-timeout.diff 1065 RMD160 79a9fa2321d9d9fc6cf03
 AUX udev-151-readd-hd-rules.diff 2759 RMD160 5a3e52ce6442ef14f5f89faa36f98ddeb06fda00 SHA1 d954725615e963ba2854c0e4c0a424450e89280e SHA256 47eb3b3dd8c8c3199148aa083a47b2cbd29953b647b6ed06391424a353e6d39c
 AUX udev-164-remove-v4l1.patch 1263 RMD160 6fac54e8ef9810c57065f730e3fcacb0a47f9143 SHA1 491bdba9b141acff68b9cd18b65055d9f7f41b54 SHA256 df8a13ea471f40383438aa5133465f580841e5cd7a95aedc090d85f7389a6403
 AUX udev-167-revert-disable-all-extras.patch 1281 RMD160 fd62b74bc534aad58690615edc5cbeafcacf3b3e SHA1 3a822ef8b94d5d08cb80546de1b6b5a56b958fea SHA256 fb695c5032f30a2091554db4dcb2713025ffc7e01036e39910421776a54c95d0
-AUX udev-175-zlib.patch 2538 RMD160 fdbacc949ab91e0a1e25a3166e8c7429ab6c06cc SHA1 9997b3c15d6ff80498fae4b1b639e969e80b0fa0 SHA256 c45723fe523746f17baea14a68a2b9e4f3c301ea87c7c3636a7b23f393634c76
+AUX udev-175-zlib.patch 2699 RMD160 d0da79d2716ec55370b1f3e6b9039064bae6bf92 SHA1 c9f77c0d6583e8ac8036d8d638ab7dcdc017ccb3 SHA256 064d28cd5c57d3e73445517943c3da9dba98544db8edf025e3f5d98ec11266e4
 AUX udev-postmount-initd-111-r2 508 RMD160 e1f42197fe3003ec4691b768a921029ce085becb SHA1 7ceb08150d429bd6b5cef88d76847575c6e89f22 SHA256 607deb133ab4be0d2fcb16346e86b3d8ae00bd62d2cbc1329458f278a1b1ff5c
 AUX udev-start-113-r2.sh 6515 RMD160 2ecaa37fd9e498e60f8cd5978cb4f7930594cf99 SHA1 670bb1845ed70442fe598a5580101be75e2402c9 SHA256 438bc31605c8d2e50bebedd7fbff1410845738372ab3bc03d6f5ed1427ddd046
 AUX udev-start-114-r1.sh 6218 RMD160 a7348ac44768096b3da712a9be0ef4bf9af6ec17 SHA1 6dfcb9aed5e066d21bebee03d29137722db19b56 SHA256 a639a6f1093f05da197c3fc548c31f7078b2f0023f66f3caade0721c60819268
@@ -133,13 +133,13 @@ EBUILD udev-164-r2.ebuild 15295 RMD160 75fec2865a95ab50d08782acd69dded82b37de5a
 EBUILD udev-171-r5.ebuild 15561 RMD160 bc5f202faa0744571fd1ecb9f47ca92b47f5dc94 SHA1 f0d1b4e6d00795b5a8bc06df16687a94f2708502 SHA256 e2475435b4b20a2400585dca9845cf9244cd4ac914d463a1fc4910b099f3336c
 EBUILD udev-175-r1.ebuild 12652 RMD160 12df1ef9e4a3bdf7b77e54e9a9bcbbefa473d97b SHA1 955f3175a290f52cb4e3621da1054acdfc686ab5 SHA256 3896f79f3025c1669712bc8902d09438829e11a9c132fc8f1524776b96a5802c
 EBUILD udev-9999.ebuild 12396 RMD160 d4a0d680d94d316cde14158a702eaf47c51522b1 SHA1 77ee95bb85d56d8df66e70f47fb898c016c073c2 SHA256 e4624b5bc0643ad2cdbeeddbbbb2441c8d3ee30b9cffd9e45498f2c144eee9e0
-MISC ChangeLog 22931 RMD160 8044901a5d58c6b70b1eddc8629f351ce9223f4a SHA1 338fd0d377ccd3b6a360d46966a02fb8ba343c8d SHA256 3908e03b8d1a608220bc4820a92eccc6105b08b01f2871d7d3487f5fc2066150
+MISC ChangeLog 23049 RMD160 317e9a8c149db4f2cfd3a658123aafc94d10d5dc SHA1 844d3d0e04beed9fe767cfc777520c81f2e7c6db SHA256 ab4db377c6d8bbc8e77f9defe1f286eb9c82d746574afa50a41ddf5267a9f8e1
 MISC ChangeLog-2009 105929 RMD160 0c1dd5616962702fb0e85e4f9572fa27b0ee9d0f SHA1 d5635636ae54db968b8405a66be7d20c8d3f99ae SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c
 MISC metadata.xml 1235 RMD160 36ff4665ed99aa392ff8003e9351bd620cc79424 SHA1 3fd0e915598c248b5c7d609b6a98a4cde8431b05 SHA256 dbbbd093a910a5cb541d7be160f749dc87fc699d72165c184965fa056d60f24b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8GdqYACgkQblQW9DDEZTh6MwCdH4zKn4/iGesrrXGVEZ4UNtQF
-UcEAnRkwWCBBejoFRrPp8HjpZVLvLs31
-=IBkt
+iEYEARECAAYFAk8PCiEACgkQblQW9DDEZThdcwCglUIg0fPgwS0R+3zUTjgOzcLC
+qLwAoJ49t2aDEMzm9NU8TUVnTDZ3HXGh
+=ecCU
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/udev/files/udev-175-zlib.patch b/sys-fs/udev/files/udev-175-zlib.patch
index fb93bbbfdcbd171c2f009981c2f27a8e97234489..d6886d9abac73c06965c81127990cb5a55608be1 100644 (file)
--- a/sys-fs/udev/files/udev-175-zlib.patch
+++ b/sys-fs/udev/files/udev-175-zlib.patch
@@ -1,3 +1,7 @@
+https://bugs.gentoo.org/360849
+
+support opening the compressed pci/usb databases
+
 --- a/extras/usb-db/usb-db.c
 +++ b/extras/usb-db/usb-db.c
 @@ -90,19 +90,60 @@
@@ -86,4 +90,5 @@
  @ENABLE_HWDB_TRUE@extras_usb_db_pci_db_SOURCES = extras/usb-db/usb-db.c
 -@ENABLE_HWDB_TRUE@extras_usb_db_pci_db_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(PCI_DATABASE)\" -DBUILD_FOR_PCI
 +@ENABLE_HWDB_TRUE@extras_usb_db_pci_db_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(PCI_DATABASE)\" -DBUILD_FOR_PCI -DUSE_ZLIB
- @ENABLE_HWDB_TRUE@extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
+-@ENABLE_HWDB_TRUE@extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
++@ENABLE_HWDB_TRUE@extras_usb_db_pci_db_LDADD = libudev/libudev-private.la -lz