summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2010-11-30 08:03:08 +0000
committerAndreas Proschofsky <suka@gentoo.org>2010-11-30 08:03:08 +0000
commitd5a2ca50504f4c2a7eab119fa64e479f53efc0e6 (patch)
tree7b84d3a86fe6c5fa4e060eaa16913d746ce2f8c6 /gnome-base/gvfs
parentalso bump gtk+ (diff)
downloadsuka-d5a2ca50504f4c2a7eab119fa64e479f53efc0e6.tar.gz
suka-d5a2ca50504f4c2a7eab119fa64e479f53efc0e6.tar.bz2
suka-d5a2ca50504f4c2a7eab119fa64e479f53efc0e6.zip
use gvfs from dev cycle
svn path=/; revision=321
Diffstat (limited to 'gnome-base/gvfs')
-rw-r--r--gnome-base/gvfs/Manifest4
-rw-r--r--gnome-base/gvfs/gvfs-1.7.0.ebuild (renamed from gnome-base/gvfs/gvfs-1.6.6-r990.ebuild)16
2 files changed, 7 insertions, 13 deletions
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 4bc2d7f..06a6dc8 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -2,5 +2,5 @@ AUX gvfs-1.2.2-expose-archive-backend.patch 1607 RMD160 cd17c501805fb81e560c35de
AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 RMD160 0c6d83f8b38cf41002dbe6f863916cfac66cd231 SHA1 fc4927fc0f3604689d446d4fe47b48384bee70a5 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062
AUX gvfs-1.6.4-sftp-timeout.patch 978 RMD160 01baba58c316fddda48cae2abf8ffee3942ac7fb SHA1 8f36224495e845db734de15c3478b9a5499d8713 SHA256 9b66f6e711dd70172204fa40a2a0e77f47253720532f831d5e571ec8021c98f6
AUX gvfs-glib-2.27-port.patch 11813 RMD160 735bc7b8db5921c826840b1fb8be943c62de5bc2 SHA1 9e4fc13b1816c7f2e4e1c761ed5b198b20539fc5 SHA256 0a43dc5bffcefcae0db68b0a0c085a7cea06ab51664618dd585eead4358359ce
-DIST gvfs-1.6.6.tar.bz2 1387796 RMD160 705934a0a3f520a41237374abeb0182d01398903 SHA1 066800558370187abd838c358349bb73f1579f8b SHA256 902890deb6a670f642180ea958406ebb02af1d5867a464c87e493d56f1dde7bd
-EBUILD gvfs-1.6.6-r990.ebuild 3234 RMD160 5fc4aa4acdc7a4843274c110276b53937595cc92 SHA1 1e5f0f5b45bdee411c3c1fdb31b66f03ecba6aec SHA256 8bb434fc6b8e78a098555a654071a20f1ef2bc1b944af91535971cc90ae15947
+DIST gvfs-1.7.0.tar.bz2 1388236 RMD160 2424e68e1bb55ff779c7d9383d26a68e571d33e4 SHA1 6d7f6c640e1486e39eb55c720b3db021aedfcc29 SHA256 0ff012cdcbc4de672ef0bc40dc8b54fb2f5e830e4ffe6a56016ad334ac28a483
+EBUILD gvfs-1.7.0.ebuild 3047 RMD160 90f2654b2705f48483b65324a11e94d62135576c SHA1 467ad3940113cde2e9844bd21bb07b43af88247e SHA256 d5cb49cab904e0ee2c940099a27b2ca6da3edd3734f03c05c0ef7034c2adb4dd
diff --git a/gnome-base/gvfs/gvfs-1.6.6-r990.ebuild b/gnome-base/gvfs/gvfs-1.7.0.ebuild
index eeabe8c..8d523bf 100644
--- a/gnome-base/gvfs/gvfs-1.6.6-r990.ebuild
+++ b/gnome-base/gvfs/gvfs-1.7.0.ebuild
@@ -2,8 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.4-r1.ebuild,v 1.1 2010/10/05 08:49:12 pacho Exp $
-EAPI="2"
-GCONF_DEBUG="no"
+EAPI="3"
inherit autotools bash-completion gnome2 eutils
@@ -12,8 +11,9 @@ HOMEPAGE="http://www.gnome.org"
LICENSE="LGPL-2"
SLOT="0"
+# Needs glib-2.27, which is unkeyworded
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="archive avahi bluetooth cdda doc fuse gdu gnome gnome-keyring gphoto2 hal
+IUSE="archive avahi bluetooth cdda doc fuse gdu gnome-keyring gphoto2 hal
+http iphone samba +udev"
# Need newer glib for gnome bug 631398
@@ -32,7 +32,6 @@ RDEPEND=">=dev-libs/glib-2.27.1
dev-libs/expat )
fuse? ( sys-fs/fuse )
gdu? ( >=sys-apps/gnome-disk-utility-2.29 )
- gnome? ( >=gnome-base/gconf-2.0 )
gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
iphone? ( app-pda/libimobiledevice )
@@ -51,6 +50,8 @@ DEPEND="${RDEPEND}
dev-util/gtk-doc-am
doc? ( >=dev-util/gtk-doc-1 )"
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
pkg_setup() {
if use cdda && ! use hal && ! use udev; then
ewarn "You have \"+cdda\", but you have \"-hal\" and \"-udev\""
@@ -67,7 +68,6 @@ pkg_setup() {
$(use_enable cdda)
$(use_enable fuse)
$(use_enable gdu)
- $(use_enable gnome gconf)
$(use_enable gphoto2)
$(use_enable iphone afc)
$(use_enable udev gudev)
@@ -75,17 +75,11 @@ pkg_setup() {
$(use_enable http)
$(use_enable gnome-keyring keyring)
$(use_enable samba)"
-
- DOCS="AUTHORS ChangeLog NEWS README TODO"
}
src_prepare() {
gnome2_src_prepare
- # Remove app lookup gconf extension
- # https://bugzilla.gnome.org/show_bug.cgi?id=631398
- epatch "${FILESDIR}/${PN}-glib-2.27-port.patch"
-
# Conditional patching purely to avoid eautoreconf
use gphoto2 && epatch "${FILESDIR}/${PN}-1.2.2-gphoto2-stricter-checks.patch"