2.1.10.60 version bump. This fixes bug #406867 (display merge list on

stdout, despite autounmask) and bug #415579 (regression in 2.1.10.59 and
2.2.0_alpha104 for ftp binhost). Bug #409383 tracks all bugs
fixed since portage-2.1.10.49.

Package-Manager: portage-2.2.0_alpha105/cvs/Linux i686

3 files changed, 17 insertions, 8 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 41063a7a0383..32996dd504f5 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1013 2012/05/12 00:09:33 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1014 2012/05/15 00:11:46 zmedico Exp $
+
+*portage-2.1.10.60 (15 May 2012)
+
+  15 May 2012; Zac Medico <zmedico@gentoo.org> +portage-2.1.10.60.ebuild,
+  -portage-2.1.10.58.ebuild:
+  2.1.10.60 version bump. This fixes bug #406867 (display merge list on stdout,
+  despite autounmask) and bug #415579 (regression in 2.1.10.59 and
+  2.2.0_alpha104 for ftp binhost). Bug #409383 tracks all bugs fixed since
+  portage-2.1.10.49.
 
 *portage-2.2.0_alpha104 (12 May 2012)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d5c7c5586623..4754c52cf98b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,8 +3,8 @@ Hash: SHA1
 
 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4
 DIST portage-2.1.10.49.tar.bz2 803941 RMD160 088a21151b66c7fdb4ed39c46b25fee1b4ecce9e SHA1 11322e216b6d6a2f753f45a150c3f618e4bf0c45 SHA256 b50cdbb4ececba27cddfe24d63517c73a32b905bcf3b7d55b692f6661247590e
-DIST portage-2.1.10.58.tar.bz2 822114 RMD160 530aa5ae2688229a60211ed16da75795e904354d SHA1 f74ccfb3b55248f889056569cd3f87eb0d7b6421 SHA256 ebc1be956839f3995055dcb2a81a1c589c860f966e5221cd40eb73774b91577a
 DIST portage-2.1.10.59.tar.bz2 822755 RMD160 076a035cd0ff5c055904d3ae7e6b5332841a5392 SHA1 df4526464205164d3dcea926932d6b6b2f3d1f8c SHA256 04b3bce44d187e63b08b5fec99feffde0cd34218f993f83447d58269b16cceac
+DIST portage-2.1.10.60.tar.bz2 830619 RMD160 4a895eb9704536b96bead6878ad5f86912656fe9 SHA1 fec65b42e4527b55e799f67f765f4527f16588ff SHA256 5c8cd3441e7269fde0adf4cd9217d13039b9490b6c183dbd0e2e493357680d80
 DIST portage-2.1.6.13.patch.bz2 177383 RMD160 ef6388ca4a55a7defb319d54c9d80625cb8e12dc SHA1 5298feb6f881c25abdbde4a353d341fd36fdee51 SHA256 2cc897b6fa43b3329ef51f6304c064237be6bc326f1f0c221a19c0f96b69cd9c
 DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0efb489 SHA1 02021be38b0f829d45b342483834652a1985a952 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0
 DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c63 SHA1 a28b191904296b551b22a7af83dacd1c336340a5 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647
@@ -15,20 +15,20 @@ DIST portage-2.2.0_alpha89.patch.bz2 4205 RMD160 ff17958771ee571ccc4560468288235
 DIST portage-2.2.0_alpha94.tar.bz2 813945 RMD160 1abe94ff71b33255f260458d1b57a00755ba375b SHA1 5a7affd3e97bf8692a6b33ef55268b2d708bd1b8 SHA256 2b559d5596ad748be4587802012d1dfd817a1b7b40242be1f0145bb0e39a6b35
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 EBUILD portage-2.1.10.49.ebuild 13076 RMD160 af9a90388420ed05de89b4a0f8213e1d2798a6c2 SHA1 3bc84dd26151c2ffe5798ca246b72ff560e00549 SHA256 055d962ea34d6784c27206aadb23868d54e30af98d713fa151eca1a6f2b18f1d
-EBUILD portage-2.1.10.58.ebuild 9733 RMD160 9ca6546a1ca9a1e8f884d700a239ef6f91915b11 SHA1 8c19a26093394a3dc9eb0fc08c9b757626f12b06 SHA256 1e6f44f60b3d5af2520e39b6148514fcf05be53c4ba7fcbcc9fb091a65786a84
 EBUILD portage-2.1.10.59.ebuild 9733 RMD160 60106bf8ac3cc34dbd0560844aa47084a670457c SHA1 0269dfa7ca5fdea7f7614d0245789d09708d9403 SHA256 c6ddefa4dfec2c5e4ccd2602c7f18639bcd0ba7f3bcf9865124896e9054f85c5
