2.1.11.16 version bump. This fixes a regression in 2.1.11.15 which would

trigger merge failures on FreeBSD when chflags needed to be called.
Bug #431026 tracks all bugs fixed since portage-2.1.11.9.

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

3 files changed, 16 insertions, 8 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 19120a44c2af..f18b563bbd6c 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,14 @@
 # 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.1091 2012/09/12 08:00:36 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1092 2012/09/12 08:24:46 zmedico Exp $
+
+*portage-2.1.11.16 (12 Sep 2012)
+
+  12 Sep 2012; Zac Medico <zmedico@gentoo.org> +portage-2.1.11.16.ebuild,
+  -portage-2.1.11.15.ebuild:
+  2.1.11.16 version bump. This fixes a regression in 2.1.11.15 which would
+  trigger merge failures on FreeBSD when chflags needed to be called. Bug
+  #431026 tracks all bugs fixed since portage-2.1.11.9.
 
 *portage-2.2.0_alpha126 (12 Sep 2012)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 2f859ea26edf..f6b899669ab6 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,7 +3,7 @@ Hash: SHA256
 
 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
 DIST portage-2.1.11.14.tar.bz2 817003 SHA256 1c5fd7a68e7317ea6202431af527844bb21f9b9f9423454a9a9eca2b6e92758a SHA512 7d4391f8f5484aab815d08a5233f5bc5fed944a1501a14ef62a9864f825da222edd54ab441469d4eab13f85b29dad7354c87d268321d0a330b22ed76cf1e2d88 WHIRLPOOL ea2df719251fa92ad834fd96939895a5122901a96610ad8580cc638425c7fb88073721c4a5d1770bc12a43c97d3aafd54555862f55aaf2ca2a03c388a844b72e
-DIST portage-2.1.11.15.tar.bz2 818637 SHA256 cc19ceea4687302643e300d68a5365357bff4c52b7acc8e86a2b4cefba9cf2bf SHA512 2aa262662db5d3fcc40efbd8f44205304c94433842311576c680d3b978fdd62796432002d77d44e67b590080ef2b4e158ea9bcdae274eb605812d21b31635aa6 WHIRLPOOL fee9a91d310646a34954c2f4dd9f5eb69d8a09a0e7f057951a08989e8c465172b75b040aa6615403b1a379c2a208375f97ac41dbc6fbd19737917724ca2d9ba3
+DIST portage-2.1.11.16.tar.bz2 818379 SHA256 ece9dff73f33f0d9fda4059c4bed84ec9ad0e834b67b5a87b808640178059c0b SHA512 37433dc3f535baad31a74cb6c05047bba0b903ce78d56da9de0bf58a83fa228850d0fdbdd1625c86965249d8f0f6b97e86a472a2cfb058d34aba514c5361c9eb WHIRLPOOL 65b8749f234825ee9a07d05df16eb70eef5a4509bdd5377b359a8cfceace21f838c4f4158ea49aee813ef0b58afba3b99da23deb30b457b9b96a5697e037639b
 DIST portage-2.1.11.9.tar.bz2 844344 SHA256 590ecdae12581e0ead0eca6e4b8e0ca6bc5f1ecaafb98a5d3b684db5b1af7a05 SHA512 64919b833a719f6f1de5bc3ec8a921dd5fca75ea8c4535ce21faa608ff2bf811632ef627845e9b050fcd1ebf56f5792c7bd471925e75c1264d01277979d704a8 WHIRLPOOL d325c2b5ec50cde40f4b2ce127728b3712321febef58897b3141287776424610bd12701c159f15c5cec41f2eb35569e302a5692045406205e833f8e4cfd3d9fd
 DIST portage-2.1.6.7.patch.bz2 50118 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0 SHA512 dd2acc1d436cad77cfc83c4dec79316763c1fb88d61b7702e8e47e6f31b2b9fe49e8a4cf4a947614a2acd6db2ef080ed8b4ae5fce9d9be29d7e218a0ec1576c0 WHIRLPOOL 050f923249fde7c4774a2a8a944889e4270a89b00441f1923c01ab0be38f107503e018d7ab7a7f42615e7e375f0f6c0eb3bdbf3ff4ce1ce226957238a729b1ee
 DIST portage-2.1.6.7_p1.patch.bz2 4741 SHA256 ddaae2ad8c01e6477bfe22e23a4da57eb9d079a27a17a08385d56fe2c49eec30 SHA512 39058d815827b340787d813515ed4fb8c52c4fb0caa12ae70c8a9a97b9ba16c2bf4177190cb7d1c508055ce8a7aaa390ba9b31642c7d74bfb4a14d729e720617 WHIRLPOOL 8eab9574ed2e6cabac593d93f8b6ff71465c01376e7eec4cf357c336b5ed3d4f3fb3521991148ba4e34ba00c56bec5534c98311167c03866812277a8d88b0494
