From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5CD85158087 for ; Tue, 18 Jan 2022 12:36:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BBB722BC026; Tue, 18 Jan 2022 12:36:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8E4302BC008 for ; Tue, 18 Jan 2022 12:36:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D83A342D5C for ; Tue, 18 Jan 2022 12:36:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08337263 for ; Tue, 18 Jan 2022 12:36:37 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1642509272.314615bdea98822feee429e7f7ad58048c509b79.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/gimp/gimp-9999.ebuild X-VCS-Directories: media-gfx/gimp/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 314615bdea98822feee429e7f7ad58048c509b79 X-VCS-Branch: master Date: Tue, 18 Jan 2022 12:36:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ac94e5fa-317e-49e2-a5bd-a15c2d033436 X-Archives-Hash: c3a5bae88f06c6fdb2ae7d649a887f6e commit: 314615bdea98822feee429e7f7ad58048c509b79 Author: Sergey Torokhov yandex ru> AuthorDate: Sun Jan 9 15:35:13 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jan 18 12:34:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314615bd media-gfx/gimp: 9999 fix USE=doc build due to new dependencies Closes: https://bugs.gentoo.org/830429 Signed-off-by: Sergey Torokhov yandex.ru> Signed-off-by: Sam James gentoo.org> media-gfx/gimp/gimp-9999.ebuild | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index 7659852820b6..46083fec3855 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -38,10 +38,10 @@ COMMON_DEPEND=" dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= - >=media-libs/babl-0.1.86[introspection,lcms,vala?] + >=media-libs/babl-0.1.88[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 - >=media-libs/gegl-0.4.32:0.4[cairo,introspection,lcms,vala?] + >=media-libs/gegl-0.4.34:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.10.10 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 @@ -101,10 +101,7 @@ DEPEND=" >=sys-devel/automake-1.11 >=sys-devel/gettext-0.21 >=sys-devel/libtool-2.4.6 - doc? ( - >=dev-util/gtk-doc-1.32 - dev-util/gtk-doc-am - ) + doc? ( dev-util/gi-docgen ) vala? ( $(vala_depend) ) " @@ -132,14 +129,6 @@ src_prepare() { sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144 - # Fix checking of gtk-doc.make if USE="-doc" like autogen.sh - # USE="doc" is currently broken for gimp-9999 due to absence of appropriate *.m4 file - if ! use doc ; then - echo "EXTRA_DIST = missing-gtk-doc" > gtk-doc.make - sed -i -e "/CLEANFILES/s/^/#/g" \ - "${S}"/devel-docs/{libgimp,libgimpbase,libgimpcolor,libgimpconfig,libgimpmath,libgimpmodule,libgimpthumb,libgimpwidgets}/Makefile.am || die - fi - gnome2_src_prepare # calls eautoreconf use vala && vala_src_prepare @@ -184,7 +173,7 @@ src_configure() { $(use_enable cpu_flags_ppc_altivec altivec) $(use_enable cpu_flags_x86_mmx mmx) $(use_enable cpu_flags_x86_sse sse) - $(use_enable doc gtk_doc) + $(use_enable doc gi-docgen) $(use_enable vector-icons) $(use_with aalib aa) $(use_with alsa)