diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2013-02-04 20:40:19 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2013-02-04 20:40:19 +0000 |
| commit | 9b3b660817d031eebfe70c6fcaae9feb38f9abbf (patch) | |
| tree | 8778ee8a35999117bce15231f062940e5217713b /gnome-base | |
| parent | add static-libs support (bug #442752) (diff) | |
| download | gentoo-2-9b3b660817d031eebfe70c6fcaae9feb38f9abbf.tar.gz gentoo-2-9b3b660817d031eebfe70c6fcaae9feb38f9abbf.tar.bz2 gentoo-2-9b3b660817d031eebfe70c6fcaae9feb38f9abbf.zip | |
Use eapi5 for next libphoto2 bumps
(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gvfs/ChangeLog | 5 | ||||
| -rw-r--r-- | gnome-base/gvfs/gvfs-1.12.3-r1.ebuild | 47 |
2 files changed, 23 insertions, 29 deletions
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog index 45fb4685be2e..7804ae7abd9c 100644 --- a/gnome-base/gvfs/ChangeLog +++ b/gnome-base/gvfs/ChangeLog @@ -1,6 +1,9 @@ # 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.199 2013/01/22 08:06:34 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.200 2013/02/04 20:40:19 pacho Exp $ + + 04 Feb 2013; Pacho Ramos <pacho@gentoo.org> gvfs-1.12.3-r1.ebuild: + Use eapi5 for next libphoto2 bumps 22 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org> metadata.xml: Switch to global systemd USE flag. diff --git a/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild b/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild index 8dc942b17da8..66d557c346c3 100644 --- a/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild +++ b/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild @@ -1,28 +1,21 @@ # 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.12.3-r1.ebuild,v 1.3 2013/01/16 05:13:26 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild,v 1.4 2013/02/04 20:40:19 pacho Exp $ -EAPI=4 +EAPI=5 GCONF_DEBUG=no GNOME2_LA_PUNT=yes inherit autotools bash-completion-r1 eutils gnome2 -[[ ${PV} = 9999 ]] && inherit gnome2-live - 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 +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 SRC_URI="${SRC_URI} http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2" @@ -30,33 +23,33 @@ SRC_URI="${SRC_URI} IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios samba +udev udisks" RDEPEND=">=dev-libs/glib-2.31.0:2 - sys-apps/dbus - dev-libs/libxml2 + sys-apps/dbus:= + dev-libs/libxml2:= 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 - dev-libs/dbus-glib + dev-libs/dbus-glib:= net-wireless/bluez - dev-libs/expat ) - bluray? ( media-libs/libbluray ) - fuse? ( >=sys-fs/fuse-2.8.0 ) + 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? ( >=gnome-base/gnome-keyring-1.0 ) - gphoto2? ( >=media-libs/libgphoto2-2.4.7 ) + gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) ios? ( - >=app-pda/libimobiledevice-1.1.0 - >=app-pda/libplist-1 ) + >=app-pda/libimobiledevice-1.1.0:= + >=app-pda/libplist-1:= ) udev? ( - cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) - virtual/udev[gudev] ) + cdda? ( >=dev-libs/libcdio-0.78.2:=[-minimal] ) + virtual/udev:=[gudev] ) udisks? ( >=sys-fs/udisks-1.90:2 ) - http? ( >=net-libs/libsoup-gnome-2.26.0 ) + http? ( >=net-libs/libsoup-gnome-2.26.0:= ) samba? ( >=net-fs/samba-3.4.6[smbclient] )" DEPEND="${RDEPEND} >=dev-util/intltool-0.40 @@ -66,7 +59,7 @@ DEPEND="${RDEPEND} REQUIRED_USE="cdda? ( udev )" -pkg_setup() { +src_prepare() { G2CONF="${G2CONF} --disable-bash-completion --disable-hal @@ -88,9 +81,7 @@ pkg_setup() { $(use_enable gnome-keyring keyring) $(use_enable samba) $(use_enable udisks udisks2)" -} -src_prepare() { # Conditional patching purely to avoid eautoreconf if use gphoto2; then epatch "${FILESDIR}"/${PN}-1.12.3-gphoto2-stricter-checks.patch |