summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-04-24 03:44:24 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-04-24 03:44:24 +0000
commite6aa0542bc5c19b0ae3dd80cc0d48727c881f6ed (patch)
tree28a596a39ff3fb81b16305478e1687937b688017 /gnome-base/gvfs
parentEnable some more POSIX options, and fixes from mainline. (diff)
downloadhistorical-e6aa0542bc5c19b0ae3dd80cc0d48727c881f6ed.tar.gz
historical-e6aa0542bc5c19b0ae3dd80cc0d48727c881f6ed.tar.bz2
historical-e6aa0542bc5c19b0ae3dd80cc0d48727c881f6ed.zip
Make udev USE flag control everything udev-related to fix gvfs on bsd (bug #413303, thanks to Alexis Ballier).
Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64
Diffstat (limited to 'gnome-base/gvfs')
-rw-r--r--gnome-base/gvfs/ChangeLog7
-rw-r--r--gnome-base/gvfs/Manifest22
-rw-r--r--gnome-base/gvfs/gvfs-1.10.1.ebuild13
-rw-r--r--gnome-base/gvfs/gvfs-1.12.0.ebuild13
-rw-r--r--gnome-base/gvfs/gvfs-1.12.1.ebuild13
5 files changed, 35 insertions, 33 deletions
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 7721ca911814..02f421a5bce3 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-base/gvfs
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.174 2012/04/21 08:20:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.175 2012/04/24 03:44:24 tetromino Exp $
+
+ 24 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.10.1.ebuild,
+ gvfs-1.12.0.ebuild, gvfs-1.12.1.ebuild:
+ Make udev USE flag control everything udev-related to fix gvfs on bsd (bug
+ #413303, thanks to Alexis Ballier).
*gvfs-1.12.1 (21 Apr 2012)
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index ad2298971c36..07a9d374c172 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -10,19 +10,19 @@ DIST gvfs-1.10.1.tar.xz 1295236 RMD160 e50d96fc0b6aa9d2ab50a3cfc5c161be5d6e6e16
DIST gvfs-1.12.0.tar.xz 1342208 RMD160 8a423a8b9eb988946802502299b0194e3a17a52e SHA1 372f5ca24ff419e5d278ba47165f0be760d32e33 SHA256 87ffb27fd884be65570d64530c3121f9e49848070b62a26e39cd363f6a6bd555
DIST gvfs-1.12.1.tar.xz 1359064 RMD160 8147ba0e5f9de1ceab6404c204dd03a094545e4d SHA1 371dc60749ff4330f30bcbddacc1ef08c00d4da8 SHA256 d75dbb0cee87ca93f393c96da56affa51609114814b87771cfc9871c09b5355e
DIST libgcrypt.m4.bz2 1526 RMD160 6149f51c00e1e21d85187136f7682e41271fed40 SHA1 1731ae882cdc7c53efeef2e23e0d2d9791c6d739 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128
-EBUILD gvfs-1.10.1.ebuild 3566 RMD160 21420049d234d9571f5092b346e4228c55eb3694 SHA1 ab30d749fe2077c2b8e9e3d3afc3e951930246b2 SHA256 9d6ea30adfda4c53c0c36e2e20b4bd3b141b39bf80674b2134132d41debe576c
-EBUILD gvfs-1.12.0.ebuild 3667 RMD160 c1916b945bc6ed002afd984fb4567e83cc629268 SHA1 5700129fc4d2fee17ea52c12e86373b660425c98 SHA256 f08f7e30d540ebddf4bddb715c2dcaaad800bc6b02bf6cad6a091e2d14142015
-EBUILD gvfs-1.12.1.ebuild 3382 RMD160 33e5190e3a3b5a039c974c058be509a0d37d770b SHA1 aaa82466a9027f43285d1ad11bfc1367ef8c6691 SHA256 a499c1af2747925204eb2898e94db0fe642b206badc3b08ce1f71652924863d6
-MISC ChangeLog 24501 RMD160 3700634a6b5c1cb4c0d56a4386d30fe503f6cde5 SHA1 cf8a3d84a39590dc84fe48f22e819217b4e0f605 SHA256 1ab00210b0b0b00a95b2a4a1e20c171ed883a6141b4b72d67a0911f0c707959b
+EBUILD gvfs-1.10.1.ebuild 3526 RMD160 43acbffbbb3921cc35f1fecd728d00d128c4887e SHA1 9eee6152f593d3529a2538ea7dfdc30d0b01fe66 SHA256 97981fe101ed2b3f042b3dea1a47ea405ba13b1c87ff36603dc66da906dc1e7a
+EBUILD gvfs-1.12.0.ebuild 3627 RMD160 18844c06d80c5079a1e2dd03fa54a693e0e737ce SHA1 c345ef1b1b28ec820bc0d383457c15dd4396b156 SHA256 47b05834159eafe949fbe5acbf3d3a09882984b21b371e24e7ed7561e23208d7
+EBUILD gvfs-1.12.1.ebuild 3342 RMD160 413170978613c850ca2ef54ce7cedbd4c1a66237 SHA1 111798ac665679ec70b3cbcc8b705a4431c1014f SHA256 6fa1251d5d358a7139a42c9b3c602ee12a41136bb034bd96548e89c51f54c9bc
+MISC ChangeLog 24738 RMD160 ae0d9f65d560b03e64f2b24c20920a13201e10bc SHA1 b2194137aa4886fcc50a7b7fe4bb2a8292c9b3b8 SHA256 cbdd6044e66342ba0553a2e8763ddc34bbaa1dea2da8038d74644db4bc3af730
MISC metadata.xml 1315 RMD160 58c1f8a1d25d892346632ae34a9a3b58288cd029 SHA1 2dd23a67b1cfdffcf1729bf2963893d743859e8c SHA256 79981750cbbf2fd42c086917b23562c668ea309acd311ae4c613b9ff29f7d65a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBAgAGBQJPkm3XAAoJEJ0WA1zPCt1hiF4H/jKix52dK3tJ2EpBh5nXCQCE
-Qe7JAzWMGGO0g5nntm1vHjssyp/+fHpoIzQc0AXN2oI5inxalxOEed+ZrCbTsNiG
-hMkiwmksL1zYiVF5biogpjSYzevu7bKzVTyGeMNVj5IwB10EToCTCSefIsfG2wt/
-hX1e3FVzcBhfDg310IipIaWiXfTo3p3+cJ8RK0jfYCg5w+7zZ/bZdkPZ7J2fWi2q
-OHwB6DoyHuWWO1pCML1x0hBWeObMAJvziCFkM1rMJDKe4C9rymwdU0aFqH4S3XPp
-GW5zAnGfhPZABbWPh7ZJWUGsZY4/3p7MUt8Z9xhpifwZmIF1zhH+g5qI2HNOX+M=
-=J4cy
+iQEcBAEBAgAGBQJPliGeAAoJEJ0WA1zPCt1hyJsH+wZ/9cbsBV9x2UWOVwOgZTIR
+cklBO544xA+VXEpgptw7ebMnd1O85BSp3oNq1Go9QSfz/ky4IjKTfv7PDWbYYTbk
+OzNPqYVJ94v3NfrgHofE6c+vQKX2asVZOkyUYuhUf6LPQ7JDqF4g7c/9fnWqVRer
+QsUUw4t1hjYXO8Dns4kW0gv5KmBJg3P0NKDqg8mpu1YxxqCJmLYixRoHI9f/5PuT
+JpIsOdEkUdBDK1SvOpUmcz3nSkmkZizCHlqtXyCfENiFaxudaNW3RsBI966hDht6
+gJzsWbC/jt8MzzdIZKdk0wHT2BMxWBO6EIyueuBcTZS2Dj1yvJ74wyPnG65rWHo=
+=DhgX
-----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/gvfs-1.10.1.ebuild b/gnome-base/gvfs/gvfs-1.10.1.ebuild
index e2fa58f819cf..6c7ec5f07d12 100644
--- a/gnome-base/gvfs/gvfs-1.10.1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.10.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild,v 1.14 2012/04/12 09:24:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild,v 1.15 2012/04/24 03:44:24 tetromino Exp $
EAPI=4
GCONF_DEBUG=no
@@ -33,7 +33,6 @@ RDEPEND=">=dev-libs/glib-2.29.14
sys-apps/dbus
dev-libs/libxml2
net-misc/openssh
- !prefix? ( >=sys-fs/udev-164-r2 )
afp? ( >=dev-libs/libgcrypt-1.2.2 )
archive? ( app-arch/libarchive )
avahi? ( >=net-dns/avahi-0.6 )
@@ -55,7 +54,7 @@ RDEPEND=">=dev-libs/glib-2.29.14
>=app-pda/libplist-1 )
udev? (
cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
- || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) )
+ || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-164-r2[extras] ) )
http? ( >=net-libs/libsoup-gnome-2.26.0 )
samba? ( >=net-fs/samba-3.4.6[smbclient] )"
DEPEND="${RDEPEND}
@@ -82,11 +81,11 @@ pkg_setup() {
$(use_enable gdu)
$(use_enable gphoto2)
$(use_enable ios afc)
+ $(use_enable udev)
$(use_enable udev gudev)
$(use_enable http)
$(use_enable gnome-keyring keyring)
- $(use_enable samba)
- $(use_enable !prefix udev)"
+ $(use_enable samba)"
}
src_prepare() {
@@ -102,7 +101,7 @@ src_prepare() {
echo mount-archive.desktop.in.in >> po/POTFILES.in
fi
- if use prefix; then
+ if ! use udev; then
sed -i -e 's/gvfsd-burn/ /' daemon/Makefile.am || die
sed -i -e 's/burn.mount.in/ /' daemon/Makefile.am || die
sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
@@ -111,7 +110,7 @@ src_prepare() {
# bug #410411, https://bugzilla.gnome.org/show_bug.cgi?id=672693
use ios && epatch "${FILESDIR}/${PN}-1.10.1-libimobiledevice-1.1.2.patch"
- if use gphoto2 || use archive || use prefix || use ios; then
+ if use gphoto2 || use archive || ! use udev || use ios; then
# libgcrypt.m4 needed for eautoreconf, bug #399043
mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
diff --git a/gnome-base/gvfs/gvfs-1.12.0.ebuild b/gnome-base/gvfs/gvfs-1.12.0.ebuild
index 7b634fcded28..baf2ce9f5303 100644
--- a/gnome-base/gvfs/gvfs-1.12.0.ebuild
+++ b/gnome-base/gvfs/gvfs-1.12.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.0.ebuild,v 1.4 2012/04/13 04:08:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.0.ebuild,v 1.5 2012/04/24 03:44:24 tetromino Exp $
EAPI=4
GCONF_DEBUG=no
@@ -33,7 +33,6 @@ RDEPEND=">=dev-libs/glib-2.31.0:2
sys-apps/dbus
dev-libs/libxml2
net-misc/openssh
- !prefix? ( >=sys-fs/udev-164-r2 )
afp? ( >=dev-libs/libgcrypt-1.2.2 )
archive? ( app-arch/libarchive )
avahi? ( >=net-dns/avahi-0.6 )
@@ -55,7 +54,7 @@ RDEPEND=">=dev-libs/glib-2.31.0:2
>=app-pda/libplist-1 )
udev? (
cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
- || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) )
+ || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-164-r2[extras] ) )
udisks? ( >=sys-fs/udisks-1.90:2 )
http? ( >=net-libs/libsoup-gnome-2.26.0 )
samba? ( >=net-fs/samba-3.4.6[smbclient] )"
@@ -83,12 +82,12 @@ pkg_setup() {
$(use_enable gdu)
$(use_enable gphoto2)
$(use_enable ios afc)
+ $(use_enable udev)
$(use_enable udev gudev)
$(use_enable http)
$(use_enable gnome-keyring keyring)
$(use_enable samba)
- $(use_enable udisks udisks2)
- $(use_enable !prefix udev)"
+ $(use_enable udisks udisks2)"
}
src_prepare() {
@@ -101,7 +100,7 @@ src_prepare() {
echo mount-archive.desktop.in.in >> po/POTFILES.in
fi
- if use prefix; then
+ if ! use udev; then
sed -i -e 's/gvfsd-burn/ /' daemon/Makefile.am || die
sed -i -e 's/burn.mount.in/ /' daemon/Makefile.am || die
sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
@@ -113,7 +112,7 @@ src_prepare() {
# For gcc-4.5 and USE=afp, https://bugzilla.gnome.org/show_bug.cgi?id=672708
epatch "${FILESDIR}/${PN}-1.12.0-afp-gcc-4.5.patch"
- if use gphoto2 || use archive || use prefix || use ios; then
+ if use gphoto2 || use archive || ! use udev || use ios; then
# libgcrypt.m4 needed for eautoreconf, bug #399043
mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
diff --git a/gnome-base/gvfs/gvfs-1.12.1.ebuild b/gnome-base/gvfs/gvfs-1.12.1.ebuild
index 31b7c11e2109..8085044dac48 100644
--- a/gnome-base/gvfs/gvfs-1.12.1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.12.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.1.ebuild,v 1.1 2012/04/21 08:20:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.1.ebuild,v 1.2 2012/04/24 03:44:24 tetromino Exp $
EAPI=4
GCONF_DEBUG=no
@@ -33,7 +33,6 @@ RDEPEND=">=dev-libs/glib-2.31.0:2
sys-apps/dbus
dev-libs/libxml2
net-misc/openssh
- !prefix? ( >=sys-fs/udev-164-r2 )
afp? ( >=dev-libs/libgcrypt-1.2.2 )
archive? ( app-arch/libarchive )
avahi? ( >=net-dns/avahi-0.6 )
@@ -55,7 +54,7 @@ RDEPEND=">=dev-libs/glib-2.31.0:2
>=app-pda/libplist-1 )
udev? (
cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
- || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) )
+ || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-164-r2[extras] ) )
udisks? ( >=sys-fs/udisks-1.90:2 )
http? ( >=net-libs/libsoup-gnome-2.26.0 )
samba? ( >=net-fs/samba-3.4.6[smbclient] )"
@@ -83,12 +82,12 @@ pkg_setup() {
$(use_enable gdu)
$(use_enable gphoto2)
$(use_enable ios afc)
+ $(use_enable udev)
$(use_enable udev gudev)
$(use_enable http)
$(use_enable gnome-keyring keyring)
$(use_enable samba)
- $(use_enable udisks udisks2)
- $(use_enable !prefix udev)"
+ $(use_enable udisks udisks2)"
}
src_prepare() {
@@ -101,13 +100,13 @@ src_prepare() {
echo mount-archive.desktop.in.in >> po/POTFILES.in
fi
- if use prefix; then
+ if ! use udev; then
sed -i -e 's/gvfsd-burn/ /' daemon/Makefile.am || die
sed -i -e 's/burn.mount.in/ /' daemon/Makefile.am || die
sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
fi
- if use gphoto2 || use archive || use prefix; then
+ if use gphoto2 || use archive || ! use udev; then
# libgcrypt.m4 needed for eautoreconf, bug #399043
mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die