gentoo resync : 30.09.2018

6 files changed, 45 insertions, 12 deletions

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index d3ce4e0720be..a64b3a296917 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -14,10 +14,10 @@ DIST gimp-2.10.4.tar.bz2 31064613 BLAKE2B 66d815c830696923759146dce68049131078dd
 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
-EBUILD gimp-2.10.2.ebuild 5296 BLAKE2B 2ab4fe7a79d779f93d62f95a83fb754dca40dd6f8490e660766b722e216cc956a03ff73f118c24bd8d356925a9a688f093da23b81cf0a9de62d4ca3b209715a3 SHA512 c9c70bc7f093dbe9cad2d9324c0ce2269cb0aaa6c022590cb01538fb14ada2a1885151e4d610596b39ea5fa556abb4872a68a389fa0496c0186ae906c5c22e2c
-EBUILD gimp-2.10.4.ebuild 5296 BLAKE2B fa52f60a44fbaa0a08569177ba247d746270a73475f32e2cbf802687bad283ed84fa59b97545eafb1116f1663d9d12b6dec64d0f2dbcea092b391becf8294240 SHA512 2236f5ce2d1e2098f6a5460ce0e28e00543e6549a8e23992955746ba8fa125236bd7e673a1a6827356f2c397906e0c27eb8490df3544f7a261be9a9522a7895d
-EBUILD gimp-2.10.6.ebuild 5296 BLAKE2B 54d186cd88d83cb1d7c9934a1c06e603eed94fd33f0615062cd9c19014cb080403ae8b1ed85351a9adc5a9b036fc3cd2d254a8db9f2277d0f79a86763b5a5ab5 SHA512 c38a73accbace98fefc26f2269d61b8ce79f077f51a88117cd7c8c5aadade7f773bbd14c44cfd4e92470158c3653abc19373a8a81ce8bfb0eb5d409fbe4ea901
+EBUILD gimp-2.10.2.ebuild 5274 BLAKE2B b2ad4c07c37503dd243731b809995d063ec237a63ece2d84a9e84f39171d03a718cb262ad8520b9cc8a976a3a426877c28f7401773f4ff26baf36c1ea1ccee76 SHA512 7a5fb5056250cac3fe0842fd869701e6fb91af8ae99f97d4fdba13ae2fd3ed6b7a37acb5988258a61548bc720867357d5593c147d01997d7da3dd8e789fae281
+EBUILD gimp-2.10.4.ebuild 5274 BLAKE2B 3b3da266805208b6a2931ee06a9c0a4fab9de812283e799b0e76f12a2b7bf02b058dbb5a13654919b7514f4464ddb068e2c1b65280fa9bebb32d3814a10ebb5b SHA512 f9d7a30c93cc898bfc5c6a402cabe95d449315566f28644b5835849d49cfff39ac690a726ccf5a21ea98deba648a66f652eb93273d08baa9add5d6c4cff23c04
+EBUILD gimp-2.10.6-r1.ebuild 5913 BLAKE2B 59a998963e01ec10965cadd57cd7cf0ca10f0455aac4ff45d5df7d71ab8ac407c632ea6ce0288f9cead8ec6fd70ea603c5fdb6b437acfb940f4135f52cd4b559 SHA512 a70f0e04a583a483af0609bb88a62199d28c2088f7fe8ea3f98e2aa5d9be80e1ed7558506c78a8668deeebac308433838a9d7e185adaa7e8e611e0e81c4af7ff
 EBUILD gimp-2.8.22-r1.ebuild 5175 BLAKE2B 01d76aae6190f14fdc12ad47a22109610a6622b0ee45e2d00ad352ff2a5e1f5b37ee36f15e6bf270cb842ce7f87ec13e92ce386ac908628115a8453706e95bc2 SHA512 f34e4a3d1e7ae474e07b985e5a0c9162bbdb6beec2e65473e0bb421d188e5fae37fe5a2618b9479511b625e3798f29e500f82d0e392b0b820257ebc542cf281c
