Move libxml2 out of the USE=X conditional.

A build-time dependency on pkgconfig is needed only in some configurations.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

6 files changed, 59 insertions, 28 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 0fb2ace2e540..bf29a3e07437 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/emacs-vcs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.72 2011/12/15 06:33:51 ulm Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.73 2012/01/05 23:43:15 ulm Exp $
+
+  05 Jan 2012; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild,
+  emacs-vcs-24.0.91.ebuild, emacs-vcs-24.0.92.ebuild,
+  emacs-vcs-24.0.9999-r2.ebuild:
+  Move libxml2 out of the USE=X conditional. A build-time dependency on
+  pkgconfig is needed only in some configurations.
 
   15 Dec 2011; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild,
   emacs-vcs-24.0.91.ebuild, emacs-vcs-24.0.92.ebuild,
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index e5a4501c4809..e3dc19ba49a8 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -3,16 +3,26 @@ Hash: SHA1
 
 DIST emacs-24.0.91.tar.gz 50973768 RMD160 6479b85929c98f18d7ffeb4d288677ee8d744a72 SHA1 7eda9e9861638cfc328582e27831ece799ba9929 SHA256 1850909dccde9a331b4585bdc3d26a30b90a81a7d2469536fddd6ba61d246bbe
 DIST emacs-24.0.92.tar.gz 50996706 RMD160 4530f9208765ef168bfb55831371cecc089e2433 SHA1 6d876d3f187be67c210242e8106e8f38c314f77d SHA256 861369d3006e59837bd2daac9931b17148d60cc16d074fb532b51ef9c5d1975f
-EBUILD emacs-vcs-23.3.9999.ebuild 10648 RMD160 7c2bbffa9ec0feef21342d53172ea0865a9282be SHA1 db3718cab74e5f63419c35d4bcfc87fe296890f6 SHA256 73db562caf13ac86cb3fc0695a28e4077d256ee3bf663bbb17aad8fe895a8c12
-EBUILD emacs-vcs-24.0.91.ebuild 10794 RMD160 32a87d2f0840401d07bb0b721db0b808aebb61f6 SHA1 36521dc1474c8db562b2130f1f5c956128c783bf SHA256 06ab5d41fdb73df317ae2ce3fd870b818dbc4b43d1583482a1241528539211e9
-EBUILD emacs-vcs-24.0.92.ebuild 10794 RMD160 e9c8546de91481798559f4018f20978a7a9075e5 SHA1 dc7a6db4ad7a8c136c1138a581dcc8a1c3ee35ce SHA256 1d7a1ca623c6786ed554b297b5e24e1071e1563952dfd11883522dd2a72b89a5
-EBUILD emacs-vcs-24.0.9999-r2.ebuild 10799 RMD160 715a60a7faf53811a3537153fd8621d100f74633 SHA1 c05762972b3ee78255b3314f3dabdb035878c43d SHA256 1c272d80be66f1d17ce1b68f6c9789a0aa40de8c1272cf30eab22b952660dc0d
-MISC ChangeLog 61761 RMD160 1e38da4fe1eb76e3c341f3fd85943c0ed9a1b1d1 SHA1 3c7786033492f1bf758ff47c64de43b795d92db0 SHA256 7ce212b9ce98f7ee7706f6ad9f47416a8330c8eae02b51f852086ed66d13a8a8
+EBUILD emacs-vcs-23.3.9999.ebuild 10716 RMD160 b30d54da550c40371a66ffc6c7b921c02bef078f SHA1 f95ef1791501967ecc45e4d42da59074f32df5d8 SHA256 f232e3862f65e910f48e86e0a6d8cb22faef5fc555f5c5e4b90d112b4fd1d3cf
+EBUILD emacs-vcs-24.0.91.ebuild 10908 RMD160 1843ea3413202525895cedbf5b2ec247627bdb50 SHA1 915b2faac203e34b112caf2ee9c800ab98be28a0 SHA256 39013b87715efbeae0f5a6b1033aa34462f4a7805c8604bfb156d9b2832b919f
+EBUILD emacs-vcs-24.0.92.ebuild 10908 RMD160 06b2638a6405a56f0273fb70325702943abe1b3d SHA1 dbe12c6daa49c27cdf460b2eb6d0eb5162ea07f0 SHA256 1d3dcec4fa4be394d2ed325c210be6b2177f09baceddf648a4735e65c89bdecb
+EBUILD emacs-vcs-24.0.9999-r2.ebuild 10913 RMD160 f559410763e9f52f922c93054e2f858deb778ca3 SHA1 ec9b050683c2af59828e15afcd76db9c29a15ac6 SHA256 8d0102a1c98d021c2ca45e3e719eb580fba9df6f97573bfce32a6a852dffcb40
+MISC ChangeLog 62047 RMD160 a25b3cdaf846fa5acbf4a043ce997a0d88191687 SHA1 f96b7da544b249fd931b86d952206e85d4afd39e SHA256 d9cbce442fd974c50555d213b1fac5959afacf40daade110a6e6f40214e254dc
 MISC metadata.xml 2159 RMD160 c0ec88f19a4e19271ea414b5e4429d0ca3ec4548 SHA1 3f8c32f164afe13baf231c60a2b64ca9912e5bfb SHA256 b1008bb18ce3aacd84175d61ac8254d017a4a9ba67d5b376f21a39e5699be3ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7plywACgkQOeoy/oIi7uxpEwCfVwwhApkK1p4WJrCo79ctktpf
