Version bump

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 233 insertions, 17 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 066fabaae499..93e3eafaf53d 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.718 2014/05/14 13:36:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.719 2014/05/31 07:59:34 pacho Exp $
+
+*gtk+-3.12.2 (31 May 2014)
+
+  31 May 2014; Pacho Ramos <pacho@gentoo.org> +gtk+-3.12.2.ebuild:
+  Version bump
 
 *gtk+-2.24.23-r1 (14 May 2014)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index be182b0272aa..8b4a3e422abe 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -18,32 +18,22 @@ DIST gtk+-1.2.10.tar.gz 2868322 SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e5
 DIST gtk+-2.24.23.tar.xz 13316276 SHA256 a0a406e27e9b5e7d6b2c4334212706ed5cdcd41e713e66c9ae950655dd61517c SHA512 e6db7d61d753f5d8ce0f41e99b461decda364d04314ff58838d2f98f29aab22313c0b5898f2cf56ddd3a18e0544f47ad796e673390d464ee2160b2542c5f558b WHIRLPOOL 65d5e277ee416bef424fa5ec424363f3f573007fa778ffef0322b75ac6835680c1ea30dc30dc03c1a8ff7b4b732df523509e573141364fcdf8cf367f8dd459b6
 DIST gtk+-3.10.8.tar.xz 14187652 SHA256 5fd28b35ab475d521751fa6ae91318bf58f69cd34e71363f24e23d3ea406b684 SHA512 b96ef832fb76c0d35f8e9a2db48c4d65229dda5a5755f8f0010e3d5731322dc8a6a01d9d0ee10e93e19b5102ad8025286cf7f1caa9466279d1daf9ec52d98b34 WHIRLPOOL 554e1e34a55103be0cfa8d0af00026dd3dc1b4a8666ba99e298ff2004b2da4971a57ddf891110b825f75aa57967c5fbc338c2752ad9b393d1515b8ad148ac79d
 DIST gtk+-3.12.1.tar.xz 14731512 SHA256 719aae5fdb560f64cadb7e968c8c85c0823664de890c9f765ff4c0efeb0277cd SHA512 e7306be21b44855e43af30a4c6314417e7a586c31a66ab40c3fcf9ed16d0223ed1b83daf651c65b49b8c492c4b40745a3cd4b06b2bdf781493a0de89f9998125 WHIRLPOOL 02ddb1302c1641906ff39cb24f898f871b8565cb5ed7302e7192a5953555e74ac4ac3d47ea61e78241b2e3a27ff98b1f8e85d456c3b9245195ba7fa46d13d8a7
