Revert the new USE flags, fix a Changelog typo.

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

3 files changed, 24 insertions, 24 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index a316a4d889c4..4a55a550b6c9 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1429 2015/02/12 05:34:22 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1430 2015/02/13 17:47:58 dolsen Exp $
+
+  13 Feb 2015; Brian Dolbec <dolsen@gentoo.org> portage-9999.ebuild:
+  Update ebuild back to automagic, undeclared vcs deps. Fix typo in bug # for
+  2.2.16 release.
 
 *portage-2.2.17 (12 Feb 2015)
 
@@ -14,7 +18,7 @@
 
   08 Feb 2015; Brian Dolbec <dolsen@gentoo.org> +portage-2.2.16.ebuild:
   Version bump. First release with the new plug-in sync system. Fixes bugs
-  583512, 538314, 537298, 534722, 536926, 536392, 492932, 142579, 282927,
+  538512, 538314, 537298, 534722, 536926, 536392, 492932, 142579, 282927,
   535850, 533036, 463266, 533884, 531656, 531724, 534070, 532670, 532784,
   532594, 525718, 532224, 504116, 412471, 531690, 531854, 522032.
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e577b1aca530..978d085f98c8 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,26 +10,26 @@ EBUILD portage-2.2.14.ebuild 11345 SHA256 015330cff1b0c7529a3b030715e5837cdf8119
 EBUILD portage-2.2.15.ebuild 11355 SHA256 2aa97a2e3ec8e4b5df74d66566e64cc164e3e59829411f35ced9961f3b766504 SHA512 46427c710b064613df744af82c6ff2ef7ca59e8c6a2fa048347cf6fd1c6b59bd147227f68787ea4d25452cc43c74f4d819d8de7fe43998d67564e7a71105f1b1 WHIRLPOOL 1f995c48c05c291e2ae3e64950e5afef606529e79ebb18ebd64cec430d4a2f14406bfe1206c279c4dc201e63235d629174c4e5e59a693cd52ad59cb1f147e162
 EBUILD portage-2.2.17.ebuild 11718 SHA256 7fa9a2c2f490db0706fab39a81ba01a5ef90c1484ebaf002a415f3144700f6e8 SHA512 79472219b71394f580ea5b060d3330301d968e9f2614bec6045036864febde0a7636bec7969e92f4dc8edfb9422d1293581f64e029d7d6d31ba508de5574ac71 WHIRLPOOL 7d27af56b26378ae5cbb2c14be56a405a216daa76a0c2a42e10b234e2479e3df44ebd38de924e9eb8a9899dadbdbacb7fe4f37f5a535f4b73861495c6eef9719
 EBUILD portage-2.2.8-r2.ebuild 19246 SHA256 e5117305e6132b0460e73b6f05de6f0c408a7ecb7d3303f3ea19c65d37e485cf SHA512 64bb817cb9467335117c96b69aa533b7e34edb0f0c3d50b87278f2c35c49d7074d3b702447cd18a646c66fc512a163b584bb1d5ec023a8077123ffde171785c7 WHIRLPOOL 99fcf94232e0de66fa33e0f0150a56b085cf67bf1a2c1434f8cc773561e5390cdbe33ca4a8d3d940c80f5209a94b9803d27503d4152420b8e1f3127a590a8666
