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 1Q8z1H-0000WG-Ij for garchives@archives.gentoo.org; Sun, 10 Apr 2011 18:05:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 905EF1C014; Sun, 10 Apr 2011 18:04:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4DBA11C014 for ; Sun, 10 Apr 2011 18:04:48 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C6AAD1B4008 for ; Sun, 10 Apr 2011 18:04:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 20CAF80065 for ; Sun, 10 Apr 2011 18:04:47 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <4be59f2f12cdd39ef8f1e9de0645089d39d9e010.eva@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.8.0.ebuild gnome-base/gvfs/gvfs-9999.ebuild X-VCS-Directories: gnome-base/gvfs/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 4be59f2f12cdd39ef8f1e9de0645089d39d9e010 Date: Sun, 10 Apr 2011 18:04:47 +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: baf662834f4648507abb0c3832114df7 commit: 4be59f2f12cdd39ef8f1e9de0645089d39d9e010 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Fri Apr 8 11:45:33 2011 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Apr 10 17:58:43 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D4be59f2f gnome-base/gvfs: QAed * Sync with gentoo-x86 * Bump to EAPI 3 (Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --forc= e, signed Manifest commit with key C6085806) --- gnome-base/gvfs/gvfs-1.8.0.ebuild | 24 ++++++++++-------------- gnome-base/gvfs/gvfs-9999.ebuild | 24 ++++++++++-------------- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/gnome-base/gvfs/gvfs-1.8.0.ebuild b/gnome-base/gvfs/gvfs-1.8= .0.ebuild index 22b1e90..9f3c6cc 100644 --- a/gnome-base/gvfs/gvfs-1.8.0.ebuild +++ b/gnome-base/gvfs/gvfs-1.8.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.4-r1.ebuild,= v 1.1 2010/10/05 08:49:12 pacho Exp $ =20 -EAPI=3D"2" +EAPI=3D"3" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 @@ -16,8 +16,6 @@ HOMEPAGE=3D"http://www.gnome.org" =20 LICENSE=3D"LGPL-2" SLOT=3D"0" -IUSE=3D"archive avahi bluetooth cdda doc fuse gdu gnome-keyring gphoto2 = hal +http -iphone samba +udev" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" DOCS=3D"AUTHORS ChangeLog.pre-1-2 NEWS README TODO" @@ -25,6 +23,7 @@ else KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd" DOCS=3D"AUTHORS ChangeLog ChangeLog.pre-1-2 NEWS README TODO" fi +IUSE=3D"archive avahi bluetooth cdda doc fuse gdu gnome-keyring gphoto2 = +http ios samba +udev" =20 RDEPEND=3D">=3Ddev-libs/glib-2.27.4 >=3Dsys-apps/dbus-1.0 @@ -42,15 +41,12 @@ RDEPEND=3D">=3Ddev-libs/glib-2.27.4 gdu? ( >=3Dsys-apps/gnome-disk-utility-2.29 ) gnome-keyring? ( >=3Dgnome-base/gnome-keyring-1.0 ) gphoto2? ( >=3Dmedia-libs/libgphoto2-2.4.7 ) - iphone? ( + ios? ( >=3Dapp-pda/libimobiledevice-1.1.0 >=3Dapp-pda/libplist-0.15 ) udev? ( cdda? ( >=3Ddev-libs/libcdio-0.78.2[-minimal] ) >=3Dsys-fs/udev-145[extras] ) - hal? ( - cdda? ( >=3Ddev-libs/libcdio-0.78.2[-minimal] ) - >=3Dsys-apps/hal-0.5.10 ) http? ( >=3Dnet-libs/libsoup-gnome-2.26.0 ) samba? ( || ( >=3Dnet-fs/samba-3.4.6[smbclient] <=3Dnet-fs/samba-3.3 ) )" @@ -60,18 +56,19 @@ DEPEND=3D"${RDEPEND} dev-util/gtk-doc-am doc? ( >=3Ddev-util/gtk-doc-1 )" =20 - pkg_setup() { - if use cdda && ! use hal && ! use udev; then - ewarn "You have \"+cdda\", but you have \"-hal\" and \"-udev\"" - ewarn "cdda support will NOT be built unless you enable EITHER hal OR = udev" + 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 =20 G2CONF=3D"${G2CONF} --enable-udev --disable-bash-completion - --with-dbus-service-dir=3D/usr/share/dbus-1/services + --disable-hal --disable-schemas-compile + --with-dbus-service-dir=3D/usr/share/dbus-1/services $(use_enable archive) $(use_enable avahi) $(use_enable bluetooth obexftp) @@ -79,9 +76,8 @@ pkg_setup() { $(use_enable fuse) $(use_enable gdu) $(use_enable gphoto2) - $(use_enable iphone afc) + $(use_enable ios afc) $(use_enable udev gudev) - $(use_enable hal) $(use_enable http) $(use_enable gnome-keyring keyring) $(use_enable samba)" diff --git a/gnome-base/gvfs/gvfs-9999.ebuild b/gnome-base/gvfs/gvfs-9999= .ebuild index 22b1e90..9f3c6cc 100644 --- a/gnome-base/gvfs/gvfs-9999.ebuild +++ b/gnome-base/gvfs/gvfs-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.4-r1.ebuild,= v 1.1 2010/10/05 08:49:12 pacho Exp $ =20 -EAPI=3D"2" +EAPI=3D"3" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 @@ -16,8 +16,6 @@ HOMEPAGE=3D"http://www.gnome.org" =20 LICENSE=3D"LGPL-2" SLOT=3D"0" -IUSE=3D"archive avahi bluetooth cdda doc fuse gdu gnome-keyring gphoto2 = hal +http -iphone samba +udev" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" DOCS=3D"AUTHORS ChangeLog.pre-1-2 NEWS README TODO" @@ -25,6 +23,7 @@ else KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd" DOCS=3D"AUTHORS ChangeLog ChangeLog.pre-1-2 NEWS README TODO" fi +IUSE=3D"archive avahi bluetooth cdda doc fuse gdu gnome-keyring gphoto2 = +http ios samba +udev" =20 RDEPEND=3D">=3Ddev-libs/glib-2.27.4 >=3Dsys-apps/dbus-1.0 @@ -42,15 +41,12 @@ RDEPEND=3D">=3Ddev-libs/glib-2.27.4 gdu? ( >=3Dsys-apps/gnome-disk-utility-2.29 ) gnome-keyring? ( >=3Dgnome-base/gnome-keyring-1.0 ) gphoto2? ( >=3Dmedia-libs/libgphoto2-2.4.7 ) - iphone? ( + ios? ( >=3Dapp-pda/libimobiledevice-1.1.0 >=3Dapp-pda/libplist-0.15 ) udev? ( cdda? ( >=3Ddev-libs/libcdio-0.78.2[-minimal] ) >=3Dsys-fs/udev-145[extras] ) - hal? ( - cdda? ( >=3Ddev-libs/libcdio-0.78.2[-minimal] ) - >=3Dsys-apps/hal-0.5.10 ) http? ( >=3Dnet-libs/libsoup-gnome-2.26.0 ) samba? ( || ( >=3Dnet-fs/samba-3.4.6[smbclient] <=3Dnet-fs/samba-3.3 ) )" @@ -60,18 +56,19 @@ DEPEND=3D"${RDEPEND} dev-util/gtk-doc-am doc? ( >=3Ddev-util/gtk-doc-1 )" =20 - pkg_setup() { - if use cdda && ! use hal && ! use udev; then - ewarn "You have \"+cdda\", but you have \"-hal\" and \"-udev\"" - ewarn "cdda support will NOT be built unless you enable EITHER hal OR = udev" + 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 =20 G2CONF=3D"${G2CONF} --enable-udev --disable-bash-completion - --with-dbus-service-dir=3D/usr/share/dbus-1/services + --disable-hal --disable-schemas-compile + --with-dbus-service-dir=3D/usr/share/dbus-1/services $(use_enable archive) $(use_enable avahi) $(use_enable bluetooth obexftp) @@ -79,9 +76,8 @@ pkg_setup() { $(use_enable fuse) $(use_enable gdu) $(use_enable gphoto2) - $(use_enable iphone afc) + $(use_enable ios afc) $(use_enable udev gudev) - $(use_enable hal) $(use_enable http) $(use_enable gnome-keyring keyring) $(use_enable samba)"