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 5B48D138CD0 for ; Tue, 19 May 2015 13:56:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 004B2E0953; Tue, 19 May 2015 13:56: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 A2197E0953 for ; Tue, 19 May 2015 13:56:20 +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 81769340BD2 for ; Tue, 19 May 2015 13:56:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CE0DB9D5 for ; Tue, 19 May 2015 13:56:16 +0000 (UTC) From: "Alexandre Rostovtsev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" Message-ID: <1432043735.22589c72543186954d630965fec901685a921222.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-terms/gnome-terminal/gnome-terminal-3.16.2-r1.ebuild x11-terms/gnome-terminal/gnome-terminal-3.16.2.ebuild x11-terms/gnome-terminal/gnome-terminal-9999.ebuild X-VCS-Directories: x11-terms/gnome-terminal/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: 22589c72543186954d630965fec901685a921222 X-VCS-Branch: master Date: Tue, 19 May 2015 13:56: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: 021d507c-589e-4beb-82f5-264780c02995 X-Archives-Hash: edd848bff17cefcd00c47805b245916a commit: 22589c72543186954d630965fec901685a921222 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Tue May 19 13:55:35 2015 +0000 Commit: Alexandre Rostovtsev gentoo org> CommitDate: Tue May 19 13:55:35 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=22589c72 x11-terms/gnome-terminal: XMLLINT override broke glib-compile-resources (bug #549304) Thanks to Harris Landgarten, bingquick, Mike Auty, mkloesges. Package-Manager: portage-2.2.20 Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D ...{gnome-terminal-3.16.2.ebuild => gnome-terminal-3.16.2-r1.ebuild} | 5 +++-- x11-terms/gnome-terminal/gnome-terminal-9999.ebuild | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.16.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.16.2-r1.ebuild similarity index 93% rename from x11-terms/gnome-terminal/gnome-terminal-3.16.2.ebuild rename to x11-terms/gnome-terminal/gnome-terminal-3.16.2-r1.ebuild index b6cd7d2..622dd35 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-3.16.2.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-3.16.2-r1.ebuild @@ -30,8 +30,10 @@ RDEPEND=" nautilus? ( >=gnome-base/nautilus-3 ) " # itstool required for help/* with non-en LINGUAS, see bug #549358 +# xmllint required for glib-compile-resources, see bug #549304 DEPEND="${RDEPEND} app-text/yelp-tools + dev-libs/libxml2 dev-util/gdbus-codegen dev-util/itstool >=dev-util/intltool-0.50 @@ -50,8 +52,7 @@ src_configure() { $(use_enable debug) \ $(use_enable gnome-shell search-provider) \ $(use_with nautilus nautilus-extension) \ - VALAC=$(type -P true) \ - XMLLINT=$(type -P true) + VALAC=$(type -P true) } src_install() { diff --git a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild index aab80a3..7dfd8c1 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild @@ -37,8 +37,10 @@ RDEPEND=" nautilus? ( >=gnome-base/nautilus-3 ) " # itstool required for help/* with non-en LINGUAS, see bug #549358 +# xmllint required for glib-compile-resources, see bug #549304 DEPEND="${RDEPEND} app-text/yelp-tools + dev-libs/libxml2 dev-util/gdbus-codegen dev-util/itstool >=dev-util/intltool-0.50 @@ -56,7 +58,6 @@ src_configure() { if [[ ${PV} != 9999 ]]; then myconf="${myconf} VALAC=$(type -P true) - XMLLINT=$(type -P true) " fi