commit: 7bccc4e365d244c5e6833a31756990acbb218759 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Thu Aug 30 21:21:06 2018 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Thu Aug 30 21:23:23 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bccc4e3
media-gfx/gimp: 2.10.6 Closes: https://bugs.gentoo.org/664246 Package-Manager: Portage-2.3.46, Repoman-2.3.10 media-gfx/gimp/Manifest | 1 + .../gimp/{gimp-9999.ebuild => gimp-2.10.6.ebuild} | 20 ++++++++++++-------- media-gfx/gimp/gimp-9999.ebuild | 4 ++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 94b046a0283..3c3570948e1 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -1,4 +1,5 @@ DIST gimp-2.10.2.tar.bz2 30863771 BLAKE2B a3525f7266ffe35be1daf973bee4ea107d9e7384e0c85a792f2fc69bd29fa8ee3d19409586b9b1e1bf36a1be4e30719c7ed945e5de9b7cb4be4f81be06ea1468 SHA512 6e351294e018a9f879993700355bdf5f10bccc6862604ae1950c4d235d32cdfcd6a0195b37377819adeef53ab3d24f32ed1de60cba6bafe58608ed0906a6fbcf DIST gimp-2.10.4.tar.bz2 31064613 BLAKE2B 66d815c830696923759146dce68049131078ddf4f67242c78a7755db34c1b7e31b1b25bfe52e8e47a7fb81e24e60e4161261043484242c4682ca6cf362d55816 SHA512 9d0cc8d97b82423687b579907edaab6044f19a8207426edf4f7428de23fa82481112bb0a53b06bb7037b68d92336517b1eddef4600519707e7feedb64e5414f7 +DIST gimp-2.10.6.tar.bz2 31447973 BLAKE2B 96df16c1d774726580ad09317cba31f36bac341aa53178bdb04444c87406465b2c56d508ba0b8c012ad8abc85136f8c635b6e9875e4da57c97e6a6832edbc296 SHA512 1330ec756ec5f57243435e66aeb5f6214a9783e26763be6679714010a631e47dbb8b5f610195587af29261d2183332a4a4c6202acafc3f2837ae7a6b7f9a30c2 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02 diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-2.10.6.ebuild similarity index 91% copy from media-gfx/gimp/gimp-9999.ebuild copy to media-gfx/gimp/gimp-2.10.6.ebuild index 9122fd25c7e..54c3e36e545 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-2.10.6.ebuild @@ -5,15 +5,17 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) GNOME2_EAUTORECONF=yes -inherit virtualx autotools gnome2 multilib python-single-r1 ltprune git-r3 +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/"; -EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git"; -SRC_URI="" +SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${MY_P}.tar.bz2" LICENSE="GPL-3 LGPL-3" SLOT="2" -KEYWORDS="" +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 postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm" @@ -35,8 +37,8 @@ RDEPEND=">=dev-libs/glib-2.54.2:2 dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme - >=media-libs/babl-0.1.50 - >=media-libs/gegl-0.4.2:0.4[cairo] + >=media-libs/babl-0.1.56 + >=media-libs/gegl-0.4.8:0.4[cairo] >=dev-libs/glib-2.43 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) @@ -76,7 +78,6 @@ DEPEND="${RDEPEND} >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 - >=sys-devel/autoconf-2.54 >=sys-devel/automake-1.11 dev-util/gtk-doc-am" @@ -84,6 +85,8 @@ 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 @@ -182,7 +185,8 @@ src_install() { prune_libtool_files --all # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - mv "${ED%/}"/usr/share/man/man1/gimp-console{-*,}.1 || die + 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 } diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index 9122fd25c7e..d7b2c657903 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -35,8 +35,8 @@ RDEPEND=">=dev-libs/glib-2.54.2:2 dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme - >=media-libs/babl-0.1.50 - >=media-libs/gegl-0.4.2:0.4[cairo] + >=media-libs/babl-0.1.56 + >=media-libs/gegl-0.4.8:0.4[cairo] >=dev-libs/glib-2.43 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib )
