From 7d81b562cdfb4bbdce5e5cea3779ecf83d1d0211 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Wed, 31 Aug 2011 19:05:35 +0000 Subject: [PATCH] media-gfx/gimp: Pass --disable-gtk-doc to autogen.sh in live ebuild (bug #346341) Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- media-gfx/gimp/ChangeLog | 5 ++++- media-gfx/gimp/Manifest | 10 +++++----- media-gfx/gimp/gimp-9999.ebuild | 8 ++++++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog index 6f627e4e2d8b..bb9635ef9f88 100644 --- a/media-gfx/gimp/ChangeLog +++ b/media-gfx/gimp/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/gimp # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.331 2011/08/31 18:44:34 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.332 2011/08/31 19:05:35 sping Exp $ + + 31 Aug 2011; Sebastian Pipping gimp-9999.ebuild: + Pass --disable-gtk-doc to autogen.sh in live ebuild (bug #346341) 31 Aug 2011; Sebastian Pipping gimp-9999.ebuild: Sync and fix live ebuild with 2.7.3 diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 33d82602631d..0b4b059410fa 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -11,13 +11,13 @@ DIST gimp-2.7.3.tar.bz2 18206530 RMD160 5740b1b62b0fca255d0ca046477c21ab9c57a5ca EBUILD gimp-2.6.11-r1.ebuild 3248 RMD160 324ff1505eeed9d839cc9695df3289dff0e5bf6e SHA1 b163b4ce5567abeb087b4f50eb4bfc2bb431a040 SHA256 07c2eafd3ce4e49f05a7b154b30be3f40a069e6617e1538c5e97d901dc424925 EBUILD gimp-2.6.11-r2.ebuild 3259 RMD160 0f869b84f27b578b0c50da27545afc724ec236fc SHA1 4159ab5be4c896576ab9ca18d5b68b544665d23a SHA256 437a9aeff3e6c03814f0ce2912b8037e2005876aee294be79804a7765aa29180 EBUILD gimp-2.7.3.ebuild 3221 RMD160 ef48c49f95326beb3e05cbb646b738da5016a5e9 SHA1 05587f53a1649199198ab628703326bcdbbfdd04 SHA256 171737d3c84cce5d83381b45a2c979e523c107854f75c880d379221a1a15d432 -EBUILD gimp-9999.ebuild 3362 RMD160 5e7b1c5f3d1f71f4e0d05ff8466eab853bd4a702 SHA1 666513d3d6bb2bc7e65c9ee5edd1a5a08307b6b9 SHA256 5c29578642765265a07d3f748bcf20a0e613971e30f1f8aafe6342c8b34f3252 -MISC ChangeLog 45319 RMD160 1048f7f32bfa50a84e5227d71ff4bb7e446780f2 SHA1 f81886978c2ac9a2102f15dedfe7e03b1f416881 SHA256 15f55502ac042e9cd03081b1e7b2a815ffb3ffcdf53071f85ee761ff8ef71b01 +EBUILD gimp-9999.ebuild 3452 RMD160 02c820633b618047403840e65f6c2720f9ada131 SHA1 a468625c2af16077ca15c94792c930f00aecf0c1 SHA256 e5bd61223185f1938e9f0a46bf38c2ae96f0568d5c9d795ff1efd5f497905b39 +MISC ChangeLog 45458 RMD160 34a802e3bcf023bc90f3123bdaacf0d9be568a6d SHA1 37e77ee4fa573ffad896cc14d09f0422b57aa518 SHA256 1bd2d56639ed200a1503b5e369643f2d8c3c232f9f59ce8e68e8f7dc4439407d MISC metadata.xml 366 RMD160 5ae566a82314bb47784051f6ca13fc1a9ecd137e SHA1 dce399814102ba9802439497439e2e00ecc3b82e SHA256 380bccccb72b527f81e02fd37b41b584316fcd7c802b959b8eae27fcef0c0db5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5egRIACgkQsAvGakAaFgAzsgCgmr9lNuddcnuxIBQX/dnkbxNG -b4YAoNTb+EgX3/IkHUrywTCCT4XF4zxd -=yeDL +iEYEARECAAYFAk5ehf0ACgkQsAvGakAaFgCR3ACgx+pmcH3Df0G6VkkuaS10uyBp +I68An0WeDBLCalVOz8aJ27xg3cegxhBE +=xpCb -----END PGP SIGNATURE----- diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index 1d891907a361..335d26527cd6 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.36 2011/08/31 18:44:34 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.37 2011/08/31 19:05:35 sping Exp $ EAPI="3" PYTHON_DEPEND="python? 2:2.5" @@ -110,7 +110,11 @@ src_prepare() { echo '#!/bin/sh' > py-compile chmod a+x py-compile || die sed -i -e 's:\$srcdir/configure:#:g' autogen.sh - ./autogen.sh || die + local myconf + if ! use doc; then + myconf="${myconf} --disable-gtk-doc" + fi + ./autogen.sh ${myconf} || die gnome2_src_prepare } -- 2.26.2