Version bump. Add more examples behing USE=examples.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 230 insertions, 5 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index f4580bfc8d03..f613a11ceb1e 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.693 2014/01/20 21:23:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.694 2014/02/06 23:02:00 eva Exp $
+
+*gtk+-3.10.7 (06 Feb 2014)
+
+  06 Feb 2014; Gilles Dartiguelongue <eva@gentoo.org> +gtk+-3.10.7.ebuild:
+  Version bump. Add more examples behing USE=examples.
 
   20 Jan 2014; Pacho Ramos <pacho@gentoo.org> gtk+-2.24.22.ebuild,
   gtk+-3.10.6.ebuild:
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index ec2ad4f1025f..092d664fd127 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -27,6 +27,7 @@ DIST gtk+-2.24.16.tar.xz 13435020 SHA256 93cd69cc2cecf9a3aa31a50caf4a24752a6928a
 DIST gtk+-2.24.17.tar.xz 13288028 SHA256 e947b2b460156d98e8e38930b82458e1d613a71eb26e927f966f7081a640f415 SHA512 7a83555b4b6eb534bbdb77eae85164e182d68f786a72dcdbf41e221a25af0981263cc6637427cdf8984f82064927fb38d370d3f8621b7b056b3b5dbd92bcaf79 WHIRLPOOL c4693da71887d5eaaf17bcc60a0e65c60a745eeed5d02534019cae3f9c1baaaae919fdbfa2076999f795aaa2c7be8d1403f2a45a3fc9993eff5a456b0ac0311d
 DIST gtk+-2.24.22.tar.xz 13376344 SHA256 b114b6e9fb389bf3aa8a6d09576538f58dce740779653084046852fb4140ae7f SHA512 be17f877eda8dd80c063dfaa0d1db2efbcdf699550bb740718b809d132a4e75cc074a53d9a03529f079a3d51527fb0841092d702f6d2afb92333b2c7ebb45993 WHIRLPOOL e4a588b588d29aebb79ce47dc161d1bcfeb7d12e6f500bcd4e03bea7d2d9fe399cbde471c40b668775463f11b72f600e5ebf36d65b59d4ea3574e14848f7260d
 DIST gtk+-3.10.6.tar.xz 14387620 SHA256 3c24c57fc5cb7a5ea39d3a3ff7b12be63d7f21a52fd6f20f7b983e19b7b0268a SHA512 2619d2e08dbdde41528ad132f120c91b7536d01a6932a9dc9ac5c5b2ba7e68bcebbd91374189160519da20794957b5dcd05502f92c2acecb01bfc99444f0617b WHIRLPOOL 03d8673f570972fbb16e69fcd4cc9d445148fc7adbe59597384f3f7e9ff317f6c10bc800719dfff0181edf2dd24a5561eafaf1d85babd446f21b957155061d56
