Version bump, drop old
authorPacho Ramos <pacho@gentoo.org>
Wed, 18 Feb 2015 12:05:46 +0000 (12:05 +0000)
committerPacho Ramos <pacho@gentoo.org>
Wed, 18 Feb 2015 12:05:46 +0000 (12:05 +0000)
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

x11-libs/gtk+/ChangeLog
x11-libs/gtk+/Manifest
x11-libs/gtk+/gtk+-2.24.26.ebuild [new file with mode: 0644]
x11-libs/gtk+/gtk+-3.14.7.ebuild [deleted file]

index 2a3c5bb26bcf601680635912d2a3eecec63057e8..556c28cd7eb9342d0f9ba75f20dee4558a091f56 100644 (file)
@@ -1,6 +1,12 @@
 # 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.760 2015/02/08 21:07:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.761 2015/02/18 12:05:45 pacho Exp $
+
+*gtk+-2.24.26 (18 Feb 2015)
+
+  18 Feb 2015; Pacho Ramos <pacho@gentoo.org> +gtk+-2.24.26.ebuild,
+  -gtk+-3.14.7.ebuild:
+  Version bump, drop old
 
   08 Feb 2015; Markus Meier <maekke@gentoo.org> gtk+-2.24.25-r1.ebuild:
   arm stable, bug #536694
index aa6d04b29d73bb8ae6c232ca7bb9d3c3d72ea179..012734435b1d6c4c5e758ed9c21f6a1ea8134469 100644 (file)
@@ -17,23 +17,23 @@ AUX settings.ini 96 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684 SHA512 aaef9275ff6330a9fe1cbe1e40def181329d79cd33eb2b2ff5ae9cba5fa57e706716233ac7515f621d913f81343eb8244c6669e6411f7d50ca69187bf8d4fd86 WHIRLPOOL 2aacaa61e3291ff3c96a724e02a1fd250fa1574a69c730fa8635c28926c4134b780e9695e3aec3a6fd27b6e25848fcaee4075e17cd47bed2851bdcf311f19020
 DIST gtk+-1.2.10.tar.gz 2868322 SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 SHA512 6a05062520954287b0e24a95169d18c216145ee79d1fa7f54222db32c8e39e011e3dc49886d3bc4de1cc1ebd71f5744e41891cde8d5c2759f637e71c390a235f WHIRLPOOL 906a78c2e2664b1cbd70fb9e64ce6ca1155b2a59c169eab986f5b4b90e937f380a5d35e2e28eb56913b0fbdfb53abeca5ef6823f92a3ab3906cd4e9f7c595b15
 DIST gtk+-2.24.25.tar.xz 13327832 SHA256 38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3 SHA512 e102eabbd86e9e697402b4d915172dd3838374b7b8a16b95369ed602228857a013fdba7b6b8d742f925ff8d340b63a90b56c1ddbd4405d8dc454144c705ac08d WHIRLPOOL b4bcf058bcc582627be35bb8ba45a933c3814f007599df59172e537fc99003f51edac7011cf36783caad4e191c622f6fa044a6ff6e0ae3f4de7635c3815807a3
+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.7.tar.xz 15664532 SHA256 fb9914b04f218c1afb4820ea492f3c6ab6d6993cc6634ecade8303678d05a46e SHA512 d3d8ac5b65666a53f7c905ff087f460f423532135b7d6cdb9818b414e878193b7395d2eb5ec11ef64dd5495695ca672c4bd91481df53c76b5a155cf7041d6bc7 WHIRLPOOL 7495ff71eca3da11583d9a68185cda22ef9c553b92ab1ae814a2dcb2b7f795c48c15eedf70751c85abf3ca9720648c26d6ca7774752a7c08156e00f1906c528a
 DIST gtk+-3.14.8.tar.xz 15689624 SHA256 7a543ea8a85f2c8a7b7374f24fd57df454067858689d8b02ec6c90f24be2b344 SHA512 110f39d0a8ef72bfcb02d8e11000210848da15d7232346277f9755c7918e16af39dce78ba409ddfcb73dd5fa9032cc51843cb658d5ce4a2b32ca401624cc5240 WHIRLPOOL 115a043e332119bc3fe582744ceeeb9a49f4361ded13131162c26fc6988f1c2c5281738e992c96580b96ea2bd966377a49f239ec6204d6072a5dbb09d4b0f22f
 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
