diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2013-07-26 20:07:49 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-07-26 20:07:49 +0000 |
| commit | fbc356bb7a9f85d168200c77f1db88f22cd47fc4 (patch) | |
| tree | 315f3113938bda723d7caddda18f0c9881317c05 /sys-apps | |
| parent | Version bump (diff) | |
| download | gentoo-2-fbc356bb7a9f85d168200c77f1db88f22cd47fc4.tar.gz gentoo-2-fbc356bb7a9f85d168200c77f1db88f22cd47fc4.tar.bz2 gentoo-2-fbc356bb7a9f85d168200c77f1db88f22cd47fc4.zip | |
Remove pkg_postinst upgrade code that should be irrelevant for portage-9999 users these days.
(Portage version: 2.2.0_alpha189/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/portage/portage-9999.ebuild | 37 |
2 files changed, 6 insertions, 37 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 8327ad2c3d7f..0842dc4069e9 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1318 2013/07/26 07:46:57 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1319 2013/07/26 20:07:49 zmedico Exp $ + + 26 Jul 2013; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild: + Remove pkg_postinst upgrade code that should be irrelevant for portage-9999 + users these days. 26 Jul 2013; Zac Medico <zmedico@gentoo.org> portage-2.1.13.ebuild, portage-2.2.0_alpha189.ebuild: diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index a7729d0b2c6f..3ad9bbc44c48 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.85 2013/07/26 08:05:39 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.86 2013/07/26 20:07:49 zmedico Exp $ EAPI=3 PYTHON_COMPAT=( @@ -397,39 +397,4 @@ pkg_preinst() { if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} fi - - 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 "${EROOT}"var/lib/portage/preserved_libs_registry ] && \ - has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ; } \ - && NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false -} - -pkg_postinst() { - if $WORLD_MIGRATION_UPGRADE && \ - grep -q "^@" "${EROOT}/var/lib/portage/world"; then - einfo "moving set references from the worldfile into world_sets" - cd "${EROOT}/var/lib/portage/" - grep "^@" world >> world_sets - sed -i -e '/^@/d' world - fi - - if ${NEEDED_REBUILD_UPGRADE} ; then - einfo "rebuilding NEEDED.ELF.2 files" - local cpv filename line newline - for cpv in "${EROOT}/var/db/pkg"/*/*; do - [[ -f "${cpv}/NEEDED" && ! -f "${cpv}/NEEDED.ELF.2" ]] || continue - while read -r line; do - filename=${line% *} - newline=$(scanelf -BF "%a;%F;%S;%r;%n" "${ROOT%/}${filename}") - newline=${newline// - } - [[ ${#ROOT} -gt 1 ]] && newline=${newline/${ROOT%/}} - echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2" - done < "${cpv}/NEEDED" - done - fi } |