+DIST gtk+-3.10.7.tar.xz 14363820 SHA256 b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427 SHA512 cb138b468b8ea159b2fe7888500f08665cf54a66a042bf507539f4d8791e4dde074a98a87f6c6a36094d3996eb300f4a70b4fc9604709f9af6f7ebfb73efe3b7 WHIRLPOOL 5db9a67e620339c042530115b974f177102af003fdeab0d58eb1075f30daf4674aeb97756f3aa397e5471a5b94a251f36c782f6631315408d80c4c1b53bf4c13
 DIST gtk+-3.4.4.tar.xz 12854476 SHA256 f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7 SHA512 1a16f54a511f85a22f74a8ea82d218efa14ea5a58fc94fca805b0e321bdcea48a5f0a018a6d996c954ee80a51a2a16b68bdb2e3f3ab57c2362f3241c6cfa9a56 WHIRLPOOL eb1d117544aafec4936920a668b684959e89383b5b014512b82be0e99b7e48e3bdf81ceff4202b64179df4aa77453390d85a433d6e913cce8740a6b31701b15a
 DIST gtk+-3.6.3.tar.xz 13274804 SHA256 da376bc0623650b1560c844d94dc3bc259edb7cac14ebab1ba3325b566213801 SHA512 40534e2404b63c25a402a84f551e07e190d70f5fabd14ae01373dcea409a9e8ee1a71578e3e3c23fe6358abec87675499e7a4ded67f06d0a46b51407c9bf0d05 WHIRLPOOL 26696a105c29214289ab9816482e36d7ec77f5b903574b1ff3e340ae9e8ae8da73ad26bae9060f9293be32743eef5f4c1280d9bfd27656da0e758e41a17b4d98
 DIST gtk+-3.8.7.tar.xz 13847376 SHA256 9cb4400922fcd7b71bf899036dd3d09cdcc61af8e5a0f302121c1686c7d67c89 SHA512 cbcf205188baafdeff3e58bd54a4b4f3a55e4d98938cb56f973825eebdb7a5eeb3337aee97dcff85e059520d2cfd830b01b02b36252f225291045973df5e1207 WHIRLPOOL fff4ba16809a2262e939a44c3b6d182108b47ad1d2f0a6d99d5a4e9018b0a51c8c043c171291b22048aa67970d2cbeb0859cd35546e3b50933aca657d9ed4d29
@@ -36,16 +37,17 @@ EBUILD gtk+-2.24.16.ebuild 8049 SHA256 4349490584f7da6a16198d7766c0e9b397a297036
 EBUILD gtk+-2.24.17.ebuild 8305 SHA256 619b0e80c99e19d9fa0beda14d35b79512537008943268adfc566b5a2641245f SHA512 53aef81203c586ab8839f67de12ff0d27498a35d526d30e6f09d24f6fa9179cc52d3d7da45c663facd184deba54c27b502f8d7f1341875022694eb82c83ed53e WHIRLPOOL 8a4e9e5882354e9fa63dab7250d669f808b91799051521ab181ad6e117cd979bcc79efa0b900523baf11c3476fd923936cfe77a46b3a7cf381d38920abe13c22
 EBUILD gtk+-2.24.22.ebuild 7891 SHA256 490adbc88adfe180e98a6c2407418a14b68be1279ef0d1c1a10917f3d97e8091 SHA512 2cea8d2bf622cac8a69a814e4ba4134ea8687bd3e375513c15087e450a5cbc108f2043b09385abab4a74b44cff18bd91a190cc584fb23df8b1ce923093111245 WHIRLPOOL 9474c552c88d3e13c32097221ae94254e06b06104f101bcd0e6f47a13bc3d8e18ef0accb51a4112cb9890a54c3b19ca98f8fabaadfb08405507074cf8df0da78
 EBUILD gtk+-3.10.6.ebuild 6643 SHA256 a800f6b3dec0827cfbf494aa44c126af31351e42606a32bb06127a8b7a4cb30b SHA512 3eacb75367e7bfce9d9978f71700190110ea9c8afbfb1ff67a81d16aeadfa784f6c439314be715ce37f9033a6f80bbbb1591799bd432d22c70b9a41208edf3ad WHIRLPOOL 5828c316da57cfb1484c28ffc6a13735c8f2cb1eea05137d8f54dd1ccc754f1901090b60d8237fb63826b27707969bd6988f156fa70bdc7d1cbc3c67b2c2a1a9
