gimp-2.8.10-r1 - merge changes from gentoo

3 files changed, 209 insertions, 7 deletions

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index ff998ba..3cb293a 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,8 +1,3 @@
-AUX gimp-2.7.4-no-deprecation.patch 1061 SHA256 fb9532406b62a6fa12f8598b142186fad1dc4e937328c8859cb4e8e76d2b19c7 SHA512 3454f3b1a7579b1da4c36b765ae2a54adab13f0a4ecf02c4c0c3c55a12ff7af57d6d0467f663d2ef3de6cda116095f5f662a29cb3d729e0533edd585731a1dc9 WHIRLPOOL 25b645c7e3f39cabe35155dd24c061a088a1800b0a4c154196ff89f4ccf3fc1950a1028d08eddf879cc482ca334bd99bc4c6cea8288e3bf36c0bed657485d984
 DIST gimp-2.8.10-freetype251.patch 679 SHA256 34d1b729e267d33084c19fc89f7e125cd49ed4586b07794b169d5fe22d98f970 SHA512 e6c9271d8de9cd549bef666254724c644cef88291c7590e86d98dae444f808002f6bdb2400a3a44a65396f8b169b2a8c2985d6f169b295de8c3d14732013e053 WHIRLPOOL 500fae1f3e8b5a4eec039662f896fa5a0b3083dfe0b83ac5b97fe99ca4aaebe007f0fb88bc03dcb554e3c8e7f006a7355448f4f6477c02f894358da2d2a155b6
 DIST gimp-2.8.10.tar.bz2 20343461 SHA256 e7fd8b19f989138d826003c75f56bd5b6f136eef597e86e3978ede0bba470ae6 SHA512 21c96832ce61ecb2dad5276b454e7965263b6733add7e4a95cfc5f308fca681bceab21c1b77921332e0725d0e514e06868a4698ca9d7e4b30a28a07c7356a3a8 WHIRLPOOL 16b0a7e8a4197db41da29832977bee917e65d5cbbf308dde1ba73c150742c70c52cd60d449d0fd0269b0ed5db0378461d3277a2350898c3a5e07b1f3cf8bdf47
 DIST gimp-2.8.8.tar.bz2 20345808 SHA256 74c4509bae55f07140bc46f16100fc1e0e052829c13d4d87dc31d07d3e696a67 SHA512 3c841c1d11ac41eb5a4ae9d039c339d91eec7b05a303efa6a10ea9cb1af3d56c9b8a55f752c8f4c50ddddca3fbe220949d6e22838c71d5f9dfba9fab922bf8c3 WHIRLPOOL b3c3f33449bb14dfed34189ec674c9b7fb52c52a5ab2ddf6bb481fe921aeaa7e5cd8de9107767d9a61476da1f9c6d6f15464372bad11e112739eb4216002e3f0
