Drop unneeded gtk-doc fix.

Package-Manager: portage-2.2_rc68/cvs/Linux x86_64

3 files changed, 6 insertions, 107 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index ac8bebcc3967..6eaed49cffe7 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.353 2010/08/18 21:53:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.354 2010/08/30 20:28:41 eva Exp $
+
+  30 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -nautilus-2.26.4.ebuild, nautilus-2.30.1-r1.ebuild:
+  Drop unneeded gtk-doc fix.
 
   18 Aug 2010; Markus Meier <maekke@gentoo.org> nautilus-2.28.4-r1.ebuild:
   arm stable, bug #314899
diff --git a/gnome-base/nautilus/nautilus-2.26.4.ebuild b/gnome-base/nautilus/nautilus-2.26.4.ebuild
deleted file mode 100644
index 371918ec69e4..000000000000
--- a/gnome-base/nautilus/nautilus-2.26.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.26.4.ebuild,v 1.12 2010/07/20 01:27:27 jer Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="beagle doc gnome tracker xmp"
-
-# not adding gnome-base/gail because it is in gtk+
-RDEPEND=">=dev-libs/glib-2.19.0
-	>=gnome-base/gnome-desktop-2.25.5
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.16.0
-	>=dev-libs/libxml2-2.4.7
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2.0
-	>=gnome-base/gvfs-0.1.2
-	dev-libs/libunique
-	dev-libs/dbus-glib
-	x11-libs/libXft
-	x11-libs/libXrender
-	beagle? ( || (
-		dev-libs/libbeagle
-		=app-misc/beagle-0.2* ) )
-	tracker? ( >=app-misc/tracker-0.6.4 )
-	xmp? ( >=media-libs/exempi-2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40.1
-	doc? ( >=dev-util/gtk-doc-1.4 )
-	gnome-base/gnome-common
-	dev-util/gtk-doc-am"
-
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-packagekit
-		$(use_enable beagle)
-		$(use_enable tracker)
-		$(use_enable xmp)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: tarball generated with broken gtk-doc, revisit me.
-	if use doc; then
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
-			-i gtk-doc.make || die "sed 1 failed"
-	else
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/bin/true" \
-			-i gtk-doc.make || die "sed 2 failed"
-	fi
-
-	# gtk-doc-am and gnome-common needed for this
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-
-	# Fix nautilus flipping-out with --no-desktop -- bug 266398
-	epatch "${FILESDIR}/${PN}-2.26.2-change-reg-desktop-file-with-no-desktop.patch"
-	# Fix massive memory consumption by Nautilus for larger zoom levels.
-	# Import from upstream, see distributor mailing lists.
-	epatch "${FILESDIR}/${PN}-2.26.3-thumbnail-zoom-level.patch"
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "nautilus can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview"
-}
diff --git a/gnome-base/nautilus/nautilus-2.30.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.30.1-r1.ebuild
index c8acde60f783..e12d631adb87 100644
--- a/gnome-base/nautilus/nautilus-2.30.1-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.30.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.30.1-r1.ebuild,v 1.4 2010/08/01 11:31:51 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.30.1-r1.ebuild,v 1.5 2010/08/30 20:28:41 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -53,15 +53,6 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	# FIXME: tarball generated with broken gtk-doc, revisit me.
-	if use doc; then
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
-			-i gtk-doc.make || die "sed 1 failed"
-	else
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/bin/true" \
-			-i gtk-doc.make || die "sed 2 failed"
-	fi
-
 	# Remove crazy CFLAGS
 	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
 		|| die "sed 4 failed"