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 1QbINf-0004sE-AW for garchives@archives.gentoo.org; Mon, 27 Jun 2011 20:26:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7914E1C137; Mon, 27 Jun 2011 20:25:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 38DEB1C13E for ; Mon, 27 Jun 2011 20:25:46 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D2B51B403F for ; Mon, 27 Jun 2011 20:25:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DB2008003E for ; Mon, 27 Jun 2011 20:25:44 +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: <48094b4c285aa642c576ffa0599c401d905bc3a3.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.8.2-r1.ebuild gnome-base/gvfs/gvfs-1.8.2.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: 48094b4c285aa642c576ffa0599c401d905bc3a3 Date: Mon, 27 Jun 2011 20:25:44 +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: adedc033cb37b54def822eecef623fb0 commit: 48094b4c285aa642c576ffa0599c401d905bc3a3 Author: Alexandre Rostovtsev gmail com> AuthorDate: Mon Jun 27 19:52:32 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Mon Jun 27 19:52:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D48094b4c gnome-base/gvfs: udev and prefix fix (bug #293480) Allow building without udev on prefix (bug #293480 by Rabbe Fogelholm); these changes were already applied to gvfs-1.6.7-r1 in gx86. --- .../{gvfs-1.8.2.ebuild =3D> gvfs-1.8.2-r1.ebuild} | 16 +++++++++++-= ---- gnome-base/gvfs/gvfs-9999.ebuild | 16 +++++++++++---= -- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/gnome-base/gvfs/gvfs-1.8.2.ebuild b/gnome-base/gvfs/gvfs-1.8= .2-r1.ebuild similarity index 88% rename from gnome-base/gvfs/gvfs-1.8.2.ebuild rename to gnome-base/gvfs/gvfs-1.8.2-r1.ebuild index fa8bc6f..92d740b 100644 --- a/gnome-base/gvfs/gvfs-1.8.2.ebuild +++ b/gnome-base/gvfs/gvfs-1.8.2-r1.ebuild @@ -23,13 +23,13 @@ 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" +IUSE=3D"archive avahi bluetooth cdda doc fuse gdu gnome-keyring gphoto2 = +http ios prefix samba +udev" =20 RDEPEND=3D">=3Ddev-libs/glib-2.27.4 >=3Dsys-apps/dbus-1.0 dev-libs/libxml2 net-misc/openssh - >=3Dsys-fs/udev-138 + !prefix? ( >=3Dsys-fs/udev-138 ) archive? ( app-arch/libarchive ) avahi? ( >=3Dnet-dns/avahi-0.6 ) bluetooth? ( @@ -64,7 +64,6 @@ pkg_setup() { fi =20 G2CONF=3D"${G2CONF} - --enable-udev --disable-bash-completion --disable-hal --disable-schemas-compile @@ -80,7 +79,8 @@ pkg_setup() { $(use_enable udev gudev) $(use_enable http) $(use_enable gnome-keyring keyring) - $(use_enable samba)" + $(use_enable samba) + $(use_enable !prefix udev)" } =20 src_prepare() { @@ -95,7 +95,13 @@ src_prepare() { echo "mount-archive.desktop.in.in" >> po/POTFILES.in fi =20 - use gphoto2 || use archive && eautoreconf + if use prefix; 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 + + { use gphoto2 || use archive || use prefix; } && eautoreconf } =20 src_install() { diff --git a/gnome-base/gvfs/gvfs-9999.ebuild b/gnome-base/gvfs/gvfs-9999= .ebuild index fa8bc6f..92d740b 100644 --- a/gnome-base/gvfs/gvfs-9999.ebuild +++ b/gnome-base/gvfs/gvfs-9999.ebuild @@ -23,13 +23,13 @@ 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" +IUSE=3D"archive avahi bluetooth cdda doc fuse gdu gnome-keyring gphoto2 = +http ios prefix samba +udev" =20 RDEPEND=3D">=3Ddev-libs/glib-2.27.4 >=3Dsys-apps/dbus-1.0 dev-libs/libxml2 net-misc/openssh - >=3Dsys-fs/udev-138 + !prefix? ( >=3Dsys-fs/udev-138 ) archive? ( app-arch/libarchive ) avahi? ( >=3Dnet-dns/avahi-0.6 ) bluetooth? ( @@ -64,7 +64,6 @@ pkg_setup() { fi =20 G2CONF=3D"${G2CONF} - --enable-udev --disable-bash-completion --disable-hal --disable-schemas-compile @@ -80,7 +79,8 @@ pkg_setup() { $(use_enable udev gudev) $(use_enable http) $(use_enable gnome-keyring keyring) - $(use_enable samba)" + $(use_enable samba) + $(use_enable !prefix udev)" } =20 src_prepare() { @@ -95,7 +95,13 @@ src_prepare() { echo "mount-archive.desktop.in.in" >> po/POTFILES.in fi =20 - use gphoto2 || use archive && eautoreconf + if use prefix; 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 + + { use gphoto2 || use archive || use prefix; } && eautoreconf } =20 src_install() {