Add proper dependencies for IUSE=xephyr, bug 528230.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x974CA72A

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 20840bf2043fa475345eb7a6486a0644f533358e..51efa0d1e16698608270810a5a71715b5875f465 100644 (file)
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.828 2015/02/21 19:53:01 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.829 2015/02/22 02:48:00 mattst88 Exp $
+
+  22 Feb 2015; Matt Turner <mattst88@gentoo.org> xorg-server-1.17.1.ebuild:
+  Add proper dependencies for IUSE=xephyr, bug 528230.
 
   21 Feb 2015; Matt Turner <mattst88@gentoo.org> xorg-server-1.17.0.ebuild,
   xorg-server-1.17.1.ebuild:

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index c5dfc9350287f6b1cfd0faf9b12c2858fbc3aa2c..e65372869d905c8e4efc3e7b56fa850e95fd6236 100644 (file)
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -32,24 +32,24 @@ EBUILD xorg-server-1.16.3.ebuild 7662 SHA256 ed4a52760a60b2baf5162235a5ce6d3c6c0
 EBUILD xorg-server-1.16.4-r1.ebuild 6040 SHA256 d88cab66209d4d8caa9d4d95293fba1a613c7ce5ff88b0dc52f4c3f732ebc664 SHA512 beacfe3fb75f83f5743604f38e172d0636083a659c6089a22a7b2b6231b7df2bdd095335306b8051a5d21da050724bd6a7de8d2d861deae645d7853f1bbe43b2 WHIRLPOOL 8f2d51ae801e38dc5f3bd59b7a5cfe1b47ed58c808100bd2c97bfeb8b9f86374a9ee3a460454aea2655a324a7cf89d57f5c6700193d41cdd92b58d4dce9a1280
 EBUILD xorg-server-1.16.4.ebuild 6932 SHA256 e7c58573df59a23e74f8ca3e69f91880c8635608d779bed2d7975859118cf153 SHA512 3ff7bcc9ad8909c47c0d581cb4f2b63d054ea9c6791124f606950bb520258eb7090f90c65eab4737cdc94e3184a3fd95c5f8c09396966401a16292aafd671122 WHIRLPOOL 8bc7041a5d7ebeaddf983afd0046a5a5b025b0182d9d8d2334c1448e40f2cbe66f7d621e7b2edffc65a39fc030a3c64e8eed37e3ba90ad867c848afbdecd9531
 EBUILD xorg-server-1.17.0.ebuild 6157 SHA256 ebac647c8a4db55555ddc23f463a4b466c54de56c4b6e7531925e065fb83385a SHA512 857a499fddfba5101647f30b353b0a8e95ee8d0229a975d386ec5ce0b6af346fbb322e43650b9cf2a76ebc0bfc267c55d7224ca9337462eb3aa446bb329f6ad8 WHIRLPOOL 8e281cdf98b16324ab4190eb8eb3d3e1eaa1569ff1f260bf8ad0526edb3b7ef95da209075cdf9bbef49d2d2734306138065c43ca19b46a52b39330cfcdb9f156
-EBUILD xorg-server-1.17.1.ebuild 6157 SHA256 0b54e7f700520a40e3b708e8824740b909c62c6d6d7505b1e5ba7c440c756fb8 SHA512 8a1d3f2a36a601c815438742147c866897f16c858eaa94dede3c1011ef213a3e8b4857147d72e3127e3494bbe71c405cb4e3706ce67c17047e9a16ddfefc2af6 WHIRLPOOL c4a72b9a11f5d3e61721ea49a79378eb04241cedea63d19aaa76f059fe9b142bf36f22b587993791468ae083fb1bd4bc4723b522d6a534059338d41e216130a9
-MISC ChangeLog 63622 SHA256 7f0fbe14e81f73ac03234eff617d0f05cd6fadef10f9ac20b50c153e497586b3 SHA512 49dba84cbd12ec766ae927312bb38baf1ecfce191056d93e2a74826ad60d008622b11b76038f32f6b9c2a6b4f5fdb804c0db308d18e3f01b4869ab99d33ceb2b WHIRLPOOL b54ddf4f77e4deb1daa28ee333e75a0394ef72a7c72a8072c582d3149c76266d4daba74719dba4561f0594f348acdea1d8fa28af28835a820470ed88b4aafba5
+EBUILD xorg-server-1.17.1.ebuild 6288 SHA256 1638bbf56b86d861c09216f14e625b4cd06c1de1589fd7ea34142eea863a7e38 SHA512 bdaf58fbf99b1e7d6e634fd8c2cf3bdf50fe5906dda33edac4cf9027995ded7eb5f768cefc7bf3a78c9341baee377fa7b4c00bc02b33652719a6effe3113b33b WHIRLPOOL 19a0a83e5c6b6bbae074f772e0b502b45d6b3adfef328c1280b85c82f832484edcf0ed5810ebe5303e5a3e90292b6603f1ac91dd01a06ae8d2d00de32b365964
+MISC ChangeLog 63754 SHA256 479310945a61b031ebc15c9558ece3e1cfd1b50bcc568c878c7a0cdc5bdd8241 SHA512 64c3394366f7766154ab8f3b180efbb9b294b69aead8c67e5133405f3fcd5715f6830123c99c32f8c81f65495f81a705aeec349867f29d330faecc6510c8e221 WHIRLPOOL 061d18c7be30118ddd0e6ab5a48f426c5a57640e819f0f1c63e0a0626b08a872ee76c27d4dec4b59443d2196c849233f283f1c5598a3e23c37f12da77d121c5e
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
 MISC metadata.xml 803 SHA256 11ce7d6b3d1a4b32ac268d791e3e9fc1a47e579fb0587f87caf4c064c1abc355 SHA512 73fee10d52b8012ee64bdb789d0ecc0368c418822ec823ad22c1eac3c7c4af37c561a58599db68a6638059624e6f37e7d3cb5f3fd363255a372a9614c1deaf75 WHIRLPOOL f26245d7f8c9bf8c653730e1e832781289e06e43dc6cbc1efc422b6e8e3f7342e5a94f8cb731b4c2193c40af6087048da0ca384e4f13e697f86098296936e2e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU6OIeAAoJEA/daC2XTKcqzcAP/1T1Rctwgzswvt+tIQWDvmy6