+EBUILD portage-2.1.10.60.ebuild 9733 RMD160 9c986d87b9c2262545fbbe086f1786d9a34d2c52 SHA1 1042059812246d6e2b0b3b3844c679bc36ab77a1 SHA256 b95369865406da79649dfab8bee1c5b028b4034d80ccffd1d01304ac3e831dd9
 EBUILD portage-2.1.6.13.ebuild 9923 RMD160 d27d0aec5dca631deb00f9dc0d415e5d3b3b8140 SHA1 c88f3873cdb95dea9dc2f66101d43ad370254bf9 SHA256 6b4794c017d59118697193c9cb208285c13eb6bf377eb97546c5c072b7073048
 EBUILD portage-2.1.6.7.ebuild 8574 RMD160 b7d3514fa7042b756c3b9d4bb91f5c696abd27c1 SHA1 4f6b8bac1f951311382b1c8f92969c71e54fb4f1 SHA256 08a1ef8de3117a1e48d7650cbce7828c8d1e8855ebfb5081b4069086bc189d26
 EBUILD portage-2.2.0_alpha103.ebuild 12447 RMD160 6e483b0d5cc3cd13f86500026245454c61d360c6 SHA1 ec055fce4fc076860cd1aca75484388b27536681 SHA256 46e4c45cae000dad946c77c46f72c2092ed98b92522c0b762e41648c02d33076
 EBUILD portage-2.2.0_alpha104.ebuild 12447 RMD160 3f69f3bba7f7bcc5ced70fe06fbd195c9864ef8f SHA1 f088562630f8715a95a86d4560bb5871c9e41c83 SHA256 4b42ef881f0f25ed916d64fc7f8183cbdb48a792872e039117daca98a29f2bb2
 EBUILD portage-2.2.0_alpha89.ebuild 15740 RMD160 488c3ae4e6afb1fc1c03fe746466e0fbdb4f0770 SHA1 1ccc3403ec313a21a0016f79b2c11eca5f7235d6 SHA256 c0b562a3f7b52f202e4c0e7b814ad3de869c22a3e9e7429d7858909e136baf08
 EBUILD portage-9999.ebuild 11696 RMD160 10990256aa32009717c766ce070f51c09243c78a SHA1 4cb6bf17d6ba77f03cacebfec3eaa4144537fd85 SHA256 183f3f0ceef25196aac7853cb565bef689b240a890fcf723c64b44c36840636d
-MISC ChangeLog 92608 RMD160 7b52104123453223959de60d9aa5be10867958e5 SHA1 a5bbc38bc2954d1ec87ed7d1f7e45a20e472da4e SHA256 20e6745dd992b61f6045fc0f9255654af3bc0a320b4f24850813db4cb40c17b4
+MISC ChangeLog 92989 RMD160 bc24e0ec987bbb2b4637d22a77675870c62ed862 SHA1 f6faa3db9063d2cf44dde03daae40f35037ba8b8 SHA256 866bd6108e9959d3a58344b640283cbf7dff6d7a38504c625bcde8d59e1782df
 MISC metadata.xml 926 RMD160 9fd2d499d8102a870e45e63ec68400d71de950c6 SHA1 83f8455f45d0baaedcbbd3fc0186cccad54af7b9 SHA256 2609962ab6a20df40f95053513e6aca76b24caee81e7b3f45de7e3c7e33eec25
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+tqkMACgkQ/ejvha5XGaMb8ACgjbWb+M8ul0BqfZQdQyxSfteU
-fFQAoMN48NtQzaGbM6GNJ+Yom5QvYym6
-=nwtc
+iEYEARECAAYFAk+xn0sACgkQ/ejvha5XGaO3/gCg6xiBetHdjiIVu3ceP2qF20+T
+3V8An2UoTob6dr0AT6No21EQ0G8WzfRW
+=kwkU
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.10.58.ebuild b/sys-apps/portage/portage-2.1.10.60.ebuild
index 96ba383a3337..cf6bfaaecc76 100644
--- a/sys-apps/portage/portage-2.1.10.58.ebuild
+++ b/sys-apps/portage/portage-2.1.10.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.58.ebuild,v 1.1 2012/05/09 23:09:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.60.ebuild,v 1.1 2012/05/15 00:11:46 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.