summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2013-08-30 22:43:40 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2013-08-30 22:43:40 +0000
commite5173136e9f92a63dfcb9eaea6d9d1a650f2fd13 (patch)
tree7bfe5ad808373799809e24077bf5df6e3b3b0a1a
parentDepend on libsoup-gnome again, clean up old revisions. (diff)
downloadgentoo-2-e5173136e9f92a63dfcb9eaea6d9d1a650f2fd13.tar.gz
gentoo-2-e5173136e9f92a63dfcb9eaea6d9d1a650f2fd13.tar.bz2
gentoo-2-e5173136e9f92a63dfcb9eaea6d9d1a650f2fd13.zip
Depend on libsoup-gnome again, clean up old revisions.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key C6085806)
-rw-r--r--gnome-base/gvfs/ChangeLog6
-rw-r--r--gnome-base/gvfs/gvfs-1.16.2.ebuild126
-rw-r--r--gnome-base/gvfs/gvfs-1.16.3.ebuild4
3 files changed, 7 insertions, 129 deletions
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 9ad37c3af73b..c0a66952276d 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/gvfs
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.224 2013/08/29 12:53:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.225 2013/08/30 22:43:40 eva Exp $
+
+ 30 Aug 2013; Gilles Dartiguelongue <eva@gentoo.org> -gvfs-1.16.2.ebuild,
+ gvfs-1.16.3.ebuild:
+ Depend on libsoup-gnome again, clean up old revisions.
29 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> gvfs-1.16.2.ebuild,
gvfs-1.16.3.ebuild:
diff --git a/gnome-base/gvfs/gvfs-1.16.2.ebuild b/gnome-base/gvfs/gvfs-1.16.2.ebuild
deleted file mode 100644
index b1b459d3a8b8..000000000000
--- a/gnome-base/gvfs/gvfs-1.16.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.16.2.ebuild,v 1.4 2013/08/29 12:51:34 ssuominen Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="Virtual filesystem implementation for gio"
-HOMEPAGE="https://git.gnome.org/browse/gvfs"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-IUSE="afp archive avahi bluetooth bluray cdda fuse gdu gnome-keyring gnome-online-accounts gphoto2 gtk +http mtp ios samba systemd test +udev udisks"
-
-# Can use libgphoto-2.5.0 as well. Automagic detection.
-RDEPEND="
- >=dev-libs/glib-2.35:2
- sys-apps/dbus
- dev-libs/libxml2:2
- net-misc/openssh
- afp? ( >=dev-libs/libgcrypt-1.2.2:= )
- archive? ( app-arch/libarchive:= )
- avahi? ( >=net-dns/avahi-0.6 )
- bluetooth? (
- >=app-mobilephone/obex-data-server-0.4.5
- dev-libs/dbus-glib
- net-wireless/bluez
- dev-libs/expat )
- bluray? ( media-libs/libbluray )
- fuse? ( >=sys-fs/fuse-2.8.0 )
- gdu? ( || (
- >=gnome-base/libgdu-3.0.2
- =sys-apps/gnome-disk-utility-3.0.2-r300
- =sys-apps/gnome-disk-utility-3.0.2-r200 ) )
- gnome-keyring? ( app-crypt/libsecret )
- gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
- gtk? ( >=x11-libs/gtk+-3.0:3 )
- http? ( || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.34.0 ) )
- ios? (
- >=app-pda/libimobiledevice-1.1.0:=
- >=app-pda/libplist-1:= )
- mtp? ( >=media-libs/libmtp-1.1.5 )
- samba? ( >=net-fs/samba-3.4.6[smbclient] )
- systemd? ( sys-apps/systemd )
- udev? (
- cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
- virtual/udev[gudev] )
- udisks? ( >=sys-fs/udisks-1.97:2 )
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxslt
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- dev-util/gdbus-codegen
- dev-util/gtk-doc-am
- test? (
- >=dev-python/twisted-core-12.3.0
- net-analyzer/netcat )
- !udev? ( >=dev-libs/libgcrypt-1.2.2 )
-"
-# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
-# test dependencies needed per https://bugzilla.gnome.org/700162
-
-# Tests with multiple failures, this is being handled upstream at:
-# https://bugzilla.gnome.org/700162
-RESTRICT="test"
-
-REQUIRED_USE="cdda? ( udev )
- udisks? ( udev )
- systemd? ( udisks )"
-
-src_prepare() {
- DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
-
- if ! use udev; then
- sed -e 's/gvfsd-burn/ /' \
- -e 's/burn.mount.in/ /' \
- -e 's/burn.mount/ /' \
- -i daemon/Makefile.am || die
-
- eautoreconf
- fi
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # --enable-documentation installs man pages
- gnome2_src_configure \
- --disable-bash-completion \
- --disable-hal \
- --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
- --enable-documentation \
- $(use_enable afp) \
- $(use_enable archive) \
- $(use_enable avahi) \
- $(use_enable bluetooth obexftp) \
- $(use_enable bluray) \
- $(use_enable cdda) \
- $(use_enable fuse) \
- $(use_enable gdu) \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable gphoto2) \
- $(use_enable gtk) \
- $(use_enable ios afc) \
- $(use_enable mtp libmtp) \
- $(use_enable udev) \
- $(use_enable udev gudev) \
- $(use_enable http) \
- $(use_enable gnome-keyring keyring) \
- $(use_enable samba) \
- $(use_enable systemd libsystemd-login) \
- $(use_enable udisks udisks2)
-}
-
-src_install() {
- gnome2_src_install
- dobashcomp programs/completion/gvfs
-}
diff --git a/gnome-base/gvfs/gvfs-1.16.3.ebuild b/gnome-base/gvfs/gvfs-1.16.3.ebuild
index 0ead7bcde312..c38156e39a56 100644
--- a/gnome-base/gvfs/gvfs-1.16.3.ebuild
+++ b/gnome-base/gvfs/gvfs-1.16.3.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/gnome-base/gvfs/gvfs-1.16.3.ebuild,v 1.4 2013/08/29 12:51:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.16.3.ebuild,v 1.5 2013/08/30 22:43:40 eva Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -41,7 +41,7 @@ RDEPEND="
gnome-keyring? ( app-crypt/libsecret )
gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
gtk? ( >=x11-libs/gtk+-3.0:3 )
- http? ( || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.34.0 ) )
+ http? ( >=net-libs/libsoup-gnome-2.34.0:2.4 )
ios? (
>=app-pda/libimobiledevice-1.1.0:=
>=app-pda/libplist-1:= )