Version bump, add broadway support (#452376 by Olaf Leidinger)

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

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index df30a08fa6e358d89737e337ff9de2d1a9f46d2a..8e0e08258889a3546897fee678452f5cf0dfb4b1 100644 (file)
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.763 2015/02/22 00:22:31 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.764 2015/02/26 20:15:19 pacho Exp $
+
+*gtk+-3.14.9 (26 Feb 2015)
+
+  26 Feb 2015; Pacho Ramos <pacho@gentoo.org> +gtk+-3.14.9.ebuild, metadata.xml:
+  Version bump, add broadway support (#452376 by Olaf Leidinger)
 
   22 Feb 2015; Rémi Cardona <remi@gentoo.org>
   files/gtk+-non-bash-support.patch:

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 6e5ca49e2adeefc086fa55fa0307c2b937fe1adb..ffef6bb40f56b47ae788f308a10be9490f35014c 100644 (file)
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -20,6 +20,7 @@ DIST gtk+-2.24.25.tar.xz 13327832 SHA256 38af1020cb8ff3d10dda2c8807f11e92af9d2fa
 DIST gtk+-2.24.26.tar.xz 13328708 SHA256 d84fc0f1e3cd99e8b9ec756e754f42653940638579a8f28d0eabffc37018d133 SHA512 2a3a366c41214fcacbc2a69719d5b20060e0efbb0576a1fc4f4123f97ea1f5ff1b06296302806655b32c06901629f5d23b91d65de9a01143053f63607d94498d WHIRLPOOL b0cf44be24dd1999f2f4aeb6ed779e536cb00c7d1b42cb1a4c8fc9a807093a1b8f26f4f750bb52533ca6a18e6a9ce481f7d879e0c186d7d11add6c793090c244
 DIST gtk+-3.12.2.tar.xz 15015024 SHA256 61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0 SHA512 4a8d2f52328587d73e30f363bdbbd91322dae0198f5581a2da3ebbe96ef0a0635193d2537e8fc127dc0950a24df42862233edd3a873dcbd166dc675bae849c9e WHIRLPOOL 26328632d78f986d25e40d8773ff3cc90a0b3a5bafb4f21224504bd1c8c78995df556e8337d7b374f047bfff2bd0b9e0082ec163591f7a0a035260b8a2db2932
 DIST gtk+-3.14.8.tar.xz 15689624 SHA256 7a543ea8a85f2c8a7b7374f24fd57df454067858689d8b02ec6c90f24be2b344 SHA512 110f39d0a8ef72bfcb02d8e11000210848da15d7232346277f9755c7918e16af39dce78ba409ddfcb73dd5fa9032cc51843cb658d5ce4a2b32ca401624cc5240 WHIRLPOOL 115a043e332119bc3fe582744ceeeb9a49f4361ded13131162c26fc6988f1c2c5281738e992c96580b96ea2bd966377a49f239ec6204d6072a5dbb09d4b0f22f
+DIST gtk+-3.14.9.tar.xz 15716588 SHA256 3be9560e6e99388d7706a168e3353ecd63fc30ec4f7f8bea23889e71ab7b6c64 SHA512 3b64142d65ec4b4e0ed709c2fac629d80b95dac03481a3d6f8e3cc6c351ac779fe172a1edee552df7b3c40287f10c97fa0e99212e5f0e6b4751e3d8efd0896e5 WHIRLPOOL bc45b3722913ebb90bff944ec724909d01e3e976d49f8bd273500de2af9de7dcedc85e24fca36226816993a10cb87f4477f4498cc67946449855b37a0790a2fa
 EBUILD gtk+-1.2.10-r12.ebuild 2406 SHA256 03e22a0e23e19cc0ad87697527ac186aeb6904b7e007bb0c023196f80765b716 SHA512 fb4a7905b5d6390a9d12bd5b0dd8e1b19744a5620279da1ae8c6962c80db44b9707dc6cd4d3a80cb091b5f4cfeacfeee7f5ebe46d1ecd2a3f720d8ccb73d8be4 WHIRLPOOL f3414b479f126236bef1670a51b46a2c37553f1c37edc912ed121f807926fa2dc87bcc8af1fa079cd12eeb8bc3084a4348948565356621c6a1ec267f40da1235
 EBUILD gtk+-2.24.25-r1.ebuild 9932 SHA256 82119295dc8a9a1e47e86d5f18620b4014efc5926197f1be60f1e68d92bcabfe SHA512 a5e318c78208b46c76ba6a068119734191077f49b2a39d36532378239034164704e59e31880e04952fefc5c3ad15b6773d331322c7ae14e7155bc104eb1e85b0 WHIRLPOOL 84f6db0f26dd7d5c3c9ab988461a2e0d6d645e052ce62928e7fbf705899ffb351325ea9f4b3db8a3fe3825171926f0f1a85328c54f602bb42dafcd2f9869585b
 EBUILD gtk+-2.24.25.ebuild 9303 SHA256 06de60abc98acf5ffbf2f5a738330bcfba09816b4c1d0bfb0de2bcd854301af0 SHA512 1568f20620ebac879bed686c16450f6e0fb62864a83705ae06e55bb5e3e1e50ef92d055c57054532dac3f7492c716ea5fc188cd2ab4ae98cffa5095b84ef1984 WHIRLPOOL 975530592ccc3b92bf04403097a2ad623be9f5ffee902a15c79b08847a71f43702b54ccbcf1b33b93cafbbb239449594beb2ed198a57a1d733e53dd2f2eff743
@@ -27,13 +28,14 @@ EBUILD gtk+-2.24.26.ebuild 9942 SHA256 5897b82870937129a465492b48b949e047288c54d
 EBUILD gtk+-3.12.2-r2.ebuild 8223 SHA256 ecee6c83c1418c0d69d7f2a21c8219cb9675509d23cfd378455af80b4cb127aa SHA512 5057611b2b8b767bf4ff36a9583e6a1635b470742b6cc429a1876a77af903dae9d1903174062bd01c568b7df9bea4f67f0e2571387fbbd1d409765b5c56653a1 WHIRLPOOL ed6f48b1908ce088dbd4ffe36709772361d80c73de5b247a8996c40ca6fe87eae19a5b61c23a632b91fcbeb53bb4ff8cce4bb841145519737cfa324fceb36626
 EBUILD gtk+-3.12.2.ebuild 6597 SHA256 be97832d070fab365a441ef5b124b803417f8ca1fa1fefd22f17772af6632e7e SHA512 d78b8d1696f16607feb4b2695ae48756cf69ea7704b73a1dda99e6f7aec119e8483c2f4197dba17188131ba9ea9a7fc18d1c97190ff3dd3a1981c3093810cd05 WHIRLPOOL e6435dd7ee84c81b9e5f1fa6b9989b6c0bd62aad8f8e35419a6dce57e174507cf60968441681057dfdcd0924f50de8409881f341253fc0d1421faedfe5a67467
 EBUILD gtk+-3.14.8.ebuild 7964 SHA256 2a9d7f4db57c6b76b8129c5a6dcbdce634743e60a9cbc60e3ea73312612a1bcf SHA512 7c77086381921f24d961921ab086d8df1e5cf4117c0d13776a185a514debb73687d102dd1975d905531b6bc26cac0afcd3a4e4a24823a077612b413d48644d00 WHIRLPOOL ada85eecff6786e23a04f580f85bf1cac0a6f24c97c16bbe4b5ab9c8838117ed3d1dcc268ccdb717d8c31495362b67166dc7e6bd23719aaca891576a3ee71fa8
-MISC ChangeLog 20455 SHA256 2c51de99a35a791649c683057c0a056df5dfbb5f0d2270830a82cd55c7b0082e SHA512 8af653906ed4b253e29b3cb081354f0e7128cdb13462f6b8cca879e8020a8971ada6eb8f3b1050421414d8c2e5e710dc63e4c420d580a46868f9215f8066cc6e WHIRLPOOL 82054b243f89e7cbaa4b8749e2700c21e287edd7adb90375135d9d842038e986f4626806dfed39497639346f52f1dd7c2af5a8f378588ed38df62dddd6457db1
+EBUILD gtk+-3.14.9.ebuild 7262 SHA256 804c5a61f2459a3754d595d73395f47e55b968d079403e35b937ccc54cda18a1 SHA512 218da3e69d9a99cb5960dce74f85dd0487b06e62339a553cf4cf3b80080b7ded4f67302258d961007fa45cea0e04e597a7c41c7c8ac50a85b31b2de4767194c2 WHIRLPOOL 8e1075fa9be6752d24362149d4a870e4545f1ad6a0a11211256639202519056f2488dc5ab8c2fc909c0a243a07d2d5fe0824ef6ea093d9c924b6eba1d5f27d2a
+MISC ChangeLog 20631 SHA256 3411742f1668da2cff4de2f8cf91eadd77db147241164bb19094c61059919583 SHA512 f15a0a9ccf5334df81bef09cc8e4e5b362898d9fd7e1b688b8fbe55bbf0a6a5e242bc4464277ace72bd02520827acefa5f2575a433479255249a710973ec7424 WHIRLPOOL cc7e7b8fd1efd072fd761ccc710fc2d058719d47786f6a10764f63697e5783c1aabef50e09da3f8e7af8dd7ebbe4d6de457f28a2a799c9433fdfb0dc7757e264
 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
-MISC metadata.xml 697 SHA256 8b5dc9aa21147f3d0418c8c39c2788b7fb061d0c51ef7631045db65a5dac54d9 SHA512 aaf3748ce89cd5bf1a7839cb73b742d5a8668834727a2ba2b4b4034aac66b616718347818578d96e84b09f104c7c728429ca45c8bfb6806571fd073da1a20ee7 WHIRLPOOL e65be162bc425eb89abffd3ae598c01b7b86a834dbec64f163144ea5faaa32b7d79d239afd9215c51d071b968b3a5acb4ad1bac71eaa7bde2113421e7c8d57fe
+MISC metadata.xml 763 SHA256 03a0b8d26ef0461bedaf694959d0025f192a70b368b2e19f8fe438f5941011ca SHA512 c3126323546eb09681b3a72cb67dd0d0fbbb792fd8df5eee821705f68ae5ffcc708d2e368bc26c97dd602d051d424af2dfd89f2e384d56c50219b3f6a47dd792 WHIRLPOOL 1ea3a03d5b2946841ce1b4945a3a3dd095ce1f6be91afc9f869d2e8d88534ae1ce197dc5904452f099f9054f0dc69d2bc9c37269438ebdbcaadf25eb04c4a365
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTpIVAACgkQfUU/I5AasIog4gCg2uKGn4t5vZ7N1bk+OlchuJN/
-6GwAn335uOo7RcKnZSArUwvAPOCLyD3o
-=6Y0c
+iEYEAREIAAYFAlTvftUACgkQCaWpQKGI+9QpfgCfYNRcTiaR1Cvq0Cxvc5eYrNsQ
+xMgAn06Lmt+YAqq5C4rxguDRN2ogcHXM
+=XDnz
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/gtk+/gtk+-3.14.9.ebuild b/x11-libs/gtk+/gtk+-3.14.9.ebuild
new file mode 100644 (file)
index 0000000..c955a93
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.14.9.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.14.9.ebuild,v 1.1 2015/02/26 20:15:19 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudprint colord cups 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.12[introspection?,${MULTILIB_USEDEP}]
+       >=dev-libs/glib-2.41.2:2[${MULTILIB_USEDEP}]
+       media-libs/fontconfig[${MULTILIB_USEDEP}]
+       >=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+       >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
+       >=x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}]
+       >=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
+       x11-misc/shared-mime-info
+
+       cloudprint? (
+               >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+               >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+       colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+       cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+       introspection? ( >=dev-libs/gobject-introspection-1.39 )
+       wayland? (
+               >=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
+               media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+               >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+       )
+       X? (
+               >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+               x11-libs/libXrender[${MULTILIB_USEDEP}]
+               x11-libs/libX11[${MULTILIB_USEDEP}]
+               >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+               x11-libs/libXext[${MULTILIB_USEDEP}]
+               >=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
+               x11-libs/libXcursor[${MULTILIB_USEDEP}]
+               x11-libs/libXfixes[${MULTILIB_USEDEP}]
+               x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+               x11-libs/libXdamage[${MULTILIB_USEDEP}]
+               xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+       )
+"
+DEPEND="${COMMON_DEPEND}
+       app-text/docbook-xsl-stylesheets
+       app-text/docbook-xml-dtd:4.1.2
+       dev-libs/libxslt
+       dev-libs/gobject-introspection-common
+       >=dev-util/gdbus-codegen-2.38.2
+       >=dev-util/gtk-doc-am-1.20
+       sys-devel/gettext
+       virtual/pkgconfig[${MULTILIB_USEDEP}]
+       X? (
+               x11-proto/xextproto[${MULTILIB_USEDEP}]
+               x11-proto/xproto[${MULTILIB_USEDEP}]
+               x11-proto/inputproto[${MULTILIB_USEDEP}]
+               x11-proto/damageproto[${MULTILIB_USEDEP}]
+               xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+       )
+       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
+       >=x11-themes/adwaita-icon-theme-3.14
+       X? ( !<x11-base/xorg-server-1.11.4 )
+       abi_x86_32? (
+               !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
+               !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+       )
+"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+MULTILIB_CHOST_TOOLS=(
+       /usr/bin/gtk-query-immodules-3.0
+)
+
+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() {
+       # https://bugzilla.gnome.org/show_bug.cgi?id=738835
+       epatch "${FILESDIR}"/${PN}-non-bash-support.patch
+
+       # -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,in}
+               strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+       fi
+
+       if ! use examples; then
+               # don't waste time building demos
+               strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+               strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+       fi
+
+       epatch_user
+
+       eautoreconf
+       gnome2_src_prepare
+}
+
+multilib_src_configure() {
+       # 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_SOURCE=${S} \
+       gnome2_src_configure \
+               $(use_enable aqua quartz-backend) \
+               $(use_enable broadway broadway-backend) \
+               $(use_enable cloudprint) \
+               $(use_enable colord) \
+               $(use_enable cups cups auto) \
+               $(multilib_native_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) \
+               CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+       # work-around gtk-doc out-of-source brokedness
+       if multilib_is_native_abi; then
+               local d
+               for d in gdk gtk libgail-util; do
+                       ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+               done
+       fi
+}
+
+multilib_src_test() {
+       # FIXME: this should be handled at eclass level
+       "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+       unset DBUS_SESSION_BUS_ADDRESS
+       unset DISPLAY #527682
+       GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
+}
+
+multilib_src_install() {
+       gnome2_src_install
+
+       # add -framework Carbon to the .pc files, bug #????
+       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
+}
+
+multilib_src_install_all() {
+       insinto /etc/gtk-3.0
+       doins "${FILESDIR}"/settings.ini
+
+       dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+}
+
+pkg_preinst() {
+       gnome2_pkg_preinst
+
+       multilib_pkg_preinst() {
+               # Make immodules.cache belongs to gtk+ 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
+       }
+       multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+       gnome2_pkg_postinst
+
+       multilib_pkg_postinst() {
+               gnome2_query_immodules_gtk3 \
+                       || die "Update immodules cache failed (for ${ABI})"
+       }
+       multilib_parallel_foreach_abi multilib_pkg_postinst
+
+       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
+               multilib_pkg_postrm() {
+                       rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+               }
+               multilib_foreach_abi multilib_pkg_postrm
+       fi
+}

diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
index 3149f0f421b21a1cfc2b200e20fa72774a5cdac1..f5d67e73f0e5ffff5d742e75867a41860d822008 100644 (file)
--- a/x11-libs/gtk+/metadata.xml
+++ b/x11-libs/gtk+/metadata.xml
@@ -9,6 +9,7 @@
     application suites.
   </longdescription>
   <use>
+    <flag name="broadway">Enable the GDK Broadway backend.</flag>
     <flag name="cloudprint">Enable printing via Google Cloud Print.</flag>
     <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management
          in printing</flag>