From 71deace00d1a2b091313fe137ab7092418c6f87c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Feb 2020 21:05:55 +0000 Subject: gentoo resync : 10.02.2020 --- media-gfx/gimp/Manifest | 10 +- media-gfx/gimp/gimp-2.10.14-r1.ebuild | 230 ++++++++++++++++++++++++++++++++++ media-gfx/gimp/gimp-2.10.14.ebuild | 228 --------------------------------- media-gfx/gimp/gimp-2.10.8-r1.ebuild | 227 --------------------------------- media-gfx/gimp/gimp-2.10.8-r2.ebuild | 229 +++++++++++++++++++++++++++++++++ media-gfx/gimp/gimp-2.8.22-r1.ebuild | 172 ------------------------- media-gfx/gimp/gimp-2.8.22-r2.ebuild | 174 +++++++++++++++++++++++++ media-gfx/gimp/gimp-2.9.8-r1.ebuild | 6 +- media-gfx/gimp/gimp-9999.ebuild | 4 +- 9 files changed, 645 insertions(+), 635 deletions(-) create mode 100644 media-gfx/gimp/gimp-2.10.14-r1.ebuild delete mode 100644 media-gfx/gimp/gimp-2.10.14.ebuild delete mode 100644 media-gfx/gimp/gimp-2.10.8-r1.ebuild create mode 100644 media-gfx/gimp/gimp-2.10.8-r2.ebuild delete mode 100644 media-gfx/gimp/gimp-2.8.22-r1.ebuild create mode 100644 media-gfx/gimp/gimp-2.8.22-r2.ebuild (limited to 'media-gfx/gimp') diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index eea609f3389a..aa5db513d85d 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -14,9 +14,9 @@ DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B f1254ab0742cf0190f4e50f001d8120fe655b DIST gimp-2.10.8.tar.bz2 31954568 BLAKE2B 11f88b1068fa1fe216a54bed27b26b94c3fdb2cbc67e1e444df74a080d00b678f8c81897a6c5fb5956fa107842b0a853ada44d15d51c2e58db7435ddd0f8e999 SHA512 b458dd710b786152f95a8e48a0727b71cac549fccb31ac9e1e6ac3c617652079773ce7076401f8ade750ed38bdc78dfdec3317423f4c4e9c931f78002bd7454e DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02 -EBUILD gimp-2.10.14.ebuild 6083 BLAKE2B 30e51fc97a7e1a97e12cad9acb85fa37d276087c3ad859783b5cbd721944d52622945dc6534bcb31cc32d3acb1b2941c8fd46954d66618d59b6232d6bd4a23ad SHA512 689c781bec1643c2b4598258b0b1162bb37abd8c6ab1b1043d1d2a42b530312ef0caeb522f0b53c7624a4552fc825a9a92821979c8ee76be90b42925c526fc21 -EBUILD gimp-2.10.8-r1.ebuild 6104 BLAKE2B bec6521e91558be2f2282baf131598c519f92c93267f687dedcac78fe70d27851c09307eb438009d35f9307c2ae78a77411cb6238cdde84b0ace9165399308cd SHA512 20f59e5aa3a8d5424b65ed9f947123feee6723dd16f946991022b17ac964be37c6aa0a71022928293fc51c542f3a3ad24ad3432fc6680d7214393d87d5159db2 -EBUILD gimp-2.8.22-r1.ebuild 5125 BLAKE2B 880aa0f1b5fbd631f5242a41059b0ba7ec54773b3f49bd6f600361a1de23d65844ec369b1ae3283dc09d2ce7ea51cfa17a6bd68fe50dd2074e14d26e30f74922 SHA512 648e90b0121e4971bdf9fcd09383f790addb5fa63e256f22c1e76b22ed1b92c2d73cb0740d061dc3c1a65311d3b2e8cb843070fb08ea528cb365886d2b495e5e -EBUILD gimp-2.9.8-r1.ebuild 6042 BLAKE2B 0190f744da671d8b8d89e2596100c2ac2268adb1d278ef3106d89863c6d501c60c1e6a5cc7cb6c831aff43224e23c1c0a818cf5102afc28da637262e51798e44 SHA512 0a5a0aa970e83d5603223e7dd6a989098a150807183626bd45f03a68eb553fe3cb85a999262adfb60ea417a43e7b45f2f2379f746b019216347b52a9497f2a07 -EBUILD gimp-9999.ebuild 6114 BLAKE2B 00745fe1d7fa98a3f681f44f0ca8c8efe3fa7af98ae117ad0b0838376d140c9f7f843eeb87f50d3acb52721d1eb19548b04f0debfd6c9d86647a7270d814109b SHA512 5f7ece5f194ce0d7c526e0aebf69c045f9bddbb4cca2612d73e871ca350bfd5e60ced6bee1f2083096e1b5182b810608d4898ba6391d745e565cb7c02f1c1b0c +EBUILD gimp-2.10.14-r1.ebuild 6128 BLAKE2B 76a1ce0fe3defafb47cf2f853661e3a5f3ef0be8107fcf52b1df9b4018780a716bc7a6f76dc9a3142583483b7819180b0d9980d8b2b1861238f424a77c3c37ae SHA512 dd91a497d1cf7a4d587a2d7c926c3d1750ff5944c94e64ede97010213975be80893402ac5055be0107b9706ab14a3725652f4b8eb09db6b8ac8da0fd46d5e0ca +EBUILD gimp-2.10.8-r2.ebuild 6149 BLAKE2B 51647e9a4673cd19e921554e1529a171205d74f3b32c54325f9e03fa08ddb140162fc9cd205da2303fede40e64fc55dbc2345dbff4c9b86df5564d568beff690 SHA512 7a2cdc2ea67f6a1bb0bf36b25e1018fb71aaeb052d05ab086310d9bd03a0b1d20be62485ac1516bd02d3d667a69d3cc64eca1c05f9ea4783e2a9f177a47aca8f +EBUILD gimp-2.8.22-r2.ebuild 5163 BLAKE2B 030810c37e0c20fa903f581e02c8e9ead89095a7375f1291e2dc771bb4026657c56e3d4f97abca096e0509e005779e3b8f139fe78e12c64b40fe518f6c879a55 SHA512 a457e0c1335a536b4072a09354f41d57a9455f973d93698ef81d1ce1e2d38015c235595400c4e9dff4f3e23856c1fe43c7aea3244e8935eadf0f6ae46ea36215 +EBUILD gimp-2.9.8-r1.ebuild 6087 BLAKE2B 2bcf7bf2256e1a768fc76806b8af465ad48dcc761c9b22a788a2674dfcd08d1cb3c12b3c85f7bf44dc70815bf5b45d3631a41c90201798076d6df7a734d05f7c SHA512 84b90d508a087cf9f31e33abe4c4cf5f6b19200bd25a1cf4d1e2a3bbc41cb7ce7697fade6da4d44e0d86766431b95d7dc927bd45c18e7b33ae62a7b021bde4b5 +EBUILD gimp-9999.ebuild 6152 BLAKE2B 26ca217a370be419450cf6f9ef66ceed8c8d77bc260de37ab74c5f6706b6c032befe261ada5e9a82fe4c6bc8b4893080e1ee64435fd25c39e829b29a499db581 SHA512 6565b9cbe478c9c311a036897cf3c1f9b3841aea0b3095665e0d482ad85cb22274660b1800dbc50f9225e88d2e262c5995d6763d28ef99caa2021f231924ebd8 MISC metadata.xml 628 BLAKE2B f1326f51db692d6e64d1bb7b44dfada65799d7ab94279771e6bd729189145a8a4bbe7a83c776bfc46acf682ad9f34c84598d25fb0a3606aabfa30383b35a9694 SHA512 cec60cde9763bdb9012fec754b95018f09da5cf7ff2f577206417651df5c18251dd5c58b1e32fb45e7c2121e06c0a5b7dc86d08b9511da4cf103bcf2fa1b6e52 diff --git a/media-gfx/gimp/gimp-2.10.14-r1.ebuild b/media-gfx/gimp/gimp-2.10.14-r1.ebuild new file mode 100644 index 000000000000..e169695de69b --- /dev/null +++ b/media-gfx/gimp/gimp-2.10.14-r1.ebuild @@ -0,0 +1,230 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +GNOME2_EAUTORECONF=yes + +inherit autotools gnome2 python-single-r1 virtualx + +DESCRIPTION="GNU Image Manipulation Program" +HOMEPAGE="https://www.gimp.org/" +SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2" +LICENSE="GPL-3 LGPL-3" +SLOT="2" +KEYWORDS="amd64 ~ia64 ~ppc64 x86" + +IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + app-arch/bzip2 + >=app-arch/xz-utils-5.0.0 + >=app-text/poppler-0.50[cairo] + >=app-text/poppler-data-0.4.7 + >=dev-libs/atk-2.2.0 + >=dev-libs/glib-2.56.0:2 + dev-libs/libxml2 + dev-libs/libxslt + >=gnome-base/librsvg-2.40.6:2 + >=media-gfx/mypaint-brushes-1.3.0 + >=media-libs/babl-0.1.72 + >=media-libs/fontconfig-2.12.4 + >=media-libs/freetype-2.1.7 + >=media-libs/gegl-0.4.18:0.4[cairo] + >=media-libs/gexiv2-0.10.6 + >=media-libs/harfbuzz-0.9.19 + >=media-libs/lcms-2.8:2 + >=media-libs/libmypaint-1.3.0:= + >=media-libs/libpng-1.6.25:0= + >=media-libs/tiff-3.5.7:0 + net-libs/glib-networking[ssl] + sys-libs/zlib + virtual/jpeg:0 + >=x11-libs/cairo-1.12.2 + >=x11-libs/gdk-pixbuf-2.31:2 + >=x11-libs/gtk+-2.24.32:2 + x11-libs/libXcursor + >=x11-libs/pango-1.29.4 + aalib? ( media-libs/aalib ) + alsa? ( >=media-libs/alsa-lib-1.0.0 ) + aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) + heif? ( >=media-libs/libheif-1.3.2:= ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) + mng? ( media-libs/libmng:= ) + openexr? ( >=media-libs/openexr-1.6.1:= ) + postscript? ( app-text/ghostscript-gpl ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}] + >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}] + ') + ) + udev? ( dev-libs/libgudev:= ) + unwind? ( >=sys-libs/libunwind-1.1.0:= ) + webp? ( >=media-libs/libwebp-0.6.0:= ) + wmf? ( >=media-libs/libwmf-0.2.8 ) + xpm? ( x11-libs/libXpm ) +" + +RDEPEND=" + ${COMMON_DEPEND} + x11-themes/hicolor-icon-theme + gnome? ( gnome-base/gvfs ) +" + +DEPEND=" + ${COMMON_DEPEND} + >=dev-lang/perl-5.10.0 + dev-libs/appstream-glib + dev-util/gtk-update-icon-cache + >=dev-util/intltool-0.40.1 + sys-apps/findutils + >=sys-devel/automake-1.11 + >=sys-devel/gettext-0.19 + >=sys-devel/libtool-2.2 + virtual/pkgconfig +" + +DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" ) + +# Bugs 685210 (and duplicate 691070) +PATCHES=( + "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" +) + +pkg_setup() { + if use python; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + # Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554 + sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \ + -e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die + + 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 + + gnome2_src_prepare # calls eautoreconf + + sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 + fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test +} + +_adjust_sandbox() { + # Bugs #569738 and #591214 + local nv + for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do + # We do not check for existence as they may show up later + # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 + addwrite "${nv}" + done + + addwrite /dev/dri/ # bugs #574038 and #684886 + addwrite /dev/ati/ # bug #589198 + addwrite /proc/mtrr # bug #589198 +} + +src_configure() { + _adjust_sandbox + + local myconf=( + GEGL="${EPREFIX}"/usr/bin/gegl-0.4 + GDBUS_CODEGEN="${EPREFIX}"/bin/false + + --enable-default-binary + + --enable-mp + --with-appdata-test + --with-bug-report-url=https://bugs.gentoo.org/ + --with-xmc + --without-libbacktrace + --without-webkit + --without-xvfb-run + $(use_enable altivec) + $(use_enable cpu_flags_x86_mmx mmx) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable python) + $(use_enable vector-icons) + $(use_with aalib aa) + $(use_with alsa) + $(use_with !aqua x) + $(use_with heif libheif) + $(use_with jpeg2k jpeg2000) + $(use_with mng libmng) + $(use_with openexr) + $(use_with postscript gs) + $(use_with udev gudev) + $(use_with unwind libunwind) + $(use_with webp) + $(use_with wmf) + $(use_with xpm libxpm) + ) + + gnome2_src_configure "${myconf[@]}" +} + +src_compile() { + export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 + gnome2_src_compile +} + +# for https://bugs.gentoo.org/664938 +_rename_plugins() { + einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' + local prepend=gimp-org- + ( + cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1 + for plugin_slash in $(ls -d1 */); do + plugin=${plugin_slash%/} + if [[ -f ${plugin}/${plugin} ]]; then + # NOTE: Folder and file name need to match for Gimp to load that plug-in + # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg" + mv ${plugin}/{,${prepend}}${plugin} || exit 1 + mv {,${prepend}}${plugin} || exit 1 + fi + done + ) +} + +src_test() { + virtx emake check +} + +src_install() { + gnome2_src_install + + if use python; then + python_optimize + fi + + # Workaround for bug #321111 to give GIMP the least + # precedence on PDF documents by default + mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die + + find "${D}" -name '*.la' -type f -delete || die + + # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) + local gimp_app_version=$(get_version_component_range 1-2) + mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die + + # Remove gimp devel-docs html files if user doesn't need it + if ! use doc; then + rm -r "${ED%/}"/usr/share/gtk-doc || die + fi + + _rename_plugins || die +} + +pkg_postinst() { + gnome2_pkg_postinst +} + +pkg_postrm() { + gnome2_pkg_postrm +} diff --git a/media-gfx/gimp/gimp-2.10.14.ebuild b/media-gfx/gimp/gimp-2.10.14.ebuild deleted file mode 100644 index 63247f2f6b4b..000000000000 --- a/media-gfx/gimp/gimp-2.10.14.ebuild +++ /dev/null @@ -1,228 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -GNOME2_EAUTORECONF=yes - -inherit autotools gnome2 python-single-r1 virtualx - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2" -LICENSE="GPL-3 LGPL-3" -SLOT="2" -KEYWORDS="amd64 ~ia64 ~ppc64 x86" - -IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - app-arch/bzip2 - >=app-arch/xz-utils-5.0.0 - >=app-text/poppler-0.50[cairo] - >=app-text/poppler-data-0.4.7 - >=dev-libs/atk-2.2.0 - >=dev-libs/glib-2.56.0:2 - dev-libs/libxml2 - dev-libs/libxslt - >=gnome-base/librsvg-2.40.6:2 - >=media-gfx/mypaint-brushes-1.3.0 - >=media-libs/babl-0.1.72 - >=media-libs/fontconfig-2.12.4 - >=media-libs/freetype-2.1.7 - >=media-libs/gegl-0.4.18:0.4[cairo] - >=media-libs/gexiv2-0.10.6 - >=media-libs/harfbuzz-0.9.19 - >=media-libs/lcms-2.8:2 - >=media-libs/libmypaint-1.3.0:= - >=media-libs/libpng-1.6.25:0= - >=media-libs/tiff-3.5.7:0 - net-libs/glib-networking[ssl] - sys-libs/zlib - virtual/jpeg:0 - >=x11-libs/cairo-1.12.2 - >=x11-libs/gdk-pixbuf-2.31:2 - >=x11-libs/gtk+-2.24.32:2 - x11-libs/libXcursor - >=x11-libs/pango-1.29.4 - aalib? ( media-libs/aalib ) - alsa? ( >=media-libs/alsa-lib-1.0.0 ) - aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) - heif? ( >=media-libs/libheif-1.3.2:= ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) - mng? ( media-libs/libmng:= ) - openexr? ( >=media-libs/openexr-1.6.1:= ) - postscript? ( app-text/ghostscript-gpl ) - python? ( - ${PYTHON_DEPS} - >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}] - >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] - ) - udev? ( dev-libs/libgudev:= ) - unwind? ( >=sys-libs/libunwind-1.1.0:= ) - webp? ( >=media-libs/libwebp-0.6.0:= ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - xpm? ( x11-libs/libXpm ) -" - -RDEPEND=" - ${COMMON_DEPEND} - x11-themes/hicolor-icon-theme - gnome? ( gnome-base/gvfs ) -" - -DEPEND=" - ${COMMON_DEPEND} - >=dev-lang/perl-5.10.0 - dev-libs/appstream-glib - dev-util/gtk-update-icon-cache - >=dev-util/intltool-0.40.1 - sys-apps/findutils - >=sys-devel/automake-1.11 - >=sys-devel/gettext-0.19 - >=sys-devel/libtool-2.2 - virtual/pkgconfig -" - -DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" ) - -# Bugs 685210 (and duplicate 691070) -PATCHES=( - "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" -) - -pkg_setup() { - if use python; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - # Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554 - sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \ - -e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die - - 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 - - gnome2_src_prepare # calls eautoreconf - - sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 - fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test -} - -_adjust_sandbox() { - # Bugs #569738 and #591214 - local nv - for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do - # We do not check for existence as they may show up later - # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 - addwrite "${nv}" - done - - addwrite /dev/dri/ # bugs #574038 and #684886 - addwrite /dev/ati/ # bug #589198 - addwrite /proc/mtrr # bug #589198 -} - -src_configure() { - _adjust_sandbox - - local myconf=( - GEGL="${EPREFIX}"/usr/bin/gegl-0.4 - GDBUS_CODEGEN="${EPREFIX}"/bin/false - - --enable-default-binary - - --enable-mp - --with-appdata-test - --with-bug-report-url=https://bugs.gentoo.org/ - --with-xmc - --without-libbacktrace - --without-webkit - --without-xvfb-run - $(use_enable altivec) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable python) - $(use_enable vector-icons) - $(use_with aalib aa) - $(use_with alsa) - $(use_with !aqua x) - $(use_with heif libheif) - $(use_with jpeg2k jpeg2000) - $(use_with mng libmng) - $(use_with openexr) - $(use_with postscript gs) - $(use_with udev gudev) - $(use_with unwind libunwind) - $(use_with webp) - $(use_with wmf) - $(use_with xpm libxpm) - ) - - gnome2_src_configure "${myconf[@]}" -} - -src_compile() { - export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 - gnome2_src_compile -} - -# for https://bugs.gentoo.org/664938 -_rename_plugins() { - einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' - local prepend=gimp-org- - ( - cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1 - for plugin_slash in $(ls -d1 */); do - plugin=${plugin_slash%/} - if [[ -f ${plugin}/${plugin} ]]; then - # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg" - mv ${plugin}/{,${prepend}}${plugin} || exit 1 - mv {,${prepend}}${plugin} || exit 1 - fi - done - ) -} - -src_test() { - virtx emake check -} - -src_install() { - gnome2_src_install - - if use python; then - python_optimize - fi - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die - - find "${D}" -name '*.la' -type f -delete || die - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - local gimp_app_version=$(get_version_component_range 1-2) - mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die - - # Remove gimp devel-docs html files if user doesn't need it - if ! use doc; then - rm -r "${ED%/}"/usr/share/gtk-doc || die - fi - - _rename_plugins || die -} - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} diff --git a/media-gfx/gimp/gimp-2.10.8-r1.ebuild b/media-gfx/gimp/gimp-2.10.8-r1.ebuild deleted file mode 100644 index c69d663e35e1..000000000000 --- a/media-gfx/gimp/gimp-2.10.8-r1.ebuild +++ /dev/null @@ -1,227 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -GNOME2_EAUTORECONF=yes - -MY_PV="${PV/_rc/-RC}" -MY_P="${PN}-${MY_PV}" - -inherit versionator virtualx autotools gnome2 multilib python-single-r1 ltprune - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${MY_P}.tar.bz2" -LICENSE="GPL-3 LGPL-3" -SLOT="2" -KEYWORDS="amd64 arm64 x86" - -LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW" -IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm" - -RDEPEND=">=dev-libs/glib-2.56.0:2 - >=dev-libs/atk-2.2.0 - >=x11-libs/gtk+-2.24.10:2 - >=x11-libs/gdk-pixbuf-2.31:2 - >=x11-libs/cairo-1.12.2 - >=x11-libs/pango-1.29.4 - xpm? ( x11-libs/libXpm ) - >=media-libs/freetype-2.1.7 - >=media-libs/harfbuzz-0.9.19 - >=media-libs/gexiv2-0.10.6 - >=media-libs/libmypaint-1.3.0 - >=media-gfx/mypaint-brushes-1.3.0 - >=media-libs/fontconfig-2.12.4 - sys-libs/zlib - dev-libs/libxml2 - dev-libs/libxslt - x11-themes/hicolor-icon-theme - >=media-libs/babl-0.1.58 - >=media-libs/gegl-0.4.12:0.4[cairo] - aalib? ( media-libs/aalib ) - alsa? ( media-libs/alsa-lib ) - aqua? ( x11-libs/gtk-mac-integration ) - gnome? ( gnome-base/gvfs ) - virtual/jpeg:0 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) - >=media-libs/lcms-2.8:2 - mng? ( media-libs/libmng ) - openexr? ( >=media-libs/openexr-1.6.1:= ) - >=app-text/poppler-0.44[cairo] - >=app-text/poppler-data-0.4.7 - >=media-libs/libpng-1.6.25:0= - python? ( - ${PYTHON_DEPS} - >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] - >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}] - ) - >=media-libs/tiff-3.5.7:0 - >=gnome-base/librsvg-2.40.6:2 - webp? ( >=media-libs/libwebp-0.6.0 ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - net-libs/glib-networking[ssl] - x11-libs/libXcursor - sys-libs/zlib - app-arch/bzip2 - >=app-arch/xz-utils-5.0.0 - postscript? ( app-text/ghostscript-gpl ) - udev? ( dev-libs/libgudev:= ) - unwind? ( sys-libs/libunwind:= ) - heif? ( >=media-libs/libheif-1.1.0:= )" -DEPEND="${RDEPEND} - >=dev-lang/perl-5.10.0 - dev-libs/appstream-glib - dev-util/gtk-update-icon-cache - sys-apps/findutils - virtual/pkgconfig - >=dev-util/intltool-0.40.1 - >=sys-devel/gettext-0.19 - doc? ( >=dev-util/gtk-doc-1 ) - >=sys-devel/libtool-2.2 - >=sys-devel/automake-1.11 - dev-util/gtk-doc-am" - -DOCS="AUTHORS ChangeLog* HACKING NEWS README*" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use python; then - python-single-r1_pkg_setup - fi -} - -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 - - gnome2_src_prepare # calls eautoreconf - - sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 - fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test -} - -_adjust_sandbox() { - # Bugs #569738 and #591214 - local nv - for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do - # We do not check for existence as they may show up later - # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 - addwrite "${nv}" - done - - addwrite /dev/dri/ # bugs #574038 and #684886 - addwrite /dev/ati/ # bug #589198 - addwrite /proc/mtrr # bug #589198 -} - -src_configure() { - _adjust_sandbox - - local myconf=( - GEGL="${EPREFIX}"/usr/bin/gegl-0.4 - GDBUS_CODEGEN="${EPREFIX}"/bin/false - - --enable-default-binary - --disable-silent-rules - - $(use_with !aqua x) - $(use_with aalib aa) - $(use_with alsa) - $(use_enable altivec) - --with-appdata-test - --without-libbacktrace - --with-bug-report-url=https://bugs.gentoo.org/ - --without-webkit - $(use_with jpeg2k jpeg2000) - $(use_with postscript gs) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_with mng libmng) - $(use_with openexr) - $(use_with webp) - $(use_with heif libheif) - $(use_enable python) - --enable-mp - $(use_enable cpu_flags_x86_sse sse) - $(use_with udev gudev) - $(use_with unwind libunwind) - $(use_with wmf) - --with-xmc - $(use_with xpm libxpm) - $(use_enable vector-icons) - --without-xvfb-run - ) - - gnome2_src_configure "${myconf[@]}" -} - -src_compile() { - export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 - gnome2_src_compile -} - -_clean_up_locales() { - [[ -z ${LINGUAS+set} ]] && return - einfo "Cleaning up locales..." - for lang in ${LANGS}; do - has ${lang} ${LINGUAS} && { - einfo "- keeping ${lang}" - continue - } - rm -Rf "${ED%/}"/usr/share/locale/"${lang}" - done -} - -# for https://bugs.gentoo.org/664938 -_rename_plugins() { - einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' - local prepend=gimp-org- - ( - cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1 - for plugin_slash in $(ls -d1 */); do - plugin=${plugin_slash%/} - if [[ -f ${plugin}/${plugin} ]]; then - # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg" - mv ${plugin}/{,${prepend}}${plugin} || exit 1 - mv {,${prepend}}${plugin} || exit 1 - fi - done - ) -} - -src_test() { - virtx emake check -} - -src_install() { - gnome2_src_install - - if use python; then - python_optimize - fi - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die - - prune_libtool_files --all - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - local gimp_app_version=$(get_version_component_range 1-2) - mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die - - _rename_plugins || die - _clean_up_locales -} - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} diff --git a/media-gfx/gimp/gimp-2.10.8-r2.ebuild b/media-gfx/gimp/gimp-2.10.8-r2.ebuild new file mode 100644 index 000000000000..936e49178bae --- /dev/null +++ b/media-gfx/gimp/gimp-2.10.8-r2.ebuild @@ -0,0 +1,229 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +GNOME2_EAUTORECONF=yes + +MY_PV="${PV/_rc/-RC}" +MY_P="${PN}-${MY_PV}" + +inherit versionator virtualx autotools gnome2 multilib python-single-r1 ltprune + +DESCRIPTION="GNU Image Manipulation Program" +HOMEPAGE="https://www.gimp.org/" +SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${MY_P}.tar.bz2" +LICENSE="GPL-3 LGPL-3" +SLOT="2" +KEYWORDS="amd64 arm64 x86" + +LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW" +IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm" + +RDEPEND=">=dev-libs/glib-2.56.0:2 + >=dev-libs/atk-2.2.0 + >=x11-libs/gtk+-2.24.10:2 + >=x11-libs/gdk-pixbuf-2.31:2 + >=x11-libs/cairo-1.12.2 + >=x11-libs/pango-1.29.4 + xpm? ( x11-libs/libXpm ) + >=media-libs/freetype-2.1.7 + >=media-libs/harfbuzz-0.9.19 + >=media-libs/gexiv2-0.10.6 + >=media-libs/libmypaint-1.3.0 + >=media-gfx/mypaint-brushes-1.3.0 + >=media-libs/fontconfig-2.12.4 + sys-libs/zlib + dev-libs/libxml2 + dev-libs/libxslt + x11-themes/hicolor-icon-theme + >=media-libs/babl-0.1.58 + >=media-libs/gegl-0.4.12:0.4[cairo] + aalib? ( media-libs/aalib ) + alsa? ( media-libs/alsa-lib ) + aqua? ( x11-libs/gtk-mac-integration ) + gnome? ( gnome-base/gvfs ) + virtual/jpeg:0 + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) + >=media-libs/lcms-2.8:2 + mng? ( media-libs/libmng ) + openexr? ( >=media-libs/openexr-1.6.1:= ) + >=app-text/poppler-0.44[cairo] + >=app-text/poppler-data-0.4.7 + >=media-libs/libpng-1.6.25:0= + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}] + >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}] + ') + ) + >=media-libs/tiff-3.5.7:0 + >=gnome-base/librsvg-2.40.6:2 + webp? ( >=media-libs/libwebp-0.6.0 ) + wmf? ( >=media-libs/libwmf-0.2.8 ) + net-libs/glib-networking[ssl] + x11-libs/libXcursor + sys-libs/zlib + app-arch/bzip2 + >=app-arch/xz-utils-5.0.0 + postscript? ( app-text/ghostscript-gpl ) + udev? ( dev-libs/libgudev:= ) + unwind? ( sys-libs/libunwind:= ) + heif? ( >=media-libs/libheif-1.1.0:= )" +DEPEND="${RDEPEND} + >=dev-lang/perl-5.10.0 + dev-libs/appstream-glib + dev-util/gtk-update-icon-cache + sys-apps/findutils + virtual/pkgconfig + >=dev-util/intltool-0.40.1 + >=sys-devel/gettext-0.19 + doc? ( >=dev-util/gtk-doc-1 ) + >=sys-devel/libtool-2.2 + >=sys-devel/automake-1.11 + dev-util/gtk-doc-am" + +DOCS="AUTHORS ChangeLog* HACKING NEWS README*" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if use python; then + python-single-r1_pkg_setup + fi +} + +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 + + gnome2_src_prepare # calls eautoreconf + + sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 + fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test +} + +_adjust_sandbox() { + # Bugs #569738 and #591214 + local nv + for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do + # We do not check for existence as they may show up later + # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 + addwrite "${nv}" + done + + addwrite /dev/dri/ # bugs #574038 and #684886 + addwrite /dev/ati/ # bug #589198 + addwrite /proc/mtrr # bug #589198 +} + +src_configure() { + _adjust_sandbox + + local myconf=( + GEGL="${EPREFIX}"/usr/bin/gegl-0.4 + GDBUS_CODEGEN="${EPREFIX}"/bin/false + + --enable-default-binary + --disable-silent-rules + + $(use_with !aqua x) + $(use_with aalib aa) + $(use_with alsa) + $(use_enable altivec) + --with-appdata-test + --without-libbacktrace + --with-bug-report-url=https://bugs.gentoo.org/ + --without-webkit + $(use_with jpeg2k jpeg2000) + $(use_with postscript gs) + $(use_enable cpu_flags_x86_mmx mmx) + $(use_with mng libmng) + $(use_with openexr) + $(use_with webp) + $(use_with heif libheif) + $(use_enable python) + --enable-mp + $(use_enable cpu_flags_x86_sse sse) + $(use_with udev gudev) + $(use_with unwind libunwind) + $(use_with wmf) + --with-xmc + $(use_with xpm libxpm) + $(use_enable vector-icons) + --without-xvfb-run + ) + + gnome2_src_configure "${myconf[@]}" +} + +src_compile() { + export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 + gnome2_src_compile +} + +_clean_up_locales() { + [[ -z ${LINGUAS+set} ]] && return + einfo "Cleaning up locales..." + for lang in ${LANGS}; do + has ${lang} ${LINGUAS} && { + einfo "- keeping ${lang}" + continue + } + rm -Rf "${ED%/}"/usr/share/locale/"${lang}" + done +} + +# for https://bugs.gentoo.org/664938 +_rename_plugins() { + einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' + local prepend=gimp-org- + ( + cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1 + for plugin_slash in $(ls -d1 */); do + plugin=${plugin_slash%/} + if [[ -f ${plugin}/${plugin} ]]; then + # NOTE: Folder and file name need to match for Gimp to load that plug-in + # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg" + mv ${plugin}/{,${prepend}}${plugin} || exit 1 + mv {,${prepend}}${plugin} || exit 1 + fi + done + ) +} + +src_test() { + virtx emake check +} + +src_install() { + gnome2_src_install + + if use python; then + python_optimize + fi + + # Workaround for bug #321111 to give GIMP the least + # precedence on PDF documents by default + mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die + + prune_libtool_files --all + + # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) + local gimp_app_version=$(get_version_component_range 1-2) + mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die + + _rename_plugins || die + _clean_up_locales +} + +pkg_postinst() { + gnome2_pkg_postinst +} + +pkg_postrm() { + gnome2_pkg_postrm +} diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r1.ebuild deleted file mode 100644 index 9fc5aa9cdd4c..000000000000 --- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1 - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2" -LICENSE="GPL-3 LGPL-3" -SLOT="2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW" -IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm" - -RDEPEND=">=dev-libs/glib-2.30.2:2 - >=dev-libs/atk-2.2.0 - >=x11-libs/gtk+-2.24.10:2 - >=x11-libs/gdk-pixbuf-2.24.1:2 - >=x11-libs/cairo-1.10.2 - >=x11-libs/pango-1.29.4 - xpm? ( x11-libs/libXpm ) - >=media-libs/freetype-2.1.7 - >=media-libs/fontconfig-2.2.0 - sys-libs/zlib - dev-libs/libxml2 - dev-libs/libxslt - x11-themes/hicolor-icon-theme - >=media-libs/babl-0.1.10 - >=media-libs/gegl-0.2.0:0 - aalib? ( media-libs/aalib ) - alsa? ( media-libs/alsa-lib ) - aqua? ( x11-libs/gtk-mac-integration ) - curl? ( net-misc/curl ) - dbus? ( dev-libs/dbus-glib ) - gnome? ( gnome-base/gvfs ) - jpeg? ( virtual/jpeg:0 ) - exif? ( >=media-libs/libexif-0.6.15 ) - lcms? ( >=media-libs/lcms-2.2:2 ) - mng? ( media-libs/libmng ) - pdf? ( >=app-text/poppler-0.12.4[cairo] ) - png? ( >=media-libs/libpng-1.2.37:0 ) - python? ( - ${PYTHON_DEPS} - >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] - ) - tiff? ( >=media-libs/tiff-3.5.7:0 ) - svg? ( >=gnome-base/librsvg-2.36.0:2 ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - x11-libs/libXcursor - sys-libs/zlib - bzip2? ( app-arch/bzip2 ) - postscript? ( app-text/ghostscript-gpl ) - udev? ( dev-libs/libgudev:= )" -DEPEND="${RDEPEND} - sys-apps/findutils - virtual/pkgconfig - >=dev-util/intltool-0.40.1 - >=sys-devel/gettext-0.19 - doc? ( >=dev-util/gtk-doc-1 ) - >=sys-devel/libtool-2.2 - >=sys-devel/automake-1.11 - dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453) - -DOCS="AUTHORS ChangeLog* HACKING NEWS README*" - -S="${WORKDIR}"/${P} - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -pkg_setup() { - G2CONF="--enable-default-binary \ - --disable-silent-rules \ - $(use_with !aqua x) \ - $(use_with aalib aa) \ - $(use_with alsa) \ - $(use_enable altivec) \ - $(use_with bzip2) \ - $(use_with curl libcurl) \ - $(use_with dbus) \ - $(use_with gnome gvfs) \ - --without-webkit \ - $(use_with jpeg libjpeg) \ - --without-libjasper \ - $(use_with exif libexif) \ - $(use_with lcms lcms lcms2) \ - $(use_with postscript gs) \ - $(use_enable cpu_flags_x86_mmx mmx) \ - $(use_with mng libmng) \ - $(use_with pdf poppler) \ - $(use_with png libpng) \ - $(use_enable python) \ - $(use_enable smp mp) \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_with svg librsvg) \ - $(use_with tiff libtiff) \ - $(use_with udev gudev) \ - $(use_with wmf) \ - --with-xmc \ - $(use_with xpm libxpm) \ - --without-xvfb-run" - - if use python; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-cve-2017-17784.patch # bug 641954 - epatch "${FILESDIR}"/${P}-cve-2017-17785.patch # bug 641954 - epatch "${FILESDIR}"/${P}-cve-2017-17786-1.patch # bug 641954 - epatch "${FILESDIR}"/${P}-cve-2017-17786-2.patch # bug 641954 - epatch "${FILESDIR}"/${P}-cve-2017-17787.patch # bug 641954 - epatch "${FILESDIR}"/${P}-cve-2017-17788.patch # bug 641954 - epatch "${FILESDIR}"/${P}-cve-2017-17789.patch # bug 641954 - - epatch "${FILESDIR}"/${PN}-2.8.14-blend-center.patch # bug 558878 - epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch # bug 395695, comment 9 and 16 - epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang - - sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 - eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too - - gnome2_src_prepare -} - -_clean_up_locales() { - [[ -z ${LINGUAS+set} ]] && return - einfo "Cleaning up locales..." - for lang in ${LANGS}; do - has ${lang} ${LINGUAS} && { - einfo "- keeping ${lang}" - continue - } - rm -Rf "${ED}"/usr/share/locale/"${lang}" || die - done -} - -src_test() { - Xemake check -} - -src_install() { - gnome2_src_install - - if use python; then - python_optimize - fi - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die - - prune_libtool_files --all - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - local gimp_app_version=$(get_version_component_range 1-2) - mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die - - _clean_up_locales -} - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} diff --git a/media-gfx/gimp/gimp-2.8.22-r2.ebuild b/media-gfx/gimp/gimp-2.8.22-r2.ebuild new file mode 100644 index 000000000000..3d4251ed76a5 --- /dev/null +++ b/media-gfx/gimp/gimp-2.8.22-r2.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1 + +DESCRIPTION="GNU Image Manipulation Program" +HOMEPAGE="https://www.gimp.org/" +SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2" +LICENSE="GPL-3 LGPL-3" +SLOT="2" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + +LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW" +IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm" + +RDEPEND=">=dev-libs/glib-2.30.2:2 + >=dev-libs/atk-2.2.0 + >=x11-libs/gtk+-2.24.10:2 + >=x11-libs/gdk-pixbuf-2.24.1:2 + >=x11-libs/cairo-1.10.2 + >=x11-libs/pango-1.29.4 + xpm? ( x11-libs/libXpm ) + >=media-libs/freetype-2.1.7 + >=media-libs/fontconfig-2.2.0 + sys-libs/zlib + dev-libs/libxml2 + dev-libs/libxslt + x11-themes/hicolor-icon-theme + >=media-libs/babl-0.1.10 + >=media-libs/gegl-0.2.0:0 + aalib? ( media-libs/aalib ) + alsa? ( media-libs/alsa-lib ) + aqua? ( x11-libs/gtk-mac-integration ) + curl? ( net-misc/curl ) + dbus? ( dev-libs/dbus-glib ) + gnome? ( gnome-base/gvfs ) + jpeg? ( virtual/jpeg:0 ) + exif? ( >=media-libs/libexif-0.6.15 ) + lcms? ( >=media-libs/lcms-2.2:2 ) + mng? ( media-libs/libmng ) + pdf? ( >=app-text/poppler-0.12.4[cairo] ) + png? ( >=media-libs/libpng-1.2.37:0 ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}] + ') + ) + tiff? ( >=media-libs/tiff-3.5.7:0 ) + svg? ( >=gnome-base/librsvg-2.36.0:2 ) + wmf? ( >=media-libs/libwmf-0.2.8 ) + x11-libs/libXcursor + sys-libs/zlib + bzip2? ( app-arch/bzip2 ) + postscript? ( app-text/ghostscript-gpl ) + udev? ( dev-libs/libgudev:= )" +DEPEND="${RDEPEND} + sys-apps/findutils + virtual/pkgconfig + >=dev-util/intltool-0.40.1 + >=sys-devel/gettext-0.19 + doc? ( >=dev-util/gtk-doc-1 ) + >=sys-devel/libtool-2.2 + >=sys-devel/automake-1.11 + dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453) + +DOCS="AUTHORS ChangeLog* HACKING NEWS README*" + +S="${WORKDIR}"/${P} + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +pkg_setup() { + G2CONF="--enable-default-binary \ + --disable-silent-rules \ + $(use_with !aqua x) \ + $(use_with aalib aa) \ + $(use_with alsa) \ + $(use_enable altivec) \ + $(use_with bzip2) \ + $(use_with curl libcurl) \ + $(use_with dbus) \ + $(use_with gnome gvfs) \ + --without-webkit \ + $(use_with jpeg libjpeg) \ + --without-libjasper \ + $(use_with exif libexif) \ + $(use_with lcms lcms lcms2) \ + $(use_with postscript gs) \ + $(use_enable cpu_flags_x86_mmx mmx) \ + $(use_with mng libmng) \ + $(use_with pdf poppler) \ + $(use_with png libpng) \ + $(use_enable python) \ + $(use_enable smp mp) \ + $(use_enable cpu_flags_x86_sse sse) \ + $(use_with svg librsvg) \ + $(use_with tiff libtiff) \ + $(use_with udev gudev) \ + $(use_with wmf) \ + --with-xmc \ + $(use_with xpm libxpm) \ + --without-xvfb-run" + + if use python; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-cve-2017-17784.patch # bug 641954 + epatch "${FILESDIR}"/${P}-cve-2017-17785.patch # bug 641954 + epatch "${FILESDIR}"/${P}-cve-2017-17786-1.patch # bug 641954 + epatch "${FILESDIR}"/${P}-cve-2017-17786-2.patch # bug 641954 + epatch "${FILESDIR}"/${P}-cve-2017-17787.patch # bug 641954 + epatch "${FILESDIR}"/${P}-cve-2017-17788.patch # bug 641954 + epatch "${FILESDIR}"/${P}-cve-2017-17789.patch # bug 641954 + + epatch "${FILESDIR}"/${PN}-2.8.14-blend-center.patch # bug 558878 + epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch # bug 395695, comment 9 and 16 + epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang + + sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 + eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too + + gnome2_src_prepare +} + +_clean_up_locales() { + [[ -z ${LINGUAS+set} ]] && return + einfo "Cleaning up locales..." + for lang in ${LANGS}; do + has ${lang} ${LINGUAS} && { + einfo "- keeping ${lang}" + continue + } + rm -Rf "${ED}"/usr/share/locale/"${lang}" || die + done +} + +src_test() { + Xemake check +} + +src_install() { + gnome2_src_install + + if use python; then + python_optimize + fi + + # Workaround for bug #321111 to give GIMP the least + # precedence on PDF documents by default + mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die + + prune_libtool_files --all + + # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) + local gimp_app_version=$(get_version_component_range 1-2) + mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die + + _clean_up_locales +} + +pkg_postinst() { + gnome2_pkg_postinst +} + +pkg_postrm() { + gnome2_pkg_postrm +} diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild index fc0e9d31d199..73a8c30f70ff 100644 --- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild +++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild @@ -49,8 +49,10 @@ RDEPEND=">=dev-libs/glib-2.40.0:2 >=media-libs/libpng-1.6.25:0 python? ( ${PYTHON_DEPS} - >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] - >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}] + >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}] + ') ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.40.6:2 diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index 31756e7a18c7..a8add4680ec1 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -65,7 +65,9 @@ COMMON_DEPEND=" postscript? ( app-text/ghostscript-gpl ) python? ( ${PYTHON_DEPS} - >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}] + ') ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) -- cgit v1.2.3