Use udev.pc pkg-config file to determine udevhelperdir and udevrulesdir. Dummy revision bump for UDisks2 because it has the same logic for --with-udevdir= in configure.ac.

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

4 files changed, 213 insertions, 10 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 29a24420d6a8..bff3bdeacb0d 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,15 @@
 # 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.102 2012/08/03 08:32:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.103 2012/08/06 11:46:40 ssuominen Exp $
+
+*udisks-1.99.0-r1 (06 Aug 2012)
+*udisks-1.0.4-r3 (06 Aug 2012)
+
+  06 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> +udisks-1.0.4-r3.ebuild,
+  +udisks-1.99.0-r1.ebuild:
+  Use udev.pc pkg-config file to determine udevhelperdir and udevrulesdir.
+  Dummy revision bump for UDisks2 because it has the same logic for
+  --with-udevdir= in configure.ac.
 
   03 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> udisks-1.99.0.ebuild,
   +files/udisks-2.x-pragma.patch:
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 327fd1dbb430..73b768745161 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX udisks-1.0.2-ntfs-3g.patch 198 SHA256 1db923f52619c2dcc6c30ffedcd47dedce048dbec2eb781088738e51f8dc0539 SHA512 3e9ba97d3d413e43df2c9e76dc88d9dc58d2f168509587228fc6c7b353111c9976b3cd1220bd4904d0e12ed2d804cd0807293a0982a8ee397692c676c567e716 WHIRLPOOL 365a00e248d6fe4ac7e5ce18a92b6f76611461ffe5c186e29eda521809381e3ec2c1bcc71b34f35513befdfcc99bec09fd741246a62e1b6feb48e95c31f841cc
 AUX udisks-2.x-ntfs-3g.patch 147 SHA256 62891ef17a4ee404e6d827ee38f8c2d8115fc8a847ef2ba842118c81b779ffad SHA512 5e4af424e4345318b7cb4caffed8793a8b0ef4e498792eba35e19e106a8d57b1ea3adc9929ccff51c208295720c0f699abe106ac7bb32fc9efdfb1b9e0dbf938 WHIRLPOOL 63dcba358fe51b695f38ca1aac256d51e680631771b40460a605e224f1d6487a662ad5e28431533bd12a895da3f3ba5610fee0297db105dd26579022be3b03de
@@ -7,17 +7,19 @@ AUX udisks-2.x-pragma.patch 988 SHA256 d260b28ccde0b55f548a62989e326acdf18241c93
 DIST udisks-1.0.4.tar.gz 719889 SHA256 854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5 SHA512 8c9ac4e234cd7680ab1b024dfa9786ec127961c6bbcef352f7bac09972a39632b824587718177ed35bf036702d716bc893a8f71a374bf99de79342a46907a8ac WHIRLPOOL 9fcbb7112258aec4f0fb4926246521b54805ca850e6ad9d951fda819945c2c15ced1798463da8ba49729ea525e2710c58e4180107b50ab0f1e07af2e494cc421
 DIST udisks-1.99.0.tar.bz2 729253 SHA256 f06d1947ac3c79f3de85ee17b7046da9d22dd9ab06cc75a985e767161704e176 SHA512 943d8e2f0b15a8d1e69ebc16008bf19374df6ecc127347d9bdc5bb55ec83fde74e10ce471813da38fd692832bd0dbebc8449425ee41526b7d721374786df57a4 WHIRLPOOL 5dfa9477c79266d3c1994107b1f9d5c050de71f54b1189026fc50ab687fc0f1d3f509304c510c054a5a89aba38a0e6d2335d555b4a91410d5254589b74cf112d
 EBUILD udisks-1.0.4-r2.ebuild 2350 SHA256 c262276dcbbf705c45def2692bb87a5d0a6ea9603ff9d0d366f9d248787109a0 SHA512 abc1800d58b0dc574b72f343bae54dd76cecbe2879843fcd5fa8d0f155ec43c7556c55c9f312bb0ea361adebd65d40f9ec750174ba4a03fec6bc1114b9ad0263 WHIRLPOOL 693d8c1e96db618fd24e086a9b8f9201820d12bdeac493290a017872444b7c4732b93e777aabc57c19c2a35f5739041df9e80f202f4585a8c8ff54dae9b0e484