-ldctOINEWrLqBLoNjfty9JSdYVpxbwzzo3LdIPkW79WhyQ7hUvEIgyqxl31NuWSY
-leElDn2ERoAYa3+pxTY6e2mwwHcLiy7ghvMyUfoFnZT2ad9ugK25zBOfAkzxZe3h
-C5sms6wj5dDPNzeo2qK3gNff7a4i5xAI1QdQtR4OoDY1tbgweQm+cNy04MDPdrHO
-Tluz6oUM3FLmpZyAoKw2tNa3otXDSnqMEB0LCD+KsyryqG6mT8rBamPqcW5o8Ar2
-S65deKjU4kgXpPOq7jvHhH8agXlOgvyZjvz2nWrD2ZepuTBKx5OSo1+cZOFE6Ag3
-dXoyNnFs8pNueU6eTPDjad7xbu4i2u7LeWjq4gGBmJ1+Ynm28OJQudvokkt1BTtQ
-CuWxaMnIV2dCZBgk15TLAZGy8RIFwMZbU9gJ7WDeIghWpTfTJz49uBkbo6Eiky7S
-P+RPpk7IjPanmGJ4Q33sRhyvgznDBRz7jb65tcf/qoRwQDOXqfhsCXidJHTh5aCu
-f1zubSHvv9EXRyQgHS4EB4C1UOOp1863Wy7ggpdfUcA/n5QCvQcYoSM0YE49Ehgy
-WBD4nCYWuhzjIyaRNNCuroJfsMmTsyi6odOYMA6T5QHA3kii6A3Y4Fxl9LdD6Y5r
-AolTMlOiZrLPp1BjkGmK
-=WYU7
+iQIcBAEBCAAGBQJU6UNhAAoJEA/daC2XTKcq7QIP/jp1cRjGnZo7dxwdRbUDi9BA
+p4ux61qAp1qQ32B2U75oo8tME6aRHDGgdqYltz6aOh757oBH/CZIiDiedJ2ANZ0k
++8KrNKMHrNXC3h/q16WUgqvKuqGNqSre2u0c37rp4JKeqJKar+2g6KSiw9y6BI2k
+lILWUqHTw2EZ9cGms23E5eNM0fnISNqWfzTu5/q/WCozOuYpn01nILakDdQl9LsT
+xOH9jmBlTwrw0Tr1FHkXgkoKklCGgRclU9US6gAvfS1qtv4U5kVrPBsNWvyNKryt
+1JaAJUdvJuSoa3hZkAO7cb3V1+FVH9gg+F5WCqa1nt7bs4dtPz6xLZsoN0aGrSzd
+lRDlNNdguJjez4P49tuBJ6oIG9r3+peZWgfIvKEbioOMe/fbQUxDTyXpqo7R6CSb
+2LSlVy102ZyUi+/DTKhQaQSG8cUOZM+kEuNjqUTRJxlnZhh8RCj/BKhpVQ7sjddK
+2AiZWnp2OhJi32oez/qOdDjEb7AMQ5Eo80KWlOdCh7BKsxlU/tQAFd6LvSrJm/qa
+hn5hq2VLqDkFwSTrbu5ZvRMyIwrqs0CXbXpgt9rcOMFhIV2Tyx3h4HfdoNyFg8Fn
+OkCaDmgj82N2uX+yvekJMyGPb9Y/migNacxKMZDc2Gx7FI/q6SVyZ6l0stn7ffw7
+JD49/mEOafqsXNsukKkp
+=2AH5
 -----END PGP SIGNATURE-----

diff --git a/x11-base/xorg-server/xorg-server-1.17.1.ebuild b/x11-base/xorg-server/xorg-server-1.17.1.ebuild
index 313d0003b6039101cd62745d82b00008983ceaa0..f5fe72d19420efb964791d2bab359f909881a7cf 100644 (file)
--- a/x11-base/xorg-server/xorg-server-1.17.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.17.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.17.1.ebuild,v 1.2 2015/02/21 19:53:01 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.17.1.ebuild,v 1.3 2015/02/22 02:48:00 mattst88 Exp $
 
 EAPI=5
 
@@ -55,7 +55,14 @@ CDEPEND=">=app-admin/eselect-opengl-1.3.0
                >=x11-libs/libXext-1.0.5
                x11-libs/libXv
        )
-       xephyr? ( x11-libs/libxcb )
+       xephyr? (
+               x11-libs/libxcb
+               x11-libs/xcb-util
+               x11-libs/xcb-util-image
+               x11-libs/xcb-util-keysyms
+               x11-libs/xcb-util-renderutil
+               x11-libs/xcb-util-wm
+       )
        !minimal? (
                >=x11-libs/libX11-1.1.5
                >=x11-libs/libXext-1.0.5