Introduce multilib support as needed for net-dns/avahi.
authorMichał Górny <mgorny@gentoo.org>
Sat, 22 Nov 2014 23:02:49 +0000 (23:02 +0000)
committerMichał Górny <mgorny@gentoo.org>
Sat, 22 Nov 2014 23:02:49 +0000 (23:02 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

x11-libs/gtk+/ChangeLog
x11-libs/gtk+/Manifest
x11-libs/gtk+/gtk+-3.12.2-r1.ebuild [new file with mode: 0644]

index 28a4208d677d5993bce65b1f446946dd0d87eab7..1aeb3f4931cbb19d41a9a613130c1d316dbef464 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.738 2014/10/15 08:10:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.739 2014/11/22 23:02:47 mgorny Exp $
+
+*gtk+-3.12.2-r1 (22 Nov 2014)
+
+  22 Nov 2014; Michał Górny <mgorny@gentoo.org> +gtk+-3.12.2-r1.ebuild:
+  Introduce multilib support as needed for net-dns/avahi.
 
   15 Oct 2014; Pacho Ramos <pacho@gentoo.org> gtk+-2.24.25.ebuild:
   dev-libs/gobject-introspection-common DEPEND needed again (#525448 by Andrei
index 5ad80463b8671f116fe34b6e366a2116050d5b78..68ffa3fbf35e981be978ff69fb34cdf1d6114194 100644 (file)
@@ -26,15 +26,28 @@ EBUILD gtk+-1.2.10-r12.ebuild 2406 SHA256 03e22a0e23e19cc0ad87697527ac186aeb6904
 EBUILD gtk+-2.24.24.ebuild 9267 SHA256 cdf1002495e97f2f57aa88f2fcc749af0e7faa517fed59b6da9906c343f03629 SHA512 a64ef91607a01fc73e1ddd879dc01964ede61a2f0e8ff351180aa67e81a8921ac4cab2ec1a23c23cefa6bdcc003bcb3059d7b4fd0bffc48953a2de263cbb8617 WHIRLPOOL 689d26ceff97be48df9c7e099513472a4910f13bc2dd5a474c38ef1f57caba7875c98a4fbac3547bf3931ccc6fd659de2e0b8f136f30b9548bd0f5b769e931c1
 EBUILD gtk+-2.24.25.ebuild 9313 SHA256 ff7bb420e9b8d0878e31eb3041f86da5be526cf9d5ce0b4d3eb17d3b18cf61c2 SHA512 f3ac699e6f64555f456ab8ae518bde3e60d8fee5cc9eeceb17f7f203299ce5b5163ff7df1ace983fed708b9f19b64c9314652246e7f15bfa74790504ab515e64 WHIRLPOOL 0da126fd6a9386c65bb98a17f4fa2512e3aeeaa260fadaca6c8ee302be9ea8a261c7af3edae2aef0e1f9ec51f579d231af9b7adc3dbb7cf1b67a9eafe4f63145
 EBUILD gtk+-3.10.8.ebuild 6476 SHA256 538f97ea50eded5aa850c46f2cca1d25f8742700aa0bf69bef2872b06bae83e9 SHA512 69b710dd6ba6f356a6b9f0bb425957b160a39666762d64ffe32839471b7386403dbd9e3f826b2b904b819be7671a256361738b217f2be5afe91d5898be6675cb WHIRLPOOL e0d166bad4fdaec041280aab3f2c77945d584c3919e9a5fdeca0e0c6b2b542ea854983a756dcb21498d447dd7c6f3208dcc99fe62ecddf9a8704990c82ba8cb3
+EBUILD gtk+-3.12.2-r1.ebuild 7769 SHA256 1b9f85be4a4a184656ea286759c63ee58931376ea5ddbf577407b0fb8e570306 SHA512 834e2156db8f88a77f39b9fb6568b129d709203260c72de4d14194307343d6e6e9ef867ad2c7ba69fcdc9ea1815f4d7c440e6e5a70c664d4171c29ecb6ce2d91 WHIRLPOOL 0ad412a092409230b54d753c29d7b8c3421544ce518c9ded9b1b272057a0ed1efcf13697913d8162fd9ffefa977fea503b254e413bc8451b35e52ef1200a53e2
 EBUILD gtk+-3.12.2.ebuild 6597 SHA256 be97832d070fab365a441ef5b124b803417f8ca1fa1fefd22f17772af6632e7e SHA512 d78b8d1696f16607feb4b2695ae48756cf69ea7704b73a1dda99e6f7aec119e8483c2f4197dba17188131ba9ea9a7fc18d1c97190ff3dd3a1981c3093810cd05 WHIRLPOOL e6435dd7ee84c81b9e5f1fa6b9989b6c0bd62aad8f8e35419a6dce57e174507cf60968441681057dfdcd0924f50de8409881f341253fc0d1421faedfe5a67467
 EBUILD gtk+-3.4.4.ebuild 7078 SHA256 5c03753346c92b03ce8876ff2223240855225ac69f8e99ad3d0f594778f4d83c SHA512 2b86d907df0cf1613d4aab3adc4ccbec8960513cd07dcbc41a933587a7cba85d0c7e078158431f5315ec91818f7793d2deed76d4ec643d5df19682193e1b5570 WHIRLPOOL f2196bef499be6eec55554d2dea442f7aa480c13fb590dab010efb6564886bb746b27479265c4ba48a93a0c630e574a37cf319fee228dfda82d333c8e4a3b093
-MISC ChangeLog 16657 SHA256 dc32c6553a1e2cf2d96e29da148136e479079bb22fa289662360b63ce7cb2ff0 SHA512 9f1556903823fca1a3d8943d17f6b7487bdd90c3a9be893e4e705f0154db047747a5ecdedd77e406cc4934b146e849919e7e0a83900941f812f9073a2045b62d WHIRLPOOL 142cb1bd463400b331f2c03360c073b18292b7406153af308bd2603be945f82f6d282f8fbf5355ab7df0a6ba072378ec6bf9d104604e15556d1ba6e83402a0c1
+MISC ChangeLog 16822 SHA256 b33342aad4493cccd4948bd720cc6eda64e8d130e008d79422585efcd65ce308 SHA512 0c0a7304abcff253379de71855d1b8f2a9897c68353e915e05e1cd9599ab986eeddf2acebbb3971ef3c9a0b0fef71f3440aaeb18e69c86f569264c0412335712 WHIRLPOOL 2783bf1e6d648b2ded12b4357f9db0c50c0058aaf331399656e7438977c8fbc6c0d7b9c6b174005120818438c386f74e73551e874920e2431480a2056f465fa3
 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
 MISC metadata.xml 848 SHA256 cfb2904b37626135ebeb5e4be0626a51e68d64e211414eefde98b738631d82f0 SHA512 7c0cfa1f2b09ca41911e4f6ccad76becd4f6edf4c5c1a9e3e60eb423b907f08d15c2bfbef378773b9428232d1e7c20bd250eec0b327d073f4de41f815ce92226 WHIRLPOOL 786c7b8987736aaa4fa7b637b84f81e56765f435c77d65aa0afe9409d4bc6c191cf04ad4bab4d7c7b704a2762c828346f1042b408234b38c145abb21df0fbd21
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ+K+0ACgkQCaWpQKGI+9Q6dgCeMQ1EaY3WylZk2Ix0NBUtw5Cb
-llEAmwZsgnU/GjuKOuH2YaoGl4wUXszp
-=wWUy
+iQJ8BAEBCABmBQJUcRYYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOeIoQANVgPEp4oPgNNq/r3Vd1L4n6
+zPh4qj9L4IOZTsrZtaMtyiQLYOT4UnLSiEZB2iotRj1zTYKHFxdqY2r96fqBLs1t
+gs5+TBr4pr1bWJ499lQS9aQCS5MeQ4fS/5e/QSVziGGDNwKhBJMU4aG9H1IhnyLm
+wU+LfFnc9a2J3GnwmZzy1T62Ul9D4QOqtlPWZLBwyZZAtWAO1/dGs8DmBR2SRLPW
+WATIsli5sq1ly1TkOBdgfyZQjE4Y56qBTzVC2JYacuz2Aoxy3yWmE/hv02LKxBAN
++/NHQLdqmdrZV4i4QCnaUIQ3QqkT+shYwUKllwPe8wyBElRWgTuEie1HSfcyCkZP
+MTNHs50qWz0RC8UCpe6Lv94ThYnZhNSNgNc0H7Xq+Qb4+v4f4F6RL1kMpM9smBGl
+4ehX5O6+kLeDN9IMRgCr8g+Kvr1hQZg2Y7UsS7AMzBxHBqfT33AzUzdKSsZpM/sO
+GsFsMvqm47Hs22T7lp5uwQmbh6xd7iP7Hh2AutMMcrTrT8oB2IwepxFGYtomIq1v
+6eMmzRJ3ZWqec1nS+nnYU8HObxBzvxBneOsNU+v9G5BDkewdnLAWKkxkFFucM/cS
+icRH7Xe4U7rJGnLpjeeDmI9BGaqp2Hp5GKiMTOTgzxuRyvcDH1YzvUk/YpWSiWaJ
+dg1G37dyVugLej04aaLn
+=Qbsp
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild b/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild
new file mode 100644 (file)
index 0000000..f4f672d
--- /dev/null
@@ -0,0 +1,245 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild,v 1.1 2014/11/22 23:02:47 mgorny Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit 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 debug examples +introspection test vim-syntax wayland X xinerama"
+REQUIRED_USE="
+       || ( aqua wayland X )
+       xinerama? ( X )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# FIXME: introspection data is built against system installation of gtk+:3
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+# Use gtk+:2 for gtk-update-icon-cache
+COMMON_DEPEND="
+       >=dev-libs/atk-2.7.5[introspection?,${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}]
+       >=x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}]
+       >=x11-libs/pango-1.32.4[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.3.90[${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-util/gdbus-codegen
+       >=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
+       X? ( !<x11-base/xorg-server-1.11.4 )
+"
+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() {
+       # -O3 and company cause random crashes in applications. Bug #133469
+       replace-flags -O3 -O2
+       strip-flags
+
+       # Build fix on Darwin 10.6; bug #519058
+       epatch "${FILESDIR}/${P}-darwin10.6.patch"
+
+       if ! use test ; then
+               # don't waste time building tests
+               strip_builddir SRC_SUBDIRS testsuite Makefile.am
+               strip_builddir SRC_SUBDIRS testsuite Makefile.in
+               strip_builddir SRC_SUBDIRS tests Makefile.am
+               strip_builddir SRC_SUBDIRS tests Makefile.in
+       fi
+
+       if ! use examples; then
+               # don't waste time building demos
+               strip_builddir SRC_SUBDIRS demos Makefile.am
+               strip_builddir SRC_SUBDIRS demos Makefile.in
+               strip_builddir SRC_SUBDIRS examples Makefile.am
+               strip_builddir SRC_SUBDIRS examples Makefile.in
+       fi
+
+       gnome2_src_prepare
+}
+
+multilib_src_configure() {
+       # Passing --disable-debug is not recommended for production use
+       # need libdir here to avoid a double slash in a path that libtool doesn't
+       # grok so well during install (// between $EPREFIX and usr ...)
+       ECONF_SOURCE=${S} \
+       gnome2_src_configure \
+               $(use_enable aqua quartz-backend) \
+               $(use_enable cloudprint) \
+               $(use_enable colord) \
+               $(use_enable cups cups auto) \
+               $(usex debug --enable-debug=yes "") \
+               $(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)
+
+       # 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
+       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 sure loaders.cache belongs to gdk-pixbuf alone
+               local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+               if [[ -e ${EROOT}${cache} ]]; then
+                       cp "${EROOT}"${cache} "${ED}"/${cache} || die
+               else
+                       touch "${ED}"/${cache} || die
+               fi
+       }
+       multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+       gnome2_pkg_postinst
+       gnome2_query_immodules_gtk3
+
+       if ! has_version "app-text/evince"; then
+               elog "Please install app-text/evince for print preview functionality."
+               elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+               elog "add it to your settings.ini file."
+       fi
+}
+
+pkg_postrm() {
+       gnome2_pkg_postrm
+
+       if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+               multilib_pkg_postrm() {
+                       rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+               }
+               multilib_foreach_abi multilib_pkg_postrm
+       fi
+}