-bW8AoMc3dXZ3kqp/3mqTxyyaKjRAE+jC
-=Kgro
+iQIcBAEBAgAGBQJPBjg9AAoJEDxpGckxwJCBjiwQAJkLKsfKyxJeGmTX04fbBO72
+gy9FGtxhIb881yVFLydugWWw2/SixkswcSaNXJeEOB68/J+dPHKtFc1govig1U4f
+6nvq5kXhD3GYgupP7cvZ/0NEshBDv6oerLUOcI86M5DW/9r+Nsvd5I5RW8FD9yDq
+7G04Ya2zJyPvoW6SfoNjadjfef3d7gviCxpdzpKgtz8XXPp2d6dKqD6lw0TZrYGP
+yMZ2v+3LjSKE/jhGF3190opX6HIXtMRCypLy2b+d+Sg6yj+sby5iSLqE7MBkERKH
+CTPhniP+8W6IR93VramZ/LaZ6I/h2jkvgsr1Q7NuAADJDUR1aw+/fvZZZH7gOZW/
+jnQXeNCEeXFAhwIUmpbsUCcpYmm/dD9gDDjXfqmTqRkIUCMvatOdONRpe80jl5J2
+ydGHatIeaS1AzRsS4RfH/DGaIOGyNqxIzTkBx5Ws3Tg8WPhveo5fq+7RMygaxeGH
+2zwzCvyb6Fl+kWrmiIEzVedyujp4eqysUYf7VoDgo4mVoKX4rWXWCZMvN5cN/PKU
+g538dfyKIq4EkXBlpVrl2IU1SXt8gStN2DJcOysfHbyTYG0rscX7+vTyZgG3OTMq
+/l4WAHKLLGsThz1vMK/vLUpoXsscfsMDV1r74AxjfGkWHVLeAbp5ZBS1clxYiLdv
+adm91VUCclIRDZGj5t6d
+=rZvV
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
index 65238c4d0ad8..bc6a061cdd6a 100644
--- a/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v 1.17 2011/12/15 06:33:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v 1.18 2012/01/05 23:43:15 ulm Exp $
+
 EAPI=4
 WANT_AUTOMAKE="none"
 
@@ -71,7 +72,9 @@ RDEPEND="sys-libs/ncurses
 	)"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	alsa? ( dev-util/pkgconfig )
+	dbus? ( dev-util/pkgconfig )
+	X? ( dev-util/pkgconfig )
 	gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild
index 250e76323b12..7a6e1a478d00 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild,v 1.6 2011/12/15 06:33:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild,v 1.7 2012/01/05 23:43:15 ulm Exp $
 
 EAPI=4
 
@@ -41,6 +41,7 @@ RDEPEND="sys-libs/ncurses
 	gpm? ( sys-libs/gpm )
 	dbus? ( sys-apps/dbus )
 	gnutls? ( net-libs/gnutls )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	selinux? ( sys-libs/libselinux )
 	X? (
 		x11-libs/libXmu
@@ -48,7 +49,6 @@ RDEPEND="sys-libs/ncurses
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
-		libxml2? ( >=dev-libs/libxml2-2.2.0 )
 		gif? ( media-libs/giflib )
 		jpeg? ( virtual/jpeg )
 		png? ( >=media-libs/libpng-1.4:0 )
@@ -79,7 +79,11 @@ RDEPEND="sys-libs/ncurses
 	)"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	alsa? ( dev-util/pkgconfig )
+	dbus? ( dev-util/pkgconfig )
+	gnutls? ( dev-util/pkgconfig )
+	libxml2? ( dev-util/pkgconfig )
+	X? ( dev-util/pkgconfig )
 	gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
