Remove obsolete less dependency (bug #384663) and tweak style of preinst/postinst...

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

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index feda66395a77f519229003047dac7fbacaa14248..2edd124820c2cf4ef012fef270e1e5eda8b40cbe 100644 (file)
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,10 @@
 # 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.902 2011/11/10 16:18:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.903 2011/11/11 18:21:44 zmedico Exp $
+
+  11 Nov 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+  Remove obsolete less dependency (bug #384663) and tweak style of
+  preinst/postinst boolean conditions.
 
   10 Nov 2011; Zac Medico <zmedico@gentoo.org> portage-2.1.6.13.ebuild,
   portage-2.1.6.7.ebuild:

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index cf5c6b45cf8a412e4aa060bacb7d26a3f4b4b9bd..fb915b484d55842e9ef2bc614c6249cdd7aed349 100644 (file)
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -22,13 +22,13 @@ EBUILD portage-2.1.9.42.ebuild 10283 RMD160 60ac7fd535e83626095d2ef11466da8e8aa9
 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-9999.ebuild 12118 RMD160 db216891c223daaa99a2dacb7dd49d7325ff3752 SHA1 47475472bfe9fa7261a445d6126e21843a15a3e5 SHA256 3663cbf53222b4183f7bd2ff870ff107a90f0bfc6d4c03542d8ef5195432817c
-MISC ChangeLog 62959 RMD160 3fd4133e3937f523cbc5c9499aac79ed1b0b1fd4 SHA1 7b568e442cc8f1120260a8ca8e37421ced0a8010 SHA256 259f79a3c2d49fb7c560f00bb041d0ef489fb1df510e1ae43f965c966766442b
+EBUILD portage-9999.ebuild 12205 RMD160 32d7e87fe7000f9d5d9134de572bb4e01e8ffe87 SHA1 016634eff2cacc538d086466d6f3f7fcfb517d1d SHA256 a3c20cf1c4e22898f25b26e2e7c12a03bb6f5aa33c802d6b5b5c619cc71253a8
+MISC ChangeLog 63134 RMD160 b1ee876b94b9dab9d6c161f9455e04ee16712cf1 SHA1 dd93c27f4844851ef900bd7a856b402486bfab3a SHA256 053e81bc682287835e7f370740e6537988f712aeb7fac45ffab9a557646dcf46
 MISC metadata.xml 784 RMD160 ed548c07d0a96be62f1854b92abb4ebc0ae2f281 SHA1 338c4eb3cbb626b8830eddb2f0ef23a48b1c9e12 SHA256 3ec8e42f1532859a3697a5870febeb90c635740da85cdf8f913c7529dfc767f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk67+VsACgkQ/ejvha5XGaMBlACdHDUJbc9ZB8BMQpO7bR/q+2v9
-8NEAoMlVcjJJuUJElPIeZOuZUVzR5Nrf
-=SnqY
+iEYEARECAAYFAk69Z8sACgkQ/ejvha5XGaN40QCfRusd0tnxR1yhZP/8Znjs/VZS
+uQ4AoOETIsICUHApc1hmD3ulB1eSdXM4
+=9fA7
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index c2ca9aa02fc5ae8ecd94986fa1678fcac04decea..0950f02022bc4ac36d99b0f1edac86fbeb71794c 100644 (file)
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.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-9999.ebuild,v 1.31 2011/11/02 05:26:03 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.32 2011/11/11 18:21:44 zmedico Exp $
 
 EAPI=3
 inherit git-2 eutils multilib python
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
-IUSE="build doc epydoc +ipc +less python2 python3 selinux"
+IUSE="build doc epydoc +ipc python2 python3 selinux"
 
 # Import of the io module in python-2.6 raises ImportError for the
 # thread module if threading is disabled.
@@ -40,7 +40,6 @@ RDEPEND="${python_dep}
        !<app-admin/logrotate-3.8.0"
 PDEPEND="
        !build? (
-               less? ( sys-apps/less )
                >=net-misc/rsync-2.6.4
                userland_GNU? ( >=sys-apps/coreutils-6.4 )
        )"
@@ -295,21 +294,21 @@ pkg_preinst() {
                rm -f "${EROOT}/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 "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
-               has_version ">=${CATEGORY}/${PN}-2.1.6_rc" )
-       NEEDED_REBUILD_UPGRADE=$?
+               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() {
@@ -317,14 +316,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 "${EROOT}/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 "${EROOT}/var/db/pkg"/*/*; do
                        if [ -f "${cpv}/NEEDED" ]; then
@@ -343,7 +342,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" \
@@ -358,7 +357,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."