@@ -15,19 +15,19 @@ DIST portage-2.2.0_alpha125.patch.bz2 9960 SHA256 4fa98f81b734b54d02a8ed565614a8
 DIST portage-2.2.0_alpha126.patch.bz2 25313 SHA256 fb7e93d87321760de588449735e9d269b0c802d399cb9f62ce47b9caea73b390 SHA512 b5344647b31af204e15b1770cbdc58147ef9b5f4600f80d6e649636157acbd3656258637a8b300f107741dc68cbab4ad637bbd337fafceace4b3aa6984c4813e WHIRLPOOL 1557230cfa3614d83aad06f376c7bd812bbaed118d320522ac4a1c9e8f33b1b824e819715da1ee661b540a2ce7bf50954e80f14290920e7a9c467d71599372fa
 DIST portage-man-pl-2.1.2.tar.bz2 53893 SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f SHA512 5f5c8dd1559048546633b1e7291ff8c0f5d637595f1a4c98405424b08c30c089fc9359e0214f78fbe358754f20d327794f4692b9b67639585c29b755975ee853 WHIRLPOOL 756e267b84077501d976f46fa448cda5368cd52aeca6ec43d109c81fe8e2364e0cd0f35630d68a4186c70e3b440b7c870b86ac7ef83cc0afa43e10f9f8e1f422
 EBUILD portage-2.1.11.14.ebuild 9673 SHA256 c05bba4f7371ef3a40d76b3b70b4a946b09e4f311f9411ebb0c6dd67e6c9010a SHA512 3b8a7b1be6a2cc4bdc2ef04d998443e1dac4946e163e151aa430d393560f688738597c9f7355d010a19c580f3085c5456958224857f24f2046f89fe6d5fadf30 WHIRLPOOL ff3b081a8408986c6fb9ccb584373a33a8bb46246a9a6b979a51e93b8456cb0192266def796c8b72ce45e06a692f9c4f22918e74703e544b42520ac405fbb760
-EBUILD portage-2.1.11.15.ebuild 9673 SHA256 9a6aa481960b0db05fc69b1cbfd4f051e75c5ea5ab1123006a06891b36099190 SHA512 52dedbb9a8a67923e9a05b833cec5dbfcabb7f77bfb3173e321a68ae139eaca0499568fad8b1ec0ba26454bbf32892d6c03d857a9408b7c157beb12eb7e2c611 WHIRLPOOL abbaa84f518f98cf5827c3ca0584289be29612af0cccc746d3f9e51919d7b9470451b6ab65d7d77f2a16078a9c91df296d59ad9c7692ef0ee0fe42ff62519d5e
+EBUILD portage-2.1.11.16.ebuild 9673 SHA256 1cc57dffcc438b2ac5114747fe78caa97544963466b40320b5b1a8379f7aba74 SHA512 e62b85218819fe2a470b0cb053bef5a2872de01df5f951533d2efe0db04fcb00126846732b22075fbc6b78a2e25ab7f8e6b6b832e6f8d5d1b412fa0c80364c43 WHIRLPOOL 0928c3576cc5525eda34a3ffd65df3758c5481278344e05c70a2d0a2bc0045057ef445d61de9345db596378ebe0e94519b4ab860e33467f672487b00c3907538
 EBUILD portage-2.1.11.9.ebuild 9833 SHA256 4b4e3df3e35a4cfba3fd3134d1dc16514e382af4474a42c925fae058440c197c SHA512 9cc3b74e87904575b7646cc1de33cadb249d7b1b03d6e3dda94a347c2ed27291d217ebcb4410cd520551289830d69c8a80a2a9a739c883a11cc9e8693f5c8335 WHIRLPOOL 4031694d504fa820b9470204d6d3297de7e98c5a6b087967977db0190326c0b6d52d611af4f3086f66a04eafa08edd277c259e4257d2ce7997a704533359c44f
 EBUILD portage-2.1.6.7_p1.ebuild 8392 SHA256 75dfa3bdb1100ca28ba46eb83e34ffc196cb3e57204e7b4f451cfb19a1644e62 SHA512 ac70b4ba9d658c4d79953088b2fdaeed8d0e31986ff7c649272c39a743ddfdf112e44d3f0f8078941c47a06b373002cfcd454100585d5bbaa807a2079b19eb8c WHIRLPOOL 57c26b40de86f3d6969fe66d5b1fd6df55f5478e03c855813ff83b1e485f99d1b34cbf30422b5b60986263cae4d4ee066daaa01c0166a04f53c7bb829fd214e1
 EBUILD portage-2.2.0_alpha120.ebuild 11951 SHA256 9530b793174de796ecf951a2808cb163005b605630b0455c57194e97f2a36dd2 SHA512 f6af265d8d9b1cbf884787105abb32335727c179d904fbdecba598878083f7384088a5db063aee4282afd4daa4d20f02466911d6c5625bf538c7cdb437026866 WHIRLPOOL 93daa1caa5b31023b1fbb11e8baabf1abced715c879acdc1bb578f75dc58d3737e23bba2c9fa3bd69702810640e47a1debbf3464d16db7a6f68a3d37799b3b76
 EBUILD portage-2.2.0_alpha125.ebuild 11774 SHA256 ef50c78bc9a4867f23bc3ce4292f65586be0a57c73dd334e859349898b92bf35 SHA512 e1a4f06024e5973d6c4c16b1210f3896dfff236300c01a6f6fc4fdaf0d9bb76dccbfb42bcb61b00dca700edd487afce45d5df4d52eda06baf9b8fd422fe0d619 WHIRLPOOL e4f095fe3ecee98b7a5041d8f6bbfef2ab646c5e7da86ed876e44a85679e72ec346daa98d114c2228e239e5c41f24cd3c1ad3ec9bc27c9492bb96f82b29cacd9
 EBUILD portage-2.2.0_alpha126.ebuild 11774 SHA256 f0ad4e9f98e8424dce0645ce03c58e996fa7c0e36938acaf8fe83bd40b7d5e28 SHA512 f5c178b3f8d4d3d64f64acb677bfc95cabb008069c886451eface72d6ea96d6bd14c0417e095f84a079ffddba029c952b5509e31beb509cee79f54a0fe791309 WHIRLPOOL 17d31a158c05b257cf8d5b32b7ab79ddc55507371654146df6ad5784bef7bf2e8d7c783b358b735008792d6c4e61faf4cd1e36716d19dff7348413a728a92902
 EBUILD portage-9999.ebuild 11024 SHA256 08e1c594ca54d46a18b231a46416425186a5f21d2bbbd2edac55d775818ea8b2 SHA512 ddc74357dfd1d6fc9f48259e10bcf97dea69cc475404071b91da269798d474bd930d71f793145ea263ea6e0c2369a94f857f6b3976a41f70e17934440f3920af WHIRLPOOL a63765e46e7b530448c20dec5cb9e4029b34b5f7667accf8bbdef2ae0a783db7adf85ba31048e66fc8f14515168b2b51f77a8cbaa84a5f50bab6a0e991f6403c
