From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2D326138A1F for ; Sun, 20 Apr 2014 18:17:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69362E09C9; Sun, 20 Apr 2014 18:17:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58DCBE09BA for ; Sun, 20 Apr 2014 18:17:39 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6A47F33FE5F for ; Sun, 20 Apr 2014 18:17:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id E5439187A8 for ; Sun, 20 Apr 2014 18:17:35 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1398008909.fadc3af0d5ebff6de560e48f3dec6c6cca4a6a80.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-libs/gtk+/gtk+-3.12.0.ebuild X-VCS-Directories: x11-libs/gtk+/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: fadc3af0d5ebff6de560e48f3dec6c6cca4a6a80 X-VCS-Branch: master Date: Sun, 20 Apr 2014 18:17:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: adf6846b-6c1e-4754-bb32-9e31c6e0fde8 X-Archives-Hash: b322360a82d81bc35442388a83dc31a6 commit: fadc3af0d5ebff6de560e48f3dec6c6cca4a6a80 Author: Mike Auty gentoo org> AuthorDate: Thu Apr 17 00:36:43 2014 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Apr 20 15:48:29 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fadc3af0 x11-libs/gtk+: 3.10.8 → 3.12.0 Bump gtk+ with wayland, gtk-doc and glib dep bumps. Also added in cloudprint optional component with dependencies. --- x11-libs/gtk+/gtk+-3.12.0.ebuild | 220 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) diff --git a/x11-libs/gtk+/gtk+-3.12.0.ebuild b/x11-libs/gtk+/gtk+-3.12.0.ebuild new file mode 100644 index 0000000..d891bcc --- /dev/null +++ b/x11-libs/gtk+/gtk+-3.12.0.ebuild @@ -0,0 +1,220 @@ +# 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.10.8.ebuild,v 1.4 2014/04/16 07:49:22 ago Exp $ + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit flag-o-matic gnome2 multilib virtualx + +DESCRIPTION="Gimp ToolKit +" +HOMEPAGE="http://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="3" +# NOTE: This gtk+ has multi-gdk-backend support, see: +# * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/ +# * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html +# I tried this and got it all compiling, but the end result is unusable as it +# horribly mixes up the backends -- grobian +IUSE="aqua cloudprint colord cups debug examples +introspection packagekit 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?] + >=dev-libs/glib-2.39.5:2 + media-libs/fontconfig + >=x11-libs/cairo-1.12[aqua?,glib,svg,X?] + >=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?] + >=x11-libs/gtk+-2.24:2 + >=x11-libs/pango-1.32.4[introspection?] + x11-misc/shared-mime-info + + colord? ( >=x11-misc/colord-0.1.9 ) + cups? ( >=net-print/cups-1.2 ) + cloudprint? ( >=net-libs/rest-0.7 + >=dev-libs/json-glib-1.0 ) + introspection? ( >=dev-libs/gobject-introspection-1.39 ) + wayland? ( + >=dev-libs/wayland-1.3.90 + media-libs/mesa[wayland] + >=x11-libs/libxkbcommon-0.2 + ) + X? ( + >=app-accessibility/at-spi2-atk-2.5.3 + x11-libs/libXrender + x11-libs/libX11 + >=x11-libs/libXi-1.3 + x11-libs/libXext + >=x11-libs/libXrandr-1.3 + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXcomposite + x11-libs/libXdamage + xinerama? ( x11-libs/libXinerama ) + ) +" +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 + virtual/pkgconfig + X? ( + x11-proto/xextproto + x11-proto/xproto + x11-proto/inputproto + x11-proto/damageproto + xinerama? ( x11-proto/xineramaproto ) + ) + 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} + !=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 +} + +src_install() { + gnome2_src_install + + insinto /etc/gtk-3.0 + doins "${FILESDIR}"/settings.ini + + dodoc AUTHORS ChangeLog* HACKING NEWS* README* + + # 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 +} + +pkg_preinst() { + gnome2_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 +} + +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 + rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache + fi +}