+EBUILD gtk+-2.24.26.ebuild 9942 SHA256 5897b82870937129a465492b48b949e047288c54d5cbfda3d7a376a5b00ba191 SHA512 b99746e08948b216d02c0b288a87a4057ba129b17c74676e7fe941ff5132748b49fe6ecc174487394bc32b5e7d9dd6b99de99dfb806ff8fac68f702466b47958 WHIRLPOOL 3e77fe0f9cf4d22a7a1976fb37a4d1604de4f7660cf300e1f1ed05266ff1f9135ed5f51e1b5c78e859b67146a6d56afec54c1ed729344d0ef536896c13e88338
 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.7.ebuild 7930 SHA256 fe5f5b4b43ac9818d6ab927c1cb3755542943e455f1299d470a1e74aba969c14 SHA512 8411f52aeddcc494f1df197668590f7f85540e1e5dfb6e0f48a657ff6ae765dc5b4131772f8707385c36b760d9cc47230e01ddea8cfea42ee43c838a3593b185 WHIRLPOOL 62da06645401e8d843827a420e229c937552a4c6da9e55b420acdedeedcabc8aac924194fb6ba11a7b09751ce5ce0803b7877b7f3bc4e18cf257afec520cd85e
 EBUILD gtk+-3.14.8.ebuild 7964 SHA256 2a9d7f4db57c6b76b8129c5a6dcbdce634743e60a9cbc60e3ea73312612a1bcf SHA512 7c77086381921f24d961921ab086d8df1e5cf4117c0d13776a185a514debb73687d102dd1975d905531b6bc26cac0afcd3a4e4a24823a077612b413d48644d00 WHIRLPOOL ada85eecff6786e23a04f580f85bf1cac0a6f24c97c16bbe4b5ab9c8838117ed3d1dcc268ccdb717d8c31495362b67166dc7e6bd23719aaca891576a3ee71fa8
-MISC ChangeLog 20064 SHA256 0d4a6e7e26f9fb2c0b2122d93b3e2137dca768611dfa0d7d67c808aa822cefef SHA512 fcac8b580aa877408811ebf1a2868c60af6e5a1be549e1ba86eba7e9929fae8dfd7d2dc642e3da92bce4ba21dd4d739f259b9bf5830b38df0f3349d713e7ccc3 WHIRLPOOL 40269406c5e8994eaef07821f58cbb67cfa09e3f119c2184a2c23bea61224d72667304fb751edc8f95d734e169cdd7a534d94a2cf617021cd2cb878e7c34a4ac
+MISC ChangeLog 20209 SHA256 001f953cdcfe17a92ab42f78da7744a80d4708b3dcca3037d60f296d49f7ba07 SHA512 8b12f4b382a5c43d5f7371fc9c69690a8981788c83b2eda6fe02ead859caca4bfd2282e88d64a2abb051b1e814f51f0f4da92868e041490615ddf429a8c16269 WHIRLPOOL 7cea68c753b7d2c7cb287a7963fe3b031c012b25f66be9808b6ec03bb28e596808fe30d7bd43ce26c4248f611962c1b173ca055057147bbc32d01adc18a65595
 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
 MISC metadata.xml 697 SHA256 8b5dc9aa21147f3d0418c8c39c2788b7fb061d0c51ef7631045db65a5dac54d9 SHA512 aaf3748ce89cd5bf1a7839cb73b742d5a8668834727a2ba2b4b4034aac66b616718347818578d96e84b09f104c7c728429ca45c8bfb6806571fd073da1a20ee7 WHIRLPOOL e65be162bc425eb89abffd3ae598c01b7b86a834dbec64f163144ea5faaa32b7d79d239afd9215c51d071b968b3a5acb4ad1bac71eaa7bde2113421e7c8d57fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTX0C8ACgkQkKaRLQcq0GLyHgCgsDHKIsYk5HsfxBbb+l23WDY5
