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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6A683138334 for ; Sun, 1 Dec 2019 03:18:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62386E0857; Sun, 1 Dec 2019 03:18:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D8B8AE084E for ; Sun, 1 Dec 2019 03:18:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5CAF434D630 for ; Sun, 1 Dec 2019 03:18:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98D3E8C6 for ; Sun, 1 Dec 2019 03:18:02 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1575170119.c6d827b9d4859defcfdf4b88ea276a747bb62b95.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/gimp/gimp-2.10.10-r1.ebuild media-gfx/gimp/gimp-2.10.12.ebuild X-VCS-Directories: media-gfx/gimp/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c6d827b9d4859defcfdf4b88ea276a747bb62b95 X-VCS-Branch: master Date: Sun, 1 Dec 2019 03:18:02 +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: 96c5ef91-f760-4a89-b9a1-57ae0ce3fedd X-Archives-Hash: 4ebceaef440c791d5e17bdd5dd4dec47 commit: c6d827b9d4859defcfdf4b88ea276a747bb62b95 Author: Sergey Torokhov yandex ru> AuthorDate: Mon Nov 25 22:56:18 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 1 03:15:19 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d827b9 media-gfx/gimp: 2.10.{10,12} update and fix TEST FAIL: test-appdata.sh Sync gimp-2.10.{10,12} ebuilds with new gimp-2.10.14.ebuild with fixing of failure test: test-appdata.sh. Closes: https://bugs.gentoo.org/685210 Closes: https://bugs.gentoo.org/691070 Signed-off-by: Sergey Torokhov yandex.ru> Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/gimp/gimp-2.10.10-r1.ebuild | 156 +++++++++++++++++----------------- media-gfx/gimp/gimp-2.10.12.ebuild | 156 +++++++++++++++++----------------- 2 files changed, 158 insertions(+), 154 deletions(-) diff --git a/media-gfx/gimp/gimp-2.10.10-r1.ebuild b/media-gfx/gimp/gimp-2.10.10-r1.ebuild index faa127d6d83..ff1bb96d42f 100644 --- a/media-gfx/gimp/gimp-2.10.10-r1.ebuild +++ b/media-gfx/gimp/gimp-2.10.10-r1.ebuild @@ -5,83 +5,94 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) GNOME2_EAUTORECONF=yes -inherit eapi7-ver virtualx autotools gnome2 multilib python-single-r1 +inherit autotools gnome2 python-single-r1 virtualx DESCRIPTION="GNU Image Manipulation Program" HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2" +SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2" LICENSE="GPL-3 LGPL-3" SLOT="2" KEYWORDS="~amd64 ~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" +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 )" -RDEPEND=">=dev-libs/glib-2.56.0:2 +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 - >=x11-libs/gtk+-2.24.32: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/glib-2.54.2:2 dev-libs/libxml2 dev-libs/libxslt - x11-themes/hicolor-icon-theme + >=gnome-base/librsvg-2.40.6:2 + >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/babl-0.1.62 + >=media-libs/fontconfig-2.12.4 + >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.14:0.4[cairo] - aalib? ( media-libs/aalib ) - alsa? ( media-libs/alsa-lib ) - aqua? ( x11-libs/gtk-mac-integration ) - gnome? ( gnome-base/gvfs ) + >=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.30.8: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.1.0:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) - >=media-libs/lcms-2.8:2 - mng? ( media-libs/libmng ) + mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) - >=app-text/poppler-0.50[cairo] - >=app-text/poppler-data-0.4.7 - >=media-libs/libpng-1.6.25:0= + postscript? ( app-text/ghostscript-gpl ) python? ( ${PYTHON_DEPS} - >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}] + >=dev-python/pygtk-2.10.4: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} + 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 - sys-apps/findutils - virtual/pkgconfig >=dev-util/intltool-0.40.1 + sys-apps/findutils + >=sys-devel/automake-1.11 >=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" + virtual/pkgconfig +" -DOCS="AUTHORS ChangeLog* HACKING NEWS README*" +DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" ) -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +# Bugs 685210 (and duplicate 691070) +PATCHES=( + "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" +) pkg_setup() { if use python; then @@ -121,33 +132,32 @@ src_configure() { 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) + --enable-mp --with-appdata-test - --without-libbacktrace --with-bug-report-url=https://bugs.gentoo.org/ + --with-xmc + --without-libbacktrace --without-webkit - $(use_with jpeg2k jpeg2000) - $(use_with postscript gs) + --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 webp) - $(use_with heif libheif) - $(use_enable python) - --enable-mp - $(use_enable cpu_flags_x86_sse sse) + $(use_with postscript gs) $(use_with udev gudev) $(use_with unwind libunwind) + $(use_with webp) $(use_with wmf) - --with-xmc $(use_with xpm libxpm) - $(use_enable vector-icons) - --without-xvfb-run ) gnome2_src_configure "${myconf[@]}" @@ -158,18 +168,6 @@ src_compile() { 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)...' @@ -209,8 +207,12 @@ src_install() { 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 - _clean_up_locales } pkg_postinst() { diff --git a/media-gfx/gimp/gimp-2.10.12.ebuild b/media-gfx/gimp/gimp-2.10.12.ebuild index c50fc2d19f7..b3c8a9550e9 100644 --- a/media-gfx/gimp/gimp-2.10.12.ebuild +++ b/media-gfx/gimp/gimp-2.10.12.ebuild @@ -5,83 +5,94 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) GNOME2_EAUTORECONF=yes -inherit eapi7-ver virtualx autotools gnome2 multilib python-single-r1 +inherit autotools gnome2 python-single-r1 virtualx DESCRIPTION="GNU Image Manipulation Program" HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2" +SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2" LICENSE="GPL-3 LGPL-3" SLOT="2" KEYWORDS="~amd64 ~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" +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 )" -RDEPEND=">=dev-libs/glib-2.56.0:2 +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 - >=x11-libs/gtk+-2.24.32: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/glib-2.54.2:2 dev-libs/libxml2 dev-libs/libxslt - x11-themes/hicolor-icon-theme + >=gnome-base/librsvg-2.40.6:2 + >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/babl-0.1.66 + >=media-libs/fontconfig-2.12.4 + >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.16:0.4[cairo] - aalib? ( media-libs/aalib ) - alsa? ( media-libs/alsa-lib ) - aqua? ( x11-libs/gtk-mac-integration ) - gnome? ( gnome-base/gvfs ) + >=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.30.8: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.1.0:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) - >=media-libs/lcms-2.8:2 - mng? ( media-libs/libmng ) + mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) - >=app-text/poppler-0.50[cairo] - >=app-text/poppler-data-0.4.7 - >=media-libs/libpng-1.6.25:0= + postscript? ( app-text/ghostscript-gpl ) python? ( ${PYTHON_DEPS} - >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}] + >=dev-python/pygtk-2.10.4: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} + 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 - sys-apps/findutils - virtual/pkgconfig >=dev-util/intltool-0.40.1 + sys-apps/findutils + >=sys-devel/automake-1.11 >=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" + virtual/pkgconfig +" -DOCS="AUTHORS ChangeLog* HACKING NEWS README*" +DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" ) -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +# Bugs 685210 (and duplicate 691070) +PATCHES=( + "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" +) pkg_setup() { if use python; then @@ -121,33 +132,32 @@ src_configure() { 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) + --enable-mp --with-appdata-test - --without-libbacktrace --with-bug-report-url=https://bugs.gentoo.org/ + --with-xmc + --without-libbacktrace --without-webkit - $(use_with jpeg2k jpeg2000) - $(use_with postscript gs) + --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 webp) - $(use_with heif libheif) - $(use_enable python) - --enable-mp - $(use_enable cpu_flags_x86_sse sse) + $(use_with postscript gs) $(use_with udev gudev) $(use_with unwind libunwind) + $(use_with webp) $(use_with wmf) - --with-xmc $(use_with xpm libxpm) - $(use_enable vector-icons) - --without-xvfb-run ) gnome2_src_configure "${myconf[@]}" @@ -158,18 +168,6 @@ src_compile() { 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)...' @@ -209,8 +207,12 @@ src_install() { 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 - _clean_up_locales } pkg_postinst() {