@@ -143,7 +147,6 @@ src_configure() {
 		myconf="${myconf} --with-x"
 		myconf="${myconf} $(use_with gconf)"
 		myconf="${myconf} $(use_with gsettings)"
-		myconf="${myconf} $(use_with libxml2 xml2)"
 		myconf="${myconf} $(use_with toolkit-scroll-bars)"
 		myconf="${myconf} $(use_with wide-int)"
 		myconf="${myconf} $(use_with gif) $(use_with jpeg)"
@@ -214,6 +217,7 @@ src_configure() {
 		$(use_with gpm) \
 		$(use_with dbus) \
 		$(use_with gnutls) \
+		$(use_with libxml2 xml2) \
 		$(use_with selinux) \
 		${myconf}
 }
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild
index e92e38d0109d..eabcdb4ec7a3 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild,v 1.4 2011/12/15 06:33:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild,v 1.5 2012/01/05 23:43:15 ulm Exp $
 
 EAPI=4
 
@@ -41,6 +41,7 @@ RDEPEND="sys-libs/ncurses
 	gpm? ( sys-libs/gpm )
 	dbus? ( sys-apps/dbus )
 	gnutls? ( net-libs/gnutls )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	selinux? ( sys-libs/libselinux )
 	X? (
 		x11-libs/libXmu
@@ -48,7 +49,6 @@ RDEPEND="sys-libs/ncurses
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
-		libxml2? ( >=dev-libs/libxml2-2.2.0 )
 		gif? ( media-libs/giflib )
 		jpeg? ( virtual/jpeg )
 		png? ( >=media-libs/libpng-1.4:0 )
@@ -79,7 +79,11 @@ RDEPEND="sys-libs/ncurses
 	)"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	alsa? ( dev-util/pkgconfig )
+	dbus? ( dev-util/pkgconfig )
+	gnutls? ( dev-util/pkgconfig )
+	libxml2? ( dev-util/pkgconfig )
+	X? ( dev-util/pkgconfig )
 	gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
@@ -143,7 +147,6 @@ src_configure() {
 		myconf="${myconf} --with-x"
 		myconf="${myconf} $(use_with gconf)"
 		myconf="${myconf} $(use_with gsettings)"
-		myconf="${myconf} $(use_with libxml2 xml2)"
 		myconf="${myconf} $(use_with toolkit-scroll-bars)"
 		myconf="${myconf} $(use_with wide-int)"
 		myconf="${myconf} $(use_with gif) $(use_with jpeg)"
@@ -214,6 +217,7 @@ src_configure() {
 		$(use_with gpm) \
 		$(use_with dbus) \
 		$(use_with gnutls) \
+		$(use_with libxml2 xml2) \
 		$(use_with selinux) \
 		${myconf}
 }
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild
index aead569671c1..e07b46ee549f 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild,v 1.2 2011/12/15 06:33:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild,v 1.3 2012/01/05 23:43:15 ulm Exp $
 
 EAPI=4
 
@@ -41,6 +41,7 @@ RDEPEND="sys-libs/ncurses
 	gpm? ( sys-libs/gpm )
 	dbus? ( sys-apps/dbus )
 	gnutls? ( net-libs/gnutls )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	selinux? ( sys-libs/libselinux )
 	X? (
 		x11-libs/libXmu
@@ -48,7 +49,6 @@ RDEPEND="sys-libs/ncurses
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
-		libxml2? ( >=dev-libs/libxml2-2.2.0 )
 		gif? ( media-libs/giflib )
 		jpeg? ( virtual/jpeg )
 		png? ( >=media-libs/libpng-1.4:0 )
@@ -79,7 +79,11 @@ RDEPEND="sys-libs/ncurses
 	)"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	alsa? ( dev-util/pkgconfig )
+	dbus? ( dev-util/pkgconfig )
+	gnutls? ( dev-util/pkgconfig )
+	libxml2? ( dev-util/pkgconfig )
+	X? ( dev-util/pkgconfig )
 	gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
@@ -143,7 +147,6 @@ src_configure() {
 		myconf="${myconf} --with-x"
 		myconf="${myconf} $(use_with gconf)"
 		myconf="${myconf} $(use_with gsettings)"
-		myconf="${myconf} $(use_with libxml2 xml2)"
 		myconf="${myconf} $(use_with toolkit-scroll-bars)"
 		myconf="${myconf} $(use_with wide-int)"
 		myconf="${myconf} $(use_with gif) $(use_with jpeg)"
@@ -214,6 +217,7 @@ src_configure() {
 		$(use_with gpm) \
 		$(use_with dbus) \
 		$(use_with gnutls) \
+		$(use_with libxml2 xml2) \
 		$(use_with selinux) \
 		${myconf}
 }