-MISC ChangeLog 115036 SHA256 929fa346d2549559c470f568a8ce072b2ffb4d9e58ad208797012084cf1061aa SHA512 757d21d4ca15c980ef915f75e794f476b684befab8ddc7302194d6fb21d1e022a4ca483e96aebb4f64d9290eee42c8e4dfed7e59e8077a199570a6693a77ba8c WHIRLPOOL 6729b843e91f39a11a37c752a4dd12c0ebc71876a7f46ad6640e3ea577dec72b78938b3eb3bde03ec55052736c030942b80b0118a8060266e2b5829d23010f00
+MISC ChangeLog 115379 SHA256 1d3a8c8d1154afab74070a8447af8874472907048822350e9d7d6ad9178f45e3 SHA512 2321e9dffc83e17b729efe6689bec15849baf755e3f930459454bd02a3d768b9514430d436b4508035fb42d494d6f775be027ae71263e08691ad89583467d32a WHIRLPOOL bf5ca9fe9dea30823da053753cbe2a0126a683600eb54a6f3e0278efcee903adbfb6f365e107408be2480f0b47f8e57655454b06ff7825f50bcca3324a5a959f
 MISC metadata.xml 926 SHA256 23463fa1d9a37979e2dffb502fffdd4dcd5dc932f4b5b3053999609012e4fc65 SHA512 41478467f90c58d8044471ed85ad6365e976b8cdb43556f024345861d08f1e9ae2f2fc728d114521adece630793248f2598fa330233eb98ae7b42950cf056d08 WHIRLPOOL 1aff07692c1fbca18cd3498f1cac2e64749b784a3135d881fc4cb95040bdfb93af079df1e053a547cfe08ea4384268e36ec98fc25160ad94e6ef65c6d04e5452
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBQQSkACgkQ/ejvha5XGaOmXQCfbobOY1WITUZNn/+X5O/Hre54
-3VoAn0vNex/Zy0zXnV2Td+rc6iviLjyM
-=OvBS
+iEYEAREIAAYFAlBQRtQACgkQ/ejvha5XGaOSMgCfR/qzopYdmGJovza5pkJZ3Twt
+xXgAniB4LiV80LFeo4X25qVMRhyBFfss
+=uZGW
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.11.15.ebuild b/sys-apps/portage/portage-2.1.11.16.ebuild
index 8762d94d5e88..593434665972 100644
--- a/sys-apps/portage/portage-2.1.11.15.ebuild
+++ b/sys-apps/portage/portage-2.1.11.16.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.11.15.ebuild,v 1.1 2012/09/12 07:59:43 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.16.ebuild,v 1.1 2012/09/12 08:24: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.