| 1 |
commit: 314615bdea98822feee429e7f7ad58048c509b79 |
| 2 |
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
| 3 |
AuthorDate: Sun Jan 9 15:35:13 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 18 12:34:32 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314615bd |
| 7 |
|
| 8 |
media-gfx/gimp: 9999 fix USE=doc build due to new dependencies |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/830429 |
| 11 |
|
| 12 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
media-gfx/gimp/gimp-9999.ebuild | 19 ++++--------------- |
| 16 |
1 file changed, 4 insertions(+), 15 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild |
| 19 |
index 7659852820b6..46083fec3855 100644 |
| 20 |
--- a/media-gfx/gimp/gimp-9999.ebuild |
| 21 |
+++ b/media-gfx/gimp/gimp-9999.ebuild |
| 22 |
@@ -38,10 +38,10 @@ COMMON_DEPEND=" |
| 23 |
dev-libs/libxslt |
| 24 |
>=gnome-base/librsvg-2.40.21:2 |
| 25 |
>=media-gfx/mypaint-brushes-2.0.2:= |
| 26 |
- >=media-libs/babl-0.1.86[introspection,lcms,vala?] |
| 27 |
+ >=media-libs/babl-0.1.88[introspection,lcms,vala?] |
| 28 |
>=media-libs/fontconfig-2.12.6 |
| 29 |
>=media-libs/freetype-2.10.2 |
| 30 |
- >=media-libs/gegl-0.4.32:0.4[cairo,introspection,lcms,vala?] |
| 31 |
+ >=media-libs/gegl-0.4.34:0.4[cairo,introspection,lcms,vala?] |
| 32 |
>=media-libs/gexiv2-0.10.10 |
| 33 |
>=media-libs/harfbuzz-2.6.5:= |
| 34 |
>=media-libs/lcms-2.9:2 |
| 35 |
@@ -101,10 +101,7 @@ DEPEND=" |
| 36 |
>=sys-devel/automake-1.11 |
| 37 |
>=sys-devel/gettext-0.21 |
| 38 |
>=sys-devel/libtool-2.4.6 |
| 39 |
- doc? ( |
| 40 |
- >=dev-util/gtk-doc-1.32 |
| 41 |
- dev-util/gtk-doc-am |
| 42 |
- ) |
| 43 |
+ doc? ( dev-util/gi-docgen ) |
| 44 |
vala? ( $(vala_depend) ) |
| 45 |
" |
| 46 |
|
| 47 |
@@ -132,14 +129,6 @@ src_prepare() { |
| 48 |
sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 |
| 49 |
sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144 |
| 50 |
|
| 51 |
- # Fix checking of gtk-doc.make if USE="-doc" like autogen.sh |
| 52 |
- # USE="doc" is currently broken for gimp-9999 due to absence of appropriate *.m4 file |
| 53 |
- if ! use doc ; then |
| 54 |
- echo "EXTRA_DIST = missing-gtk-doc" > gtk-doc.make |
| 55 |
- sed -i -e "/CLEANFILES/s/^/#/g" \ |
| 56 |
- "${S}"/devel-docs/{libgimp,libgimpbase,libgimpcolor,libgimpconfig,libgimpmath,libgimpmodule,libgimpthumb,libgimpwidgets}/Makefile.am || die |
| 57 |
- fi |
| 58 |
- |
| 59 |
gnome2_src_prepare # calls eautoreconf |
| 60 |
|
| 61 |
use vala && vala_src_prepare |
| 62 |
@@ -184,7 +173,7 @@ src_configure() { |
| 63 |
$(use_enable cpu_flags_ppc_altivec altivec) |
| 64 |
$(use_enable cpu_flags_x86_mmx mmx) |
| 65 |
$(use_enable cpu_flags_x86_sse sse) |
| 66 |
- $(use_enable doc gtk_doc) |
| 67 |
+ $(use_enable doc gi-docgen) |
| 68 |
$(use_enable vector-icons) |
| 69 |
$(use_with aalib aa) |
| 70 |
$(use_with alsa) |
Archives