Remove usage of old pci-db and rely upon >=virtual/udev-196 dependency to bring us internal hwdb support wrt #447304 by "Konstantin"

Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 143 insertions, 5 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 3de462e4b280..ad5bb56aaf8a 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/udisks
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.108 2012/12/09 10:42:16 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.109 2012/12/15 21:04:13 ssuominen Exp $
+
+*udisks-1.0.4-r4 (15 Dec 2012)
+
+  15 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> +udisks-1.0.4-r4.ebuild,
+  +files/udisks-1.0.4-drop-pci-db.patch:
+  Remove usage of old pci-db and rely upon >=virtual/udev-196 dependency to
+  bring us internal hwdb support wrt #447304 by "Konstantin"
 
   09 Dec 2012; <swift@gentoo.org> udisks-1.0.4-r2.ebuild,
   udisks-1.0.4-r3.ebuild, udisks-2.0.0.ebuild:
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index fcfb4a15922c..ac8041ae34b7 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX udisks-1.0.2-ntfs-3g.patch 198 SHA256 1db923f52619c2dcc6c30ffedcd47dedce048dbec2eb781088738e51f8dc0539 SHA512 3e9ba97d3d413e43df2c9e76dc88d9dc58d2f168509587228fc6c7b353111c9976b3cd1220bd4904d0e12ed2d804cd0807293a0982a8ee397692c676c567e716 WHIRLPOOL 365a00e248d6fe4ac7e5ce18a92b6f76611461ffe5c186e29eda521809381e3ec2c1bcc71b34f35513befdfcc99bec09fd741246a62e1b6feb48e95c31f841cc
+AUX udisks-1.0.4-drop-pci-db.patch 1003 SHA256 f6e735063c492e9bb319762ff92639212b9c2ca9235be0c0758c734218cd591f SHA512 ec0b1fa0dc6b186c1fff0f2101d1216b7b10123b57e6bf008e4c5092d120f15d3ee0a7379b21c85e567756cb165947c3a46669e882c69162903b72f8ae0dcbb8 WHIRLPOOL 8472b2377ba87760c3c10218867d70498f9ec7bf3bc4c67691a2438ee79bd43dcca465fde343e799e721a181335bbab07150bc4fe90deb11e1092743140b67a2
 AUX udisks-1.0.4-kernel-2.6.36-compat.patch 1441 SHA256 6b9ebe47adde63876b890f90b22979dd53c26ffb7e38171e9bd0e152f22f48aa SHA512 da57b1f431606d04a0b4d0590ad58b8caa6a317c301dcb650bd08a9aca292cc983711ba27fd6a8f6e4d0cd4d05198f08a99bb3913eec6079cf73a5fa893f3e01 WHIRLPOOL 4c9a5df9a11841d20945d625510a495c23571d2568c0e2e71851dd6f9d6c044021be268c706931dc7895cbb7a36b9b8a8e8fe9d0a92b0407986e704f2264bbaf
 AUX udisks-2.x-ntfs-3g.patch 374 SHA256 3d3964bc7ea65aff3720e5afa6d98584a48b03c3a47aff11d888ac6e103b6aeb SHA512 572708d4386c3b90cf77f19cc54d38a2f588e4aec044caf4c74e6cfde8f2118f11a4aef5b63225163cf650b59b9c0a01eb77d679b0b398fa17b70fa1cdeb5013 WHIRLPOOL 962182b4f4c79acc8fa183d430e675346f56075724b3cabec49a3cf2511f85036a6cfe9234b9455f6dda97f739aab14f1f1b2893c0b2a1edd09351950ecafe5c
 AUX udisks-2.x-pragma.patch 988 SHA256 d260b28ccde0b55f548a62989e326acdf18241c93b4822688fc768f16757c1b9 SHA512 0dbce04d26f3a863356dbd88ebc33864321361ef7f35a622dc53ed06c403d177d779cbefce168301d52308a095e3548c3007200d23e60f5f804a582057e2961c WHIRLPOOL 95f8a33fec4a972d446e0a992f964b6c56dccad0b5540ce559a0cce82cd98d9e3c94108ce80a2fc97bd7f55332f2074b7be0a1c11df46df4141e20658041fb2a
