diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-12-20 16:27:56 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-12-20 16:27:56 +0000 |
| commit | 975872674f64ee041bcf6d0bd6c4eedfaf0a7ad8 (patch) | |
| tree | eacc491a9344269d87bcc3cb4c9ea2f2180ed471 /gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild | |
| parent | Remove old. (diff) | |
| download | gentoo-2-975872674f64ee041bcf6d0bd6c4eedfaf0a7ad8.tar.gz gentoo-2-975872674f64ee041bcf6d0bd6c4eedfaf0a7ad8.tar.bz2 gentoo-2-975872674f64ee041bcf6d0bd6c4eedfaf0a7ad8.zip | |
Remove useless doc USE flag (bug #447938), fix nautilus-2 build with ld.gold, update license, switch to global introspection flag. Drop old.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild')
| -rw-r--r-- | gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild b/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild index 71eb1bc46cc3..1dba0db37c6c 100644 --- a/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild +++ b/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild @@ -1,21 +1,22 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild,v 1.8 2012/07/15 17:31:31 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild,v 1.9 2012/12/20 16:27:56 tetromino Exp $ -EAPI="3" +EAPI="4" GCONF_DEBUG="no" +GNOME_TARBALL_SUFFIX="bz2" -inherit eutils gnome2 virtualx +inherit autotools eutils gnome2 virtualx DESCRIPTION="A file manager for the GNOME desktop" HOMEPAGE="http://live.gnome.org/Nautilus" SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2" -LICENSE="GPL-2 LGPL-2 FDL-1.1" +LICENSE="GPL-2+ LGPL-2+ FDL-1.1" SLOT="0" KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux" -IUSE="doc gnome +introspection xmp" +IUSE="gnome +introspection xmp" RDEPEND=">=dev-libs/glib-2.28.0:2 >=gnome-base/gnome-desktop-2.29.91:2 @@ -35,34 +36,30 @@ DEPEND="${RDEPEND} >=dev-lang/perl-5 sys-devel/gettext virtual/pkgconfig - >=dev-util/intltool-0.40.1 - doc? ( >=dev-util/gtk-doc-1.4 )" + dev-util/gtk-doc-am + >=dev-util/intltool-0.40.1" # For eautoreconf # gnome-base/gnome-common -# dev-util/gtk-doc-am" PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 ) >=gnome-base/gvfs-0.1.2" -pkg_setup() { +src_prepare() { G2CONF="${G2CONF} --disable-update-mimedb --disable-packagekit $(use_enable introspection) $(use_enable xmp)" DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO" -} - -src_prepare() { - gnome2_src_prepare # Apply multiple upstream fixes epatch "${WORKDIR}/${P}-patches"/*.patch - # Remove crazy CFLAGS - sed -i \ - -e 's:-DG.*DISABLE_DEPRECATED::g' \ - configure{,.in} eel/Makefile.{am,in} || die + # build failure with ld.gold, fixed in 3.4 + epatch "${FILESDIR}/${P}-gold-glib2.32.patch" + eautoreconf + + gnome2_src_prepare } src_test() { |