Upstream now always requires pkgconfig. For simplicity, have all versions depend on it unconditionally.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

6 files changed, 30 insertions, 44 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index b088ca76a91f..2d98de4582c3 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.158 2014/05/12 17:01:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.159 2014/05/16 20:10:42 ulm Exp $
+
+  16 May 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.91.ebuild,
+  emacs-vcs-24.3.9999-r1.ebuild, emacs-vcs-24.4.50_pre20140512.ebuild,
+  emacs-vcs-24.4.9999.ebuild:
+  Upstream now always requires pkgconfig. For simplicity, have all versions
+  depend on it unconditionally.
 
 *emacs-vcs-24.4.50_pre20140512 (12 May 2014)
 *emacs-vcs-24.3.91 (12 May 2014)
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index e74c8a36f30d..e02f3ef5c046 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -3,23 +3,23 @@ Hash: SHA256
 
 DIST emacs-24.3.91.tar.xz 39423508 SHA256 40cee18cecd3a54b6b14dd2d9d46bf3de625a1649c39fa8826be42ad47dd217a SHA512 e944755ed464d269b535125f154127215ece9413e369286fe9d572bd32d9ef6160627a19644a9d80593c30d58412c55bb0559d06a7332d9090cb5fea718e1395 WHIRLPOOL f6b31889faa64a359969a33d319461865183d2a40ca61bab3398f07b9a939ac9f6ac8c9f84277e13682032a3f3efdcaf64c6dedf482a05c6c382373e8a27e826
 DIST emacs-24.4.50_pre20140512.tar.xz 24025212 SHA256 6df0c15aa736de7836b0f6124cfd82bc9c6b730e9fa8e7a696b9c09d15f1c2a9 SHA512 5cf1c192948447a30f364ec0ded15a4e543e0315f7be29107ced7f399afdfc4d45faab5da9c3c06e9ccd17845bc8de3aa53d059fc4453337bbe2c8abb4a5dd9e WHIRLPOOL 2ac765473d09f14064875e7e6d7677492230c353cef2d3fcb2f53eb31e1a31ecac385932e079111a3bdf76acd5010a71e66dbe28059d1c13f46910124828f87f
