summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Torokhov <torokhov-s-a@yandex.ru>2022-01-09 18:35:13 +0300
committerSam James <sam@gentoo.org>2022-01-18 12:34:32 +0000
commit314615bdea98822feee429e7f7ad58048c509b79 (patch)
treef17acb7f3e19025b10cbcc812334fd04083d5d60 /media-gfx
parentsys-fs/bcache-tools: Stabilize 1.1-r1 ppc64, #831331 (diff)
downloadgentoo-314615bdea98822feee429e7f7ad58048c509b79.tar.gz
gentoo-314615bdea98822feee429e7f7ad58048c509b79.tar.bz2
gentoo-314615bdea98822feee429e7f7ad58048c509b79.zip
media-gfx/gimp: 9999 fix USE=doc build due to new dependencies
Closes: https://bugs.gentoo.org/830429 Signed-off-by: Sergey Torokhov <torokhov-s-a@yandex.ru> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/gimp/gimp-9999.ebuild19
1 files 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)