[gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/

["Sebastian Pipping" <sping@gentoo.org>]

commit:     126a12f3fbebb42836b3a6e9b80da53e538c9ab0
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  7 18:15:32 2019 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jul  7 18:17:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=126a12f3

media-gfx/gimp: 2.10.12

Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-2.3.68, Repoman-2.3.16

 media-gfx/gimp/Manifest                              |  1 +
 .../gimp/{gimp-9999.ebuild => gimp-2.10.12.ebuild}   | 20 +++++++++-----------
 media-gfx/gimp/gimp-9999.ebuild                      |  4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 45765720586..66dd90d4dc5 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,4 +1,5 @@
 DIST gimp-2.10.10.tar.bz2 32408724 BLAKE2B 7d4f06d255d7b853f08c2a8bd9695b5cbc27a417f2f78aab56c970675430534b7c6f870168c5555369b873971b4ca3889565085cfc0cb9b2e1bb60c3bfe938bd SHA512 87caab9643a018e741e5e51c61220b7b282a66ed5bb723750cdf4139950f98c9ab246f4d6450420531d0e878c4561150efc4063cda896f08b25669bac4d1d172
+DIST gimp-2.10.12.tar.bz2 32614932 BLAKE2B 93e0c6c3ac58335920a9ebcfa81c970f0c657757860ab255e8a584ec2fa0c4d97c639797419eef58d5ef076797f2437eade20c1dea02c18bcbd8bd0fb30a8069 SHA512 dd4af3f0fa6fca815d254b7f42aeff15412c38294f1f5bd491563e2b597fcb868e6adff9001b196a68e01cf49bde61cbb153b662b8da1aa1b4b1f7285879659f
 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

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-2.10.12.ebuild
similarity index 92%
copy from media-gfx/gimp/gimp-9999.ebuild
copy to media-gfx/gimp/gimp-2.10.12.ebuild
index 30b9a0ee9d5..54808a41fa8 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-2.10.12.ebuild
@@ -5,15 +5,14 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 GNOME2_EAUTORECONF=yes
 
-inherit virtualx autotools gnome2 multilib python-single-r1 git-r3
+inherit eapi7-ver virtualx autotools gnome2 multilib python-single-r1
 
 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$(ver_cut 1-2)/${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 heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm"
@@ -35,8 +34,8 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	dev-libs/libxml2
 	dev-libs/libxslt
 	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.62
-	>=media-libs/gegl-0.4.14:0.4[cairo]
+	>=media-libs/babl-0.1.66
+	>=media-libs/gegl-0.4.16:0.4[cairo]
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	aqua? ( x11-libs/gtk-mac-integration )
@@ -70,7 +69,6 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5.10.0
 	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
 	dev-util/gtk-update-icon-cache
 	sys-apps/findutils
 	virtual/pkgconfig
@@ -78,7 +76,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"
 
@@ -121,7 +118,7 @@ src_configure() {
 
 	local myconf=(
 		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
 
 		--enable-default-binary
 		--disable-silent-rules
@@ -178,7 +175,7 @@ _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.99/plug-ins || exit 1
+		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
@@ -209,7 +206,8 @@ src_install() {
 	find "${D}" -name '*.la' -type f -delete || die
 
 	# 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
 
 	_rename_plugins || die
 	_clean_up_locales

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 30b9a0ee9d5..7c23c4d716d 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -35,8 +35,8 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	dev-libs/libxml2
 	dev-libs/libxslt
 	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.62
-	>=media-libs/gegl-0.4.14:0.4[cairo]
+	>=media-libs/babl-0.1.66
+	>=media-libs/gegl-0.4.16:0.4[cairo]
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	aqua? ( x11-libs/gtk-mac-integration )