@@ -9,13 +10,18 @@ DIST udisks-1.0.4.tar.gz 719889 SHA256 854b89368733b9c3a577101b761ad5397ae75a051
 DIST udisks-2.0.0.tar.bz2 747405 SHA256 aa026a5a865688a2e9e430a389c7636c1a556d980539e4bd4a3f31dc5d4fe1eb SHA512 87522f5998ff7b67ad157700803441f7179f23a43e29e804f5e152501c7fc88a08d2633175004449378dd34f5d7fed8138398110c1441eb6bb904cd0284b4e9b WHIRLPOOL 7d8221301c206bb91802d54d97d71c7e96c1ef1c0c9ca37078a98b3a08d0cf0bac1027b15af98c21bc20645155c8425991392c2296c853ab6cc6163f47074df1
 EBUILD udisks-1.0.4-r2.ebuild 2359 SHA256 4ba023701e1a5c12d0dd0e58afdd63bb24dd3e323e3002ec9b102fd7a50e361b SHA512 64d95d89544fae58e57ae24f6483782377ab98deb8e0cd1b636697c9e0da30b04a89c811ba40f72fba0cea2f7c684bdd457176bf9c77b53c430b9e6756c187c9 WHIRLPOOL 9917d22798d023581445ac171c1acc6311f8ee5c3ac50fbbe07e418a617354853fcab5d64a17dfa225077efd1dec6f25875679e09e4d72b60f87aa356bdf8090
 EBUILD udisks-1.0.4-r3.ebuild 2607 SHA256 06999c144cd22a45e86d9b38b2f8e1d0b96da5db229e009e89e7072ada4d664b SHA512 99adcf58794eaccba0be35864e3686dc0899e4aeb69c66390f887ba13ddc2307268d6de6ffef0c2bd950265522ddf3da5b7655fd37d46f9425b56cf77f86c459 WHIRLPOOL eb57ce44b75f63e9798bc92e0d3a17cb76080cb8b4252c3431e4c39c87c97b08ad3ed4682917178a7aebff174331a10dca5fde29f2c48ebb3499ea33f4e5f2a0
+EBUILD udisks-1.0.4-r4.ebuild 2658 SHA256 1ac1659efd33b296a28a52457186c9fc2698974b64895f971b38776c75f2f6f0 SHA512 cbc999429acd029b75aeeb25286ccddd09ae09c48d3d0dcfd22457cf194bacf7e99f5485db5c1df12783ce7c620b4335f48df3e992f46079159d597dd794179a WHIRLPOOL cb82eb52228a4959393df7c71fbab8dc2060c575a1d090f712201ffbd229440757304fe64191492b6dfd435c009213a34d3b723ed0fd575a59a0d40da90f7ab4
 EBUILD udisks-2.0.0.ebuild 2924 SHA256 4305fda540f7f80f55c68d638ed1789a80b72cf0eaba3ea333b5a8534452603d SHA512 e9b64b94fa5a77188d5bc7fcae131e5ee0a5769a2dd79859cc3123ef65742a3736cf7b3481a0b9c16b05ad8b9d72659eefba59f137f2e737331c6643663669cc WHIRLPOOL 125bd1cb2b3ddc6d7ed652014266fdce3b0779d8f997f3ee70ed63ea35d90d02de7301601c865d82e804b4b0eb706bc9339e50ef7dc169138babfb230fbb2bc3
-MISC ChangeLog 15519 SHA256 a0b16329e7b937eea2dfff466637bdcfdf4b47d9618a4a2331ba745255f929df SHA512 f72ad0cb2d6e925b345d48c58fed088e9626431b979fe631fab4bc93f2d9670f65d82a6b7798913b4428a284732bf89ad41362f672abb0892a655894a5f2011e WHIRLPOOL 4974aa50ae4b018d189d267af66e60dcb844dd447337368d2d764bdcec3526d8e34570797dc50f2b20f1588a095ac1e1f5a9a49563294e64a1b5ee633fc643a3
+MISC ChangeLog 15813 SHA256 99ba021449c63b1b977625e45f8691d1dcf1080fc366e0d58e5e6370b5a9ccc1 SHA512 8ce5cf0e2f981b5af54ed7ff95985664b216849a3f3febe769bfb1deae55033ba0352a11e2580913c165208b75825ebb38f70c933944688c7029ccdf1d5ef040 WHIRLPOOL fd67aeea263dc973a26d995a78d136257a7658e27920fd2ec88772e1928c7dc8ea8a7f922e7e0b41dac9e91a44b03fc3700aab0101356ce2bb09073fd1936d51
 MISC metadata.xml 673 SHA256 17e74f564943ba8dc4c7fcb8950755cf0cecdd88c9ab0fe7485ef2a363000f8c SHA512 f5004914ab449164d2cc9146a18215bbbffbf1fe09ed5078ea4cacc02ce83f0ce25b49a9e0e67c0cce6f7e0f0ff0099a0c3f66b59c36407ace837285525054bd WHIRLPOOL ed7342b97f9efcc5e5b88c543f34aa4b2228110685550ce7dfe8e3e0f1a3ce13a0aa0d36d49313156130578e78db030a5db03c603a9b1c2f78d097e6c54ba3dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDEawUACgkQXfqz7M26L9uXPwCfcCihCfFRks278VZKiuSm8NMl
