Bump. Notable changes: improves filechooser appearance in non-gnome DEs, plus assorte...

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 357b141691b23b1ae3d8acd271ce4f459c5820d5..1c631686bf2547c7e32ae306cbbc2399c3ea11b4 100644 (file)
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.547 2011/10/30 15:50:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.548 2011/11/14 08:44:05 tetromino Exp $
+
+*gtk+-3.2.2 (14 Nov 2011)
+
+  14 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> +gtk+-3.2.2.ebuild:
+  Bump. Notable changes: improves filechooser appearance in non-gnome DEs, plus
+  assorted bugfixes, mostly treeview-related.
 
   30 Oct 2011; Raúl Porcel <armin76@gentoo.org> gtk+-3.0.12-r1.ebuild:
   alpha/ia64/sh/sparc stable wrt #385699

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 35c668bc1d49ec079a84e40ea2a4cbe8c701d2b9..6695ef5384df4af0b97ae81a85a1c61a06c93282 100644 (file)
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
 AUX gtk+-1.2.10-as-needed.patch 19865 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0d700e SHA1 1027f38d29492c6f77205fc40992d8e625da8dbe SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7
@@ -28,6 +28,7 @@ DIST gtk+-2.24.7.tar.xz 13224600 RMD160 37fcc2702da52ec9785a6886939b795fb3c764ae
 DIST gtk+-3.0.12-use-const2.patch.xz 12500 RMD160 2cebd73630f83530a76ac263d797e196032994ee SHA1 697b8d41ba24386acd1cfec1d733361901e797dd SHA256 f10b251a52a4f5d73b435315c94297dd30a4bc3c20a25bc947842bb214808cc4
 DIST gtk+-3.0.12.tar.xz 13104092 RMD160 c82d14e113ae287476f5887ca03b8b01b8d22e1b SHA1 1b87e12ef3dfe598ee757db1f5bdff6cd66e6558 SHA256 219fdea120897981840e909fac40d4d433fe061a37b12b9402e215c819ebeae9
 DIST gtk+-3.2.1.tar.xz 12664740 RMD160 38f61e8881b5dd1230aeafecc01cfa45629bc6ef SHA1 7f3feaa6e9227bfc9247d58fd34962c677750591 SHA256 f1989f183700cd5f46681cfabc2253e2f526b19b56e4b631dcee2594dddb0ef3
+DIST gtk+-3.2.2.tar.xz 12662804 RMD160 344ff194cda11b95e44ef75cd47f19a858b564b6 SHA1 fc88cbd2801efac02a6171a2f4b5ffe50eec61f7 SHA256 f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84
 DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
 EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b
 EBUILD gtk+-2.24.4.ebuild 7474 RMD160 6423a1cb33e4f0493c39da224d2a125c45494c8a SHA1 d6d4caaf3ad58d7d81884d82b3fd6fbff6a15120 SHA256 08ae86596433eca5aa8cfa82f6eca0f0463fb4860d5ebfca1363dacb08eb4cc5
@@ -37,12 +38,13 @@ EBUILD gtk+-2.24.7.ebuild 7680 RMD160 72bb82e782cf3cbc41509b8d353186fdc781e821 S
 EBUILD gtk+-3.0.12-r1.ebuild 6168 RMD160 0f1671e21ae1d8f5296cef76abc76e8529d5fcf3 SHA1 ce3f023df86242370b1ce92a5dfeaa008e9019ce SHA256 bfb696209c581aff44462759223770dea30cc41a2be608fd96169dc34ec9faab
 EBUILD gtk+-3.0.12.ebuild 5924 RMD160 304c8786053b789687d2179b017e2bc8b6538943 SHA1 b15b6ffc22ae2c709af8249f8283d1150e209d20 SHA256 a28b2ead97e9a6d44d2aab8db2811befd406444ca7733ca5d4eb3851301f4c9e
 EBUILD gtk+-3.2.1.ebuild 6248 RMD160 78c1cb16b8ed44fdcf8d9dc30b9d68be006cb230 SHA1 a792484cda6857875f17b163b39aba3908c5507e SHA256 c0389b5bb1f3537f096b6229f72bec022503f0ceda061a5646d1150d75b41a25
-MISC ChangeLog 82523 RMD160 88bf5f76fc890d275daa48d63410b00a9028cb40 SHA1 0395ec028f0f0ed3198857b47c7752c0b9d1d7ef SHA256 aad8692aa46ba5fd0c92f8defd975b8bf8ff7cbd7691644fb7662d6b8255be0d
+EBUILD gtk+-3.2.2.ebuild 6248 RMD160 3ea9afb5135cb73d1e975d158f49e65d5b14c88c SHA1 ec2923b31caa036d2a2b5d6051c84e78a6619162 SHA256 0ade63da62e03571fc6e5c5247d6ef0c394b3d35b4b219838de5e899f567f080
+MISC ChangeLog 82758 RMD160 264a7bcc78a455e018661a1261caca290068610b SHA1 66dc7d7c623b515651e7cb9ee7b2e49d6d1f0cd4 SHA256 0134fd8898d2fb7087e60066299528e09cd4d7a26ae8000e9c5509c6293b3fd1
 MISC metadata.xml 798 RMD160 9c1c01af06ea6cb0d398d66eda999eba1ec6880a SHA1 13f2860e4e48abb065d70fd85b7073074624ec28 SHA256 634c27d323d01eecbcda3159df57a7cc64557e2a0087eac60e6d9e3d94acd85c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6tclcACgkQuQc30/atMkCFCQCfUPBZpVGlFJDbt7f2owna7209
