diff options
-rw-r--r-- | sys-apps/microcode-data/Manifest | 14 | ||||
-rw-r--r-- | sys-apps/portage/ChangeLog | 7 | ||||
-rw-r--r-- | sys-apps/portage/Manifest | 18 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.1.6.13.ebuild | 3 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.1.6.7.ebuild | 3 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.1.7.17.ebuild | 3 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.1.8.3.ebuild | 3 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.2_rc67.ebuild | 3 |
8 files changed, 38 insertions, 16 deletions
diff --git a/sys-apps/microcode-data/Manifest b/sys-apps/microcode-data/Manifest index f02e146c06e7..ccb38f6b5e56 100644 --- a/sys-apps/microcode-data/Manifest +++ b/sys-apps/microcode-data/Manifest @@ -1,8 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST microcode-20090330.tgz 473751 RMD160 cd137eaa77ad5fd13ab78f1894fd4a9589de3bc1 SHA1 79b5db88f52866836d382309891c112eb7703853 SHA256 5930635a02d429b7c07a8c6675fcbc18cbd5c8499055ae4e861319bb7f0a7b8f DIST microcode-20100209.tgz 563138 RMD160 432a02247fd92ebdfef26a6567a81792ec45fd00 SHA1 10efd9ad6cf94de8fdb7da6136a699f3e271d9a8 SHA256 48f249ff6789406eaff298a3de5843e72b59a016c46c6065a2b1a4a41e025393 DIST microcode-20100826.tgz 601018 RMD160 65e7b6b57d586839c6b58363fa03174021cbd31a SHA1 259aef6affd8a7641f782cba4b48376fa552b141 SHA256 0a1373216061ff97e8183f5839a30a89b723b7c3227fab1b37c92dcc47cc5cfa +DIST microcode-20100914.tgz 556475 RMD160 4ac4ccc609f84996a64ce10e12b9a64a44ddc2c2 SHA1 9058c24b7e49ffce99f4ee1005e3d56a1ca8aad7 SHA256 b71e2f20715df3e4d1afd6450e19c88d043ca2d847d914ee218b1a466c218e82 EBUILD microcode-data-20090330.ebuild 779 RMD160 04f5239d8e31d411eddaf7c2fa65107834a1f194 SHA1 942a063790d055f03296635aa12c2bf48866468d SHA256 feb1e12cc9c31aca221a1f433dcd4e44f5404844c3641d783f3edfeafc3f4bec EBUILD microcode-data-20100209.ebuild 844 RMD160 1b316a053f164e3f4822d27a190d67959d6f5fdb SHA1 692c0960db27384d75a0f84920c8715c21542741 SHA256 37a6f2faf23965e2b833af6431bd831f526a6be08525fda6da6200ddae9a2090 EBUILD microcode-data-20100826.ebuild 846 RMD160 10d6d8d6a1875d397ab1e618d47f792f49431222 SHA1 ed095c9bc840f17198eace25ea0c6ab9847aec69 SHA256 c45f25e4fe7a69b97d405aef3396c07e81506b8ce78b2d7a0e0ec4b3caf80bf9 -MISC ChangeLog 1652 RMD160 5c8f3f9f7bd01736030cfa147c64f7c753c78a43 SHA1 c5c3064b038247485e2f596d086592408ac1d5ed SHA256 500e5d65ca0c25c3c0e6ae946cbee0fc080ef93de2565819d173df6c587fbc41 +EBUILD microcode-data-20100914.ebuild 849 RMD160 3a18d09832f37b1a0f3ee8090b8e803509003f8e SHA1 62182fdfe23b2aacc52dcc659523bba08640669c SHA256 7100a2ebea07eb065983b7dd2efc860bc83b877595d8b7b09f2118f665f1764c +MISC ChangeLog 1803 RMD160 88e643e9754ca54a3801bc2485ef8c45902331ce SHA1 05d239594b8d94ecde9ee737e64edd0b8f2d9852 SHA256 1367d533d6f49ce7728e504dd6cd330e318949d5b00cca0156d23d8aa187d42f MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iEYEARECAAYFAky1DLkACgkQAiZjviIA2XishACg4ufAxhCEdNOjai6EltOsNpwK +MAwAoIjS7e25HHa9xUsZTqd1ByJKX1Gj +=Tqi2 +-----END PGP SIGNATURE----- diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 2493edd32608..e2c87a3868bd 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.751 2010/10/12 06:28:04 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.752 2010/10/13 01:30:40 zmedico Exp $ + + 13 Oct 2010; Zac Medico <zmedico@gentoo.org> portage-2.1.6.7.ebuild, + portage-2.1.6.13.ebuild, portage-2.1.7.17.ebuild, portage-2.1.8.3.ebuild, + portage-2.2_rc67.ebuild: + Bug #330937 - Make older portage block incompatible versions of python2. *portage-2.2_rc94 (12 Oct 2010) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 291cd6e16ebc..95f78fac4c91 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -20,24 +20,24 @@ DIST portage-2.2_rc91.patch.bz2 250560 RMD160 36b05ec34c54b302e103acdc2d0e1711ca DIST portage-2.2_rc92.patch.bz2 254176 RMD160 8bddfd9631ce62c90e2d03da6f5ad8b3a8ee1802 SHA1 98c7525f98f5087ddfa185b3350c6a759283ead4 SHA256 e2f33d02cbc097ca028c00c3777b024aa419de0db66c7e809bd346bfbdca8bf3 DIST portage-2.2_rc94.patch.bz2 256958 RMD160 54a64e03c9e0e638b631efebe2f26a84b78ebd7a SHA1 69ad1a44523672501cfd94ee86d8b4c3b7f49268 SHA256 02773890cb3483b140efe38b25b77269603826ece3bb36c47dd9ed43e01f66bf DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f -EBUILD portage-2.1.6.13.ebuild 9835 RMD160 9156cb9799ccb3e90c547bf31e4a5d19bac0a922 SHA1 9ac95c12ad9adae2cbfbb8260a98d966b41c5145 SHA256 366b35c2a71f7fb656f0d13834e41cb6b8012a96887c36be97388983c0b03a5c -EBUILD portage-2.1.6.7.ebuild 8512 RMD160 eb3e345ca2913e32911283820cf24a1353cbf32e SHA1 5d6f7ceae47cebb7fcf53d0dc3e2c76568e615a7 SHA256 6ad25eec2c4333685eed9aa39d3e323c9941c2ee6143b87837775c1f59c15190 -EBUILD portage-2.1.7.17.ebuild 10144 RMD160 d0f7754a886adb1ca5f67191850b5c3e55323a77 SHA1 28b5972adae5aee10181301860b2bbd375ca3662 SHA256 1ae99d927e265405bcb61c48fc6acb72ce86fc0a7b313ad354b1f32312ee1701 -EBUILD portage-2.1.8.3.ebuild 9220 RMD160 490daac2cc4a22597c399ba524ae40b608c7fefb SHA1 c675fb28e9830672d58e8a531130e0a823d92250 SHA256 54311690ec2ccead2ce49d7ada878a6b2f08a81e0f00336288069bd206b2a325 +EBUILD portage-2.1.6.13.ebuild 9886 RMD160 830a84ad6f5c8640f55351d67edeb1a1bf75e70a SHA1 29aa8a43789805fca31b5a32d98c082fe9f510a4 SHA256 e0ad29eeb0bda0c9c137bdc933e2b286990264364672498b56cc5e057ae7ba4a +EBUILD portage-2.1.6.7.ebuild 8538 RMD160 af018f60721b1d1e581d48e4ecadea2e6fe2a4e7 SHA1 7b9a758aba1f35784f55f2a14ad59584456e5ee6 SHA256 d29ccc18665540c61e5f65f09bd66b71c60c7d6e3e69613cdb47ccc3a4758745 +EBUILD portage-2.1.7.17.ebuild 10211 RMD160 8ab7618313d82254e1ec0a096c6246c78249b01c SHA1 53be95b09e2017f3b27a4da5dd35ed13d318d46d SHA256 0c0a133bfaf1e8854a907d2898b34523bceb9c9c55d0b4a65477950aa27d861e +EBUILD portage-2.1.8.3.ebuild 9288 RMD160 8a26eed38f21c7d9ba7cdc7b698bc3bb3e2082cc SHA1 f700cc590175eb370799fb233cb7c60131f5d063 SHA256 5e5f7d51fc0881a4e2a836ea27f2ef51378acf217bc8ec5302e82f780fe4c2c8 EBUILD portage-2.1.9.14.ebuild 9760 RMD160 27657bf38b45aac9ddbdfabd5c4a107738c973e3 SHA1 1176140f2079129e6184c9a602b1112808b21c10 SHA256 8661f253166cd4bd4204bc674fc72ebdf533b0285ef58922f9e20bccd51571cc EBUILD portage-2.1.9.16.ebuild 9760 RMD160 6e34e37ddfaeaf136aa1447197c5c45a33937fb8 SHA1 49d32b01322af3d345698b05f3087c53ce8ce509 SHA256 08f1dc9bd6c5dcd9c0f4efd70dfeda96a4833c6d8f8f53b8781db67a2184aa95 -EBUILD portage-2.2_rc67.ebuild 10634 RMD160 3e9604c6105b684625ff72446cc1915ed4a2610a SHA1 391ee47e7850b29070492b07b68c84b30e0ebdcd SHA256 516c4abf53797fc96eb72c7004b83895246f0827385ed095d78bea4171370815 +EBUILD portage-2.2_rc67.ebuild 10701 RMD160 09eeaf053c359828bb5597b68f32efc96e181116 SHA1 403132c4dc71450809a9f2f4b3c49ba0125a3223 SHA256 f4cc6bfaef1c0bdcf4afa533b82ab67fc3132f6e5f1916ed70a522a4c03310d3 EBUILD portage-2.2_rc89.ebuild 11314 RMD160 8f3f77788eb8ad6a33b2caf9e76b6328087c3aab SHA1 f76162892105afa6764d7370b1b51522427f26fc SHA256 2d2bf43d49573709a68e03124e54916f851ab0034d2128e6f25091e1405fe6fa EBUILD portage-2.2_rc91.ebuild 11584 RMD160 d50944019de56667b1400bdf4bf2f4ba5f89c565 SHA1 ff36a97730786ac0935f2da179c47fd37ba3ef44 SHA256 86903b436f3fd937e7085fdcd4bbc79cdd1d79ded58b92ded1bfd1c6f11ebac4 EBUILD portage-2.2_rc92.ebuild 11584 RMD160 8e7e53b600b91d24467d571b2ca892bf69da75cf SHA1 c036c514bff860035b68293414e55a37c7132bf2 SHA256 9342c5bb43c605d7adc38b42cc5dc0da7502952f94886c95bada6d9de7c83014 EBUILD portage-2.2_rc94.ebuild 11584 RMD160 bceb5e640947e5133537e14acff07facce17e25c SHA1 fc10baba31c575111e6ca4189a9b107589192795 SHA256 1382088f631f449cdd4ed6c39ff6fd888178947cf8dacfe23fbcbf6647fd17e0 EBUILD portage-9999.ebuild 10641 RMD160 88a29c154394f1a3b5aa1313dcb9533b99cd11c9 SHA1 a2b3f474ca80a6628847a2cea2919b4f95f16aef SHA256 accd165113a7f06f0485e485e926c542a42fd0b216e10b7a9220311b87d9f4ba -MISC ChangeLog 36247 RMD160 2d36131ca8ab5a3da2f14d9718b506772f3016c8 SHA1 2e7bf4df71e3bc76c68bc52e218791a20594f714 SHA256 2db611f0dd4df0e334afde48c77a5e71c0e5bbdc0da1019ef8ca3de6308b5081 +MISC ChangeLog 36497 RMD160 ee2c71c45dbc7d3ff5cd91530770e9e11e085077 SHA1 fef538071f3ffca68778b89efd70d9e904910f4d SHA256 bef76f3ccb4e3975cbac55901204a1bf95aa2f9fb1ec06181ba26d1211fb4fe7 MISC metadata.xml 659 RMD160 7ee0e47eb8f485c2a0d45164b90e0aa4f91bd738 SHA1 afeb226c303b15eb2157cf9f97293c77f92a2919 SHA256 e141c1ecbca4c7c97009ecf16a70628c0470f291683c788dfed5d06efcd6ae2e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkyz//UACgkQ/ejvha5XGaPFCACfUm0HRJz8z7bTzNVkWtXuDtF7 -UgkAoKdNQA6rnd1XfSdgzlyaFXjYxh8P -=6XoY +iEYEARECAAYFAky1C8QACgkQ/ejvha5XGaPo3gCdFD/lTUj3CgyBelnHLEnUFSTu +/xQAoLBKREavaf8vdg94YQOpSfFW/O6+ +=PffP -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.1.6.13.ebuild b/sys-apps/portage/portage-2.1.6.13.ebuild index 445ca35ca9ef..e5c778f3e17e 100644 --- a/sys-apps/portage/portage-2.1.6.13.ebuild +++ b/sys-apps/portage/portage-2.1.6.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild,v 1.18 2010/09/13 18:08:23 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild,v 1.19 2010/10/13 01:30:40 zmedico Exp $ # EAPI 1 since python-2.5 is also EAPI 1. EAPI=1 @@ -22,6 +22,7 @@ DEPEND="${python_dep} epydoc? ( >=dev-python/epydoc-2.0 )" # the debugedit blocker is for bug #289967 RDEPEND="${python_dep} + !>=dev-lang/python-2.6.6:2.6 !dev-lang/python:2.7 !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) diff --git a/sys-apps/portage/portage-2.1.6.7.ebuild b/sys-apps/portage/portage-2.1.6.7.ebuild index 727a3861a1b1..6ce689460928 100644 --- a/sys-apps/portage/portage-2.1.6.7.ebuild +++ b/sys-apps/portage/portage-2.1.6.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7.ebuild,v 1.17 2010/09/13 18:08:23 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7.ebuild,v 1.18 2010/10/13 01:30:40 zmedico Exp $ inherit eutils multilib python @@ -20,6 +20,7 @@ DEPEND="${python_dep} epydoc? ( >=dev-python/epydoc-2.0 )" # the debugedit blocker is for bug #289967 RDEPEND="${python_dep} + !>=dev-lang/python-2.6.6 !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) diff --git a/sys-apps/portage/portage-2.1.7.17.ebuild b/sys-apps/portage/portage-2.1.7.17.ebuild index 0510d514f773..45925fcb9cae 100644 --- a/sys-apps/portage/portage-2.1.7.17.ebuild +++ b/sys-apps/portage/portage-2.1.7.17.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild,v 1.13 2010/09/13 18:08:23 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild,v 1.14 2010/10/13 01:30:40 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -27,6 +27,7 @@ DEPEND="${python_dep} doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )" RDEPEND="${python_dep} + !python3? ( !!>=dev-lang/python-2.6.6:2.6 !!dev-lang/python:2.7 ) !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) diff --git a/sys-apps/portage/portage-2.1.8.3.ebuild b/sys-apps/portage/portage-2.1.8.3.ebuild index 63875d066e2a..9747db4110bb 100644 --- a/sys-apps/portage/portage-2.1.8.3.ebuild +++ b/sys-apps/portage/portage-2.1.8.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.8.3.ebuild,v 1.9 2010/09/13 18:08:23 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.8.3.ebuild,v 1.10 2010/10/13 01:30:40 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -27,6 +27,7 @@ DEPEND="${python_dep} doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )" RDEPEND="${python_dep} + !python3? ( !!>=dev-lang/python-2.6.6:2.6 !!dev-lang/python:2.7 ) !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) diff --git a/sys-apps/portage/portage-2.2_rc67.ebuild b/sys-apps/portage/portage-2.2_rc67.ebuild index 48f4548031df..b9c5ea43463a 100644 --- a/sys-apps/portage/portage-2.2_rc67.ebuild +++ b/sys-apps/portage/portage-2.2_rc67.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc67.ebuild,v 1.4 2010/09/13 22:48:26 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc67.ebuild,v 1.5 2010/10/13 01:30:40 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -28,6 +28,7 @@ DEPEND="${python_dep} epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )" # Require sandbox-2.2 for bug #288863. RDEPEND="${python_dep} + !python3? ( !!>=dev-lang/python-2.6.6:2.6 !!dev-lang/python:2.7 ) !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) |