+EBUILD udisks-1.0.4-r3.ebuild 2661 SHA256 472a258b228dc7f194ae78c96747d8a663969d2a16533cbeffd44068f20e6f5b SHA512 c1e9f569c26fd014fcd7dffbdcdbf168c43876b97240c0cf1afdf54762469a411d2de26e88464b323e55fcaa93498821930a19b6017c64901f1d1fe72ec03e98 WHIRLPOOL a353e8fec2af6306e99a74de8b97a80fc346a3dd2006b508bf287905001464c3d0bbb1be40c8466509e2259526ac1663737be71c61ab82c394b3f27a5353949a
+EBUILD udisks-1.99.0-r1.ebuild 2891 SHA256 294455976a56b762ad3a42f41646d7b68e36df3105b7e305e5283ac0dc52cd51 SHA512 bc58e16ccbb94e2d0ebce16b64db07d8133feeb621c1a806ff61ca62162b95bb20e676157842b58e9750b9b1399582d69cf2a07104d2e4c081670b15eb7a7420 WHIRLPOOL 9f6d641a3f5746fcfcead2466276dbbd6f42cd63928024239f9a77932f3f4862bdccd5f20f90344bbb740383cb7115254d9b5447f47556b3a5ce43f221576dee
 EBUILD udisks-1.99.0.ebuild 2888 SHA256 575eade13a070cf362a511ec6ec39da6daf75feb5446f5209d30a1cccb7f58a5 SHA512 7b2ecd1fa0f8f43e007221e9712105266c12050828473656306f31ec7fd9cb48a6683bbcf7808ec3e6169e7dbec74f6de8e29adfcdca6933783ff84c770a042b WHIRLPOOL e5ed2323af87d361338d875917f83f3e8f9f1904175db818957df24bc548b93f8d47c37da56a7a23873849c8036f7a55bf18c2836126a54dc4880f689b3eca4d
-MISC ChangeLog 14376 SHA256 7d8def1e8b8d6abd0798db4f1bf7d8888c4c5421c78a86ed701f6ec05d683f2a SHA512 b10e46474c97a9d2a685125fd6aa808d5634941159baa9154a5c23fc597855c94019e434b81775d10734cd4b3a6661846328318bce73678382aa1b9704b83f62 WHIRLPOOL 692047587f757fe6df4ede008260fd1d6ed27cf24caf7435de43ca33a0a8e132972f253864195f82787278777028c673d37bb51b4c04dcbcff7369a5915fc888
+MISC ChangeLog 14726 SHA256 f24d76e68bac1d8d1503742ef14283695089e80e7bd4d37664c6a06278fb94f7 SHA512 9b564714181a468d5e6baaf95832f9d57a1d22d120ce982b9767af4248b4b05dbe2a53c2a58c674d5e57f02326ceca0246e71c04f5f4523f07bfb36bcee52451 WHIRLPOOL 34a30147b40a5a28327de71b78356d5c07c7a21cddcb74d71cbabdb4fda0a457c540d96fe3689e59dececf227e8ca7655c90701f79c821e66a34e8353d5513f5
 MISC metadata.xml 673 SHA256 17e74f564943ba8dc4c7fcb8950755cf0cecdd88c9ab0fe7485ef2a363000f8c SHA512 f5004914ab449164d2cc9146a18215bbbffbf1fe09ed5078ea4cacc02ce83f0ce25b49a9e0e67c0cce6f7e0f0ff0099a0c3f66b59c36407ace837285525054bd WHIRLPOOL ed7342b97f9efcc5e5b88c543f34aa4b2228110685550ce7dfe8e3e0f1a3ce13a0aa0d36d49313156130578e78db030a5db03c603a9b1c2f78d097e6c54ba3dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJQG4xuAAoJEEdUh39IaPFN4sEIAKLZtEUAoNVJvnU6iLKaOdXC