+DIST gtk+-3.12.2.tar.xz 15015024 SHA256 61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0 SHA512 4a8d2f52328587d73e30f363bdbbd91322dae0198f5581a2da3ebbe96ef0a0635193d2537e8fc127dc0950a24df42862233edd3a873dcbd166dc675bae849c9e WHIRLPOOL 26328632d78f986d25e40d8773ff3cc90a0b3a5bafb4f21224504bd1c8c78995df556e8337d7b374f047bfff2bd0b9e0082ec163591f7a0a035260b8a2db2932
 DIST gtk+-3.4.4.tar.xz 12854476 SHA256 f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7 SHA512 1a16f54a511f85a22f74a8ea82d218efa14ea5a58fc94fca805b0e321bdcea48a5f0a018a6d996c954ee80a51a2a16b68bdb2e3f3ab57c2362f3241c6cfa9a56 WHIRLPOOL eb1d117544aafec4936920a668b684959e89383b5b014512b82be0e99b7e48e3bdf81ceff4202b64179df4aa77453390d85a433d6e913cce8740a6b31701b15a
 EBUILD gtk+-1.2.10-r12.ebuild 2406 SHA256 03e22a0e23e19cc0ad87697527ac186aeb6904b7e007bb0c023196f80765b716 SHA512 fb4a7905b5d6390a9d12bd5b0dd8e1b19744a5620279da1ae8c6962c80db44b9707dc6cd4d3a80cb091b5f4cfeacfeee7f5ebe46d1ecd2a3f720d8ccb73d8be4 WHIRLPOOL f3414b479f126236bef1670a51b46a2c37553f1c37edc912ed121f807926fa2dc87bcc8af1fa079cd12eeb8bc3084a4348948565356621c6a1ec267f40da1235
 EBUILD gtk+-2.24.23-r1.ebuild 8839 SHA256 5e1673cb7b6f215f16b4ed1e1fe5bef439852730c411d58642347242ab00367f SHA512 d5ac6f5ff90c6856823548f128cb589c6a7b15ef009e5e0de997e0e38657a20910db6baa505669c8a68b7b817deea09bdaf8fba393d8395420c49f2f8012684e WHIRLPOOL cce040ed9d736489d47e3a1c2dd65560361dfe2b27e1437733b1e4e24e58a7d166b5d73764e3c2e8c4b2957f80469703517d5415fdf714b82452005a6342470a
 EBUILD gtk+-2.24.23.ebuild 7821 SHA256 e96fb4da8b45c90e3ddfaffc15c078e80f485413b6ce031c9fe5122b82096633 SHA512 68492d880062b05e889500a0bef528131b8c33ea312fb5d29587ecf5c9a109998b51c10796533428b0caa384d49250f4abae2ee7fb64c4d569de3f1736f544d5 WHIRLPOOL 4dc248ffea386cb508ce78782becaada1bdc449a325e6b8b9fb155dab2ab9f2b208c1251a41fef330100668677c19fe0766c863ff6c90d9fdff872e161277a6b
 EBUILD gtk+-3.10.8.ebuild 6476 SHA256 538f97ea50eded5aa850c46f2cca1d25f8742700aa0bf69bef2872b06bae83e9 SHA512 69b710dd6ba6f356a6b9f0bb425957b160a39666762d64ffe32839471b7386403dbd9e3f826b2b904b819be7671a256361738b217f2be5afe91d5898be6675cb WHIRLPOOL e0d166bad4fdaec041280aab3f2c77945d584c3919e9a5fdeca0e0c6b2b542ea854983a756dcb21498d447dd7c6f3208dcc99fe62ecddf9a8704990c82ba8cb3
 EBUILD gtk+-3.12.1.ebuild 6508 SHA256 c28cc3e211c462c2b8a2ac297e85dbe20234f722ee51e1e46ede104a8a97d7f5 SHA512 e66996f48666ad92d4432fca78230396b2154aeda5ac7f07553f3cab29bfbc339a2a139d07d2c3ec3422f259afc95e51365f44a46fdd4a73b934e34c8595767c WHIRLPOOL 6835114339edd698ab962c7ab904390d386c5f73d7ffb8cbef82ce600721a6446e9def08742bdd13adb9291e531b638fa6c6fccbf4bfc855d92c2bedb239b150
+EBUILD gtk+-3.12.2.ebuild 6511 SHA256 d120d21d768f879991540b2f55f6205b5112e06f73dc8bba96c770893a959d62 SHA512 543e7c90ffdb48e2037927f5829841fc6f23f7dd81be0d50c9d9a2a545d125921e30a28e2ac1cc37b8eec1e3aa80db3c4681bf6c36712b7c8ac939a1bddea0ed WHIRLPOOL 5826fccfcbb9b90473d353d3ff1fe5fad97bf5e1b816bbb3e550352ee8123138ddc8c1ca475c4e4404a7e74b6a55ed20b8ab40f90ba22856b1c90cf998fb971b
 EBUILD gtk+-3.4.4.ebuild 7078 SHA256 5c03753346c92b03ce8876ff2223240855225ac69f8e99ad3d0f594778f4d83c SHA512 2b86d907df0cf1613d4aab3adc4ccbec8960513cd07dcbc41a933587a7cba85d0c7e078158431f5315ec91818f7793d2deed76d4ec643d5df19682193e1b5570 WHIRLPOOL f2196bef499be6eec55554d2dea442f7aa480c13fb590dab010efb6564886bb746b27479265c4ba48a93a0c630e574a37cf319fee228dfda82d333c8e4a3b093
