Move ~arm and --enable/--disable-remote-access handling from gnome-overlay.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 93123cae8083d17127cc713256d1575de5d653ec..a6d03de085f9ffe735c2e917faf28fe8468f77fb 100644 (file)
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udisks
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.1 2010/04/07 14:20:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.2 2010/04/08 09:04:32 ssuominen Exp $
+
+  08 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> udisks-1.0.0.ebuild:
+  Move ~arm and --enable/--disable-remote-access handling from
+  gnome-overlay.
 
 *udisks-1.0.0 (07 Apr 2010)
 

diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 3b770390b04653b55f44f5e86fccbd73b749d1a2..925d86fb102aae61b3b2354730c40bcce016ec7e 100644 (file)
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,4 +1,4 @@
 DIST udisks-1.0.0.tar.gz 710462 RMD160 8cc0b0137514a440c8c28695efc50599435ece1c SHA1 4c5a416104e4f88905420e9dc13b18d780c80aa0 SHA256 54834720ca0d44e04f1b71f6b0782bc30af506b5ec87fe024f93e50b70734955
-EBUILD udisks-1.0.0.ebuild 1517 RMD160 7d8884576b43ada9a5b5921df6577331b0b72606 SHA1 d5fc1c45d57c22f84a50cf35ae4479590ec50000 SHA256 48ba2f6e2f07bb444011557f9e65393a37799bbd9c7197e1558ab1bfe737fd24
-MISC ChangeLog 363 RMD160 865242338cbc9580be1b470608a025e0b891155e SHA1 e4f97e8c872a25390a257b80c58f1f28bf13ee41 SHA256 792ea6497211f85118d0b79eeec8e32d977b46ed1ac9b3e12a03cf7457d222b6
+EBUILD udisks-1.0.0.ebuild 1640 RMD160 b2f4c514a64e0c5052193f69c8a36653391339b1 SHA1 8dc2464ad83de1d92f4eeaa5b2daac844b9d7505 SHA256 8a41deddd0c4a8b00a49d6a9989d0b0cc80196aa00671a8f472d7d2ec066e14e
+MISC ChangeLog 519 RMD160 2871cbb0162231655c402bdccbd078344555ee3b SHA1 787b05b357a9cbc20f34cb14ea1c16c8c6f285f0 SHA256 12d1ffdbfd2231289964ad79ed190b554e20e4689e3247372fea38bd33dc78f2
 MISC metadata.xml 244 RMD160 244bfcdb5c3c5eab051189d8adf5e572866b8c64 SHA1 580ce8a447f3237ea98b1d289b440bc89245e89b SHA256 552982cb042dce6d0051aef928f3cca7553e6d7327e0556f97f9e6e52e651b6c

diff --git a/sys-fs/udisks/udisks-1.0.0.ebuild b/sys-fs/udisks/udisks-1.0.0.ebuild
index 4a98d98fd7801b6bcbb79e432afd8af456e9b4c9..0c7f133627b8ebd38a9facd9dacd1a1d00278936 100644 (file)
--- a/sys-fs/udisks/udisks-1.0.0.ebuild
+++ b/sys-fs/udisks/udisks-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.0.ebuild,v 1.2 2010/04/07 15:28:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.0.ebuild,v 1.3 2010/04/08 09:04:32 ssuominen Exp $
 
 EAPI=3
 inherit bash-completion
@@ -11,10 +11,10 @@ SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc nls"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug doc nls zeroconf"
 
-RDEPEND=">=sys-fs/udev-147[extras]
+COMMON_DEPEND=">=sys-fs/udev-147[extras]
        >=dev-libs/glib-2.16.1:2
        >=sys-apps/dbus-1
        >=dev-libs/dbus-glib-0.82
@@ -24,7 +24,9 @@ RDEPEND=">=sys-fs/udev-147[extras]
        >=dev-libs/libatasmart-0.14
        >=sys-apps/sg3_utils-1.27.20090411
        !sys-apps/devicekit-disks"
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+       zeroconf? ( net-dns/avahi )"
+DEPEND="${COMMON_DEPEND}
        dev-util/pkgconfig
        dev-libs/libxslt
        app-text/docbook-xsl-stylesheets
@@ -40,17 +42,17 @@ src_configure() {
                $(use_enable debug verbose-mode) \
                --enable-man-pages \
                $(use_enable doc gtk-doc) \
+               $(use_enable zeroconf remote-access) \
                $(use_enable nls) \
                --with-html-dir="${EPREFIX}/usr/share/doc/${PF}/html"
 }
 
 src_install() {
-       emake DESTDIR="${D}" profiledir="${T}" install || die
+       emake DESTDIR="${D}" install || die
        dodoc AUTHORS HACKING NEWS README
 
-       if use bash-completion; then
-               dobashcompletion tools/udisks-bash-completion.sh || die
-       fi
+       rm -f "${D}"/etc/profile.d/udisks-bash-completion.sh
+       dobashcompletion tools/udisks-bash-completion.sh ${PN}
 
        find "${ED}" -name '*.la' -delete
 }