-DVoAnRDhiTOdqUW6k+iOuvg9Iu3l/7G6
-=IbFa
+iQEcBAEBCAAGBQJQzOXPAAoJEEdUh39IaPFN1EIH/AiDXH2i69S8Nzq8GbhucefA
+IZImoVDC2czqZXfMp4PuvaSdCvOpy/y6Pywjg262uDOXCQThHWDgNw9otJdpLN2S
+YCDu44e5wMb0lqWkTOoh/VvtXUbanRHi9dZn6tRe1tF2juwbrLwr/BNUKAtL/Q1L
+tyzu/uZ3pt/FKL3w1kc/4EWRjaRDym//AQSVCj7v3AuQt+yLTKYJY0/1Wlh+vH4Q
+yRDG/Q40+96UiFgPXvVDWvLL8tcSTBy6tOssGIP0txf1+bdjDdJzz22vjveh8uQQ
+aXMPhEnZNAuNdwStCL5BgthHtnH0ElKPTlbG9j9qV5vcVUs/Cc5GjDj4BrZjlWw=
+=fEGD
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udisks/files/udisks-1.0.4-drop-pci-db.patch b/sys-fs/udisks/files/udisks-1.0.4-drop-pci-db.patch
new file mode 100644
index 000000000000..852835b0287e
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-1.0.4-drop-pci-db.patch
@@ -0,0 +1,28 @@
+commit c73b5ab54378ec6d7df9948c46ce87f98587af9a
+Author: Tom Gundersen <teg@jklm.no>
+Date:   2 days ago
+
+    udev: remove redundant call to deprecated pci-db
+
+    The binary is no longer shipped with systemd/udev. The functionality
+    is taken over by a builtin, which is ran for all devices, rendering
+    this rule superfluous.
+
+    Cc: Jan de Groot <jgc@archlinux.org>
+    Signed-off-by: Tom Gundersen <teg@jklm.no>
+
+diff --git a/data/80-udisks.rules b/data/80-udisks.rules
+index d1c8c5d..4bf2b37 100644
+--- a/data/80-udisks.rules
++++ b/data/80-udisks.rules
+@@ -1,10 +1,6 @@
+ # Do not edit this file, it will be overwritten on updates
+ #
+
+-# import names for PCI storage controllers
+-#
+-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p"
+-
+ # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure
+ # the device is on a cardbus controller (upper PCI device) - then we check
+ # vid/pid (lower PCI device)
diff --git a/sys-fs/udisks/udisks-1.0.4-r4.ebuild b/sys-fs/udisks/udisks-1.0.4-r4.ebuild
new file mode 100644
index 000000000000..b3dbc9fd707a
--- /dev/null
+++ b/sys-fs/udisks/udisks-1.0.4-r4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.4-r4.ebuild,v 1.1 2012/12/15 21:04:13 ssuominen Exp $
+
+EAPI=5
+inherit eutils bash-completion-r1 linux-info udev
+
+DESCRIPTION="Daemon providing interfaces to work with storage devices"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
+SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="debug nls remote-access selinux"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.30
+	>=dev-libs/libatasmart-0.19
+	>=sys-auth/polkit-0.104-r1
+	>=sys-apps/dbus-1.6
+	>=sys-apps/sg3_utils-1.27.20090411
+	>=sys-block/parted-3
+	>=sys-fs/lvm2-2.02.66
+	>=virtual/udev-196[gudev,hwdb]
+	selinux? ( sec-policy/selinux-devicekit )"
+# util-linux -> mount, umount, swapon, swapoff (see also #403073)
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/util-linux-2.20.1-r2
+	virtual/eject
+	remote-access? ( net-dns/avahi )"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/intltool
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# Listing only major arch's here to avoid tracking kernel's defconfig
+	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
+		CONFIG_CHECK="~!IDE" #319829
+		CONFIG_CHECK+=" ~USB_SUSPEND" #331065
+		CONFIG_CHECK+=" ~NLS_UTF8" #425562
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.0.2-ntfs-3g.patch \
+		"${FILESDIR}"/${P}-kernel-2.6.36-compat.patch \
+		"${FILESDIR}"/${P}-drop-pci-db.patch
+
+	sed -i -e "s:/lib/udev:$(udev_get_udevdir):" data/80-udisks.rules || die
+}
+
+src_configure() {
+	# device-mapper -> lvm2 -> mandatory depend -> force enabled
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--disable-static \
+		$(use_enable debug verbose-mode) \
+		--enable-man-pages \
+		--disable-gtk-doc \
+		--enable-lvm2 \
+		--enable-dmmp \
+		$(use_enable remote-access) \
+		$(use_enable nls) \
+		--with-html-dir="${EPREFIX}"/deprecated
+}
+
+src_test() {
+	ewarn "Skipping testsuite because sys-fs/udisks:0 is deprecated"
+	ewarn "in favour of sys-fs/udisks:2."
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		slashsbindir=/usr/sbin \
+		slashlibdir=/usr/lib \
+		udevhelperdir="$(udev_get_udevdir)" \
+		udevrulesdir="$(udev_get_udevdir)"/rules.d \
+		install #398081
+
+	dodoc AUTHORS HACKING NEWS README
+
+	rm -f "${ED}"/etc/profile.d/udisks-bash-completion.sh
+	newbashcomp tools/udisks-bash-completion.sh ${PN}
+
+	prune_libtool_files --all
+
+	keepdir /media
+	keepdir /var/lib/udisks #383091
+
+	rm -rf "${ED}"/deprecated
+}