-WWwAoKy9YLhB3givuYGvkPUpcfNarJWP
-=yPJt
+iF4EAREIAAYFAk7A1NsACgkQdjK8w9WeBnCtrwD+JeYRRxRUgeoTNFXcB3X1cyVx
+ZdgKxdhc9roqkVsrfQoA/00UXKZ8zDRXRuogebfrDPo5B/l19r/sErFX8r6UPL+Y
+=+vw0
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/gtk+/gtk+-3.2.2.ebuild b/x11-libs/gtk+/gtk+-3.2.2.ebuild
new file mode 100644 (file)
index 0000000..196c815
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.2.2.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.2.ebuild,v 1.1 2011/11/14 08:44:05 tetromino Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic gnome.org gnome2-utils libtool 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 doc examples +introspection packagekit test vim-syntax xinerama"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-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 and gtk-builder-convert
+# >=x11-libs/gtk+-2.24:2 is needed for bug 359555
+COMMON_DEPEND="!aqua? (
+               x11-libs/libXrender
+               x11-libs/libX11
+               x11-libs/libXi
+               x11-libs/libXt
+               x11-libs/libXext
+               >=x11-libs/libXrandr-1.3
+               x11-libs/libXcursor
+               x11-libs/libXfixes
+               x11-libs/libXcomposite
+               x11-libs/libXdamage
+               >=x11-libs/cairo-1.10.0[X,glib,svg]
+               >=x11-libs/gdk-pixbuf-2.23.5:2[X,introspection?]
+       )
+       aqua? (
+               >=x11-libs/cairo-1.10.0[aqua,glib,svg]
+               >=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
+       )
+       xinerama? ( x11-libs/libXinerama )
+       >=dev-libs/glib-2.29.14
+       >=x11-libs/pango-1.29.0[introspection?]
+       >=dev-libs/atk-2.1.5[introspection?]
+       >=x11-libs/gtk+-2.24:2
+       media-libs/fontconfig
+       x11-misc/shared-mime-info
+       colord? ( >=x11-misc/colord-0.1.9 )
+       cups? ( net-print/cups )
+       introspection? ( >=dev-libs/gobject-introspection-0.10.1 )"
+DEPEND="${COMMON_DEPEND}
+       >=dev-util/pkgconfig-0.9
+       !aqua? (
+               x11-proto/xextproto
+               x11-proto/xproto
+               x11-proto/inputproto
+               x11-proto/damageproto
+       )
+       xinerama? ( x11-proto/xineramaproto )
+       >=dev-util/gtk-doc-am-1.11
+       doc? (
+               >=dev-util/gtk-doc-1.11
+               ~app-text/docbook-xml-dtd-4.1.2 )
+       test? (
+               media-fonts/font-misc-misc
+               media-fonts/font-cursor-misc )"
+RDEPEND="${COMMON_DEPEND}
+       !<gnome-base/gail-1000
+       packagekit? ( app-admin/packagekit-base )"
+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
+
+       # Non-working test in gentoo's env
+       sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
+               -i gtk/tests/testing.c || die "sed 1 failed"
+       sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
+               -i gtk/tests/recentmanager.c || die "sed 2 failed"
+
+       # Missing file, required for tests; https://bugzilla.gnome.org/show_bug.cgi?id=662024
+       cp "${FILESDIR}/${PN}-3.2.1-selector.errors" \
+               tests/css/parser/selector.errors || die "cp failed"
+
+       # FIXME: multiple reftests fail when run from portage (but succeed when
+       # run from a manual compile in a temp directory)
+       sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
+               -i tests/Makefile.* || die "sed 3 failed"
+
+       # Test results depend on the list of mounted filesystems!
+       rm -v tests/a11y/pickers.{ui,txt} || die "rm failed"
+
+       # Failing treeview scrolling tests; bug #384855,
+       # https://bugzilla.gnome.org/show_bug.cgi?id=660931
+       epatch "${FILESDIR}/${PN}-3.2.1-failing-tests.patch"
+
+       if ! use test; then
+               # don't waste time building tests
+               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
+       fi
+}
+
+src_configure() {
+       # png always on to display icons (foser)
+       local myconf="$(use_enable doc gtk-doc)
+               $(use_enable xinerama)
+               $(use_enable packagekit)
+               $(use_enable cups cups auto)
+               $(use_enable colord)
+               $(use_enable introspection)
+               --disable-papi
+               --enable-gtk2-dependency"
+
+       # XXX: Maybe with multi-backend we should enable x11 all the time?
+       if use aqua; then
+               myconf="${myconf} --enable-quartz-backend --disable-xinput"
+       else
+               myconf="${myconf} --enable-x11-backend --enable-xinput"
+       fi
+
+       # Passing --disable-debug is not recommended for production use
+       use debug && myconf="${myconf} --enable-debug=yes"
+
+       # 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 --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
+}
+
+src_test() {
+       unset DBUS_SESSION_BUS_ADDRESS
+       # Exporting HOME fixes tests using XDG directories spec since all defaults
+       # are based on $HOME. It is also backward compatible with functions not
+       # yet ported to this spec.
+       XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
+}
+
+src_install() {
+       emake DESTDIR="${D}" install
+
+       insinto /etc/gtk-3.0
+       doins "${FILESDIR}"/settings.ini
+
+       dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+       # Remove unneeded *.la files
+       find "${D}" -name '*.la' -exec rm -f {} +
+
+       # add -framework Carbon to the .pc files
+       use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+               sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+       done
+}
+
+pkg_preinst() {
+       gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+       gnome2_schemas_update
+
+       local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
+       gtk-query-immodules-3.0  > "${GTK3_MODDIR}/immodules.cache" \
+               || ewarn "Failed to run gtk-query-immodules-3.0"
+
+       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 --uninstall
+}