-1NkAn3PW5KkozXHskqsLkQgPxgMPje+p
-=cLJC
+iEYEAREIAAYFAlTkgBoACgkQCaWpQKGI+9TozACfVnUHAiFPN1O5aEEA9/7FUoIe
+QpoAnRHUejoyYy8yfGC5RJhYkxiOxi7j
+=/wdh
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-2.24.26.ebuild b/x11-libs/gtk+/gtk+-2.24.26.ebuild
new file mode 100644 (file)
index 0000000..6daee6d
--- /dev/null
@@ -0,0 +1,306 @@
+# 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+-2.24.26.ebuild,v 1.1 2015/02/18 12:05:45 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx readme.gentoo multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="aqua cups examples +introspection test vim-syntax xinerama"
+REQUIRED_USE="
+       xinerama? ( !aqua )
+"
+
+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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+COMMON_DEPEND="
+       >=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
+       >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+       >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+       >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}]
+       >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
+       >=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
+       x11-misc/shared-mime-info
+
+       cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
+       introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+       !aqua? (
+               >=x11-libs/cairo-1.12.14-r4:=[X]
+               >=x11-libs/gdk-pixbuf-2.30.7:2[X]
+               >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+               >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+               >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+               >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+               >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+               >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+               >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+               >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
+               >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+               xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+       )
+"
+DEPEND="${COMMON_DEPEND}
+       dev-libs/gobject-introspection-common
+       >=dev-util/gtk-doc-am-1.20
+       sys-devel/gettext
+       >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+       !aqua? (
+               >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+               >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+               >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
+               >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
+               xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
+       )
+       test? (
+               x11-themes/hicolor-icon-theme
+               media-fonts/font-misc-misc
+               media-fonts/font-cursor-misc )
+"
+
+# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
+# Add blocker against old gtk-builder-convert to be sure we maintain both
+# in sync.
+RDEPEND="${COMMON_DEPEND}
+       !<gnome-base/gail-1000
+       !<dev-util/gtk-builder-convert-${PV}
+       !<x11-libs/vte-0.28.2-r201:0
+       abi_x86_32? (
+               !<=app-emulation/emul-linux-x86-gtklibs-20140508
+               !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+       )
+"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
+edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:
+[Filechooser Settings]
+StartupMode=cwd"
+
+MULTILIB_CHOST_TOOLS=(
+       /usr/bin/gtk-query-immodules-2.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."
+}
+
+set_gtk2_confdir() {
+       # An arch specific config directory is used on multilib systems
+       GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+}
+
+src_prepare() {
+       # Fix building due to moved definition, upstream bug #704766
+       # Upstream says it was fixed with a different commit
+#      epatch "${FILESDIR}"/${PN}-2.24.20-darwin-quartz-pasteboard.patch
+
+       # Fix tests running when building out of sources, bug #510596, upstream bug #730319
+       epatch "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch
+
+       # marshalers code was pre-generated with glib-2.31, upstream bug #662109
+       rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
+               perf/marshalers.c || die
+
+       # Stop trying to build unmaintained docs, bug #349754, upstream bug #623150
+       strip_builddir SUBDIRS tutorial docs/Makefile.{am,in}
+       strip_builddir SUBDIRS faq docs/Makefile.{am,in}
+
+       # -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 tests Makefile.{am,in}
+               strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
+       else
+               # 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"
+
+               # Cannot work because glib is too clever to find real user's home
+               # gentoo bug #285687, upstream bug #639832
+               # XXX: /!\ Pay extra attention to second sed when bumping /!\
+               sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
+                       || die "failed to disable recentmanager test (1)"
+               sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
+                       || die "failed to disable recentmanager test (2)"
+               sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
+                       || die "failed to disable recentmanager test (3)"
+
+               # Skip tests known to fail
+               # https://bugzilla.gnome.org/show_bug.cgi?id=646609
+#              sed -e '/g_test_add_func.*test_text_access/s:^://:' \
+#                      -i "${S}/gtk/tests/testing.c" || die
+
+               # https://bugzilla.gnome.org/show_bug.cgi?id=617473
+               sed -i -e 's:pltcheck.sh:$(NULL):g' \
+                       gtk/Makefile.am || die
+
+               # UI tests require immodules already installed; bug #413185
+               if ! has_version 'x11-libs/gtk+:2'; then
+                       ewarn "Disabling UI tests because this is the first install of"
+                       ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
+                       ewarn "has been installed."
+                       sed '/g_test_add_func.*ui-tests/ d' \
+                               -i gtk/tests/testing.c || die "sed 2 failed"
+               fi
+       fi
+
+       if ! use examples; then
+               # don't waste time building demos
+               strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+       fi
+
+       epatch_user
+
+       eautoreconf
+       gnome2_src_prepare
+}
+
+multilib_src_configure() {
+       [[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc
+
+       ECONF_SOURCE=${S} \
+       gnome2_src_configure \
+               $(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
+               $(usex aqua "" --with-xinput) \
+               $(use_enable cups cups auto) \
+               $(multilib_native_use_enable introspection) \
+               $(use_enable xinerama) \
+               --disable-papi \
+               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() {
+       unset DBUS_SESSION_BUS_ADDRESS
+       Xemake check
+}
+
+multilib_src_install() {
+       gnome2_src_install
+
+       # add -framework Carbon to the .pc files
+       if use aqua ; then
+               for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.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() {
+       # see bug #133241
+       echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
+       insinto /usr/share/gtk-2.0
+       doins "${T}"/gtkrc
+
+       dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+       # dev-util/gtk-builder-convert split off into a separate package, #402905
+       rm "${ED}"usr/bin/gtk-builder-convert || die
+
+       readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+       gnome2_pkg_preinst
+
+       multilib_pkg_preinst() {
+               # Make immodules.cache belongs to gtk+ alone
+               local cache="usr/$(get_libdir)/gtk-2.0/2.10.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_gtk2 \
+                       || die "Update immodules cache failed (for ${ABI})"
+       }
+       multilib_parallel_foreach_abi multilib_pkg_postinst
+
+       set_gtk2_confdir
+
+       if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
+               elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
+               elog "aware location. Removing deprecated file."
+               rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
+       fi
+
+       if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
+               elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
+               elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
+               elog "Removing deprecated file."
+               rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules
+       fi
+
+       # pixbufs are now handled by x11-libs/gdk-pixbuf
+       if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
+               elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+               elog "Removing deprecated file."
+               rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
+       fi
+
+       # two checks needed since we dropped multilib conditional
+       if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
+               elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+               elog "Removing deprecated file."
+               rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
+       fi
+
+       if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
+               elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
+               elog "to do that you can use qfile from portage-utils:"
+               elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
+       fi
+
+       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 gtkrc."
+       fi
+
+       readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+       gnome2_pkg_postrm
+
+       if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+               multilib_pkg_postrm() {
+                       rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache
+               }
+               multilib_foreach_abi multilib_pkg_postrm
+       fi
+}
diff --git a/x11-libs/gtk+/gtk+-3.14.7.ebuild b/x11-libs/gtk+/gtk+-3.14.7.ebuild
deleted file mode 100644 (file)
index a14f435..0000000
+++ /dev/null
@@ -1,255 +0,0 @@
-# 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.7.ebuild,v 1.1 2015/01/26 13:36:45 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"
-# 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 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() {
-       # see bug #525928
-       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 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() {
-       # 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
-       unset DISPLAY #527682
-       GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
-}
-
-multilib_src_install() {
-       gnome2_src_install
-
-       # 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
-}
-
-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
-}