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 36A3C138ACF for ; Mon, 5 Jan 2015 15:40:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AA2AE0864; Mon, 5 Jan 2015 15:40:57 +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 63803E0864 for ; Mon, 5 Jan 2015 15:40:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 24D5833FA71 for ; Mon, 5 Jan 2015 15:40:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9111EEC8 for ; Mon, 5 Jan 2015 15:40:52 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1420461126.90b68d24e60658d86da37024840cfd8420037abb.leio@gentoo> Subject: [gentoo-commits] dev/leio:master commit in: x11-libs/gtk+/, x11-libs/gtk+/files/ X-VCS-Repository: dev/leio X-VCS-Files: x11-libs/gtk+/files/gtk+-non-bash-support.patch x11-libs/gtk+/gtk+-3.14.5.ebuild x11-libs/gtk+/gtk+-3.14.6.ebuild X-VCS-Directories: x11-libs/gtk+/files/ x11-libs/gtk+/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 90b68d24e60658d86da37024840cfd8420037abb X-VCS-Branch: master Date: Mon, 5 Jan 2015 15:40:52 +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: 60a1bdaf-9115-46c4-9a11-36735f216099 X-Archives-Hash: b7d63c6a60b9c757b1a9d284480be3cd commit: 90b68d24e60658d86da37024840cfd8420037abb Author: Mart Raudsepp gentoo org> AuthorDate: Sun Jan 4 09:58:12 2015 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Mon Jan 5 12:32:06 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=dev/leio.git;a=commit;h=90b68d24 gtk+: Bump to 3.14.6, sync with portage --- x11-libs/gtk+/files/gtk+-non-bash-support.patch | 29 ++++++++++++++ .../{gtk+-3.14.5.ebuild => gtk+-3.14.6.ebuild} | 45 ++++++++++++++-------- 2 files changed, 59 insertions(+), 15 deletions(-) diff --git a/x11-libs/gtk+/files/gtk+-non-bash-support.patch b/x11-libs/gtk+/files/gtk+-non-bash-support.patch new file mode 100644 index 0000000..efd13e6 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-non-bash-support.patch @@ -0,0 +1,29 @@ +From c8ef010024db794e25ca58ef3c02663de685f1bb Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy +Date: Sun, 26 Oct 2014 01:59:33 +0400 +Subject: [PATCH] gtk/Makefile.am: improve portability of ECHO + +--- + gtk/Makefile.am | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/gtk/Makefile.am b/gtk/Makefile.am +index f60bec8..e923940 100644 +--- a/gtk/Makefile.am ++++ b/gtk/Makefile.am +@@ -19,11 +19,7 @@ GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings % + endif + + SUBDIRS = inspector native . +-if OS_DARWIN +- ECHO="echo" +-else +- ECHO=echo -e +-endif ++ECHO=printf '%b\n' + + if HAVE_CLOUDPRINT + if HAVE_PAPI_CUPS +-- +2.0.4 + diff --git a/x11-libs/gtk+/gtk+-3.14.5.ebuild b/x11-libs/gtk+/gtk+-3.14.6.ebuild similarity index 87% rename from x11-libs/gtk+/gtk+-3.14.5.ebuild rename to x11-libs/gtk+/gtk+-3.14.6.ebuild index 074a076..88040d5 100644 --- a/x11-libs/gtk+/gtk+-3.14.5.ebuild +++ b/x11-libs/gtk+/gtk+-3.14.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -6,7 +6,7 @@ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal +inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal DESCRIPTION="Gimp ToolKit +" HOMEPAGE="http://www.gtk.org/" @@ -69,7 +69,8 @@ DEPEND="${COMMON_DEPEND} app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt - dev-util/gdbus-codegen + 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}] @@ -91,7 +92,12 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} !=x11-themes/adwaita-icon-theme-3.14 X? ( !