+EBUILD gtk+-3.10.7.ebuild 6511 SHA256 a4082dde19c03d5c0e517d123ce7ec3f8d6f5d8cb96aa3155105e0231f327b1d SHA512 742a85c21482e61d97f3011445ea6fb7a8c8056b41f85a2c8b3c36f12dda8ef008d173bd198ba16710226add5cdbf9865551ff2046b558f8090e0d0f7da7009a WHIRLPOOL 03f4aacc7dd7ed301a17541ec11f874b6f1427838b20026b30bb4aa84b58da06df9d4818d88eae0ac6716eceb41da910846f3dcd96c8369bfde1c5cb0bad0202
 EBUILD gtk+-3.4.4.ebuild 7076 SHA256 aa0defe046743a54ec62a77bd6f778179741df78faf35a154b01461ec0739b7c SHA512 adf621a389b83a55299aefb964fb49baff2f76f700c9ddb3d4dd96defa04b1d6b3dfb928e5b9d80aa1c86ea84fab77573ef508d73927f9a44ef1b814b4af03b4 WHIRLPOOL 989fc4c62b80d70e6e26c643d8366dfd5bce856fa12fcb7947e9c553dea6ad493a3d3f5d33fb0ca528dfcc6186bb2db6a48002f0a88a677459f25ef46f147975
 EBUILD gtk+-3.6.3-r3.ebuild 7364 SHA256 912daae1ce9cca1d0abd631bdeac90c6c0d705a5f46b1e5f40dcfae7243c1681 SHA512 5c6e8438c52b9a4259f47fa64e152f0fba69e5a35d9148b5d18ae321667e87ee9686206c493d880a2d12231c1a54fea2843646e74076cb0e5aeb37765c900fce WHIRLPOOL fd7d76f17d1d734cf7da6b056d264791d29d0834ea90a842641c96208520403dd26a0619334c22158919cb5453746a1ec4e34580411754286337344dd0043888
 EBUILD gtk+-3.8.7.ebuild 7108 SHA256 bfab31d7204f2ab0bf8949be435b2a6e1652c9027d91bfb7518ce3fa33926807 SHA512 38ab920f1f338f491ae888a279f89d5c3ebf304503e63fbed2118be1b55599d32afdc2015dedcb3ef9bbb1ad07d8553677e731383851e9e2566e46d747942b8a WHIRLPOOL ee2de855c653790626b8f5f96966969259c1e0fbead8cf8df35370de9a8f9eb90bd3e7cb8be09aa2feabfaf49fb680a35ccd8ca7d506c63af32fdc62ecc427b7
-MISC ChangeLog 9932 SHA256 54a7a3fa0371b0fc1f8e9f0be2d1191c88277411e1db4d7b34993f98935d5fcb SHA512 4e850b2f0972dfced29c6dc9a7073395f3743c63b51d3a854d22850959e3f0663291b336ccc9ff4787edcf5791affb3be5bd0cc668482f822a95a65c4eaa3197 WHIRLPOOL b271a6c437af187100344842e899e382246335477f19abc5ceaab630efe25a200440e700a3e7422b3d278084937611ae30e5d9c2199282edaced133e3b8ce1f0
+MISC ChangeLog 10089 SHA256 ecfada5904fc0bf5b65b8a443746cc7ca498f91b3ba15094009ac542d7591e2a SHA512 7083b93962402939532080040965e92f62db98f630a5da462f2f5be3a087533332592a343e95b2b73ccb0c13d8838fb285b78f1b89b51cb2ccac94b76160e4f9 WHIRLPOOL c5b80d1d8ec8cdcda432ee88a27bf3944aa9a2569fb46e4411d0871a42d6993025e1683505258d6beaa1999f0068485cac0c473ab4d5ce6faf5dfa8668bab590
 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
 MISC metadata.xml 902 SHA256 f4bad589c3732f53e882bde561c44c6b1beb6fe0bea42f2149e1f3fd07929ffc SHA512 aec419c5cd0cb202c00ede6a7bd822fbe562654d95dab37f5fcd4ac47dfa19d20573a0dbe718fb582b0eaf2cc1636302825df5363075d09b3fb7f2eba7129897 WHIRLPOOL 89cb8aadfb3ae4c90d48997f8dbafd7d17da02a3ded145ce5b5ff17302353c181f9729d1e161e6cef163dfaf947624fb4526bb08e7d13675ef47aee59f4458e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLdk+sACgkQCaWpQKGI+9TCywCfc/OKiIDPN4/s1K/XT/S3HEtg
