diff options
author | Gregory M. Tuner <gmt@be-evil.net> | 2014-05-17 06:23:08 -0700 |
---|---|---|
committer | Gregory M. Tuner <gmt@be-evil.net> | 2014-05-17 06:26:18 -0700 |
commit | 4d586f912797bbe171e4be27d4decb2e25205f5e (patch) | |
tree | 5892ce4e91bf0327fe5fe7abff3b1d82b08cfa37 /x11-libs | |
parent | dev-libs/atk: drop as multilibutized upstream (diff) | |
download | gmt-4d586f912797bbe171e4be27d4decb2e25205f5e.tar.gz gmt-4d586f912797bbe171e4be27d4decb2e25205f5e.tar.bz2 gmt-4d586f912797bbe171e4be27d4decb2e25205f5e.zip |
x11-libs/gtk+: drop/add
Drop 2.24.xx as multilibutized upstream.
Add untested bump/merge of 3.12.1-r1
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
s
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/gtk+/ChangeLog | 120 | ||||
-rw-r--r-- | x11-libs/gtk+/Manifest | 10 | ||||
-rw-r--r-- | x11-libs/gtk+/gtk+-2.24.22-r1.ebuild | 271 | ||||
-rw-r--r-- | x11-libs/gtk+/gtk+-2.24.23-r1.ebuild | 268 | ||||
-rw-r--r-- | x11-libs/gtk+/gtk+-3.12.1-r1.ebuild (renamed from x11-libs/gtk+/gtk+-3.10.7-r1.ebuild) | 39 | ||||
-rw-r--r-- | x11-libs/gtk+/metadata.xml | 3 |
6 files changed, 146 insertions, 565 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index f4580bf..066faba 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,124 @@ # 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.718 2014/05/14 13:36:39 mgorny Exp $ + +*gtk+-2.24.23-r1 (14 May 2014) + + 14 May 2014; Michał Górny <mgorny@gentoo.org> +gtk+-2.24.23-r1.ebuild: + Enable multilib support, bug #489000. + + 02 May 2014; Pacho Ramos <pacho@gentoo.org> gtk+-2.24.23.ebuild, + gtk+-3.10.8.ebuild: + Fix gtk-doc dep (#509118 by Chris Williams) + + 27 Apr 2014; Alexandre Rostovtsev <tetromino@gentoo.org> gtk+-3.10.8.ebuild: + colord now has subslots + +*gtk+-3.12.1 (27 Apr 2014) + + 27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +gtk+-3.12.1.ebuild, + metadata.xml: + Version bump for Gnome 3.12. + + 27 Apr 2014; Pacho Ramos <pacho@gentoo.org> gtk+-3.4.4.ebuild: + Redigest + +*gtk+-3.4.4 (27 Apr 2014) + + 27 Apr 2014; Pacho Ramos <pacho@gentoo.org> + +files/gtk+-3.3.18-fallback-theme.patch, + +files/gtk+-3.3.20-wayland-xkbcommon-headers.patch, + +files/gtk+-3.4.4-isnan.patch, +gtk+-3.4.4.ebuild: + Recover this old version as looks like old slot of clearlooks-phenix rdepends + on it + + 27 Apr 2014; Pacho Ramos <pacho@gentoo.org> + -files/gtk+-2.14.3-limit-gtksignal-includes.patch, + -files/gtk+-2.21.3-multilib.patch, + -files/gtk+-2.24.7-darwin-quartz-introspection.patch, + -files/gtk+-3.10.7-clang.patch, -files/gtk+-3.3.18-fallback-theme.patch, + -files/gtk+-3.3.20-wayland-xkbcommon-headers.patch, + -files/gtk+-3.4.4-isnan.patch, -files/gtk+-3.6.3-darwin-gtksettings.patch, + -files/gtk+-3.6.3-librsvg-2.39.patch, + -files/gtk+-3.6.3-revert-recompute-font.patch, + -files/gtk+-3.6.3-stylecontext-font-crash.patch, + -files/gtk+-3.8.6-skip-filechooser-test.patch, -gtk+-2.24.17.ebuild, + -gtk+-2.24.22.ebuild, -gtk+-3.10.7.ebuild, -gtk+-3.4.4.ebuild, + -gtk+-3.6.3-r3.ebuild, metadata.xml: + drop old + + 21 Apr 2014; Agostino Sarubbo <ago@gentoo.org> gtk+-2.24.23.ebuild, + gtk+-3.10.8.ebuild: + Stable for arm, wrt bug #507568 + + 20 Apr 2014; Agostino Sarubbo <ago@gentoo.org> gtk+-2.24.23.ebuild, + gtk+-3.10.8.ebuild: + Stable for x86, wrt bug #507568 + + 19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> gtk+-2.24.23.ebuild, + gtk+-3.10.8.ebuild: + Stable for sparc, wrt bug #507568 + + 18 Apr 2014; Agostino Sarubbo <ago@gentoo.org> gtk+-2.24.23.ebuild, + gtk+-3.10.8.ebuild: + Stable for alpha, wrt bug #507568 + + 18 Apr 2014; Pacho Ramos <pacho@gentoo.org> gtk+-2.24.23.ebuild, + gtk+-3.10.8.ebuild: + Add missing DEPEND on gettext (#507958 by Nikoli) + + 17 Apr 2014; Jeroen Roovers <jer@gentoo.org> gtk+-2.24.23.ebuild, + gtk+-3.10.8.ebuild: + Stable for HPPA (bug #507568). + + 17 Apr 2014; Agostino Sarubbo <ago@gentoo.org> gtk+-2.24.23.ebuild, + gtk+-3.10.8.ebuild: + Stable for ia64, wrt bug #507568 + + 16 Apr 2014; Agostino Sarubbo <ago@gentoo.org> gtk+-2.24.23.ebuild, + gtk+-3.10.8.ebuild: + Stable for ppc64, wrt bug #507568 + + 14 Apr 2014; Agostino Sarubbo <ago@gentoo.org> gtk+-2.24.23.ebuild, + gtk+-3.10.8.ebuild: + Stable for ppc, wrt bug #507568 + + 13 Apr 2014; Agostino Sarubbo <ago@gentoo.org> gtk+-2.24.23.ebuild, + gtk+-3.10.8.ebuild: + Stable for amd64, wrt bug #507568 + +*gtk+-3.10.8 (06 Apr 2014) + + 06 Apr 2014; Pacho Ramos <pacho@gentoo.org> +gtk+-3.10.8.ebuild: + Version bump + +*gtk+-2.24.23 (29 Mar 2014) + + 29 Mar 2014; Pacho Ramos <pacho@gentoo.org> +gtk+-2.24.23.ebuild, + -gtk+-2.24.16.ebuild, -gtk+-3.10.6.ebuild, -gtk+-3.8.7.ebuild: + Version bump, drop old + + 28 Mar 2014; Jeroen Roovers <jer@gentoo.org> gtk+-3.10.7.ebuild: + Stable for HPPA (bug #499954). + + 17 Mar 2014; Julian Ospald <hasufell@gentoo.org> gtk+-3.10.7.ebuild, + +files/gtk+-3.10.7-clang.patch: + fix build with clang wrt #504228 + + 09 Mar 2014; Pacho Ramos <pacho@gentoo.org> gtk+-3.10.7.ebuild: + x86 stable, bug 499954 + + 09 Mar 2014; Pacho Ramos <pacho@gentoo.org> gtk+-3.10.7.ebuild: + amd64 stable, bug 499954 + + 22 Feb 2014; Pacho Ramos <pacho@gentoo.org> gtk+-2.24.22.ebuild, + gtk+-3.10.7.ebuild: + Fix wrong commit, bug 502160 + +*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 dbf853b..7e5aefd 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -20,16 +20,14 @@ AUX gtk+-3.6.3-stylecontext-font-crash.patch 2243 SHA256 a72ce114fac2069d26e454a AUX gtk+-3.8.6-skip-filechooser-test.patch 795 SHA256 1b900fc9501024170f2bfc48e321b43e961c077f080e5bafb6f337d25d3d270d SHA512 068fbfcf95240f31ddc69b98d34fd9a2492c6848b4e3de70b3b4d1aca25b97161754328d25891cb7ebc9469737b8ce2ac1a282a3a44ce7f3a28809095dff10a1 WHIRLPOOL 80fa54c7554ca3f3e0c75e1417f5c5b58efccbb282adb2c62f3a3f46403f05ef7d888b45c32b9ba83b21daafed3d8f6d41683e91dfa35c1cdf04b91383f71467 AUX gtkrc 627 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4 WHIRLPOOL fdb1c72ce448e867dd8d591455103fb7790919e1d7e77d6c5aa46e9a3fbc590ad6a189c50d2bc958896471a31b975940960307dc80a2d88416b77fca581b4dfb AUX settings.ini 96 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163 SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418 WHIRLPOOL 64a2c11ef1a6eda0bca40555a182023229202bcf15d527e6da8c52703be2fca26629b78ed677522eb626de7b7f456a7c37ab7fc3fe41907f1a46d770edb1fd67 -DIST gtk+-2.24.22.tar.xz 13376344 SHA256 b114b6e9fb389bf3aa8a6d09576538f58dce740779653084046852fb4140ae7f SHA512 be17f877eda8dd80c063dfaa0d1db2efbcdf699550bb740718b809d132a4e75cc074a53d9a03529f079a3d51527fb0841092d702f6d2afb92333b2c7ebb45993 WHIRLPOOL e4a588b588d29aebb79ce47dc161d1bcfeb7d12e6f500bcd4e03bea7d2d9fe399cbde471c40b668775463f11b72f600e5ebf36d65b59d4ea3574e14848f7260d -DIST gtk+-2.24.23.tar.xz 13316276 SHA256 a0a406e27e9b5e7d6b2c4334212706ed5cdcd41e713e66c9ae950655dd61517c SHA512 e6db7d61d753f5d8ce0f41e99b461decda364d04314ff58838d2f98f29aab22313c0b5898f2cf56ddd3a18e0544f47ad796e673390d464ee2160b2542c5f558b WHIRLPOOL 65d5e277ee416bef424fa5ec424363f3f573007fa778ffef0322b75ac6835680c1ea30dc30dc03c1a8ff7b4b732df523509e573141364fcdf8cf367f8dd459b6 DIST gtk+-3.10.7.tar.xz 14363820 SHA256 b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427 SHA512 cb138b468b8ea159b2fe7888500f08665cf54a66a042bf507539f4d8791e4dde074a98a87f6c6a36094d3996eb300f4a70b4fc9604709f9af6f7ebfb73efe3b7 WHIRLPOOL 5db9a67e620339c042530115b974f177102af003fdeab0d58eb1075f30daf4674aeb97756f3aa397e5471a5b94a251f36c782f6631315408d80c4c1b53bf4c13 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.8.7.tar.xz 13847376 SHA256 9cb4400922fcd7b71bf899036dd3d09cdcc61af8e5a0f302121c1686c7d67c89 SHA512 cbcf205188baafdeff3e58bd54a4b4f3a55e4d98938cb56f973825eebdb7a5eeb3337aee97dcff85e059520d2cfd830b01b02b36252f225291045973df5e1207 WHIRLPOOL fff4ba16809a2262e939a44c3b6d182108b47ad1d2f0a6d99d5a4e9018b0a51c8c043c171291b22048aa67970d2cbeb0859cd35546e3b50933aca657d9ed4d29 -EBUILD gtk+-2.24.22-r1.ebuild 8893 SHA256 b136fa2cf4e06f7ba562bef3bcbce679c02bdfa47c74b7ab22c2901480737468 SHA512 4098ccdbecb6257cd97ee712573b92d2f2abe6a8dc8acc85bf6919854f4eddbfab2a83df77b02fd205a610ad2dea9880f520a54ab7b39e77d8e1f7682350e0c6 WHIRLPOOL b4b11159449e5c3b16fab7ab602d6eb024e3dc1f2dfcae8f9a65aad9e2d922ef4e4d4a462b938c59bdecfb1123613867c2476c0fc4a39004cb43be33ce0320d8 -EBUILD gtk+-2.24.23-r1.ebuild 8854 SHA256 1ef10e8b4ee4048865141d528a7cfba27a7b5908f80069c4214d7f553931396b SHA512 1d0f2bc5c30b31b598f8b5cbb4ea80093170a7d95b9561152c6f8dc7343ce77cb9ca8d06be2705016dd53a146d3fb033407b15916ea90477210223da4b3f18fd WHIRLPOOL 6cd6fcef610a4bff2caccc286366bf7f51621a5de21eaaa6a6bf3d3362ed3091c4f7aafd6f13430f4297ba0cf9e997175ce1e58d04675254dcbdb2a55de1a068 EBUILD gtk+-3.10.7-r1.ebuild 7357 SHA256 2ba1899f5333b63a415da536d466c08acc75977fefb3235674425cbbea2e3992 SHA512 1818c29feae009ca04619a7d7302505c2cfe60d6aa0a73464b181e5d8b8997df84c4d4197665db3ebaa77a325f50c8ecbb8fda51a0e55d9d5644fdd43e04d6a4 WHIRLPOOL 6fcbf800ccef9a00202f97af87508f7b2ee8e61568f6f4945521e69659c2bc5efc495e8c6691c2c8c3329e076e7fbad7f5fcf56fece89641792fadf47b72023c EBUILD gtk+-3.10.8-r1.ebuild 7405 SHA256 3d3a795ac5810b12e5a568cb978569d44559842008798b045dda3a043d1688be SHA512 572f31a649f013747d38489437d65f1b742ff8dd292ca73fe5be48b6a2ddef1e245230d38ad51eb4b7936c14020fac0b0bdeb7b1e054a4a97ead58f4af596d70 WHIRLPOOL 6c9734b61b0d089256d4b805c7aa612c7da92e570111033e98b9685b585965935ae98f63749a2b64f1e839d2b7b3f053fd56790387e6670ed240b1b1e330e05d +EBUILD gtk+-3.12.1-r1.ebuild 7433 SHA256 b576693e7573bf6226a531d56823cb438958d3d24915cc676e6af0698fd3f3cd SHA512 5791b888408a8f87d91846fa491ffc0fd071a111cc47708068bdbddfa88b35964277a206d4611997ee1badbbfc3d69e74e60b2a180b7fa4fada479039bd222f7 WHIRLPOOL 1137faecc920b4cb6bbe5ec81cdad47318b62936d32d3fe577c3a114b11af941697c96b846f8372963f4d21a433429fc55968155c1a8ff2daa99730e81e53656 EBUILD gtk+-3.8.7-r1.ebuild 7922 SHA256 c6d9ef100d44c5b46b6a512c5bf3f8aa05d0dd5a2556b63ac4a0aa0ca6e477ab SHA512 0ac51aa6d8ca15eede4648ae6ab78fa9ccede987995d997465e02c155e61d77f423e4ad36b36b2b85b48b37a9a0fccb6ad98bcf44e8807215bc67b384a9c7f31 WHIRLPOOL f1bbebfa7481921275aca856c3f097db27a63031fc3aa98750809aa424dc225a293028f8e3af2b45112b4423bf8a2f98892b2f69a746fcf25d27d742a8087c18 -MISC ChangeLog 9932 SHA256 54a7a3fa0371b0fc1f8e9f0be2d1191c88277411e1db4d7b34993f98935d5fcb SHA512 4e850b2f0972dfced29c6dc9a7073395f3743c63b51d3a854d22850959e3f0663291b336ccc9ff4787edcf5791affb3be5bd0cc668482f822a95a65c4eaa3197 WHIRLPOOL b271a6c437af187100344842e899e382246335477f19abc5ceaab630efe25a200440e700a3e7422b3d278084937611ae30e5d9c2199282edaced133e3b8ce1f0 +MISC ChangeLog 13886 SHA256 a4e4c723fb5526cd72045312964553dc1197b0876a1f047c4c155381f41626f6 SHA512 c49ac634226e2aa88e8abf9e337066873e5732ae6afe901caac3c6daa86f7288ba44fbe6cdeb6b8c62e3beb7aff93769c6f6b8ba636fd5097f2ec97f1235150a WHIRLPOOL 6de3b9ea913e6322d8cff0e896c630b2dfff94611f1a0a89c2d3f7b5a3135ca8dd0035e3de8fa263e760b934edddeec1c7862a89a6d3618961a585966f54cd06 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec -MISC metadata.xml 902 SHA256 f4bad589c3732f53e882bde561c44c6b1beb6fe0bea42f2149e1f3fd07929ffc SHA512 aec419c5cd0cb202c00ede6a7bd822fbe562654d95dab37f5fcd4ac47dfa19d20573a0dbe718fb582b0eaf2cc1636302825df5363075d09b3fb7f2eba7129897 WHIRLPOOL 89cb8aadfb3ae4c90d48997f8dbafd7d17da02a3ded145ce5b5ff17302353c181f9729d1e161e6cef163dfaf947624fb4526bb08e7d13675ef47aee59f4458e9 +MISC metadata.xml 848 SHA256 cfb2904b37626135ebeb5e4be0626a51e68d64e211414eefde98b738631d82f0 SHA512 7c0cfa1f2b09ca41911e4f6ccad76becd4f6edf4c5c1a9e3e60eb423b907f08d15c2bfbef378773b9428232d1e7c20bd250eec0b327d073f4de41f815ce92226 WHIRLPOOL 786c7b8987736aaa4fa7b637b84f81e56765f435c77d65aa0afe9409d4bc6c191cf04ad4bab4d7c7b704a2762c828346f1042b408234b38c145abb21df0fbd21 diff --git a/x11-libs/gtk+/gtk+-2.24.22-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.22-r1.ebuild deleted file mode 100644 index 658da24..0000000 --- a/x11-libs/gtk+/gtk+-2.24.22-r1.ebuild +++ /dev/null @@ -1,271 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" -inherit eutils flag-o-matic gnome.org multilib virtualx autotools readme.gentoo gnome2-multilib - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="http://www.gtk.org/" - -LICENSE="LGPL-2+" -SLOT="2" -KEYWORDS="~amd64" -IUSE="aqua cups debug examples +introspection test vim-syntax xinerama" - -# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) -COMMON_DEPEND=" - !aqua? ( - x11-libs/libXrender[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXi[${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}] - >=x11-libs/cairo-1.6:=[X,svg,${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf:2[X,introspection?,${MULTILIB_USEDEP}] - ) - aqua? ( - >=x11-libs/cairo-1.6:=[aqua,svg,${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf:2[introspection?,${MULTILIB_USEDEP}] - ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - >=dev-libs/glib-2.34:2[${MULTILIB_USEDEP}] - >=x11-libs/pango-1.20[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/atk-1.29.2[introspection?,${MULTILIB_USEDEP}] - media-libs/fontconfig[${MULTILIB_USEDEP}] - x11-misc/shared-mime-info - cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-0.9.3[${MULTILIB_USEDEP}] ) - !<gnome-base/gail-1000 - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1 - !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] - ) -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - !aqua? ( - 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}] ) - >=dev-util/gtk-doc-am-1.11 - 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} - !<dev-util/gtk-builder-convert-${PV} - !<x11-libs/vte-0.28.2-r201:0 -" -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_WRAPPED_EXECUTABLES=( - /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() { - gnome2_environment_reset - - # Fix building due to moved definition, upstream bug #704766 - epatch "${FILESDIR}"/${PN}-2.24.20-darwin-quartz-pasteboard.patch - - # marshalers code was pre-generated with glib-2.31, upstream bug #671763 - rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \ - perf/marshalers.c || die - - # but the test suite relies on the above being in-tree, so find the - # generated ones - epatch "${FILESDIR}"/${PN}-2.24.22-out-of-tree-test.patch - - # Stop trying to build unmaintained docs, bug #349754 - strip_builddir SUBDIRS tutorial docs/Makefile.am docs/Makefile.in - strip_builddir SUBDIRS faq docs/Makefile.am docs/Makefile.in - - # -O3 and company cause random crashes in applications. Bug #133469 - replace-flags -O3 -O2 - strip-flags - - use ppc64 && append-flags -mminimal-toc - - 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 "${S}"/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[${MULTILIB_USEDEP}]"; 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 "${S}"/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 Makefile.in - fi - - epatch_user - - eautoreconf - # Use elibtoolize in place of eautoreconf when it will be dropped - #elibtoolize -} - -src_configure() { - # Passing --disable-debug is not recommended for production use - gnome2-multilib_src_configure \ - $(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \ - $(usex aqua "" --with-xinput) \ - $(usex debug --enable-debug=yes "") \ - $(use_enable cups cups auto) \ - $(use_enable introspection) \ - $(use_enable xinerama) \ - --disable-papi -} - -ehook gnome2-multilib-per-abi-pre_src_test my_abi_pre_test -my_abi_pre_test() { - unset DBUS_SESSION_BUS_ADDRESS - Xemake check - return 1 -} - -ehook gnome2-multilib-per-abi-pre_src_install my_abi_pre_install -my_abi_pre_install() { - default - return 1 -} - -ehook gnome2-multilib-per-abi-post_src_install my_abi_post_install -my_abi_post_install() { - # add -framework Carbon to the .pc files - use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do - sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed" - done -} - -ehook gnome2-multilib-global-post_src_install my_global_post_install -my_global_post_install() { - # 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 - - prune_libtool_files --modules - - readme.gentoo_create_doc -} - -update-immod-cache() { - gtk-query-immodules-2.0-${ABI} --update-cache || die "Update immodules cache failed" -} - -pkg_postinst() { - set_gtk2_confdir - - multilib_foreach_abi update-immod-cache - - 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 -} diff --git a/x11-libs/gtk+/gtk+-2.24.23-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.23-r1.ebuild deleted file mode 100644 index 9a3d294..0000000 --- a/x11-libs/gtk+/gtk+-2.24.23-r1.ebuild +++ /dev/null @@ -1,268 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" -GCONF_DEBUG="no" - -inherit eutils flag-o-matic gnome2 multilib virtualx autotools readme.gentoo gnome2-multilib - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="http://www.gtk.org/" - -LICENSE="LGPL-2+" -SLOT="2" -KEYWORDS="~amd64" -IUSE="aqua cups debug examples +introspection test vim-syntax xinerama" - -# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) -COMMON_DEPEND=" - !aqua? ( - x11-libs/libXrender[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXi[${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}] - >=x11-libs/cairo-1.6:=[X,svg,${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf:2[X,introspection?,${MULTILIB_USEDEP}] - ) - aqua? ( - >=x11-libs/cairo-1.6:=[aqua,svg,${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf:2[introspection?,${MULTILIB_USEDEP}] - ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - >=dev-libs/glib-2.34:2[${MULTILIB_USEDEP}] - >=x11-libs/pango-1.20[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/atk-1.29.2[introspection?,${MULTILIB_USEDEP}] - media-libs/fontconfig[${MULTILIB_USEDEP}] - x11-misc/shared-mime-info - cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-0.9.3[${MULTILIB_USEDEP}] ) - !<gnome-base/gail-1000 - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1 - !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] - ) -" -DEPEND="${COMMON_DEPEND} - sys-devel/gettext[${MULTILIB_USEDEP}] - virtual/pkgconfig - !aqua? ( - 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}] ) - >=dev-util/gtk-doc-am-1.11 - 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} - !<dev-util/gtk-builder-convert-${PV} - !<x11-libs/vte-0.28.2-r201:0 -" -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 - epatch "${FILESDIR}"/${PN}-2.24.20-darwin-quartz-pasteboard.patch - - # marshalers code was pre-generated with glib-2.31, upstream bug #671763 - rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \ - perf/marshalers.c || die - - # but the test suite relies on the above being in-tree, so find the - # generated ones - epatch "${FILESDIR}"/${PN}-2.24.22-out-of-tree-test.patch - - # Stop trying to build unmaintained docs, bug #349754 - strip_builddir SUBDIRS tutorial docs/Makefile.am docs/Makefile.in - strip_builddir SUBDIRS faq docs/Makefile.am docs/Makefile.in - - # -O3 and company cause random crashes in applications. Bug #133469 - replace-flags -O3 -O2 - strip-flags - - use ppc64 && append-flags -mminimal-toc - - 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 "${S}"/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[${MULTILIB_USEDEP}]"; 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 "${S}"/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 Makefile.in - fi - - epatch_user - - eautoreconf - - gnome2-multilib_src_prepare -} - -src_configure() { - # Passing --disable-debug is not recommended for production use - gnome2-multilib_src_configure \ - $(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \ - $(usex aqua "" --with-xinput) \ - $(usex debug --enable-debug=yes "") \ - $(use_enable cups cups auto) \ - $(use_enable introspection) \ - $(use_enable xinerama) \ - --disable-papi -} - -ehook gnome2-multilib-per-abi-pre_src_test my_abi_pre_test -my_abi_pre_test() { - unset DBUS_SESSION_BUS_ADDRESS - Xemake check - return 1 -} - -ehook gnome2-multilib-per-abi-post_src_install my_abi_post_install -my_abi_post_install() { - # add -framework Carbon to the .pc files - use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do - sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed" - done -} - -ehook gnome2-multilib-global-post_src_install my_global_post_install -my_global_post_install() { - # 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 -} - -update-immod-cache() { - if multilib_build_binaries ; then - gtk-query-immodules-2.0 --update-cache || die "Update immodules cache failed" - else - ${CHOST}-gtk-query-immodules-2.0 --update-cache || die "Update immodules cache failed" - fi -} - -pkg_postinst() { - set_gtk2_confdir - - multilib_foreach_abi update-immod-cache - - 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 -} diff --git a/x11-libs/gtk+/gtk+-3.10.7-r1.ebuild b/x11-libs/gtk+/gtk+-3.12.1-r1.ebuild index 27bc938..2cd1585 100644 --- a/x11-libs/gtk+/gtk+-3.10.7-r1.ebuild +++ b/x11-libs/gtk+/gtk+-3.12.1-r1.ebuild @@ -3,8 +3,10 @@ # $Header: $ EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" -inherit eutils gtk-doc flag-o-matic gnome.org gnome2-multilib virtualx +inherit gtk-doc flag-o-matic gnome2-multilib virtualx DESCRIPTION="Gimp ToolKit +" HOMEPAGE="http://www.gtk.org/" @@ -16,7 +18,7 @@ SLOT="3" # * 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" +IUSE="aqua cloudprint colord cups debug examples +introspection test vim-syntax wayland X xinerama" REQUIRED_USE=" || ( aqua wayland X ) xinerama? ( X )" @@ -28,7 +30,7 @@ KEYWORDS="~amd64" # Use gtk+:2 for gtk-update-icon-cache COMMON_DEPEND=" >=dev-libs/atk-2.7.5[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/glib-2.37.5:2[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.39.5:2[${MULTILIB_USEDEP}] media-libs/fontconfig[${MULTILIB_USEDEP}] >=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] >=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?,${MULTILIB_USEDEP}] @@ -36,11 +38,15 @@ COMMON_DEPEND=" >=x11-libs/pango-1.32.4[introspection?,${MULTILIB_USEDEP}] x11-misc/shared-mime-info + cloudprint? ( + >=net-libs/rest-0.7 + >=dev-libs/json-glib-1.0 + ) colord? ( >=x11-misc/colord-0.1.9[${MULTILIB_USEDEP}] ) cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.32[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.39[${MULTILIB_USEDEP}] ) wayland? ( - >=dev-libs/wayland-1.2[${MULTILIB_USEDEP}] + >=dev-libs/wayland-1.3.90[${MULTILIB_USEDEP}] media-libs/mesa[wayland,${MULTILIB_USEDEP}] >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] ) @@ -68,6 +74,7 @@ DEPEND="${COMMON_DEPEND} dev-libs/libxslt[${MULTILIB_USEDEP}] dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.11 + sys-devel/gettext[${MULTILIB_USEDEP}] virtual/pkgconfig X? ( x11-proto/xextproto[${MULTILIB_USEDEP}] @@ -87,12 +94,11 @@ DEPEND="${COMMON_DEPEND} 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 )" -MULTILIB_WRAPPED_EXECUTABLES=( +MULTILIB_CHOST_TOOLS=( /usr/bin/gtk-query-immodules-3.0 ) @@ -106,8 +112,6 @@ strip_builddir() { } src_prepare() { - gnome2_environment_reset - # -O3 and company cause random crashes in applications. Bug #133469 replace-flags -O3 -O2 strip-flags @@ -136,11 +140,11 @@ src_configure() { # grok so well during install (// between $EPREFIX and usr ...) gnome2-multilib_src_configure \ $(use_enable aqua quartz-backend) \ + $(use_enable cloud-print) \ $(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) \ @@ -149,12 +153,11 @@ src_configure() { $(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@" + --libdir="${EPREFIX}"/usr/@GET_LIBDIR@ } ehook gnome2-multilib-per-abi-pre_src_test my_abi_pre_test @@ -183,8 +186,6 @@ my_global_post_install() { doins "${FILESDIR}"/settings.ini dodoc AUTHORS ChangeLog* HACKING NEWS* README* - - prune_libtool_files --modules } ehook gnome2-multilib-per-abi-post_src_install my_per_abi_post_install @@ -199,8 +200,12 @@ my_per_abi_post_install() { } pkg_preinst() { - gnome2_schemas_savelist + gnome2-multilib_pkg_preinst + + multilib_foreach_abi abi_pkg_preinst +} +abi_pkg_preinst() { # Make sure loaders.cache belongs to gdk-pixbuf alone local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" @@ -212,7 +217,7 @@ pkg_preinst() { } pkg_postinst() { - gnome2_schemas_update + gnome2-multilib_pkg_postinst gnome2-multilib_query_immodules_gtk3 if ! has_version "app-text/evince"; then @@ -223,7 +228,7 @@ pkg_postinst() { } pkg_postrm() { - gnome2_schemas_update + gnome2-multilib_pkg_postrm [[ -z ${REPLACED_BY_VERSIONS} ]] && \ multilib_foreach_abi my_per_abi_pkg_postrm diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml index df813ea..f29cdbe 100644 --- a/x11-libs/gtk+/metadata.xml +++ b/x11-libs/gtk+/metadata.xml @@ -9,10 +9,9 @@ application suites. </longdescription> <use> + <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> - <flag name="egl">Use EGL surfaces and Cairo GL in the wayland - backend. This flag has no effect on X or aqua backends.</flag> <flag name="packagekit">Enable support for the distro-neutral package manager GUI <pkg>app-admin/packagekit</pkg> in application chooser</flag> </use> |