From 43b31c555a2cd7d9f505a5b9704a3a48f3ea59c0 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 11 Nov 2011 19:06:30 +0000 Subject: [PATCH] 2.2.0_alpha74 version bump. This includes the --quiet-build change that's in portage-2.1.10.34. Bug #210077 tracks all bugs fixed since portage-2.1.x. Package-Manager: portage-2.2.0_alpha74/cvs/Linux i686 --- sys-apps/portage/ChangeLog | 9 +++++- sys-apps/portage/Manifest | 12 ++++---- ...73.ebuild => portage-2.2.0_alpha74.ebuild} | 30 +++++++++---------- 3 files changed, 29 insertions(+), 22 deletions(-) rename sys-apps/portage/{portage-2.2.0_alpha73.ebuild => portage-2.2.0_alpha74.ebuild} (94%) diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 302e4d7f5ea5..49867b7e74f1 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,13 @@ # 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.904 2011/11/11 19:04:22 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.905 2011/11/11 19:06:30 zmedico Exp $ + +*portage-2.2.0_alpha74 (11 Nov 2011) + + 11 Nov 2011; Zac Medico +portage-2.2.0_alpha74.ebuild, + -portage-2.2.0_alpha73.ebuild: + 2.2.0_alpha74 version bump. This includes the --quiet-build change that's in + portage-2.1.10.34. Bug #210077 tracks all bugs fixed since portage-2.1.x. *portage-2.1.10.34 (11 Nov 2011) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 44746f766688..286e8049edb3 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -11,7 +11,7 @@ DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c6 DIST portage-2.1.9.42.tar.bz2 764537 RMD160 7bfef7fb167c986e36532416a0ed4b914f0a9809 SHA1 d5593b09781dae537198197adc3c1d7f7fb466f7 SHA256 1bd238065eca36aaae11607482ae43b20c64f338db7401a46c11ab56d6ff72ba DIST portage-2.2.0_alpha51.tar.bz2 848918 RMD160 84c771624d4f89d7017fd90d522a008e47b68345 SHA1 b8f09497e49af0e669014332511179c305fb4782 SHA256 3b695242c4a7f69d1b0863a82220ccd17512e018e404f279e2ddba7b7d29deb5 DIST portage-2.2.0_alpha72.tar.bz2 906984 RMD160 d7af4b5e566d2706fc5bb6334de0cde1d8b3adb1 SHA1 cd1ffa7b5a50a6b6f747cb238c1535530b08d061 SHA256 ca30c06aa33be96d67a05032e6cf0a34fee4454d5e5bc525e18e96fc764be9a3 -DIST portage-2.2.0_alpha73.patch.bz2 24261 RMD160 438328cac093ceb040c85f2c674c0f7ba0cc49ed SHA1 119b9ed6171cfcc9c8db512a5b8852e2a5d51d52 SHA256 aa92008aea1f268225fecc6b5c53a9ce5ecd815ce650d3f7c0b2e51bc78ad62f +DIST portage-2.2.0_alpha74.tar.bz2 909710 RMD160 43bd737fed5afebdda6a9809e9ba7e442beb0357 SHA1 f70b309a80da4456663920eb21bc4219924895ba SHA256 9552511676e2b714631a1ef20073268bede65a073a0bde73b51d97b0dd9a0202 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 @@ -21,14 +21,14 @@ EBUILD portage-2.1.6.7.ebuild 8735 RMD160 24a4e2901f34cc9e6163759d386f74d644020c EBUILD portage-2.1.9.42.ebuild 10283 RMD160 60ac7fd535e83626095d2ef11466da8e8aa9b209 SHA1 b204bf62ad13b3c3d116fff53bc7a482eb89b7d8 SHA256 1b7968c34b0fc83aa1b388540a155340fdeb93df19de4515826af205fbcb9a3e EBUILD portage-2.2.0_alpha51.ebuild 12928 RMD160 72acaaa06c2d1c170b17ae9449ed9f9bceeb0735 SHA1 195fc5ef71c91f86ec3329833e56543d482c7b7d SHA256 486a6a78bae63337695a134af3f6ff6462a01613b1f1848663cd2ca79cd59292 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-2.2.0_alpha74.ebuild 13028 RMD160 60c73e02cd61264dc712a37cc6d0edec4c466498 SHA1 69eb019bce7bfa6bf69289fd993a2b1a375b8c7c SHA256 f2ce0ece9d2ad14d3083c88e4dd156ac15efa3b5d539067e2332c01f0cc3fdbe EBUILD portage-9999.ebuild 12205 RMD160 32d7e87fe7000f9d5d9134de572bb4e01e8ffe87 SHA1 016634eff2cacc538d086466d6f3f7fcfb517d1d SHA256 a3c20cf1c4e22898f25b26e2e7c12a03bb6f5aa33c802d6b5b5c619cc71253a8 -MISC ChangeLog 63570 RMD160 a5f69d5573b2606fcc9d7ee7ad1e0643f436336b SHA1 9a9007e707469b9d44e7621ed554fa97c7837cc7 SHA256 595e1f57042a0c92eec83888314abf556ddbeb7697b079fca38357e579e12264 +MISC ChangeLog 63875 RMD160 7249270b312a86b863434bd36e9f984ee665acae SHA1 e40b852db9fd1ae12b0196aa6618b73ef1952052 SHA256 fa371b5ae38ccfafcb19371f0365fb961238a718f446fa46e9c01c3c026b84e2 MISC metadata.xml 784 RMD160 ed548c07d0a96be62f1854b92abb4ebc0ae2f281 SHA1 338c4eb3cbb626b8830eddb2f0ef23a48b1c9e12 SHA256 3ec8e42f1532859a3697a5870febeb90c635740da85cdf8f913c7529dfc767f2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk69cbwACgkQ/ejvha5XGaP/zACbB/kjAWwB7i/IRFhOEOH4joOY -gSwAmgOruIIkME/HysjiHcNJIeY9NsDx -=Ru6M +iEYEARECAAYFAk69cjwACgkQ/ejvha5XGaOEJACfY2jbrjtquDmKUlisEblJTeZ6 +b4sAoLle9cdPQcR7W6nH4cvZGRDTergl +=zj4n -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.2.0_alpha73.ebuild b/sys-apps/portage/portage-2.2.0_alpha74.ebuild similarity index 94% rename from sys-apps/portage/portage-2.2.0_alpha73.ebuild rename to sys-apps/portage/portage-2.2.0_alpha74.ebuild index 2e406eb9f7c2..984b7ff44e72 100644 --- a/sys-apps/portage/portage-2.2.0_alpha73.ebuild +++ b/sys-apps/portage/portage-2.2.0_alpha74.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.2.0_alpha73.ebuild,v 1.1 2011/11/10 06:07:09 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha74.ebuild,v 1.1 2011/11/11 19:06:30 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -61,7 +61,7 @@ prefix_src_archives() { PV_PL="2.1.2" PATCHVER_PL="" -TARBALL_PV=2.2.0_alpha72 +TARBALL_PV=2.2.0_alpha74 SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2) linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2 @@ -320,21 +320,21 @@ pkg_preinst() { rm "${ROOT}/etc/make.globals" fi - has_version "<${CATEGORY}/${PN}-2.2_alpha" - MINOR_UPGRADE=$? + has_version "<${CATEGORY}/${PN}-2.2_alpha" \ + && MINOR_UPGRADE=true || MINOR_UPGRADE=false - has_version "<=${CATEGORY}/${PN}-2.2_pre5" - WORLD_MIGRATION_UPGRADE=$? + has_version "<=${CATEGORY}/${PN}-2.2_pre5" \ + && WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false # If portage-2.1.6 is installed and the preserved_libs_registry exists, # assume that the NEEDED.ELF.2 files have already been generated. has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \ - ! ( [ -e "$ROOT"var/lib/portage/preserved_libs_registry ] && \ - has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) - NEEDED_REBUILD_UPGRADE=$? + ! ( [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \ + has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \ + && NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false - [[ -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 } pkg_postinst() { @@ -342,14 +342,14 @@ pkg_postinst() { # will be identified and removed in postrm. python_mod_optimize /usr/$(get_libdir)/portage/pym - if [ $WORLD_MIGRATION_UPGRADE = 0 ] ; then + if $WORLD_MIGRATION_UPGRADE ; then einfo "moving set references from the worldfile into world_sets" cd "${ROOT}/var/lib/portage/" grep "^@" world >> world_sets sed -i -e '/^@/d' world fi - if [ $NEEDED_REBUILD_UPGRADE = 0 ] ; then + if $NEEDED_REBUILD_UPGRADE ; then einfo "rebuilding NEEDED.ELF.2 files" for cpv in "${ROOT}/var/db/pkg"/*/*; do if [ -f "${cpv}/NEEDED" ]; then @@ -368,7 +368,7 @@ pkg_postinst() { done fi - 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" \ @@ -383,7 +383,7 @@ pkg_postinst() { einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3" einfo - if [ $MINOR_UPGRADE = 0 ] ; then + if $MINOR_UPGRADE ; then elog "If you're upgrading from a pre-2.2 version of portage you might" elog "want to remerge world (emerge -e world) to take full advantage" elog "of some of the new features in 2.2." -- 2.26.2