-4DsAn04+X2yrq/qNTZhlOR/UVEQNrwtS
-=iDtG
+iEYEAREIAAYFAlL0FGkACgkQ1fmVwcYIWAYCRwCggLM+AH+owPPdVRP7h2UqTIKK
+qMUAnjnasjDJV6GkKn95bM4Ao/An/jqt
+=r4VI
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-3.10.7.ebuild b/x11-libs/gtk+/gtk+-3.10.7.ebuild
new file mode 100644
index 000000000000..0b10d4b10c3b
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.10.7.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.10.7.ebuild,v 1.1 2014/02/06 23:02:00 eva Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+# NOTE: This gtk+ has multi-gdk-backend support, see:
+#  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
+#  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
+# I tried this and got it all compiling, but the end result is unusable as it
+# horribly mixes up the backends -- grobian
+IUSE="aqua colord cups debug examples +introspection packagekit test vim-syntax wayland X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# FIXME: introspection data is built against system installation of gtk+:3
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+# Use gtk+:2 for gtk-update-icon-cache
+COMMON_DEPEND="
+	>=dev-libs/atk-2.7.5[introspection?]
+	>=dev-libs/glib-2.37.5:2
+	media-libs/fontconfig
+	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?]
+	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
+	>=x11-libs/gtk+-2.24:2
+	>=x11-libs/pango-1.32.4[introspection?]
+	x11-misc/shared-mime-info
+
+	colord? ( >=x11-misc/colord-0.1.9 )
+	cups? ( >=net-print/cups-1.2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
+	wayland? (
+		>=dev-libs/wayland-1.2
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.5.3
+		x11-libs/libXrender
+		x11-libs/libX11
+		>=x11-libs/libXi-1.3
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.3
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		xinerama? ( x11-libs/libXinerama )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+		x11-proto/inputproto
+		x11-proto/damageproto
+		xinerama? ( x11-proto/xineramaproto )
+	)
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+# >=xorg-server-1.11.4 needed for
+#  http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.31.0:2.90
+	packagekit? ( app-admin/packagekit-base )
+	X? ( !<x11-base/xorg-server-1.11.4 )
+"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	gnome2_environment_reset
+
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.am
+		strip_builddir SRC_SUBDIRS testsuite Makefile.in
+		strip_builddir SRC_SUBDIRS tests Makefile.am
+		strip_builddir SRC_SUBDIRS tests Makefile.in
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.am
+		strip_builddir SRC_SUBDIRS demos Makefile.in
+		strip_builddir SRC_SUBDIRS examples Makefile.am
+		strip_builddir SRC_SUBDIRS examples Makefile.in
+	fi
+}
+
+src_configure() {
+	# Passing --disable-debug is not recommended for production use
+	# need libdir here to avoid a double slash in a path that libtool doesn't
+	# grok so well during install (// between $EPREFIX and usr ...)
+	econf \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(usex debug --enable-debug=yes "") \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		--disable-gtk-doc \
+		--disable-papi \
+		--enable-man \
+		--enable-gtk2-dependency \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_test() {
+	# Tests require a new gnome-themes-standard, but adding it to DEPEND
+	# would result in circular dependencies.
+	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
+	if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk]'; then
+		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]"
+		ewarn "is not installed. Please re-run tests after installing the"
+		ewarn "required version of gnome-themes-standard."
+		return 0
+	fi
+
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+	unset DBUS_SESSION_BUS_ADDRESS
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	prune_libtool_files --modules
+
+	# add -framework Carbon to the .pc files
+	if use aqua ; then
+		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+				-i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+		done
+	fi
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+
+	# Make sure loaders.cache belongs to gdk-pixbuf alone
+	local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"/${cache} || die
+	fi
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	gnome2_query_immodules_gtk3
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+		rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+	fi
+}