-EBUILD emacs-vcs-24.3.91.ebuild 11599 SHA256 38d3a2f6ac27f2c0fdc0837506abb84a34e58a81315b6e197c2e4fd4fa569cf8 SHA512 aa965c78e6ba6673b1f7c9629ae9d97f198700a3bcad024de734316dba52c9bd1881e431162a445653d0375cc23f047e2d13d9c4a923adbb6bb9affd2a0592ae WHIRLPOOL 084f6145549ccd7ebc8d2a480ee327449ea39bc056d67f1637f37a587273e41dea4cdadbdc630c195f4f56f2e56c30c2a4b3d320cbc4ed3f30d56cba1b50422a
-EBUILD emacs-vcs-24.3.9999-r1.ebuild 11449 SHA256 fa69590a90de89d816fd7dad93ae9715b3c1dcc829e8604b793f73effad15ea8 SHA512 a65034bf976370dd591c53dd90ea3f954cabe92b99c16a5b2455ee1f14ae4d9aa3983b3c6228af36dbdfc3ecbe96af7f8ffe61d6086f1d621f08b83621db525a WHIRLPOOL 64566cdd3e39af0c0be5ce6bcef4779e5983c4b0e79483479e4e9d045632a7668debe1add8815a0832338037ad0ac40920b811063c35b3ec8e0b2c94cffeeae0
-EBUILD emacs-vcs-24.4.50_pre20140512.ebuild 11631 SHA256 c1795be40dc5d9f8e5feef37cb274b3f09f9b63497bd22dad119100583a2d73d SHA512 d237feb2d4c920bc95201bcaced07911ae3e0da5905632d56f2dee288973baef2e91bdfc014ea9dc4f584204ab4c092492a9dd3bb8c575f58092ef0c38de806b WHIRLPOOL d9006e966ce307384fd0f2e3777eb4f7b2fbde3f7619c1f0f77fef744f24944c59dd0efb4032ce67eeb403e46223f4d98607ac4afefcc74a462bd34d6f4b1450
-EBUILD emacs-vcs-24.4.9999.ebuild 11443 SHA256 b48e1c331dbbdd7a7fb223bc7d2c16704ad1568c194a04b6b49356f0df0482a4 SHA512 9d5e3222424929a7e764ee5e30a052c2c9fe32cb4e4fb6f532e87b9909d71c59e08bc400e57fbe115a1c8cff1cb52543845f0c1d17c2752f637a0d2edf502b83 WHIRLPOOL 28fa80cdd1837a8014ada1d028d80f2e1420f01942402d0a9280dcef2018af97f317e53ce668c01b30cce2ebbcb5526de59832be88f250d604d63138c4a584d5
-MISC ChangeLog 77710 SHA256 b9d54c9ec3f7b0437ff0873a164fa221df322d5485e3f0e6cd5144d103132ef5 SHA512 28ea8b41a779da632b258666d24cca590a5b92c93137dc106630a01b7ad58bfd4b008f0b1b17ad573c60d856035ba8f72d5f35cc936d19636b3ae019ab1a5d63 WHIRLPOOL daa5959876e9690f8d0d667d1089c29349443ee48460384bdca4b97c54513855a692083f883d3b189b14ff71cb8af6ebc79362ad9e5d00fead3bccf023f5f380
+EBUILD emacs-vcs-24.3.91.ebuild 11441 SHA256 2328d3bf668cb98cb343ce95739861ba24c39811a71ecfdd2ec3e91ef10444d7 SHA512 e3eaca660cee9b8aea5b0a8d1287f0474515f815f97b57b06bd270266a9362214d001677519defccfc6de9567c2d331c6308780867ea998e9a4f723b3ddd5640 WHIRLPOOL b25be868f80129222c2ce7ec6a731e95d34008fb8c109515064e24bde84dc869d90afb317406ad35af8857d177cbba4faeaae4b226fb1af13432d2a9f1821519
+EBUILD emacs-vcs-24.3.9999-r1.ebuild 11291 SHA256 e18678477ed72ff1124799238306aee8bafb0b2ceedde3c8a3e592d53bf08e32 SHA512 73c310e9a351faf37eb967dc202ccadc5c0d862485938c6df732cf8a83c77ce69bb912fcab337c4447f6d7567f5d994c6596f860aed5930ea0576058c166b3c2 WHIRLPOOL de7371f51cc0d8e7241e82ab8eda1991b65e11cf572b90804333289a06843b19aaccf83ea5d03d7ff0c5e44c82f92bf225138d9ab1565fa56e9a545732256cd2
+EBUILD emacs-vcs-24.4.50_pre20140512.ebuild 11473 SHA256 43fd45b3556d87636cbdb43f06b72cff7e4d4e93899fc7c23e558d4457455061 SHA512 28a1bff6dd3614a0b3daa311158c741904b526ce26b2d1cfa04213f99edafdb520c37c5dece51c15ef6f052d129381918a7273edaaa0559742c31ea6c24b41d0 WHIRLPOOL 6a9b7ea2c3095e195780e78ca6b94570013c166ac9ed863f101212b7c6b88db28fd21a178fafa9ba45b40c648acdc924a38ccc3d5749440c2c1530aa62db1f15
+EBUILD emacs-vcs-24.4.9999.ebuild 11285 SHA256 17397768375acbfae3f427ae6b4045745443129c8216f4a5ae3c48fcdc8bf7eb SHA512 53fde7952587a4d0d99423aeb661d58490dad211dc36cf90c28e26491969e20080d5ea2f6486c88e73dd9be9ee39f3eb59f013c13bb5170ec06820a36065295f WHIRLPOOL 6999e6e985e66ed16b4bc90ed60abff22882306a6984a37119f3a7714950fc20f5b4a454ace89e8c03599dd40ed7b74e50aacd01a59f59abe40d6cbe141f22c2
+MISC ChangeLog 77993 SHA256 43b82cfe88d90f594dfc2576e530c2aeccd3218cf654146e2a02a7f12046c4f6 SHA512 822fcd2a4341d9ee5268f466ebede6001d42b46c3f8d516a49bf700bacb2bab13c0040db1c8a8112527340a129bc0f5ae5b15641f40dcf579af3ab6ffdec7a79 WHIRLPOOL f6fa0312729d1d121b6efb5d096a0cb8f2902d95f1bc888e99b4a350c8c17a56cefe1301e8ab5409c322d7ce5fa552f1c5cd5d69d21384ce34f4ad85479b5922
 MISC metadata.xml 2522 SHA256 0dcfb3cd3457215ad785b82adfd0d60eafc10df3ac58c9125f6006e4ac90ced6 SHA512 8fefab8f3644c38b5a5c37e8aba2ee45a0b329b4dd846d280ef33893d940892abaf09204bf807d98870106677caf48e376667a4f2bf7c1dca26e72b6b5ea2c54 WHIRLPOOL b40fe229764c94b5bf59eda550e9a480a9793f3a4df43fa65c0dea518ad2372faf3276ce6009ad44a02907c2df63068b9596fc39e53cc7214dd5b30750df9a8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJTcP57AAoJEJQzkH1pP7W4T8YL/A3cf98YdVly3sZOuI/h58nl
