2.1.10.34 version bump. The emerge --quiet-build option is now enabled by

default. Set --quiet-build=n in EMERGE_DEFAULT_OPTS if you want to disable it
by default. See the emerge(1) man page for more information about this
option. Bug #381649 tracks all bugs fixed since portage-2.1.10.11.

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

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 2edd124820c2cf4ef012fef270e1e5eda8b40cbe..302e4d7f5ea54e0bc4171e745aff466af814a671 100644 (file)
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.903 2011/11/11 18:21:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.904 2011/11/11 19:04:22 zmedico Exp $
+
+*portage-2.1.10.34 (11 Nov 2011)
+
+  11 Nov 2011; Zac Medico <zmedico@gentoo.org> +portage-2.1.10.34.ebuild,
+  -portage-2.1.10.33.ebuild:
+  2.1.10.34 version bump. The emerge --quiet-build option is now enabled by
+  default. Set --quiet-build=n in EMERGE_DEFAULT_OPTS if you want to disable it
+  by default. See the emerge(1) man page for more information about this option.
+  Bug #381649 tracks all bugs fixed since portage-2.1.10.11.
 
   11 Nov 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
   Remove obsolete less dependency (bug #384663) and tweak style of

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index fb915b484d55842e9ef2bc614c6249cdd7aed349..44746f76668827991d647ab8e37e2701cc7db18a 100644 (file)
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,7 +4,7 @@ Hash: SHA1
 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4
 DIST portage-2.1.10.11.tar.bz2 849505 RMD160 ae1fae8df7e42978a988ae7f66c3bb335bfd31b4 SHA1 a0c35facd342cc32a4e713925809e72530b98ec9 SHA256 c9d47d2211fa5feec398bc155cf64ec911fb30eb11a32a9ae7ca38dbeb9b37de
 DIST portage-2.1.10.32.tar.bz2 907107 RMD160 69f6b34d051a1ba3bafe8c80b3cb4d376e334475 SHA1 ff1d7a47a6fc11f4ad95b11744decb8ebb523e00 SHA256 d67b3b9ae868e8e8087f43f146ae41431604cf0fcbd3a0495bd8167239c62da2
-DIST portage-2.1.10.33.tar.bz2 909680 RMD160 d58a3af629fafed4aff2c4e0eade59898cffd9cf SHA1 c01bffeb96c7d401d0d2a152fcc34bb785c2d307 SHA256 0c30a4e5b5ba3807998b5d2444cdf8a94860f15cc5377da63de87acbbc89b773
+DIST portage-2.1.10.34.tar.bz2 909716 RMD160 2c0e20e61610455de0052d4838234afc5ba9686b SHA1 4503f44f6ff8697278ff43d7e765395866771d80 SHA256 4fae827653cc4a8848d37fcc2194af3ac35b5372dcfa599e494c79bdf5d491a5
 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,7 +15,7 @@ DIST portage-2.2.0_alpha73.patch.bz2 24261 RMD160 438328cac093ceb040c85f2c674c0f
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 EBUILD portage-2.1.10.11.ebuild 11660 RMD160 4d52b4ce74bc553ec0f3502bdc03ebfa0d953825 SHA1 7767202cb8ecca952a31c2d5db89734a94561d61 SHA256 14b7bc6fd709f7a1f00de22bc8dfb3288e3cdfde561ff412d56621fc7a8126b5
 EBUILD portage-2.1.10.32.ebuild 11641 RMD160 08c8ed272d69469ef793f66a27fb32f3d59e6271 SHA1 945f6f0c76f7dccc5a377349ed4bec73f5f86925 SHA256 c2515e82c1e7947b2d6440449d81950d5a2b9c28f529d5f5adbd9004868d2815
-EBUILD portage-2.1.10.33.ebuild 11641 RMD160 770a40af2d391b08009f6619f834a77ad49d52ae SHA1 6ce8e2763fb6c9afa791f3631dda1a3b5a32a87d SHA256 17c1d094b21781900563a6efc1c133440e448f1bedc76969e66bd08c36990d2a
+EBUILD portage-2.1.10.34.ebuild 12159 RMD160 f0c9238a94511a83e5bb1ecdc27fe3f68f2ab388 SHA1 38e198500258dd663dbf98076b018544cdffb7ef SHA256 21716ca3d0b3e4541f09eeb3887d9c766a79c0fcb3009480f4f04bd2ae304e82
 EBUILD portage-2.1.6.13.ebuild 10084 RMD160 63d739515373e5535beb8dc325c934c64d713a3a SHA1 ba95493af4cc94e8d4a84db95d5fcd0e453aa364 SHA256 c0c3f9c3665bc51a599615f8e58d03246a8e77447aa234135fbca7cba2c96d1c
 EBUILD portage-2.1.6.7.ebuild 8735 RMD160 24a4e2901f34cc9e6163759d386f74d644020cb8 SHA1 4d5a52aa90da31a65ace19fbe792ff9d65a6e9c5 SHA256 3953088ecfbc137ebeaeeda89fae22898c01430901473bfc014e6afd8a2b47f3
 EBUILD portage-2.1.9.42.ebuild 10283 RMD160 60ac7fd535e83626095d2ef11466da8e8aa9b209 SHA1 b204bf62ad13b3c3d116fff53bc7a482eb89b7d8 SHA256 1b7968c34b0fc83aa1b388540a155340fdeb93df19de4515826af205fbcb9a3e
@@ -23,12 +23,12 @@ EBUILD portage-2.2.0_alpha51.ebuild 12928 RMD160 72acaaa06c2d1c170b17ae9449ed9f9
 EBUILD portage-2.2.0_alpha72.ebuild 12906 RMD160 c367bedf3afe792184f9f0ebedd844cb227a805e SHA1 d6eae77a17c34b4e84e4c43375e8d6290373ab29 SHA256 cee4246dc475570466107c40d647b04dad0f0e0574d6b0d23f904813e40b4f77
 EBUILD portage-2.2.0_alpha73.ebuild 12906 RMD160 c2c5a22004a5cfa8e1fb49b186cce66f33fa0b2b SHA1 f1f5c0f2c8b62ab2623e63d9f979b570ae4f912b SHA256 34da0d5ef74a608c1e936f4a6bf8d3abf438f83c876de9f35f6af8fcef94567d
 EBUILD portage-9999.ebuild 12205 RMD160 32d7e87fe7000f9d5d9134de572bb4e01e8ffe87 SHA1 016634eff2cacc538d086466d6f3f7fcfb517d1d SHA256 a3c20cf1c4e22898f25b26e2e7c12a03bb6f5aa33c802d6b5b5c619cc71253a8
-MISC ChangeLog 63134 RMD160 b1ee876b94b9dab9d6c161f9455e04ee16712cf1 SHA1 dd93c27f4844851ef900bd7a856b402486bfab3a SHA256 053e81bc682287835e7f370740e6537988f712aeb7fac45ffab9a557646dcf46
+MISC ChangeLog 63570 RMD160 a5f69d5573b2606fcc9d7ee7ad1e0643f436336b SHA1 9a9007e707469b9d44e7621ed554fa97c7837cc7 SHA256 595e1f57042a0c92eec83888314abf556ddbeb7697b079fca38357e579e12264
 MISC metadata.xml 784 RMD160 ed548c07d0a96be62f1854b92abb4ebc0ae2f281 SHA1 338c4eb3cbb626b8830eddb2f0ef23a48b1c9e12 SHA256 3ec8e42f1532859a3697a5870febeb90c635740da85cdf8f913c7529dfc767f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk69Z8sACgkQ/ejvha5XGaN40QCfRusd0tnxR1yhZP/8Znjs/VZS
-uQ4AoOETIsICUHApc1hmD3ulB1eSdXM4
-=9fA7
+iEYEARECAAYFAk69cbwACgkQ/ejvha5XGaP/zACbB/kjAWwB7i/IRFhOEOH4joOY
+gSwAmgOruIIkME/HysjiHcNJIeY9NsDx
+=Ru6M
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-2.1.10.33.ebuild b/sys-apps/portage/portage-2.1.10.34.ebuild
similarity index 94%
rename from sys-apps/portage/portage-2.1.10.33.ebuild
rename to sys-apps/portage/portage-2.1.10.34.ebuild
index 9cf390db2296efb1717af0d723367e7eaa7e0943..3233b14c5e9fe648c8371148cc25a9e6557d382f 100644 (file)
--- a/sys-apps/portage/portage-2.1.10.33.ebuild
+++ b/sys-apps/portage/portage-2.1.10.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.33.ebuild,v 1.1 2011/11/10 06:05:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.34.ebuild,v 1.1 2011/11/11 19:04:22 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -329,8 +329,11 @@ pkg_preinst() {
                chmod g+ws "${ROOT}var/log/portage"
        fi
 
-       [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
-       REPO_LAYOUT_CONF_WARN=$?
+       [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" \
+               && REPO_LAYOUT_CONF_WARN=true || REPO_LAYOUT_CONF_WARN=false
+
+       has_version "<${CATEGORY}/${PN}-2.1.10.34" \
+               && QUIET_BUILD_WARN=true || QUIET_BUILD_WARN=false
 }
 
 pkg_postinst() {
@@ -338,7 +341,7 @@ pkg_postinst() {
        # will be identified and removed in postrm.
        python_mod_optimize /usr/$(get_libdir)/portage/pym
 
-       if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then
+       if $REPO_LAYOUT_CONF_WARN ; then
                ewarn
                echo "If you want overlay eclasses to override eclasses from" \
                        "other repos then see the portage(5) man page" \
@@ -348,6 +351,17 @@ pkg_postinst() {
                ewarn
        fi
 
+       if $QUIET_BUILD_WARN ; then
+               elog
+               echo "NOTE: Beginning with portage-2.1.10.34, the emerge" \
+                       "--quiet-build option is enabled by default." \
+                       "Set --quiet-build=n in EMERGE_DEFAULT_OPTS if" \
+                       "you want to disable it by default. See the emerge(1)" \
+                       "man page for more information about this option." \
+                       | fmt -w 75 | while read -r ; do elog "$REPLY" ; done
+               elog
+       fi
+
        einfo
        einfo "For help with using portage please consult the Gentoo Handbook"
        einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"