diff options
| -rw-r--r-- | sys-apps/portage/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/portage/Manifest | 16 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.1.7.16.ebuild | 21 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.1.7.17.ebuild | 21 |
4 files changed, 59 insertions, 6 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index b2adba195a3a..d04e17a5cb99 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.670 2010/02/07 02:11:42 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.671 2010/02/10 00:49:49 zmedico Exp $ + + 10 Feb 2010; Zac Medico <zmedico@gentoo.org> portage-2.1.7.16.ebuild, + portage-2.1.7.17.ebuild: + Bug #303211 - Add a ewarn message for people upgrading with + PORTAGE_BINHOST set. 07 Feb 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> portage-2.1.7.17.ebuild, portage-2.2_rc62.ebuild: diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index b395e0ad9520..42c7d8fc24ac 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 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 @@ -13,10 +16,17 @@ DIST portage-2.2_rc62.patch.bz2 104266 RMD160 85f117fe7dc58cca4b1497b88cb8e755b9 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f EBUILD portage-2.1.6.13.ebuild 10249 RMD160 5b09a3d3eda1bebec6634d8735697bda8289d989 SHA1 131ca76d9630d3a832f003134093a9623028e795 SHA256 e51275ed74c2fd58dd987aba0ddb06b609e733eada680c7ed94440d45cf233af EBUILD portage-2.1.6.7.ebuild 8901 RMD160 5c40ca328a0e24bcc3b04a3c611c09f2f8248c23 SHA1 118de80c813cbd187ba33266b4bac32e43d7e46d SHA256 7478716e9c0d8e2c8deec1f5c6f47ba684b1a7efe3e5f3b9c544f28122fea300 -EBUILD portage-2.1.7.16.ebuild 9149 RMD160 6d2ee060e55bcf60b65e56cbc58628756aaef789 SHA1 bc05d73e8bbd194f54d2dd4d56defcc49206f529 SHA256 fc61737640c8dfd65cbd71243d654e5b399d0afcae74322700ef68993f5ba920 -EBUILD portage-2.1.7.17.ebuild 9218 RMD160 d1037c411f6106c819686090e35dcd376b2ccb51 SHA1 e3ef5425625043b16e790814f3a0911fdb152c58 SHA256 cb9f8b9eee380b3132926068f14d14d8b2a509f40ea168539494b7016c2a7b89 +EBUILD portage-2.1.7.16.ebuild 9966 RMD160 1b4edff0d624f438ae2a1c7260c578c49cdb9891 SHA1 aca572ebcc8d54bc1c80172026b1b52bb2e4309d SHA256 0da17945e36eff04d784ba35a639d90fcd1ada19739951b465907ae362fa0810 +EBUILD portage-2.1.7.17.ebuild 10035 RMD160 a78d717b8c2a8381f8c5e634f12fca5cef1fc9ba SHA1 acd361a5615c3abd76ec75a90e18bf6b72c1f88c SHA256 d41b1f05dacc9c2bc20f6ced71e043c751bec8e47e14be8ecadbbbfae3881346 EBUILD portage-2.2_rc33.ebuild 10657 RMD160 cbec6b53aee00d355c8965cb967d557467705dda SHA1 91b4acc0c25014324eb0cb4c8117a8e3a47b1103 SHA256 7ac2424fea034a979caa48bc5c2596cf0a6511271b4f81b8e9c26f2aee80e4b7 EBUILD portage-2.2_rc61.ebuild 10891 RMD160 b4433a55b6edb85d93780b8c7b2839bfcc2337ce SHA1 945b85d19ee85afe295645ec8b855efb456e828a SHA256 c54625210a18566cbaa5bd25edd0515a7f9035b755aac9d89dc7387a87225f3e EBUILD portage-2.2_rc62.ebuild 10949 RMD160 1f6107144e10f2ee78eea8b139cc6589ba8a2cda SHA1 bc4cce429ef2061849fb264250bf05ebf8305d9d SHA256 3a6eb49053119279fc08534158bd74a53cc1096fcba78ccda3ab8a1bcb13c1ea -MISC ChangeLog 56375 RMD160 33cd44611c68fd316e2bf0d6ccd25aa89b7b8212 SHA1 5b85dbd1d330c8b52f02f19f8436d56eb94b15bd SHA256 68e43cd056037a392da0d0a0c2b7542bc562cba4a1da3317c37af180dd37acb6 +MISC ChangeLog 56559 RMD160 ac47224f28ad987b4bb5cf5d8a7ec274ef16e0d6 SHA1 5f8be427e75c2a32a35ab5d5012ee3f33a82d3c9 SHA256 4b25f10a3f972e15b3aed969780860032eaa76fd7adbea32f23d0a64fb5168d3 MISC metadata.xml 436 RMD160 ac90cc20b6b1e04e386ee758372fa8d9261046ec SHA1 01ec015d6e3a341353400be991c61347fd1f9142 SHA256 cf021b3830c7b854696e5b46b5b802156555e2cd5618ff27826a6a2f8f57a1c0 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAktyAtUACgkQ/ejvha5XGaMnYQCg34yH0h6x/V2HxgUHGMlGNfJ9 +UXUAn0tcKpHYUNO8L/fIe6nTwkI7URyI +=vdTP +-----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.1.7.16.ebuild b/sys-apps/portage/portage-2.1.7.16.ebuild index 5e822ce3a38a..5486ae71577e 100644 --- a/sys-apps/portage/portage-2.1.7.16.ebuild +++ b/sys-apps/portage/portage-2.1.7.16.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.16.ebuild,v 1.6 2010/01/26 16:16:03 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild,v 1.7 2010/02/10 00:49:49 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -269,6 +269,8 @@ pkg_preinst() { [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" REPO_LAYOUT_CONF_WARN=$? + has_version "<${CATEGORY}/${PN}-2.1.7" + UPGRADE_FROM_2_1=$? } pkg_postinst() { @@ -276,6 +278,7 @@ pkg_postinst() { # will be identified and removed in postrm. python_mod_optimize /usr/$(get_libdir)/portage/pym + local warning_shown=0 if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then ewarn echo "If you want overlay eclasses to override eclasses from" \ @@ -283,7 +286,23 @@ pkg_postinst() { "for information about the new layout.conf and repos.conf" \ "configuration files." \ | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done + fi + if [[ $UPGRADE_FROM_2_1 = 0 && -n $PORTAGE_BINHOST ]] ; then ewarn + echo "If you have an old PORTAGE_BINHOST setting in /etc/make.conf" \ + "then you will encounter bug #303211. Therefore, please ensure" \ + "that your PORTAGE_BINHOST setting points to a remote directory" \ + "containing a \$PKGDIR/Packages file which is created by" \ + ">=portage-2.1.6. If \$PKGDIR/Packages does not exist on" \ + "the server or it is incomplete, you must run \`emaint" \ + "--fix binhost\` on the server in order to generate it." \ + "See \`man make.conf\` for more information about" \ + "PORTAGE_BINHOST." | \ + fmt -w 70 | while read -r ; do ewarn "$REPLY" ; done + warning_shown=1 + fi + if [ $warning_shown = 1 ] ; then + ewarn # for symmetry fi einfo diff --git a/sys-apps/portage/portage-2.1.7.17.ebuild b/sys-apps/portage/portage-2.1.7.17.ebuild index 1bfe0112a8f1..a3a7aa5be2cb 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.2 2010/02/07 02:11:42 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild,v 1.3 2010/02/10 00:49:49 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -273,6 +273,8 @@ pkg_preinst() { [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" REPO_LAYOUT_CONF_WARN=$? + has_version "<${CATEGORY}/${PN}-2.1.7" + UPGRADE_FROM_2_1=$? } pkg_postinst() { @@ -280,6 +282,7 @@ pkg_postinst() { # will be identified and removed in postrm. python_mod_optimize /usr/$(get_libdir)/portage/pym + local warning_shown=0 if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then ewarn echo "If you want overlay eclasses to override eclasses from" \ @@ -287,7 +290,23 @@ pkg_postinst() { "for information about the new layout.conf and repos.conf" \ "configuration files." \ | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done + fi + if [[ $UPGRADE_FROM_2_1 = 0 && -n $PORTAGE_BINHOST ]] ; then ewarn + echo "If you have an old PORTAGE_BINHOST setting in /etc/make.conf" \ + "then you will encounter bug #303211. Therefore, please ensure" \ + "that your PORTAGE_BINHOST setting points to a remote directory" \ + "containing a \$PKGDIR/Packages file which is created by" \ + ">=portage-2.1.6. If \$PKGDIR/Packages does not exist on" \ + "the server or it is incomplete, you must run \`emaint" \ + "--fix binhost\` on the server in order to generate it." \ + "See \`man make.conf\` for more information about" \ + "PORTAGE_BINHOST." | \ + fmt -w 70 | while read -r ; do ewarn "$REPLY" ; done + warning_shown=1 + fi + if [ $warning_shown = 1 ] ; then + ewarn # for symmetry fi einfo |