-EBUILD gimp-2.9.8-r1.ebuild 5734 BLAKE2B a176bcbabc8298b9e29b755f7d3dbdc26c3e6a77335e826762c6ce0273aeea38341378bc719df8e617a69bd6f8570442e46f92116119fd40043669201ecdcf50 SHA512 2778c83c74d87fd8492a1107b1b64aab8114ea167aaf8d7ca2290cec314ed9640d60096a04c7834b718159f242cf3e2a2c46c6293a03927d8084d834bc415ff5
-EBUILD gimp-9999.ebuild 5188 BLAKE2B 00471a359fa4b4e31d181aee1dfdb3ca860b719166e4d9e4a7974920d14af252a3c4b3d92665d4dbdc8da48428af9217f2988ca87b827b2945b1e4986425054e SHA512 0a725258eb1f9704a30d897d1fba14dc79e03d5afa68dbe383486ba3fffe60eb9bfec3b180c10f95680883170b9d6c442dc2730a0b9ca2e671c67d4c8cb0f225
+EBUILD gimp-2.9.8-r1.ebuild 5712 BLAKE2B f09f553f5d7eb8e8df0af0a316d2d98e9b0a32a204bb43c563927eae5a6dcb3bb4f5ff882bc05ce6ef3f8914939be6296683c382af45bcab877889042c96bc66 SHA512 7474ecdd5a1c785684b79c0007d77f45e475d7220f74960c48e686e7f6b15d82145b154caa802e2774eb34b46b03c5c4a1fc43a8ebc3716fb5f836be4d412886
+EBUILD gimp-9999.ebuild 5805 BLAKE2B c26c7b0b46db8f02d42196a988f8010b55e1278da2a4daf3f1db8d7ba073d93d8c8868a7ca4728bf479178c41de7720a068c02cf7148c13c3418fce5ef9266fd SHA512 b3bffc6728f7071bb683e95710cd26552940928b3087cea2d6ef5dfb741be7161b0a237b1c74c958155f1588a90e702c21eab76e2ec01f6b0d6ce5f1a56a6790
 MISC metadata.xml 388 BLAKE2B 2e779c672c788e3631b0532be9a6081767215bf9687cb2546c92d3c6f4a00d8e8f6e32cca607019847200ed416336f752cfbfaf43b2f600b4bea63eb985e63d5 SHA512 e3a626ac39cea422d1b4660731048d764c4b6f1985e09577865f0047ecbc61c8677d6f15626dbbc03ceb3cb18887ba58747df5d91f5f4b2126afb9ad12eaccb0
diff --git a/media-gfx/gimp/gimp-2.10.2.ebuild b/media-gfx/gimp/gimp-2.10.2.ebuild
index bbc9b522552f..818b06076c82 100644
--- a/media-gfx/gimp/gimp-2.10.2.ebuild
+++ b/media-gfx/gimp/gimp-2.10.2.ebuild
@@ -39,7 +39,6 @@ RDEPEND=">=dev-libs/glib-2.54.2:2
 	x11-themes/hicolor-icon-theme
 	>=media-libs/babl-0.1.50
 	>=media-libs/gegl-0.4.2:0.4[cairo]
-	>=dev-libs/glib-2.43
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	aqua? ( x11-libs/gtk-mac-integration )
diff --git a/media-gfx/gimp/gimp-2.10.4.ebuild b/media-gfx/gimp/gimp-2.10.4.ebuild
index 4d9bbe895d72..586cce90b374 100644
--- a/media-gfx/gimp/gimp-2.10.4.ebuild
+++ b/media-gfx/gimp/gimp-2.10.4.ebuild
@@ -39,7 +39,6 @@ RDEPEND=">=dev-libs/glib-2.54.2:2
 	x11-themes/hicolor-icon-theme
 	>=media-libs/babl-0.1.52
 	>=media-libs/gegl-0.4.4:0.4[cairo]
-	>=dev-libs/glib-2.43
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	aqua? ( x11-libs/gtk-mac-integration )
diff --git a/media-gfx/gimp/gimp-2.10.6.ebuild b/media-gfx/gimp/gimp-2.10.6-r1.ebuild
index 54c3e36e5452..7d7306ae33f2 100644
--- a/media-gfx/gimp/gimp-2.10.6.ebuild
+++ b/media-gfx/gimp/gimp-2.10.6-r1.ebuild
@@ -20,7 +20,7 @@ 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"
 
-RDEPEND=">=dev-libs/glib-2.54.2:2
+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
@@ -39,7 +39,6 @@ RDEPEND=">=dev-libs/glib-2.54.2:2
 	x11-themes/hicolor-icon-theme
 	>=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 )
 	aqua? ( x11-libs/gtk-mac-integration )
@@ -167,6 +166,24 @@ _clean_up_locales() {
 	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
 }
@@ -188,6 +205,7 @@ 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
 
+	_rename_plugins || die
 	_clean_up_locales
 }
 
diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
index fd50f6600b1d..73c30b3307ba 100644
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
@@ -35,7 +35,6 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
 	x11-themes/hicolor-icon-theme
 	>=media-libs/babl-0.1.38
 	>=media-libs/gegl-0.3.24:0.3[cairo]
-	>=dev-libs/glib-2.43
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	aqua? ( x11-libs/gtk-mac-integration )
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 82186f49ec6f..ffaa9b6d047e 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -18,7 +18,7 @@ KEYWORDS=""
 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"
 
-RDEPEND=">=dev-libs/glib-2.54.2:2
+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
@@ -37,7 +37,6 @@ RDEPEND=">=dev-libs/glib-2.54.2:2
 	x11-themes/hicolor-icon-theme
 	>=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 )
 	aqua? ( x11-libs/gtk-mac-integration )
@@ -165,6 +164,24 @@ _clean_up_locales() {
 	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
 }
@@ -185,6 +202,7 @@ src_install() {
 	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
 	mv "${ED%/}"/usr/share/man/man1/gimp-console{-*,}.1 || die
 
+	_rename_plugins || die
 	_clean_up_locales
 }