-intZnRV3I3n3upPwKmq8WzEwLR+0xvwu3rwrBScVgWJTiKB4qG9IIuEUZfwR39jx
-7ygMDNCyVdGrCcwKXs7q/nZ4dnIEUdrR0N8jSIPuccqDs9KMTvG7vMiTc5L+q50D
-/P2p6KNaoJUpfq83ki7PngdnkTMXZwmhTTNfzklWWt5dAy+LRL1YS0w1vaEZZXPv
-Qm/7VVVq9YwIW3vIYRY/8Lc8Zni/2gS0TqATaef7x8xKp5FYu1s4c4tsSeSqkWEE
-yNn8AcSBpuq4lt3wDRsPumSRjAdzJZb/oYHAhvwVGkPnq9yyVi3GEjO2zdZORi8w
-e2M1OOeY+NNaQAh7jGWIdlYT7W8HXbZd29YyQa8YW81Z/5FR4vEJaphtU310rRy4
-ZUS1uz4FHv4eA34kSuapZNDWCyfU+lJbt2Msd+sfo/dCcdKyMTFiapebcKIOqqHm
-o1WrcMDP5/o1FLYJy0BAEm2ELEQYzlEbfXSqHjsHoQ==
-=hlJq
+iQGcBAEBCAAGBQJTdnDUAAoJEJQzkH1pP7W4l/wL/3EFg0W6k9CarUyrMHL6Ot/g
+tdQRxf/+riWc2k4Mg2Ax3o9ykdogaCtYXFTwIuc3uFo1IayseIrfjYknKIsgBURP
+kRkf/w6NN9HF2hFsSUUbg7a9sg2u7F5pRDuW9meJtqFXKB2BVgdXsLzTZzL0DF2T
+HXIYCNLhf89vVu4WEuY+6qUK2Ba0UBxMk4epFXRgRilGIqS+ycaqfurFIbIt5sa1
+pYjznUzx721R/t3yk4ldQIpHzoukDl1xMXaF/GQ/9z2A4zxY6OdiFnt3IRtPguXn
+yI2BteoxVIHf6io9XjBkPTIbs00/mATHeKrvFKuMTFbiThK8csxq8dRQ8WwBncxS
+AMjRxC0FR2LbKtjaOpUc4TLWoi//f1Dgy2pCH1soTrY8dctBoVMmhsGixZbGrcge
+seyZKfH4718EA66guyFQOkujCDm1uY5r03CMwhj8qbAQSUIGzwrsVFmma8nTzTue
+Gkzttz2a1wmOzNssDLwRs7UkkV+zAPuYUcK1/2oknw==
+=y2SF
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.91.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.91.ebuild
index cfe3f51ebed0..48ccab885965 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.91.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.91.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.3.91.ebuild,v 1.1 2014/05/12 17:01:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.91.ebuild,v 1.2 2014/05/16 20:10:42 ulm Exp $
 
 EAPI=5
 
@@ -86,12 +86,7 @@ RDEPEND="sys-libs/ncurses
 	)"
 
 DEPEND="${RDEPEND}
-	alsa? ( virtual/pkgconfig )
-	dbus? ( virtual/pkgconfig )
-	gfile? ( virtual/pkgconfig )
-	gnutls? ( virtual/pkgconfig )
-	libxml2? ( virtual/pkgconfig )
-	X? ( virtual/pkgconfig )
+	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )
 	pax_kernel? (
 		sys-apps/attr
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild
index 4895ca34080b..1753dd82f387 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.3.9999-r1.ebuild,v 1.4 2014/05/05 07:05:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild,v 1.5 2014/05/16 20:10:42 ulm Exp $
 
 EAPI=5
 
@@ -85,12 +85,7 @@ RDEPEND="sys-libs/ncurses
 	)"
 
 DEPEND="${RDEPEND}
-	alsa? ( virtual/pkgconfig )
-	dbus? ( virtual/pkgconfig )
-	gfile? ( virtual/pkgconfig )
-	gnutls? ( virtual/pkgconfig )
-	libxml2? ( virtual/pkgconfig )
-	X? ( virtual/pkgconfig )
+	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )
 	pax_kernel? (
 		sys-apps/attr
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140512.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140512.ebuild
index 66c144ecfc1d..a770a55892ac 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140512.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140512.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.4.50_pre20140512.ebuild,v 1.1 2014/05/12 17:01:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140512.ebuild,v 1.2 2014/05/16 20:10:42 ulm Exp $
 
 EAPI=5
 
@@ -87,12 +87,7 @@ RDEPEND="sys-libs/ncurses
 	)"
 
 DEPEND="${RDEPEND}
-	alsa? ( virtual/pkgconfig )
-	dbus? ( virtual/pkgconfig )
-	gfile? ( virtual/pkgconfig )
-	gnutls? ( virtual/pkgconfig )
-	libxml2? ( virtual/pkgconfig )
-	X? ( virtual/pkgconfig )
+	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )
 	pax_kernel? (
 		sys-apps/attr
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
index 50fef54f2a59..9f24f3ce5974 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.4.9999.ebuild,v 1.5 2014/05/05 07:05:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild,v 1.6 2014/05/16 20:10:42 ulm Exp $
 
 EAPI=5
 
@@ -85,12 +85,7 @@ RDEPEND="sys-libs/ncurses
 	)"
 
 DEPEND="${RDEPEND}
-	alsa? ( virtual/pkgconfig )
-	dbus? ( virtual/pkgconfig )
-	gfile? ( virtual/pkgconfig )
-	gnutls? ( virtual/pkgconfig )
-	libxml2? ( virtual/pkgconfig )
-	X? ( virtual/pkgconfig )
+	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )
 	pax_kernel? (
 		sys-apps/attr