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

(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 133 insertions, 1 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/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
+}