[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/

[Alexandre Rostovtsev]

commit:     22589c72543186954d630965fec901685a921222
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue May 19 13:55:35 2015 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> 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