-EBUILD gimp-2.8.10-r1.ebuild 4793 SHA256 8bc9d96ee7ee4f00f6d3b93b7a1e584d8503ab06b987131584dd6e88356ad090 SHA512 6928ffe531b4d64704c23d7ff11d9ae78c5740e4ed05673daf0bf3b990530ec6055a0f1062d3452cad0922557c377c4e7d36b25807bfd91acfc7e2d420ad4065 WHIRLPOOL cbd7ebc4393207c4560cceffaa659f077c6c595e2a54c23cbfcc84aeae3cd71dfb3edc282b4ac0c6874774561f7efc7199b67953e7892ae3810bd77cab6d72c9
-EBUILD gimp-2.8.8-r1.ebuild 4868 SHA256 a0eaa9ef8a5975dcd491ee27d8fc2b08502be45efb16bb1495d6bd1e159634aa SHA512 5ab8df2b8f9c65d0a7caace0da11989f8e4ec6552c33fa160759eff3e1ded49c1bcb924f4cf3dbd49e8af8251bcfec1a86238007b0b9feddfc11acfe2b205124 WHIRLPOOL 095f8bb7810d26d7611a386aa470e2839aa5b5076b99f58cf5b1026314f24120c11fffda3c4559719d0deeae492b6b6cf42a9b08812f96febbb191fad9196525
-EBUILD gimp-2.8.8.ebuild 4866 SHA256 0ef460fe27419df8ae21dc3d99773944f980c4ffa55a3d92519c757fa9fa8def SHA512 5c54fc1ebcb153078b25ef288f4ff4b7c55c699fa02a0b6cf3dd807cf070b4efe8ba5488b062935617f2b68c672642f9f15318485711e960606c7da0a7f86a66 WHIRLPOOL 769e909a652aed104aac33a2da40203b1b6cbb58b9db638827c4826ec36f3b14e9aaba3e4ac07b70aa672a095bfcad09a4dc04d57bb7b9c02e301422ffba9bff
-MISC metadata.xml 285 SHA256 77c9767711868abab1e559504dd88eb8aef8cf395629d8ec8c7a5fdb3d29397e SHA512 0b1abe9749d79ed8644c2a34312ab70cff232e08f64c1a914185cbafe8c754e9c6442eac1e3a1c449057e52b076333b70ea8be7418570bfcbee69f69d455079e WHIRLPOOL 9f2199f149dd49efce83f4710f026fc235a9aed38b7c7e0ffbb5480ef6865dee6ac555178bb92a819071d016fb0ead581765697cc3035b829ed96126bc7e6053
diff --git a/media-gfx/gimp/files/gimp-2.8.10-clang.patch b/media-gfx/gimp/files/gimp-2.8.10-clang.patch
new file mode 100644
index 0000000..065c66b
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.8.10-clang.patch
@@ -0,0 +1,204 @@
+--- app/Makefile.am
++++ app/Makefile.am
+@@ -120,29 +120,29 @@
+ 
+ # FIXME: core should not depend on xcf
+ workaround_that_core_depends_on_xcf = \
+-	-u $(SYMPREFIX)xcf_init
++	-Wl,-u,$(SYMPREFIX)xcf_init
+ 
+ # FIXME: core should not depend on pdb
+ workaround_that_core_depends_on_pdb = \
+-	-u $(SYMPREFIX)internal_procs_init		\
+-	-u $(SYMPREFIX)gimp_plug_in_manager_restore
++	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
++	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore
+ 
+ # FIXME: plug-in should not depend on pdb
+ workaround_that_plug_in_depends_on_pdb = \
+-	-u $(SYMPREFIX)gimp_pdb_compat_param_spec
++	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec
+ 
+ # FIXME: file should not depend on plug-in
+ workaround_that_file_depends_on_plug_in = \
+-	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
+-	-u $(SYMPREFIX)gimp_image_map_config_get_type
++	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
++	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type
+ 
+ # core, vectors and gegl are on the same architectural layer, prevent
+ # the linker from panicing
+ calm_down_linker = \
+-	-u $(SYMPREFIX)gimp_vectors_undo_get_type	\
+-	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
+-	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
+-	-u $(SYMPREFIX)gimp_curve_map_pixels
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
+ 
+ AM_LDFLAGS = \
+ 	$(munix)					\
+--- app/Makefile.in
++++ app/Makefile.in
+@@ -702,33 +702,33 @@
+ 
+ # FIXME: core should not depend on xcf
+ workaround_that_core_depends_on_xcf = \
+-	-u $(SYMPREFIX)xcf_init
++	-Wl,-u,$(SYMPREFIX)xcf_init
+ 
+ 
+ # FIXME: core should not depend on pdb
+ workaround_that_core_depends_on_pdb = \
+-	-u $(SYMPREFIX)internal_procs_init		\
+-	-u $(SYMPREFIX)gimp_plug_in_manager_restore
++	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
++	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore
+ 
+ 
+ # FIXME: plug-in should not depend on pdb
+ workaround_that_plug_in_depends_on_pdb = \
+-	-u $(SYMPREFIX)gimp_pdb_compat_param_spec
++	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec
+ 
+ 
+ # FIXME: file should not depend on plug-in
+ workaround_that_file_depends_on_plug_in = \
+-	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
+-	-u $(SYMPREFIX)gimp_image_map_config_get_type
++	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
++	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type
+ 
+ 
+ # core, vectors and gegl are on the same architectural layer, prevent
+ # the linker from panicing
+ calm_down_linker = \
+-	-u $(SYMPREFIX)gimp_vectors_undo_get_type	\
+-	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
+-	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
+-	-u $(SYMPREFIX)gimp_curve_map_pixels
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
+ 
+ AM_LDFLAGS = \
+ 	$(munix)					\
+--- app/tests/Makefile.am
++++ app/tests/Makefile.am
+@@ -63,22 +63,22 @@
+ # We need this due to circular dependencies, see more detailed
+ # comments about it in app/Makefile.am
+ AM_LDFLAGS = \
+-	-u $(SYMPREFIX)xcf_init				\
+-	-u $(SYMPREFIX)base_init			\
+-	-u $(SYMPREFIX)internal_procs_init		\
+-	-u $(SYMPREFIX)gimp_plug_in_manager_restore	\
+-	-u $(SYMPREFIX)gimp_pdb_compat_param_spec	\
+-	-u $(SYMPREFIX)gui_init				\
+-	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
+-	-u $(SYMPREFIX)gimp_image_map_config_get_type	\
+-	-u $(SYMPREFIX)gimp_vectors_undo_get_type	\
+-	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
+-	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
+-	-u $(SYMPREFIX)actions_init			\
+-	-u $(SYMPREFIX)gimp_error_dialog_new		\
+-	-u $(SYMPREFIX)menus_save			\
+-	-u $(SYMPREFIX)gimp_tools_save			\
+-	-u $(SYMPREFIX)gimp_curve_map_pixels
++	-Wl,-u,$(SYMPREFIX)xcf_init				\
++	-Wl,-u,$(SYMPREFIX)base_init			\
++	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
++	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore	\
++	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec	\
++	-Wl,-u,$(SYMPREFIX)gui_init				\
++	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
++	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
++	-Wl,-u,$(SYMPREFIX)actions_init			\
++	-Wl,-u,$(SYMPREFIX)gimp_error_dialog_new		\
++	-Wl,-u,$(SYMPREFIX)menus_save			\
++	-Wl,-u,$(SYMPREFIX)gimp_tools_save			\
++	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
+ 
+ # Note that we have some duplicate entries here too to work around
+ # circular dependencies and systems on the same architectural layer as
+--- app/tests/Makefile.in
++++ app/tests/Makefile.in
+@@ -1221,22 +1221,22 @@
+ # We need this due to circular dependencies, see more detailed
+ # comments about it in app/Makefile.am
+ AM_LDFLAGS = \
+-	-u $(SYMPREFIX)xcf_init				\
+-	-u $(SYMPREFIX)base_init			\
+-	-u $(SYMPREFIX)internal_procs_init		\
+-	-u $(SYMPREFIX)gimp_plug_in_manager_restore	\
+-	-u $(SYMPREFIX)gimp_pdb_compat_param_spec	\
+-	-u $(SYMPREFIX)gui_init				\
+-	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
+-	-u $(SYMPREFIX)gimp_image_map_config_get_type	\
+-	-u $(SYMPREFIX)gimp_vectors_undo_get_type	\
+-	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
+-	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
+-	-u $(SYMPREFIX)actions_init			\
+-	-u $(SYMPREFIX)gimp_error_dialog_new		\
+-	-u $(SYMPREFIX)menus_save			\
+-	-u $(SYMPREFIX)gimp_tools_save			\
+-	-u $(SYMPREFIX)gimp_curve_map_pixels
++	-Wl,-u,$(SYMPREFIX)xcf_init				\
++	-Wl,-u,$(SYMPREFIX)base_init			\
++	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
++	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore	\
++	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec	\
++	-Wl,-u,$(SYMPREFIX)gui_init				\
++	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
++	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
++	-Wl,-u,$(SYMPREFIX)actions_init			\
++	-Wl,-u,$(SYMPREFIX)gimp_error_dialog_new		\
++	-Wl,-u,$(SYMPREFIX)menus_save			\
++	-Wl,-u,$(SYMPREFIX)gimp_tools_save			\
++	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
+ 
+ 
+ # Note that we have some duplicate entries here too to work around
+--- devel-docs/app/Makefile.am
++++ devel-docs/app/Makefile.am
+@@ -62,10 +62,10 @@
+ 	-UGTK_DISABLE_SINGLE_INCLUDES
+ 
+ GTKDOC_LIBS = \
+-	-u $(SYMPREFIX)xcf_init		   				     \
+-	-u $(SYMPREFIX)internal_procs_init 				     \
+-	-u $(SYMPREFIX)gimp_coords_mix	   				     \
+-	-u $(SYMPREFIX)gimp_plug_in_manager_restore			     \
++	-Wl,-u,$(SYMPREFIX)xcf_init		   				     \
++	-Wl,-u,$(SYMPREFIX)internal_procs_init 				     \
++	-Wl,-u,$(SYMPREFIX)gimp_coords_mix	   				     \
++	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore			     \
+ 	$(top_builddir)/app/app.o					     \
+         $(top_builddir)/app/batch.o					     \
+         $(top_builddir)/app/errors.o					     \
+--- devel-docs/app/Makefile.in
++++ devel-docs/app/Makefile.in
+@@ -511,10 +511,10 @@
+ 	-UGTK_DISABLE_SINGLE_INCLUDES
+ 
+ GTKDOC_LIBS = \
+-	-u $(SYMPREFIX)xcf_init		   				     \
+-	-u $(SYMPREFIX)internal_procs_init 				     \
+-	-u $(SYMPREFIX)gimp_coords_mix	   				     \
+-	-u $(SYMPREFIX)gimp_plug_in_manager_restore			     \
++	-Wl,-u,$(SYMPREFIX)xcf_init		   				     \
++	-Wl,-u,$(SYMPREFIX)internal_procs_init 				     \
++	-Wl,-u,$(SYMPREFIX)gimp_coords_mix	   				     \
++	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore			     \
+ 	$(top_builddir)/app/app.o					     \
+         $(top_builddir)/app/batch.o					     \
+         $(top_builddir)/app/errors.o					     \
diff --git a/media-gfx/gimp/gimp-2.8.10-r1.ebuild b/media-gfx/gimp/gimp-2.8.10-r1.ebuild
index f9361c2..c9b30ff 100644
--- a/media-gfx/gimp/gimp-2.8.10-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.10-r1.ebuild,v 1.1 2013/12/10 09:12:09 polynomial-c Exp $
+# $Header: $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -39,6 +39,7 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 	>=media-libs/gegl-0.2.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 )
@@ -118,6 +119,8 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch  # bug 395695, comment 9 and 16
 	epatch "${DISTDIR}"/${P}-freetype251.patch # bug #493466
+	epatch "${FILESDIR}"/${P}-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