diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest index 7cd10507b..297b12169 100644 --- a/sys-fs/udisks/Manifest +++ b/sys-fs/udisks/Manifest @@ -1,2 +1 @@ -DIST udisks-2.0.92.tar.bz2 820346 SHA256 a0214326ba10c45db9ad5875a83e1bb40a77af82bc5fd2cbc1bdb5891b257663 SHA512 8cd1753838beea52389499c46f95940a202dac7ff23dbca9b258f5108f959aee86188d1be4dd8389636f1d7329acb85d9d695f304a1a5fefa8b568c0ead02948 WHIRLPOOL 9feb5a607b0f8f52a310f03bd4474a485bcc177cde3cdffab2cdb983f4d0e5b13d7a9693c726a9d6c74c21f7a3a2b890fad8810bc7c0315669865a75a91b748b -DIST udisks-2.1.0.tar.bz2 823805 SHA256 310208e5a10335dae4b52a0125c24d31cf292cce3d15cf65da4cd308e38d15a8 SHA512 dffbceda998aee62f56819111db7c33fd65b8295d14885f28f8209be332ab319353116d51e2c006e434865ac515db04c7d8f5d2639ab9870247cf49136747811 WHIRLPOOL a891e1fed94b6c516a31b291ae4bfcfb8764df51f93781a6da4b1aa4051b7164ddb5ba7d28067dd4418c756af3056dddabc952f531c4d78c8ff60e7ce305835a +DIST udisks-2.1.1.tar.bz2 837872 SHA256 013b09ff38aa256b89c01525771f4565cb088724d5c8c79b32e9f811e88086fb SHA512 d232bcf60365c8f5687af2c9f95752c6ed4be1aee218f0e3e509c4da5853714642a622298755516e1b9802a2a7acf04100300dee8d94953360d00f53897a4491 WHIRLPOOL 2eaf7a1adfe67a6af166fcb6cafbd5645a66d99c653afa4561ca8a90ce2a797632e8dbb6adc32ee4a6cee2a06c448cb41a91c1295953c21e44b1b53b74967da8 diff --git a/sys-fs/udisks/files/udisks-2.1.0-W_define.patch b/sys-fs/udisks/files/udisks-2.1.0-W_define.patch new file mode 100644 index 000000000..fd82ba170 --- /dev/null +++ b/sys-fs/udisks/files/udisks-2.1.0-W_define.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/462784 + +udiskslinuxfilesystem.c:1294:11: error: implicit declaration of function 'WIFEXITED' [-Werror=implicit-function-declaration] +udiskslinuxfilesystem.c:1294:11: error: implicit declaration of function 'WEXITSTATUS' [-Werror=implicit-function-declaration] + +--- src/udiskslinuxfilesystem.c ++++ src/udiskslinuxfilesystem.c +@@ -22,6 +22,7 @@ + #include + + #include ++#include + #include + #include + #include diff --git a/sys-fs/udisks/udisks-2.0.92.ebuild b/sys-fs/udisks/udisks-2.0.92.ebuild deleted file mode 100644 index 336fb62ad..000000000 --- a/sys-fs/udisks/udisks-2.0.92.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -inherit bash-completion-r1 eutils linux-info systemd - -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="alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc x86" -IUSE="debug crypt +gptfdisk +introspection selinux systemd" - -UDEV_VERSION="197" -COMMON_DEPEND=">=dev-libs/glib-2.32 - >=dev-libs/libatasmart-0.19 - >=sys-auth/polkit-0.110 - virtual/acl - >=virtual/udev-${UDEV_VERSION}[gudev,hwdb] - introspection? ( >=dev-libs/gobject-introspection-1.30 ) - selinux? ( sec-policy/selinux-devicekit ) - systemd? ( >=sys-apps/systemd-${UDEV_VERSION} )" -# 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" - -QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd" - -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() { - # Fix certain DVD playback by setting proper udf filesystem perms - epatch "${FILESDIR}/${PN}-2.0.91-udf-dvd-fix-dmask.patch" - - use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; } -} - -src_configure() { - econf \ - --localstatedir="${EPREFIX}"/var \ - --disable-static \ - $(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 - keepdir /var/lib/udisks2 #383091 - - rm -rf "${ED}"/usr/share/bash-completion - dobashcomp data/completions/udisksctl - - 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 -} - -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 -} diff --git a/sys-fs/udisks/udisks-2.1.0.ebuild b/sys-fs/udisks/udisks-2.1.1.ebuild similarity index 87% rename from sys-fs/udisks/udisks-2.1.0.ebuild rename to sys-fs/udisks/udisks-2.1.1.ebuild index c1fb9989e..b9cc6a690 100644 --- a/sys-fs/udisks/udisks-2.1.0.ebuild +++ b/sys-fs/udisks/udisks-2.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-2.1.0.ebuild,v 1.9 2013/03/31 14:54:48 ago Exp $ +# $Header: $ EAPI=5 inherit bash-completion-r1 eutils linux-info systemd udev @@ -11,15 +11,15 @@ SRC_URI="http://udisks.freedesktop.org/releases/${P}.tar.bz2" LICENSE="GPL-2" SLOT="2" -KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="debug crypt +gptfdisk +introspection selinux systemd" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="debug cryptsetup +gptfdisk +introspection selinux systemd" UDEV_VERSION="197" COMMON_DEPEND=">=dev-libs/glib-2.32 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 virtual/acl - >=virtual/udev-${UDEV_VERSION}[gudev,hwdb] + >=virtual/udev-${UDEV_VERSION}[gudev,hwdb(+)] introspection? ( >=dev-libs/gobject-introspection-1.30 ) selinux? ( sec-policy/selinux-devicekit ) systemd? ( >=sys-apps/systemd-${UDEV_VERSION} )" @@ -29,7 +29,10 @@ RDEPEND="${COMMON_DEPEND} >=sys-apps/util-linux-2.20.1-r2 >=sys-block/parted-3 virtual/eject - crypt? ( sys-fs/cryptsetup ) + cryptsetup? ( + sys-fs/cryptsetup[udev(+)] + sys-fs/lvm2[udev(+)] + ) gptfdisk? ( >=sys-apps/gptfdisk-0.8 )" DEPEND="${COMMON_DEPEND} app-text/docbook-xsl-stylesheets @@ -48,9 +51,9 @@ pkg_setup() { 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 + kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278 linux-info_pkg_setup fi } @@ -58,7 +61,7 @@ pkg_setup() { src_prepare() { # Fix certain DVD playback by setting proper udf filesystem perms epatch "${FILESDIR}/${PN}-2.0.91-udf-dvd-fix-dmask.patch" - epatch "${FILESDIR}"/${P}-ieee1394.patch + epatch "${FILESDIR}"/${PN}-2.1.0-W_define.patch use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; } }