From c8923619f0949e4aa4ca0190f8702395b6166b03 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Thu, 12 Feb 2015 05:34:36 +0000 Subject: [PATCH] Version bump, remove masked version, /add cvs, git, subversion USE flags Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xD80F5F1E1245142E --- sys-apps/portage/ChangeLog | 12 +++++-- sys-apps/portage/Manifest | 36 +++++++++---------- ...ge-2.2.16.ebuild => portage-2.2.17.ebuild} | 13 +++++-- sys-apps/portage/portage-9999.ebuild | 10 ++++-- 4 files changed, 46 insertions(+), 25 deletions(-) rename sys-apps/portage/{portage-2.2.16.ebuild => portage-2.2.17.ebuild} (96%) diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index bd3a4b1eb07a..a316a4d889c4 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,12 +1,20 @@ # 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.1428 2015/02/08 18:06:12 dolsen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1429 2015/02/12 05:34:22 dolsen Exp $ + +*portage-2.2.17 (12 Feb 2015) + + 12 Feb 2015; Brian Dolbec -portage-2.2.16.ebuild, + +portage-2.2.17.ebuild, portage-9999.ebuild: + Regression fix bump. Remove buggy version. Add git, cvs, subversion USE flags + to toggle installation and RDEPENDS of those sync modules. + Fixes bug 539746, 539478, 539402. *portage-2.2.16 (08 Feb 2015) 08 Feb 2015; Brian Dolbec +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, + 583512, 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 648b27c1ea24..e577b1aca530 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -4,32 +4,32 @@ Hash: SHA256 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5 DIST portage-2.2.14.tar.bz2 896674 SHA256 8dd65971e0f1c31dca922b0f7be06e622aabbed8d012d056ff25a169fc9946d8 SHA512 c8724b42d9932adf6065ff9f9c3bb3d22ec3258dcdb23e041ce704f2c7b634d459a36764f3ec5aa4613843733c70725025af10439816c538ec12837db50dc1ab WHIRLPOOL 82bb660fcc1f0bb4639b53829cf8207fc40ee01a0cb9935ad46fb5039f0558fbbbb3af3d12d208289e9701e0874d77a7990911fd50fe04806948c6c6955625fc DIST portage-2.2.15.tar.bz2 907786 SHA256 be62ee5e104272f9e6472a60db7e05136e6acf212003159b500fa3132a9a68d7 SHA512 4e0ca51ddbe94ce0595e56f549c8cdff68d3d2f7d0d7fdece78adc10a9657ed848f084672840f2533bc7c87c6aaa06e02861c7f9d92bdcc1647c9b40b7a3a5a1 WHIRLPOOL 689e62a261b8fa404c8aedfcc825135ba3005ab920db6cb2ce1040ec252f24f67a5d5c01a84db908598390fc97f6df9d9ba78a106ee16aa748a049bf425bf28d -DIST portage-2.2.16.tar.bz2 931768 SHA256 355418291cb778d2d25825795a294bdf71ed894f1ba8e79c40af53ac8c0aefe0 SHA512 a6d5f947a51649b51fa618471b68c08c4c2b0a5cdf608e48db6b714f51ea93d167f7d98500fe61cfe6499ac18eaf24bb55439c4696b3a18b956148285b0f5525 WHIRLPOOL 9c980fec1a827d2e28b36ed73d0c0a084ddbe56f2f30a34276eb5a24911f9988ccb5bd20301b83dcce03b1dee8033b099f8960ae0545da2337eddb653ff73d3d +DIST portage-2.2.17.tar.bz2 931533 SHA256 6f4023ea8acacb9b14e6a8b5b4e0636c5098e1246917ed184f88bed0930e0480 SHA512 efddfd3ab9d725db2ccafcfbb19baff8b16cd09d9f3a7b42bea9578855d8e73291fdf692932c3e6d4de21183d0384c02055e87f434c19d8cc04d17cc3c57adb1 WHIRLPOOL 4d0d696b8b96723dbf27472d4f77872122d231f2beb87d6023c269796ea74f3505df638ec286c847a1dcefe2174356045feb3a415afb086936c444554349dc6d DIST portage-2.2.8.tar.bz2 874672 SHA256 c1074e01173df5384e003598dbc5f64f09e92f83fd26faab2f88f9f0bc64aa7e SHA512 acc47d94ff8c08e5a7bf2d4c4e600863430dd1e7d0bb8b4254d6477a498933cae663db84debf9487d2243c2cba689629ef8e8b6cf108e10d40e89e8e8d7e1257 WHIRLPOOL d54290ede8d3d85e5211cda7e86ed740178121ef2f47cf0858c27941d8679d29c11445befff962986d40a47ded50d0d4654de19e7d4aef3fdf2546655a0d6fe2 EBUILD portage-2.2.14.ebuild 11345 SHA256 015330cff1b0c7529a3b030715e5837cdf81199a10a1553e60750b69a4c365d4 SHA512 aeef1d6a08303251052afb35818c4d15dcc1943ce23bf4749aa27e5fb88dbd3bc1338d589f5a5192cc70eafd5ea23a1febe6168201edcd99263e4d587f45b08b WHIRLPOOL 0e562264d9edd2e16e93eec382cdab776bc491e9bcb0c41800beb255a6652df73aac057c8dc5616492a2f9dbde12c8c112fb3a890f2801964ec8dba20c86d684 EBUILD portage-2.2.15.ebuild 11355 SHA256 2aa97a2e3ec8e4b5df74d66566e64cc164e3e59829411f35ced9961f3b766504 SHA512 46427c710b064613df744af82c6ff2ef7ca59e8c6a2fa048347cf6fd1c6b59bd147227f68787ea4d25452cc43c74f4d819d8de7fe43998d67564e7a71105f1b1 WHIRLPOOL 1f995c48c05c291e2ae3e64950e5afef606529e79ebb18ebd64cec430d4a2f14406bfe1206c279c4dc201e63235d629174c4e5e59a693cd52ad59cb1f147e162 -EBUILD portage-2.2.16.ebuild 11355 SHA256 76dbc9c56efdaa7757b8e68d691bb9a06b4be1c73c16d8eeb9c479c50244b815 SHA512 0e4e59abfcc3376ea806a6a7eae38cffbdd27ff93261c25c94bd61829a025782539f11815a5d231662d2890dfd46045c87a95845641112e22f03c2d5562e2f67 WHIRLPOOL b17da137d21ad108a227408cfc5f98e8e32366e88333423b68c01ac09c79e4794177d8befc192a668e5f8d1059b8e12562746b9f2f458e898212f35a79506ddf +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 8356 SHA256 f4cc53024d0e6a352050ac5a0fb119b979c8623383ddbce7e5e2b8f1e44b2401 SHA512 1f66e43964f1040acf7b3653d5f355b822b8c08579c1f9032a03769b79319d3eb6bd444355627e7f0de29ca498dbadc7fab73e0d6dbb184e0b679592adf0e674 WHIRLPOOL 806a6c2172b69277c083457d5698f779381fe3e609e5071dd4089e1161054af64ab6824b2b9bd5c04ed020fee0ddae223c440a90cabe98cd937fdea079cf11c0 -MISC ChangeLog 62511 SHA256 c7a93b94d9715714a803698ac96c595b884fbe959cf4052116914e20aef31291 SHA512 67d8594124f5cd827b2d058727dbe56b8f63816180bc362a797f2cd8de6e11ffba8bdedfb834524a84ad3bcbda0e173f0cb79658b728f9a9e4d31401f60e441d WHIRLPOOL c41fabc8d4fc01634ca1ebbf200b16fc5d17c505694172d8a53dbf31d29482f1641a6ea792027d70eacf8c33e48d9597ed0c7222c4cd08d6242a1f80ad58fa5b +EBUILD portage-9999.ebuild 8481 SHA256 ec942599204f9bb42fe178f9d9f9ceaee0690517d4ea8a078baa24f7dfc93272 SHA512 9049066c0501a4be4269542c2e77f58a15d7ba8d3e4c1b04f8eff652bdf494d3bc420da1f0d7ad0991887cbf8defa101869c044600dd9f95d8f864f27368d2fe WHIRLPOOL 565b7f73e4513adf998acc655a984fc54aae4941a7d734ee201ba01c67dd15eeceff04921ab298e732408d0daf85c54ef4e2224eb6e0f4a6e835b7a0d4bf517e +MISC ChangeLog 62838 SHA256 44fd09f746334a0fafdef3cbfef11ac1a10f2be5e2a34417e0b402536237da1e SHA512 6bbbab86cf7a68897d250af14973280291e32db2ad3031860bead48521734ff582cd7874620c041f6d77f1b5cf7ba5280c77c60214e259fd0835528a79260741 WHIRLPOOL 265d0812d0567a980ffdc7864794777c2ccbbe9b957dcb75ce599408ce92e44db9d98f7438ab5db53775ae413a7223fe32cffdde295734dc696edddd4b14e366 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 -iQJ8BAEBCABmBQJU16WWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJU3DtfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBNUQ3Qzc0RTA4MUNDNzBEQjRBNEFBRjVG -QkJEMDg3Mjc1ODIwRUQ4AAoJEPu9CHJ1gg7YOmwP/0vnGhLBURqhBo+oR+NZr6FE -Znj1P0YC9sXLcZ/w8yICDPhZ9u9ZOAfFgYUvHNqC8EYgI/YHdSzcIEMuDODnicuX -DR7YFh4jEeRGAiZvppUNj2r8c+rO7wiFMJSG+MH5CL2hAsSDJVKgunoJu8COeUlZ -SKBSxThrf20LejZXPuwrG/3KlthA5H0Q/xiz8TVuEim/ZmNnulETmT+CZJKhInuc -w87u5M+vInIdRTralEHn7AXbXFI3FUdmjeXD1I62C2Oc+bQ8UsUwqDVHMOn8x/XV -JCUkq64VCBuEaqYquPsghLlEILEIldpLRJqm4GIhfGEN+8s8UXhoszw5bRPzNRBY -9c8tmaUpPuDeQUwIm4patu0UWdZgJ2bWEllZlLP/4YFjDg06goJF0F95ffxfDmrP -o+IQImiSH4bFc1zTyXFuTji9IOS+jcS041gs+YdPNzLyfZVPeM4PcCOEPHmBNVZp -6ZJrX7MTjjYaxO11iKlob9TWBdkVghoOf9KXfW9MbgiiYqNLtMvDuFNWj/JunXrI -t7d03fRNeAExqi18NlmB6I6pbZHPhbmzP34bBNyU5kzvxW4W6j1qPpWEOHM2/AOC -tnNeYZJZcJhB7dyIqKlLymiCKhpnfccC6HFrcxFYRlP8VKGSDaeLyQshN2IkBaw7 -MPCtMd+6WYqW37F8rU6+ -=OQ2a +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 -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.2.16.ebuild b/sys-apps/portage/portage-2.2.17.ebuild similarity index 96% rename from sys-apps/portage/portage-2.2.16.ebuild rename to sys-apps/portage/portage-2.2.17.ebuild index 3063197f29a0..edd6b2322240 100644 --- a/sys-apps/portage/portage-2.2.16.ebuild +++ b/sys-apps/portage/portage-2.2.17.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-2.2.16.ebuild,v 1.1 2015/02/08 18:06:12 dolsen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.17.ebuild,v 1.1 2015/02/12 05:34:22 dolsen Exp $ EAPI=5 @@ -20,7 +20,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" LICENSE="GPL-2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" SLOT="0" -IUSE="build doc epydoc +ipc linguas_ru selinux xattr" +IUSE="build cvs doc epydoc git +ipc linguas_ru selinux subversion xattr" DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) dev-lang/python-exec:2 @@ -41,11 +41,14 @@ 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}]' \ @@ -78,6 +81,7 @@ SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" python_prepare_all() { + esetup.py select_plugins distutils-r1_python_prepare_all if ! use ipc ; then @@ -349,4 +353,9 @@ pkg_postinst() { -exec chown -R portage:portage {} + fi fi + + einfo "The portage build now has USE flag enabled sync modules." + einfo "The rsync and webrsync modules are installed by default." + einfo "Enable the cvs, git and subversion USE flags to install " + einfo "those sync modules as needed." } diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 70a9e0a1daf7..7e122adfb3b5 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# 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.108 2014/12/22 11:14:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.109 2015/02/12 05:34:22 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 doc epydoc +ipc linguas_ru selinux xattr" +IUSE="build cvs doc epydoc git +ipc linguas_ru selinux subversion xattr" DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) dev-lang/python-exec:2 @@ -41,11 +41,14 @@ 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}]' \ @@ -77,6 +80,7 @@ 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 -- 2.26.2