removing mask on zlib for pciutils/usbutils after talking to ssuominon on irc.

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 342be016f5893ab42b31e3d7cae7ea9c0d1fc2b3..30b0ee6ffdbfad28fa45dfe44edabb13d04d56b9 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for profile directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6078 2012/01/05 22:31:29 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6079 2012/01/06 00:17:47 williamh Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  06 Jan 2012; William Hubbs <williamh@gentoo.org>
+  default/linux/package.use.mask:
+  dropping mask for zlib on pciutils/usbutils after talking with ssuominon on
+  irc.
+
   05 Jan 2012; William Hubbs <williamh@gentoo.org>
   default/linux/package.use.mask:
   Mask zlib for sys-apps/pciutils and sys-apps/usbutils; needed for bug #360849

diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index 5368a5d1d6858abdd75052e5850911bf06461c69..0e87271c44c2d282a3f939b02d1dc8e8b808de5b 100644 (file)
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -1,27 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/package.use.mask,v 1.23 2012/01/05 22:31:29 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/package.use.mask,v 1.24 2012/01/06 00:17:48 williamh Exp $
 
 sys-devel/gcc hardened
 sys-libs/glibc hardened
 
-# William Hubbs <williamh@gentoo.org> (05 Jan 2012)
-# Udev does not support reading compressed hardware databases.
-# Upstream was approached about adding this functionality to udev;
-# however, the idea was rejected (see comment #28 of the bug below).
-# Since pciutils only stores the compressed database on disk when the
-# zlib use flag is on and usbutils is moving toward doing the same,
-# the udev maintainers (myself and Robin Johnson <robbat2@gentoo.org>)
-# agree that the best way forward for this bug is to package.use.mask
-# zlib for pciutils and usbutils until the upstreams agree or udev
-# upstream moves away from using the databases these packages provide.
-# This way, zlib support can be left on for everything else and neither
-# udev nor base-system needs to carry custom patches.
-# Please do not unmask without speaking to myself and Robin.
-# See bug #360849 for the details.
-sys-apps/pciutils zlib
-sys-apps/usbutils zlib
-
 # Markos Chandras <hwoarang@gentoo.org> (07 Aug 2011)
 # doc flag is not ready yet for media-video/mplayer2.
 # See bug #361075