-EBUILD portage-9999.ebuild 8481 SHA256 ec942599204f9bb42fe178f9d9f9ceaee0690517d4ea8a078baa24f7dfc93272 SHA512 9049066c0501a4be4269542c2e77f58a15d7ba8d3e4c1b04f8eff652bdf494d3bc420da1f0d7ad0991887cbf8defa101869c044600dd9f95d8f864f27368d2fe WHIRLPOOL 565b7f73e4513adf998acc655a984fc54aae4941a7d734ee201ba01c67dd15eeceff04921ab298e732408d0daf85c54ef4e2224eb6e0f4a6e835b7a0d4bf517e
-MISC ChangeLog 62838 SHA256 44fd09f746334a0fafdef3cbfef11ac1a10f2be5e2a34417e0b402536237da1e SHA512 6bbbab86cf7a68897d250af14973280291e32db2ad3031860bead48521734ff582cd7874620c041f6d77f1b5cf7ba5280c77c60214e259fd0835528a79260741 WHIRLPOOL 265d0812d0567a980ffdc7864794777c2ccbbe9b957dcb75ce599408ce92e44db9d98f7438ab5db53775ae413a7223fe32cffdde295734dc696edddd4b14e366
+EBUILD portage-9999.ebuild 8356 SHA256 037cc9a68811e161a4181e74f68c7f261ebabb4e161b0040250e56bc5660408d SHA512 5d9f4f91009e729572ba8dec83ec7722437e09d17891f640448ba2e6e7f7386cf921367b04990481b294e7b52eceb00fbbf760bb6b0de39001a188d604698321 WHIRLPOOL ff67ecbd8e6457d6b7b95b80d5ce1d8da8f85a10b0f8a651d84fa21b980a8c4d88991a8dd42eeae2d4d4c89fce35eaa534e5d81094507e46995f261d24bf3f3d
+MISC ChangeLog 63004 SHA256 4ecdbbd93a7392188d9294d93e4fc411ab38a486d1c359bbf7922a1101e50226 SHA512 e276f687ce46484a8e653b81047e6602145fd53cb212c6cd5980b6fb5f54da53b73bd988e1aa1e4c00bfc58368f70f5ed30c2417115cfe4636ef4f69e525f7f6 WHIRLPOOL ba112c9d96ff818dc93f351b08525d94e9469cae077b8852af8e9def1da94aa299a4bf5b5507e65bc66b598fdae6dbd434a944cf75b79872bad18e32265797ef
 MISC ChangeLog-2012 133873 SHA256 157a7eb13d4cf2e2c94bfcb7e91f218af1ea88f5ff20c24a50546950a9839c94 SHA512 1241f4ccd7b31bdd340649417257b0e95202992feb66e0cd4d41fc2d35bf0baeac19680f34a831d2fefce0c0fec03aa6e7a191f783e59cf9b93aaf266f010a3f WHIRLPOOL b027bdba0f5ccc1b3a2dc18df92d82b473af5e55536816b7177071c1ae1a89e4d50d42c2093fa1bbe28b92a42014fbefbfc9e7daa4e6426ebecbd5bffc3d479f
 MISC metadata.xml 1028 SHA256 c3c8eaafc55327db46f7851b816118637c3f81ba908fb7c536036122a807a874 SHA512 287af0b907a1890ad8ab53cf33001ad1cb6f2c2c8efc022ffa27647afa0e0fc75060e7268d2b7f0932258e12204ac23f927f49d99130714d025e5610e2526e83 WHIRLPOOL a332c3d7208a4bf6bb5caa155331956f6123e73d999200c09e3a477136f9090de492f6455e2b19e49d7d6782a2bfe1aafd147df382db7927bbb12ae553a2d3bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU3DtfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU3jjbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBNUQ3Qzc0RTA4MUNDNzBEQjRBNEFBRjVG
