Fix build with USE=doc, bug #273958. Move gnome-common to DEPEND, add die messages, strip G_DISABLE* to prevent build failures.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

2 files changed, 29 insertions, 12 deletions

diff --git a/media-gfx/gtkimageview/ChangeLog b/media-gfx/gtkimageview/ChangeLog
index 9c53aeaab2aa..fdbe8fc794ca 100644
--- a/media-gfx/gtkimageview/ChangeLog
+++ b/media-gfx/gtkimageview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gtkimageview
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/ChangeLog,v 1.4 2009/06/12 19:31:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/ChangeLog,v 1.5 2009/06/28 18:00:11 eva Exp $
+
+  28 Jun 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  gtkimageview-1.6.4.ebuild:
+  Fix build with USE=doc, bug #273958. Move gnome-common to DEPEND, add die
+  messages, strip G_DISABLE* to prevent build failures.
 
   12 Jun 2009; Markus Meier <maekke@gentoo.org> gtkimageview-1.6.4.ebuild:
   do not use -Werror during build wrt bug #272301
diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
index 0b806292d692..f693a58e887a 100644
--- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
+++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild,v 1.5 2009/06/12 19:31:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild,v 1.6 2009/06/28 18:00:11 eva Exp $
 
 EAPI="2"
 
@@ -14,30 +14,42 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~x86"
 IUSE="doc examples"
+
 # tests do not work with userpriv
 RESTRICT="userpriv"
 
-RDEPEND="gnome-base/gnome-common
-	>=x11-libs/gtk+-2.6"
+RDEPEND=">=x11-libs/gtk+-2.6"
 DEPEND="${DEPEND}
+	gnome-base/gnome-common
+	dev-util/gtk-doc-am
 	doc? ( >=dev-util/gtk-doc-1.8 )"
 
-pkg_setup() {
-	DOCS="README"
-	# apparently docs are always built...
-	use doc || export GTKDOC_REBASE=/bin/true
-}
+DOCS="README"
 
 src_prepare() {
-	sed -i -e '/CFLAGS/s/-Werror //g' configure.in || die
 	gnome2_src_prepare
+
+	# Prevent excessive build failures due to gcc changes
+	sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die "sed 1 failed"
+
+	# Prevent excessive build failures due to glib/gtk changes
+	sed '/DEPRECATED_FLAGS/d' -i configure.in || die "sed 2 failed"
+
+	if use doc; then
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
+			-i gtk-doc.make || die "sed 3 failed"
+	else
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=true" \
+			-i gtk-doc.make || die "sed 4 failed"
+	fi
+
 	eautoreconf
 }
 
 src_test() {
 	# the tests are only built, but not run by default
 	local failed="0"
-	emake check || die
+	emake check || die "emake check failed"
 	cd "${S}"/tests
 	for test in test-* ; do
 		if [[ -x ${test} ]] ; then
@@ -51,6 +63,6 @@ src_install() {
 	gnome2_src_install
 	if use examples ; then
 		docinto examples
-		dodoc tests/ex-*.c || die
+		dodoc tests/ex-*.c || die "dodoc failed"
 	fi
 }