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 1Q8z0Z-0000Np-PW for garchives@archives.gentoo.org; Sun, 10 Apr 2011 18:05:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12B341C0C0; Sun, 10 Apr 2011 18:04:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C59EF1C0BE for ; Sun, 10 Apr 2011 18:04:49 +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 626E31B4008 for ; Sun, 10 Apr 2011 18:04:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id AAF2080079 for ; Sun, 10 Apr 2011 18:04:48 +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: Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/nautilus/nautilus-3.0.0.ebuild gnome-base/nautilus/nautilus-9999.ebuild X-VCS-Directories: gnome-base/nautilus/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: aff0a548d2878cbd8ff1e4dd99384079a8d8928f Date: Sun, 10 Apr 2011 18:04:48 +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: 78a958c18863292cfdbf93a5dafdcb4c commit: aff0a548d2878cbd8ff1e4dd99384079a8d8928f Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Apr 9 13:32:43 2011 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Apr 10 18:03:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Daff0a548 gnome-base/nautilus: QAed * Sync with gentoo-x86 changes (Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --forc= e, signed Manifest commit with key C6085806) --- gnome-base/nautilus/nautilus-3.0.0.ebuild | 30 ++++++++---------------= ----- gnome-base/nautilus/nautilus-9999.ebuild | 30 ++++++++---------------= ----- 2 files changed, 18 insertions(+), 42 deletions(-) diff --git a/gnome-base/nautilus/nautilus-3.0.0.ebuild b/gnome-base/nauti= lus/nautilus-3.0.0.ebuild index bae8300..f5b9a68 100644 --- a/gnome-base/nautilus/nautilus-3.0.0.ebuild +++ b/gnome-base/nautilus/nautilus-3.0.0.ebuild @@ -2,26 +2,26 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 -EAPI=3D"2" +EAPI=3D"3" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 -inherit autotools eutils gnome2 virtualx +inherit eutils gnome2 virtualx if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi =20 DESCRIPTION=3D"A file manager for the GNOME desktop" -HOMEPAGE=3D"http://www.gnome.org/projects/nautilus/" +HOMEPAGE=3D"http://live.gnome.org/Nautilus" =20 LICENSE=3D"GPL-2 LGPL-2 FDL-1.1" SLOT=3D"0" -IUSE=3D"doc exif gnome +introspection sendto xmp" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else - KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 = ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux" + KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd ~x86-interix ~amd64-linux ~x86-linux" fi +IUSE=3D"doc exif gnome +introspection sendto xmp" =20 COMMON_DEPEND=3D">=3Ddev-libs/glib-2.28.0:2 >=3Dx11-libs/pango-1.28.3 @@ -52,8 +52,6 @@ RDEPEND=3D"${COMMON_DEPEND} PDEPEND=3D"gnome? ( >=3Dx11-themes/gnome-icon-theme-1.1.91 ) >=3Dgnome-base/gvfs-0.1.2" =20 -DOCS=3D"AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO" - pkg_setup() { G2CONF=3D"${G2CONF} --disable-maintainer-mode @@ -63,29 +61,19 @@ pkg_setup() { $(use_enable introspection) $(use_enable sendto nst-extension) $(use_enable xmp)" + DOCS=3D"AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO" } =20 src_prepare() { gnome2_src_prepare =20 - # FIXME: tarball generated with broken gtk-doc, revisit me. - if use doc; then - sed "/^TARGET_DIR/i \GTKDOC_REBASE=3D/usr/bin/gtkdoc-rebase" \ - -i gtk-doc.make || die "sed 1 failed" - else - sed "/^TARGET_DIR/i \GTKDOC_REBASE=3D/bin/true" \ - -i gtk-doc.make || die "sed 2 failed" - fi - # Remove crazy CFLAGS - sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in \ - || die "sed 4 failed" - - eautoreconf + sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \ + || die "sed 1 failed" } =20 src_test() { - addwrite "/root/.gnome2_private" + addpredict "/root/.gnome2_private" unset SESSION_MANAGER unset ORBIT_SOCKETDIR unset DBUS_SESSION_BUS_ADDRESS diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautil= us/nautilus-9999.ebuild index bae8300..f5b9a68 100644 --- a/gnome-base/nautilus/nautilus-9999.ebuild +++ b/gnome-base/nautilus/nautilus-9999.ebuild @@ -2,26 +2,26 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 -EAPI=3D"2" +EAPI=3D"3" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 -inherit autotools eutils gnome2 virtualx +inherit eutils gnome2 virtualx if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi =20 DESCRIPTION=3D"A file manager for the GNOME desktop" -HOMEPAGE=3D"http://www.gnome.org/projects/nautilus/" +HOMEPAGE=3D"http://live.gnome.org/Nautilus" =20 LICENSE=3D"GPL-2 LGPL-2 FDL-1.1" SLOT=3D"0" -IUSE=3D"doc exif gnome +introspection sendto xmp" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else - KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 = ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux" + KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd ~x86-interix ~amd64-linux ~x86-linux" fi +IUSE=3D"doc exif gnome +introspection sendto xmp" =20 COMMON_DEPEND=3D">=3Ddev-libs/glib-2.28.0:2 >=3Dx11-libs/pango-1.28.3 @@ -52,8 +52,6 @@ RDEPEND=3D"${COMMON_DEPEND} PDEPEND=3D"gnome? ( >=3Dx11-themes/gnome-icon-theme-1.1.91 ) >=3Dgnome-base/gvfs-0.1.2" =20 -DOCS=3D"AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO" - pkg_setup() { G2CONF=3D"${G2CONF} --disable-maintainer-mode @@ -63,29 +61,19 @@ pkg_setup() { $(use_enable introspection) $(use_enable sendto nst-extension) $(use_enable xmp)" + DOCS=3D"AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO" } =20 src_prepare() { gnome2_src_prepare =20 - # FIXME: tarball generated with broken gtk-doc, revisit me. - if use doc; then - sed "/^TARGET_DIR/i \GTKDOC_REBASE=3D/usr/bin/gtkdoc-rebase" \ - -i gtk-doc.make || die "sed 1 failed" - else - sed "/^TARGET_DIR/i \GTKDOC_REBASE=3D/bin/true" \ - -i gtk-doc.make || die "sed 2 failed" - fi - # Remove crazy CFLAGS - sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in \ - || die "sed 4 failed" - - eautoreconf + sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \ + || die "sed 1 failed" } =20 src_test() { - addwrite "/root/.gnome2_private" + addpredict "/root/.gnome2_private" unset SESSION_MANAGER unset ORBIT_SOCKETDIR unset DBUS_SESSION_BUS_ADDRESS