-MISC ChangeLog 13886 SHA256 a4e4c723fb5526cd72045312964553dc1197b0876a1f047c4c155381f41626f6 SHA512 c49ac634226e2aa88e8abf9e337066873e5732ae6afe901caac3c6daa86f7288ba44fbe6cdeb6b8c62e3beb7aff93769c6f6b8ba636fd5097f2ec97f1235150a WHIRLPOOL 6de3b9ea913e6322d8cff0e896c630b2dfff94611f1a0a89c2d3f7b5a3135ca8dd0035e3de8fa263e760b934edddeec1c7862a89a6d3618961a585966f54cd06
+MISC ChangeLog 13996 SHA256 2fc6629d20ddd2e4fb7f978da2548006d0913f8ac4104e58b5c58d337f1f4ad9 SHA512 e3291bf7281481941c2f9f87c27fe33f5b49b540fadd499a563fd715ca60ea8047060abd291db051430a8ed668e867eb718f3bbd890a25e04741064d0b14a9cb WHIRLPOOL a75fab765095dccc84469d49183f534de438dde72cd7e660a143476aa80222517c8ba2820cac9f932fc4252f79dc554aadbb11abce7b016bfe609585704f472c
 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
 MISC metadata.xml 848 SHA256 cfb2904b37626135ebeb5e4be0626a51e68d64e211414eefde98b738631d82f0 SHA512 7c0cfa1f2b09ca41911e4f6ccad76becd4f6edf4c5c1a9e3e60eb423b907f08d15c2bfbef378773b9428232d1e7c20bd250eec0b327d073f4de41f815ce92226 WHIRLPOOL 786c7b8987736aaa4fa7b637b84f81e56765f435c77d65aa0afe9409d4bc6c191cf04ad4bab4d7c7b704a2762c828346f1042b408234b38c145abb21df0fbd21
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTc3FpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObHgP/icfBgATDlf6lOaSqkcZf/RH
-zVZjhIyF9ik8K3p+Hy/xRsNUvliYkfVmd+IAffQZpfEWY6axBmshS1ZnWfmH88VJ
-vdCrXZNNv/o12Rc6siJE6v3auGS7Fva063/Lhg2zTSfnsuwfuBUhPD20wFtCf4PD
-m8xJn/2jPgRMOBlw+SAvIZmRXXf9BQEIP2ssTeCRaiIZjAM0XoIBWpw6tjgW2fef
-yIkGhrc+KTPF4Aa5l+TaC0b3E73FQeOoBIS4m9FLX/oNnJEZTn5hCHNvsRMSaqDN
-DRMcAxah2N8Ks9dJCg9z/vx6NuiS5TY1VaptaYLIKuTpevVTjXoDefBY3DTffYQ7
-gtLA4zSm3Q4p4jxRuLBDeX71H9XcYfU2wIpjEnqgMql44Ci+9LT1OTlcIyfAHcrB
-csgDvY8pYWaWo5/eW1wBj37GgylwRoMwFQ9IscN37bYUB3lRgCFmxRJRs4k8dCIw
-UB2yk3O1xpK8lIphZRb7IroKJXgnOUwBRm2auy8SzZ3ruxR/NOl3/zM9dTfoMrf6
-50oobh4NHPB5qJQflDcg411I18Ion7N3AyBOvotDl1IXd+4xxDpTt3tQ7jcmsEgs
-bXv5ih5l6csKyj/NI4SPa47QQOkPsYJBbKmXZih6QaQZd0ihHjCC0PZBQutmPeFb
-jnkBSxw29KjN/fMt7mMB
-=kduf
+iEYEAREIAAYFAlOJi+cACgkQCaWpQKGI+9SNjgCeOv/oG8QcrWhWyMN4G8X/4L//
+Wm0An1aAKcWnyCqyiXcK3Ofi/JGnIvQ4
+=VcpL
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-3.12.2.ebuild b/x11-libs/gtk+/gtk+-3.12.2.ebuild
new file mode 100644
index 000000000000..901994cd3ed3
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.12.2.ebuild
@@ -0,0 +1,221 @@
+# 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.12.2.ebuild,v 1.1 2014/05/31 07:59:34 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2 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 cloudprint colord cups debug examples +introspection 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.39.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
+
+	cloudprint? (
+		>=net-libs/rest-0.7
+		>=dev-libs/json-glib-1.0 )
+	colord? ( >=x11-misc/colord-0.1.9:0= )
+	cups? ( >=net-print/cups-1.2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.39 )
+	wayland? (
+		>=dev-libs/wayland-1.3.90
+		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.20
+	sys-devel/gettext
+	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
+	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() {
+	# -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
+
+	gnome2_src_prepare
+}
+
+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 ...)
+	gnome2_src_configure \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable cloudprint) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(usex debug --enable-debug=yes "") \
+		$(use_enable introspection) \
+		$(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-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() {
+	gnome2_src_install
+
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	# 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_pkg_preinst
+
+	# 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_pkg_postinst
+	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_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+		rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+	fi
+}