From bd8a8605db7d8628c1b92e15fb034b8d7edfa95e Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Mon, 10 Dec 2012 11:26:30 +0000 Subject: Update to EAPI5; drop old. (Portage version: 2.2.0_alpha145/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) --- gnome-base/gvfs/ChangeLog | 6 +- gnome-base/gvfs/gvfs-1.14.1.ebuild | 129 ------------------------------------- gnome-base/gvfs/gvfs-1.14.2.ebuild | 10 +-- 3 files changed, 10 insertions(+), 135 deletions(-) delete mode 100644 gnome-base/gvfs/gvfs-1.14.1.ebuild (limited to 'gnome-base') diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog index 4a768ec92f01..e8f00adb22d3 100644 --- a/gnome-base/gvfs/ChangeLog +++ b/gnome-base/gvfs/ChangeLog @@ -1,6 +1,10 @@ # 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.194 2012/12/03 10:02:21 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.195 2012/12/10 11:26:30 tetromino Exp $ + + 10 Dec 2012; Alexandre Rostovtsev -gvfs-1.14.1.ebuild, + gvfs-1.14.2.ebuild: + Update to EAPI5; drop old. 03 Dec 2012; Samuli Suominen gvfs-1.12.3.ebuild, gvfs-1.12.3-r1.ebuild, gvfs-1.14.1.ebuild, gvfs-1.14.2.ebuild: diff --git a/gnome-base/gvfs/gvfs-1.14.1.ebuild b/gnome-base/gvfs/gvfs-1.14.1.ebuild deleted file mode 100644 index 121b22956ef2..000000000000 --- a/gnome-base/gvfs/gvfs-1.14.1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# 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.14.1.ebuild,v 1.2 2012/12/03 10:02:21 ssuominen Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit autotools bash-completion-r1 eutils gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION="GNOME Virtual Filesystem Layer" -HOMEPAGE="http://www.gnome.org" - -LICENSE="LGPL-2+" -SLOT="0" - -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" - DOCS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" - DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits -fi - -SRC_URI="${SRC_URI} - http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2" - -IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 gtk +http ios samba systemd +udev udisks" -REQUIRED_USE="systemd? ( udisks )" - -# Can use libgphoto-2.5.0 as well. Automagic detection. -RDEPEND=">=dev-libs/glib-2.33.12: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-gnome-2.26.0 ) - ios? ( - >=app-pda/libimobiledevice-1.1.0 - >=app-pda/libplist-1 ) - samba? ( >=net-fs/samba-3.4.6[smbclient] ) - systemd? ( sys-apps/systemd ) - udev? ( - cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) - virtual/udev[gudev] ) - udisks? ( >=sys-fs/udisks-1.97:2[systemd?] )" -DEPEND="${RDEPEND} - dev-libs/libxslt - >=dev-util/intltool-0.40 - virtual/pkgconfig - dev-util/gtk-doc-am - doc? ( >=dev-util/gtk-doc-1 )" - -REQUIRED_USE="cdda? ( udev )" - -pkg_setup() { - # --enable-documentation installs man pages - G2CONF="${G2CONF} - --disable-bash-completion - --disable-hal - --disable-schemas-compile - --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 gphoto2) - $(use_enable gtk) - $(use_enable ios afc) - $(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_prepare() { - if use archive; then - epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch - echo mount-archive.desktop.in >> po/POTFILES.in - echo mount-archive.desktop.in.in >> po/POTFILES.in - fi - - 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 archive || ! use udev; then - # libgcrypt.m4 needed for eautoreconf, bug #399043 - mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die - - [[ ${PV} = 9999 ]] || AT_M4DIR=. eautoreconf - fi - - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - dobashcomp programs/completion/gvfs -} diff --git a/gnome-base/gvfs/gvfs-1.14.2.ebuild b/gnome-base/gvfs/gvfs-1.14.2.ebuild index d62a0db596a7..c3e3398ec0c4 100644 --- a/gnome-base/gvfs/gvfs-1.14.2.ebuild +++ b/gnome-base/gvfs/gvfs-1.14.2.ebuild @@ -1,8 +1,8 @@ # 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.14.2.ebuild,v 1.2 2012/12/03 10:02:21 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.14.2.ebuild,v 1.3 2012/12/10 11:26:30 tetromino Exp $ -EAPI="4" +EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" @@ -36,8 +36,8 @@ RDEPEND=">=dev-libs/glib-2.33.12:2 sys-apps/dbus dev-libs/libxml2:2 net-misc/openssh - afp? ( >=dev-libs/libgcrypt-1.2.2 ) - archive? ( app-arch/libarchive ) + 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 @@ -51,7 +51,7 @@ RDEPEND=">=dev-libs/glib-2.33.12: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 ) + gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-gnome-2.26.0 ) ios? ( -- cgit v1.2.3-65-gdbad