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 5616F138D02 for ; Wed, 12 Feb 2014 23:48:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7323FE0A81; Wed, 12 Feb 2014 23:48:21 +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 CBCD1E0AD2 for ; Wed, 12 Feb 2014 23:48:19 +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 D4C7833FA43 for ; Wed, 12 Feb 2014 23:48:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 49969188D3 for ; Wed, 12 Feb 2014 23:48:16 +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: <1392248105.31877704f1419e12ca0bf264227d1501fe906aa3.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.10.6.ebuild x11-libs/gtk+/gtk+-9999.ebuild X-VCS-Directories: x11-libs/gtk+/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 31877704f1419e12ca0bf264227d1501fe906aa3 X-VCS-Branch: master Date: Wed, 12 Feb 2014 23:48:16 +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: 5dec1483-dee3-43c1-97a5-217bb5568472 X-Archives-Hash: b4cb336c6a0e683bf69106e8d8884a3a commit: 31877704f1419e12ca0bf264227d1501fe906aa3 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Wed Feb 12 23:35:05 2014 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Wed Feb 12 23:35:05 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=31877704 x11-libs/gtk+: moved to gentoo-x86 + sync live ebuild --- x11-libs/gtk+/gtk+-3.10.6.ebuild | 221 --------------------------------------- x11-libs/gtk+/gtk+-9999.ebuild | 7 +- 2 files changed, 5 insertions(+), 223 deletions(-) diff --git a/x11-libs/gtk+/gtk+-3.10.6.ebuild b/x11-libs/gtk+/gtk+-3.10.6.ebuild deleted file mode 100644 index fe48b76..0000000 --- a/x11-libs/gtk+/gtk+-3.10.6.ebuild +++ /dev/null @@ -1,221 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" - -inherit eutils flag-o-matic gnome.org gnome2-utils 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 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 ~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.37.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 ) - introspection? ( >=dev-libs/gobject-introspection-1.32 ) - wayland? ( - >=dev-libs/wayland-1.2 - 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.11 - 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() { - emake DESTDIR="${D}" install - - insinto /etc/gtk-3.0 - doins "${FILESDIR}"/settings.ini - - dodoc AUTHORS ChangeLog* HACKING NEWS* README* - - prune_libtool_files --modules - - # 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_schemas_savelist - - # 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_schemas_update - 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_schemas_update - - if [[ -z ${REPLACED_BY_VERSIONS} ]]; then - rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache - fi -} diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild index 3a9d8de..f755462 100644 --- a/x11-libs/gtk+/gtk+-9999.ebuild +++ b/x11-libs/gtk+/gtk+-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -120,8 +120,9 @@ src_prepare() { if ! use test ; then # don't waste time building tests + strip_builddir SRC_SUBDIRS testsuite Makefile.am + [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS testsuite Makefile.in strip_builddir SRC_SUBDIRS tests Makefile.am - [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS testsuite Makefile.in [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in fi @@ -129,6 +130,8 @@ src_prepare() { # don't waste time building demos strip_builddir SRC_SUBDIRS demos Makefile.am [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in + strip_builddir SRC_SUBDIRS examples Makefile.am + [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS examples Makefile.in fi [[ ${PV} = 9999 ]] && gnome2_src_prepare