From 43de2fc5f661260852fca78960383e32cf326253 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sun, 29 Apr 2012 18:36:09 +0000 Subject: Version bump, remove old. (Portage version: 2.1.10.57/cvs/Linux x86_64) --- gnome-base/gvfs/ChangeLog | 8 +- .../gvfs/files/gvfs-1.12.0-afp-gcc-4.5.patch | 26 ----- gnome-base/gvfs/gvfs-1.12.0.ebuild | 128 --------------------- gnome-base/gvfs/gvfs-1.12.2.ebuild | 122 ++++++++++++++++++++ 4 files changed, 129 insertions(+), 155 deletions(-) delete mode 100644 gnome-base/gvfs/files/gvfs-1.12.0-afp-gcc-4.5.patch delete mode 100644 gnome-base/gvfs/gvfs-1.12.0.ebuild create mode 100644 gnome-base/gvfs/gvfs-1.12.2.ebuild (limited to 'gnome-base') diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog index 02f421a5bce3..1bf28bee7af0 100644 --- a/gnome-base/gvfs/ChangeLog +++ b/gnome-base/gvfs/ChangeLog @@ -1,6 +1,12 @@ # 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.175 2012/04/24 03:44:24 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.176 2012/04/29 18:36:09 pacho Exp $ + +*gvfs-1.12.2 (29 Apr 2012) + + 29 Apr 2012; Pacho Ramos +gvfs-1.12.2.ebuild, + -files/gvfs-1.12.0-afp-gcc-4.5.patch, -gvfs-1.12.0.ebuild: + Version bump, remove old. 24 Apr 2012; Alexandre Rostovtsev gvfs-1.10.1.ebuild, gvfs-1.12.0.ebuild, gvfs-1.12.1.ebuild: diff --git a/gnome-base/gvfs/files/gvfs-1.12.0-afp-gcc-4.5.patch b/gnome-base/gvfs/files/gvfs-1.12.0-afp-gcc-4.5.patch deleted file mode 100644 index 575436ab335a..000000000000 --- a/gnome-base/gvfs/files/gvfs-1.12.0-afp-gcc-4.5.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 384e7b838570fce794cea368fcbaa97b9ad72df2 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Fri, 23 Mar 2012 18:33:40 +0100 -Subject: [PATCH] gvfsafp: Prevent redefinition of GVfsAfpServer. - -GVfsAfpServer is already included in gvfsafpvolume.h which gvfsafpserver.h -includes; so no need to declare GVfsAfpServer here. ---- - daemon/gvfsafpserver.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/daemon/gvfsafpserver.h b/daemon/gvfsafpserver.h -index 25753ca..5cf6fc4 100644 ---- a/daemon/gvfsafpserver.h -+++ b/daemon/gvfsafpserver.h -@@ -48,7 +48,6 @@ typedef enum - #define G_VFS_AFP_SERVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), G_VFS_TYPE_AFP_SERVER, GVfsAfpServerClass)) - - typedef struct _GVfsAfpServerClass GVfsAfpServerClass; --typedef struct _GVfsAfpServer GVfsAfpServer; - - struct _GVfsAfpServerClass - { --- -1.7.6 - diff --git a/gnome-base/gvfs/gvfs-1.12.0.ebuild b/gnome-base/gvfs/gvfs-1.12.0.ebuild deleted file mode 100644 index baf2ce9f5303..000000000000 --- a/gnome-base/gvfs/gvfs-1.12.0.ebuild +++ /dev/null @@ -1,128 +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.12.0.ebuild,v 1.5 2012/04/24 03:44:24 tetromino Exp $ - -EAPI=4 -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 ~x86-fbsd" - 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 +http ios samba +udev udisks" - -RDEPEND=">=dev-libs/glib-2.31.0:2 - sys-apps/dbus - dev-libs/libxml2 - 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? ( >=gnome-base/gnome-keyring-1.0 ) - gphoto2? ( >=media-libs/libgphoto2-2.4.7 ) - ios? ( - >=app-pda/libimobiledevice-1.1.0 - >=app-pda/libplist-1 ) - udev? ( - cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) - || ( >=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] )" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40 - dev-util/pkgconfig - dev-util/gtk-doc-am - doc? ( >=dev-util/gtk-doc-1 )" - -REQUIRED_USE="cdda? ( udev )" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-bash-completion - --disable-hal - --disable-schemas-compile - --with-dbus-service-dir=/usr/share/dbus-1/services - $(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 ios afc) - $(use_enable udev) - $(use_enable udev gudev) - $(use_enable http) - $(use_enable gnome-keyring keyring) - $(use_enable samba) - $(use_enable udisks udisks2)" -} - -src_prepare() { - # Conditional patching purely to avoid eautoreconf - use gphoto2 && epatch "${FILESDIR}"/${PN}-1.2.2-gphoto2-stricter-checks.patch - - 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 - - # bug #410411, https://bugzilla.gnome.org/show_bug.cgi?id=672693 - use ios && epatch "${FILESDIR}/${PN}-1.10.1-libimobiledevice-1.1.2.patch" - - # 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 udev || use ios; then - # libgcrypt.m4 needed for eautoreconf, bug #399043 - mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die - - AT_M4DIR=. eautoreconf - fi - - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - newbashcomp programs/gvfs-bash-completion.sh ${PN} -} diff --git a/gnome-base/gvfs/gvfs-1.12.2.ebuild b/gnome-base/gvfs/gvfs-1.12.2.ebuild new file mode 100644 index 000000000000..f590f4ea5eb7 --- /dev/null +++ b/gnome-base/gvfs/gvfs-1.12.2.ebuild @@ -0,0 +1,122 @@ +# 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.2.ebuild,v 1.1 2012/04/29 18:36:09 pacho Exp $ + +EAPI=4 +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 ~x86-fbsd" + 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 +http ios samba +udev udisks" + +RDEPEND=">=dev-libs/glib-2.31.0:2 + sys-apps/dbus + dev-libs/libxml2 + 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? ( >=gnome-base/gnome-keyring-1.0 ) + gphoto2? ( >=media-libs/libgphoto2-2.4.7 ) + ios? ( + >=app-pda/libimobiledevice-1.1.0 + >=app-pda/libplist-1 ) + udev? ( + cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) + || ( >=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] )" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.40 + dev-util/pkgconfig + dev-util/gtk-doc-am + doc? ( >=dev-util/gtk-doc-1 )" + +REQUIRED_USE="cdda? ( udev )" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-bash-completion + --disable-hal + --disable-schemas-compile + --with-dbus-service-dir=/usr/share/dbus-1/services + $(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 ios afc) + $(use_enable udev) + $(use_enable udev gudev) + $(use_enable http) + $(use_enable gnome-keyring keyring) + $(use_enable samba) + $(use_enable udisks udisks2)" +} + +src_prepare() { + # Conditional patching purely to avoid eautoreconf + use gphoto2 && epatch "${FILESDIR}"/${PN}-1.2.2-gphoto2-stricter-checks.patch + + 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 gphoto2 || use archive || ! use udev; then + # libgcrypt.m4 needed for eautoreconf, bug #399043 + mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die + + AT_M4DIR=. eautoreconf + fi + + gnome2_src_prepare +} + +src_install() { + gnome2_src_install + newbashcomp programs/gvfs-bash-completion.sh ${PN} +} -- cgit v1.2.3-65-gdbad