-lzx3YlnJbHjUJbS+49bz/D/MusXrXzFN2hoEuGuA8IRQg4pSG5hW7720bQif/Rrs
-kg+4BQqOES4kCK5FV68ic33cvAA1k5WpJmWZytRy7BnC6RY2adNe4eEkkefJnE8J
-jBmbrtdvg3QidVMD47WaO7JAdJ6jrscXOkvjpwoBgvzh2JVQ+LTqTtea4zHULKUC
-czMqLyfsUxdChPJo64DyIBQyXMS05puZEbTVmk9QaurETrU7ZyjZHaMKoe79PPWb
-CAabf0amP+RZ7VrBUuUnzMvI2t7ub7LrqgLqFIRNQ8pMtnRaZNHC1X9faCj0sxI=
-=1Z1J
+iQEcBAEBCAAGBQJQH66cAAoJEEdUh39IaPFNLBgIAJzen7KHCNmBAclhLSOMLyDm
+cwUMbp0bZPnyDBK3HwYooOdWcBknlM34OuAKbsX0ZiZ/eWsq6YQSQPdk9Z2nboJA
+63gdjv+Lg1Pcj48wA2HXKW//3iTYzsq3bFhAip3xOdOoSZNTk2oI4ZOBpmv1EZKb
+gthIsa5OIMtb8Uj21dvWtTYCoZbnY2h2i0sk95w7WGjnGnaG3D+XaQaNJEF+ORB4
+c8c5vEqzfWcj1th60IxFaXL1kT1/AZg42fdZDNzGfyOZZ2TXL0oKD8LIXGGiUV1G
+OMF7RN073JJsXsuxvpJn7JvGq5cHpW2IGLywxHUftqGVOkO3w4V1B9n+xUH0wSU=
+=sBUx
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udisks/udisks-1.0.4-r3.ebuild b/sys-fs/udisks/udisks-1.0.4-r3.ebuild
new file mode 100644
index 000000000000..b838edc8c467
--- /dev/null
+++ b/sys-fs/udisks/udisks-1.0.4-r3.ebuild
@@ -0,0 +1,96 @@
+# 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-r3.ebuild,v 1.1 2012/08/06 11:46:40 ssuominen Exp $
+
+EAPI=4
+inherit eutils bash-completion-r1 linux-info toolchain-funcs
+
+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"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.98
+	>=dev-libs/glib-2.28
+	>=dev-libs/libatasmart-0.18
+	>=sys-auth/polkit-0.104-r1
+	>=sys-apps/dbus-1.4.20
+	>=sys-apps/sg3_utils-1.27.20090411
+	>=sys-block/parted-3
+	|| ( >=sys-fs/udev-171-r5[gudev,hwdb] <sys-fs/udev-171[extras] )
+	>=sys-fs/lvm2-2.02.66"
+# 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
+
+	local udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	sed -i -e "s:/lib/udev:${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() {
+	local udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+
+	emake \
+		DESTDIR="${D}" \
+		slashsbindir=/usr/sbin \
+		slashlibdir=/usr/lib \
+		udevhelperdir="${udevdir}" \
+		udevrulesdir="${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
+}
diff --git a/sys-fs/udisks/udisks-1.99.0-r1.ebuild b/sys-fs/udisks/udisks-1.99.0-r1.ebuild
new file mode 100644
index 000000000000..cfb9cd9e6a79
--- /dev/null
+++ b/sys-fs/udisks/udisks-1.99.0-r1.ebuild
@@ -0,0 +1,96 @@
+# 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.99.0-r1.ebuild,v 1.1 2012/08/06 11:46:40 ssuominen Exp $
+
+EAPI=4
+inherit eutils bash-completion-r1 linux-info systemd toolchain-funcs
+
+DESCRIPTION="Daemon providing interfaces to work with storage devices"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
+SRC_URI="http://udisks.freedesktop.org/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug crypt +gptfdisk +introspection systemd"
+
+COMMON_DEPEND=">=dev-libs/glib-2.32
+	>=sys-auth/polkit-0.106
+	>=dev-libs/libatasmart-0.19
+	>=sys-fs/udev-180[gudev,hwdb]
+	virtual/acl
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )
+	systemd? ( >=sys-apps/systemd-44 )"
+# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
+# util-linux -> mount, umount, swapon, swapoff (see also #403073)
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/util-linux-2.20.1-r2
+	>=sys-block/parted-3
+	virtual/eject
+	crypt? ( sys-fs/cryptsetup )
+	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.32
+	dev-util/intltool
+	>=sys-kernel/linux-headers-3.1
+	virtual/pkgconfig"
+
+DOCS="AUTHORS HACKING NEWS README"
+
+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+=" ~TMPFS_POSIX_ACL" #412377
+		CONFIG_CHECK+=" ~USB_SUSPEND" #331065
+		CONFIG_CHECK+=" ~SWAP" # http://forums.gentoo.org/viewtopic-t-923640.html
+		CONFIG_CHECK+=" ~NLS_UTF8" #425562
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.x-ntfs-3g.patch
+	use systemd || { sed -i -e 's:libsystemd-login:&use_USE_systemd:' configure || die; }
+	[[ $(gcc-version) < 4.6 ]] && epatch "${FILESDIR}"/${PN}-2.x-pragma.patch
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--disable-static \
+		--disable-silent-rules \
+		$(use_enable debug) \
+		--disable-gtk-doc \
+		$(use_enable introspection) \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		"$(systemd_with_unitdir)"
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+
+	local htmldir=udisks2
+	if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
+		dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir}
+	fi
+
+	rm -rf "${ED}"/etc/bash_completion.d
+	dobashcomp tools/udisksctl-bash-completion.sh
+
+	keepdir /var/lib/udisks2 #383091
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"/run #415987
+
+	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
+	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}