-QkJEMDg3Mjc1ODIwRUQ4AAoJEPu9CHJ1gg7YW8QP/3MeeFGZDWlvOVKBUmHZa8AE
-de6FpL8KXjru0YtLbyje8Rae7EoKzxYEOJ5fuv1+E7IbmLnDNqZ84ASmvuK6P0+O
-95nfSUPzo9gl+7KwM2+btmftcRVwt8OV2YjzFSDWUNgvbYPXsynZe7VEXtbZcG6g
-AjXt/bG4QyRuWc2+Yo1BSlCdX1DgMA2qnG9kdtvNHWtR4PsVv3tPVrsHAPFNbEay
-YuibqWS1dbhCjhjqqUFXO0YjSWcQ0kuaCMS8ZYluxlMOkHZJPMm/D+7vI4EVsEv0
-mKLUVQqSORd3iv3OaLz2I4qcUUN9yAuMj0UeEWoFigcf/PevPqjfh1r55yN5Tssf
-/XenrD62PtT94UutP+uClDVMAblVzhxFCTKOUaI5W5rtwS9oBu/GfrC+Rk2BhB7t
-ZUEK6DNpsYvTf4g4/qCSLN7Y4VAZeV0AS/vVf1oMJ0j104plHl8E5QLTRzNNyjnr
-dIwIw/Jcydiljd9HFg+sJSF4U4oNdeRkTM3qLkkbu7jn8sBG6cx9BsOYoanmqy7s
-QnkxSl5RBQYu3rojOq8vwea+LDyz7Af+o8+rbwkx90oI2AhLFFLmue+Ubz1hj0FR
-X0ViNgpDR1kL9zrI6s5n9Gy5i5y9CJRtWDurscwWSCxi2gENMz9gxIR5BDGK19O/
-OfzQRmd2Z1Ap7+lgR6wu
-=Q62S
+QkJEMDg3Mjc1ODIwRUQ4AAoJEPu9CHJ1gg7YJYsP/iOxRRbF3N1VKAs4ZDPMbdkh
+17+489k/sQav2E9cx21UGz6eK85BMRGVStW0WwGFOJHk4somS4OkYCC3+/XJf5Yu
+17eyUSZMbsVgjB7Rf1ugPMohTWsPw4XaRvzg1oNMn1AS+89DwYvxSeKFtqbIJqag
+YNLYReLwZjjbPg6blRpZk5O7dQSS9m05tQjJKayISSqkav6IHqqzbS/gDIDzPElg
+zKFgWbeJ3Yiwk581fRT+gRq1WSRyqfBsemBnJfTLZakdR9SNESOT6DQhAC/XZwGY
+R5FtYUC4x+o/Rg4lE9K/EagAiseR0f5kkot4nmhrg3Q8QHFTj88y3yFs5qIroNJv
+JcDC/euQKiyC6tiPTKhReN+xKFPWgK/F78RN6ydKPfubGHv2FHS5kc8FomaElGAe
+3viSL5rEvIdEIBJGok6yuM4c+trwvyHVR02n3vfgUYwAeAKRNc6mbrpoGky58aSV
+VyiQrisxVPTUinUmEBUG874fIPGpdaStpzMlkAEqXf25zLWLpThJ9DpQ0A86rVTU
+ZvRrVMs0TM5ca3XXubOpz0nmFeuC7sGzwVh6wR6LzYYHyO4qVlb9ntRRfOVe/V8C
+1BwLMAcJDLQkErIsL5dbMD4/haaki/SnvmOiVz8Dce9T4ClJEN2KuxiXxXlLL2Oj
+4x7kMx3V+8VfpoKTY4ly
+=+ZKl
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 7e122adfb3b5..18b64c684538 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.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/sys-apps/portage/portage-9999.ebuild,v 1.109 2015/02/12 05:34:22 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.110 2015/02/13 17:47:58 dolsen Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
-IUSE="build cvs doc epydoc git +ipc linguas_ru selinux subversion xattr"
+IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
 
 DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
 	dev-lang/python-exec:2
@@ -41,14 +41,11 @@ RDEPEND="
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
 	)
-	cvs? ( dev-vcs/cvs )
 	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
 	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	git? ( dev-vcs/git )
 	>=app-misc/pax-utils-0.1.17
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	subversion? ( dev-vcs/subversion )
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
 		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
@@ -80,7 +77,6 @@ EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git
 	https://github.com/gentoo/portage.git"
 
 python_prepare_all() {
-	esetup.py select_plugins
 	distutils-r1_python_prepare_all
 
 	if ! use ipc ; then