From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RG4Xu-00053O-I2 for garchives@archives.gentoo.org; Tue, 18 Oct 2011 07:57:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E07A021C024; Tue, 18 Oct 2011 07:57:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9F27D21C024 for ; Tue, 18 Oct 2011 07:57:02 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ECA811B4009 for ; Tue, 18 Oct 2011 07:57:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4E70F80042 for ; Tue, 18 Oct 2011 07:57:01 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <1834e88d1a44661a6dacdef231779c3aae5b77e5.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gvfs/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gvfs/gvfs-1.10.1.ebuild gnome-base/gvfs/gvfs-9999.ebuild X-VCS-Directories: gnome-base/gvfs/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 1834e88d1a44661a6dacdef231779c3aae5b77e5 Date: Tue, 18 Oct 2011 07:57:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 1a880d99a505671731156d10831c33f3 commit: 1834e88d1a44661a6dacdef231779c3aae5b77e5 Author: Alexandre Rostovtsev gmail com> AuthorDate: Tue Oct 18 07:52:00 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Tue Oct 18 07:52:00 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D1834e88d gnome-base/gvfs: sync with gx86 changes --- gnome-base/gvfs/gvfs-1.10.1.ebuild | 24 +++++++++--------------- gnome-base/gvfs/gvfs-9999.ebuild | 29 +++++++++++++---------------- 2 files changed, 22 insertions(+), 31 deletions(-) diff --git a/gnome-base/gvfs/gvfs-1.10.1.ebuild b/gnome-base/gvfs/gvfs-1.= 10.1.ebuild index 3934ab2..a0ec60b 100644 --- a/gnome-base/gvfs/gvfs-1.10.1.ebuild +++ b/gnome-base/gvfs/gvfs-1.10.1.ebuild @@ -6,7 +6,7 @@ EAPI=3D"4" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 -inherit autotools bash-completion gnome2 eutils +inherit autotools bash-completion-r1 gnome2 eutils if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -20,16 +20,16 @@ if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" DOCS=3D"AUTHORS ChangeLog.pre-1-2 NEWS README TODO" else - KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd" + KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 = ~x86-fbsd" DOCS=3D"AUTHORS ChangeLog ChangeLog.pre-1-2 NEWS README TODO" fi IUSE=3D"afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyri= ng gphoto2 +http ios prefix samba +udev" =20 RDEPEND=3D">=3Ddev-libs/glib-2.29.14 - >=3Dsys-apps/dbus-1.0 + sys-apps/dbus dev-libs/libxml2 net-misc/openssh - !prefix? ( >=3Dsys-fs/udev-138 ) + !prefix? ( >=3Dsys-fs/udev-164-r2 ) afp? ( >=3Ddev-libs/libgcrypt-1.2.2 ) archive? ( app-arch/libarchive ) avahi? ( >=3Dnet-dns/avahi-0.6 ) @@ -45,7 +45,7 @@ RDEPEND=3D">=3Ddev-libs/glib-2.29.14 gphoto2? ( >=3Dmedia-libs/libgphoto2-2.4.7 ) ios? ( >=3Dapp-pda/libimobiledevice-1.1.0 - >=3Dapp-pda/libplist-0.15 ) + >=3Dapp-pda/libplist-1 ) udev? ( cdda? ( >=3Ddev-libs/libcdio-0.78.2[-minimal] ) || ( >=3Dsys-fs/udev-171[gudev] >=3Dsys-fs/udev-145[extras] ) ) @@ -54,17 +54,13 @@ RDEPEND=3D">=3Ddev-libs/glib-2.29.14 <=3Dnet-fs/samba-3.3 ) )" DEPEND=3D"${RDEPEND} >=3Ddev-util/intltool-0.40 - >=3Ddev-util/pkgconfig-0.19 + dev-util/pkgconfig dev-util/gtk-doc-am doc? ( >=3Ddev-util/gtk-doc-1 )" =20 -pkg_setup() { - if use cdda && ! use udev; then - ewarn - ewarn "You need to enable USE=3D\"udev\" for USE=3D\"cdda\" to be usef= ul." - ewarn - fi +REQUIRED_USE=3D"cdda? ( udev )" =20 +pkg_setup() { G2CONF=3D"${G2CONF} --disable-bash-completion --disable-hal @@ -113,13 +109,11 @@ src_prepare() { =20 src_install() { gnome2_src_install - use bash-completion && \ - dobashcompletion programs/gvfs-bash-completion.sh ${PN} + newbashcomp programs/gvfs-bash-completion.sh ${PN} } =20 pkg_postinst() { gnome2_pkg_postinst - use bash-completion && bash-completion_pkg_postinst =20 ewarn "In order to use the new gvfs services, please reload dbus config= uration" ewarn "You may need to log out and log back in for some changes to take= effect" diff --git a/gnome-base/gvfs/gvfs-9999.ebuild b/gnome-base/gvfs/gvfs-9999= .ebuild index 60546e0..a0ec60b 100644 --- a/gnome-base/gvfs/gvfs-9999.ebuild +++ b/gnome-base/gvfs/gvfs-9999.ebuild @@ -6,7 +6,7 @@ EAPI=3D"4" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 -inherit autotools bash-completion gnome2 eutils +inherit autotools bash-completion-r1 gnome2 eutils if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -20,16 +20,16 @@ if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" DOCS=3D"AUTHORS ChangeLog.pre-1-2 NEWS README TODO" else - KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd" + KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 = ~x86-fbsd" DOCS=3D"AUTHORS ChangeLog ChangeLog.pre-1-2 NEWS README TODO" fi IUSE=3D"afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyri= ng gphoto2 +http ios prefix samba +udev" =20 RDEPEND=3D">=3Ddev-libs/glib-2.29.14 - >=3Dsys-apps/dbus-1.0 + sys-apps/dbus dev-libs/libxml2 net-misc/openssh - !prefix? ( >=3Dsys-fs/udev-138 ) + !prefix? ( >=3Dsys-fs/udev-164-r2 ) afp? ( >=3Ddev-libs/libgcrypt-1.2.2 ) archive? ( app-arch/libarchive ) avahi? ( >=3Dnet-dns/avahi-0.6 ) @@ -45,7 +45,7 @@ RDEPEND=3D">=3Ddev-libs/glib-2.29.14 gphoto2? ( >=3Dmedia-libs/libgphoto2-2.4.7 ) ios? ( >=3Dapp-pda/libimobiledevice-1.1.0 - >=3Dapp-pda/libplist-0.15 ) + >=3Dapp-pda/libplist-1 ) udev? ( cdda? ( >=3Ddev-libs/libcdio-0.78.2[-minimal] ) || ( >=3Dsys-fs/udev-171[gudev] >=3Dsys-fs/udev-145[extras] ) ) @@ -54,17 +54,13 @@ RDEPEND=3D">=3Ddev-libs/glib-2.29.14 <=3Dnet-fs/samba-3.3 ) )" DEPEND=3D"${RDEPEND} >=3Ddev-util/intltool-0.40 - >=3Ddev-util/pkgconfig-0.19 + dev-util/pkgconfig dev-util/gtk-doc-am doc? ( >=3Ddev-util/gtk-doc-1 )" =20 -pkg_setup() { - if use cdda && ! use udev; then - ewarn - ewarn "You need to enable USE=3D\"udev\" for USE=3D\"cdda\" to be usef= ul." - ewarn - fi +REQUIRED_USE=3D"cdda? ( udev )" =20 +pkg_setup() { G2CONF=3D"${G2CONF} --disable-bash-completion --disable-hal @@ -105,18 +101,19 @@ src_prepare() { sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die fi =20 - { use gphoto2 || use archive || use prefix; } && eautoreconf + # Drop G_DISABLE_DEPRECATED (fixed in git master); requires eautoreconf + epatch "${FILESDIR}/${PN}-1.10.1-G_DISABLE_DEPRECATED.patch" + eautoreconf + #{ use gphoto2 || use archive || use prefix; } && eautoreconf } =20 src_install() { gnome2_src_install - use bash-completion && \ - dobashcompletion programs/gvfs-bash-completion.sh ${PN} + newbashcomp programs/gvfs-bash-completion.sh ${PN} } =20 pkg_postinst() { gnome2_pkg_postinst - use bash-completion && bash-completion_pkg_postinst =20 ewarn "In order to use the new gvfs services, please reload dbus config= uration" ewarn "You may need to log out and log back in for some changes to take= effect"