diff options
| -rw-r--r-- | media-gfx/gimp/Manifest | 2 | ||||
| -rw-r--r-- | media-gfx/gimp/gimp-2.99.10.ebuild (renamed from media-gfx/gimp/gimp-2.99.8-r1.ebuild) | 29 |
2 files changed, 10 insertions, 21 deletions
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 4d0a354..28ccadb 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -1 +1 @@ -DIST gimp-2.99.8.tar.bz2 30799403 BLAKE2B a67863f5e7d40beca80f931973759dc4523718ac2740cac4924dae8e1611491e59c43436ca670643be1878e1d9ff1575174a59c919b33103128a812e7eba6042 SHA512 c603d9a315c21c9da716cc1d8c0c784061e7d0eac4b3d28467aabc3c63c950da0a52649e498049e0b8475933ef93d721a2b8423811b47b00c9490485d316345e +DIST gimp-2.99.10.tar.bz2 26782056 BLAKE2B 103e7fa2d04b1989e59fb03964a122891831d122cdc6dd3b7637f06cff28310e12d9a79678ac477b56728f4ceb53292001c53f026e94be417db76dd7e14740ab SHA512 898c1e1ffd2270ccc965db9a8263e04d95455535361b47f92256b4028808e1e91eb1924cf6cef7ff9e988194ebbc67535bd9cfbf0243159824e58551a2b91ba3 diff --git a/media-gfx/gimp/gimp-2.99.8-r1.ebuild b/media-gfx/gimp/gimp-2.99.10.ebuild index 595de4d..6ac8afe 100644 --- a/media-gfx/gimp/gimp-2.99.8-r1.ebuild +++ b/media-gfx/gimp/gimp-2.99.10.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( luajit ) PYTHON_COMPAT=( python3_{8..10} ) @@ -38,11 +38,11 @@ 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.90[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/gexiv2-0.10.10 + >=media-libs/gegl-0.4.36:0.4[cairo,introspection,lcms,vala?] + >=media-libs/gexiv2-0.12.2 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 >=media-libs/libmypaint-1.6.1:= @@ -101,19 +101,14 @@ DEPEND=" >=sys-devel/automake-1.11 >=sys-devel/gettext-0.21 >=sys-devel/libtool-2.4.6 - doc? ( - app-text/yelp-tools - dev-libs/gobject-introspection[doctool] - >=dev-util/gtk-doc-1.32 - dev-util/gtk-doc-am - ) + doc? ( dev-util/gi-docgen ) vala? ( $(vala_depend) ) " # TODO: there are probably more atoms in DEPEND which should be in BDEPEND now BDEPEND="virtual/pkgconfig" -DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" ) +DOCS=( "AUTHORS" "devel-docs/CODING_STYLE.md" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" ) # Bugs 685210 (and duplicate 691070) PATCHES=( @@ -136,8 +131,6 @@ src_prepare() { gnome2_src_prepare # calls eautoreconf - use vala && vala_src_prepare - sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test @@ -161,6 +154,8 @@ _adjust_sandbox() { src_configure() { _adjust_sandbox + use vala && vala_setup + local myconf=( GEGL="${EPREFIX}"/usr/bin/gegl-0.4 GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen @@ -178,8 +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 g-ir-doc) + $(use_enable doc gi-docgen) $(use_enable vector-icons) $(use_with aalib aa) $(use_with alsa) @@ -248,11 +242,6 @@ src_install() { mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die _rename_plugins || die - - if use doc; then - mkdir "${ED}/usr/share/gtk-doc/html/gimp3_g-ir-docs" || die - cp -r "${S}/devel-docs/g-ir-docs/html/"{gjs,python} "${ED}/usr/share/gtk-doc/html/gimp3_g-ir-docs/" || die - fi } pkg_postinst() { |