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

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

3 files changed, 31 insertions, 24 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/Manifest b/media-gfx/gtkimageview/Manifest
index 089a6a467de2..5d472fa98706 100644
--- a/media-gfx/gtkimageview/Manifest
+++ b/media-gfx/gtkimageview/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST gtkimageview-1.6.4.tar.gz 1158138 RMD160 0d9cfdf97cde57bba057d75600d1abb0eabfe063 SHA1 a6c78744ba98441bca28c9d27bf89245517940db SHA256 4c681d38d127ee3950a29bce9aa7aa8a2abe3b4d915f7a0c88e526999c1a46f2
-EBUILD gtkimageview-1.6.4.ebuild 1332 RMD160 e9e995083996a8e50d124d22e2aa4c77f06402e0 SHA1 c993f90e6fd03da87c759f569d36689558b8d5a7 SHA256 9fb54fa0a20a20ee6187e51ea1c620439b0309c7f771d2c6365470ed60533229
-MISC ChangeLog 843 RMD160 ab2c0afbaf0c703d87014e5d2b60d421ed9e12cf SHA1 160de9e5cf7fbe3f2569e0743f21847f91d43c03 SHA256 2c462900995df011ce9c8c831cc003f63d59f577cfccf8c1a74ab5a0060a40c0
+EBUILD gtkimageview-1.6.4.ebuild 1705 RMD160 3285f8762c0098453cb94ad39ee29661e0ce3bab SHA1 d57aec87fae7f98f21b9bf47045188f082da0021 SHA256 8d8d93bdfcf1938b1bf71412da802b1ea12e7ad04aa30f32bbad19059ff883e7
+MISC ChangeLog 1056 RMD160 faf841d0ae231da5d03f2e60c52f57f63b10f18b SHA1 40e46d695c7ba0d12551dad0c99c9ea595698fcf SHA256 3dc84bf7ea950cc826659a77fc5fe61ae02ad1816c37561830ab5a2921cd3374
 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoyrYwACgkQkKaRLQcq0GLbMgCdFb6kUHZbey6UksfQ7Z8pc6qn
-FtgAn3lwEnRyn17Tsl0JB+EvYTKyrI2C
-=0zH6
------END PGP SIGNATURE-----
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
 }