summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-01-18 08:55:08 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-01-18 08:55:08 +0000
commit2e98ec4c7205924e32d982e43c9c79c9bc2bf9fb (patch)
tree8da79eb4c7bfb8a1383895e12e15704ab416ac6b /gnome-base/gvfs
parentOnly depend on python if USE=python (bug #398957, thanks to Maxim Kammerer). (diff)
downloadgentoo-2-2e98ec4c7205924e32d982e43c9c79c9bc2bf9fb.tar.gz
gentoo-2-2e98ec4c7205924e32d982e43c9c79c9bc2bf9fb.tar.bz2
gentoo-2-2e98ec4c7205924e32d982e43c9c79c9bc2bf9fb.zip
Ship libgcrypt.m4 to allow eautoreconf without libgcrypt installed (bug #399043, thanks to Christopher Head for reporting). Also, move gnome2_src_prepare after the eautoreconf.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gvfs')
-rw-r--r--gnome-base/gvfs/ChangeLog7
-rw-r--r--gnome-base/gvfs/gvfs-1.10.1.ebuild16
2 files changed, 18 insertions, 5 deletions
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index b84094d612b1..b74a130d61b8 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,11 @@
# 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.163 2012/01/14 17:04:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.164 2012/01/18 08:55:08 tetromino Exp $
+
+ 18 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.10.1.ebuild:
+ Ship libgcrypt.m4 to allow eautoreconf without libgcrypt installed (bug
+ #399043, thanks to Christopher Head for reporting). Also, move
+ gnome2_src_prepare after the eautoreconf.
14 Jan 2012; Markus Meier <maekke@gentoo.org> gvfs-1.10.1.ebuild:
x86 stable, bug #393007
diff --git a/gnome-base/gvfs/gvfs-1.10.1.ebuild b/gnome-base/gvfs/gvfs-1.10.1.ebuild
index 1fe402cae4da..08d75c72dc9c 100644
--- a/gnome-base/gvfs/gvfs-1.10.1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.10.1.ebuild
@@ -1,6 +1,6 @@
# 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.10.1.ebuild,v 1.6 2012/01/14 17:04:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild,v 1.7 2012/01/18 08:55:08 tetromino Exp $
EAPI=4
GCONF_DEBUG=no
@@ -24,6 +24,9 @@ else
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"
RDEPEND=">=dev-libs/glib-2.29.14
@@ -84,8 +87,6 @@ pkg_setup() {
}
src_prepare() {
- gnome2_src_prepare
-
# Conditional patching purely to avoid eautoreconf
use gphoto2 && epatch "${FILESDIR}"/${PN}-1.2.2-gphoto2-stricter-checks.patch
@@ -101,7 +102,14 @@ src_prepare() {
sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
fi
- { use gphoto2 || use archive || use prefix; } && eautoreconf
+ if use gphoto2 || use archive || use prefix; then
+ # libgcrypt.m4 needed for eautoreconf, bug #399043
+ mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
+
+ AT_M4DIR=. eautoreconf
+ fi
+
+ gnome2_src_prepare
}
src_install() {