From: "Zac Medico (zmedico)" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
Date: Fri, 11 Nov 2011 18:21:44 +0000 (UTC) [thread overview]
Message-ID: <20111111182144.E0ADB2004B@flycatcher.gentoo.org> (raw)
zmedico 11/11/11 18:21:44
Modified: portage-9999.ebuild ChangeLog
Log:
Remove obsolete less dependency (bug #384663) and tweak style of preinst/postinst boolean conditions.
(Portage version: 2.2.0_alpha73_p1/cvs/Linux i686)
Revision Changes Path
1.32 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.31&r2=1.32
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- portage-9999.ebuild 2 Nov 2011 05:26:03 -0000 1.31
+++ portage-9999.ebuild 11 Nov 2011 18:21:44 -0000 1.32
@@ -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 @@
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 @@
!<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 @@
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 @@
# 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 @@
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 @@
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."
1.903 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.903&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.903&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.902&r2=1.903
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.902
retrieving revision 1.903
diff -u -r1.902 -r1.903
--- ChangeLog 10 Nov 2011 16:18:28 -0000 1.902
+++ ChangeLog 11 Nov 2011 18:21:44 -0000 1.903
@@ -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:
next reply other threads:[~2011-11-11 18:21 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-11 18:21 Zac Medico (zmedico) [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-04-25 15:46 [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog Brian Dolbec (dolsen)
2015-04-25 15:32 Brian Dolbec (dolsen)
2015-02-13 17:47 Brian Dolbec (dolsen)
2014-12-06 17:34 Brian Dolbec (dolsen)
2014-09-26 17:04 Brian Dolbec (dolsen)
2014-09-26 2:28 Brian Dolbec (dolsen)
2014-09-12 7:04 Michal Gorny (mgorny)
2014-09-11 22:46 Michal Gorny (mgorny)
2014-07-26 9:48 Michal Gorny (mgorny)
2014-04-06 15:32 Michal Gorny (mgorny)
2014-01-13 23:25 Mike Gilbert (floppym)
2014-01-13 19:56 Brian Dolbec (dolsen)
2013-07-26 20:07 Zac Medico (zmedico)
2013-07-25 22:09 Zac Medico (zmedico)
2013-07-25 18:11 Zac Medico (zmedico)
2013-07-23 3:18 Zac Medico (zmedico)
2013-07-22 3:13 Zac Medico (zmedico)
2013-07-21 16:42 Zac Medico (zmedico)
2013-05-16 13:59 Zac Medico (zmedico)
2013-03-21 23:39 Zac Medico (zmedico)
2013-01-14 23:15 Zac Medico (zmedico)
2013-01-14 17:47 Zac Medico (zmedico)
2012-07-24 19:17 Zac Medico (zmedico)
2012-07-24 9:11 Michal Gorny (mgorny)
2012-06-23 7:32 Zac Medico (zmedico)
2012-06-04 23:04 Zac Medico (zmedico)
2012-03-23 19:02 Zac Medico (zmedico)
2012-03-17 1:57 Zac Medico (zmedico)
2012-02-14 19:06 Zac Medico (zmedico)
2011-12-22 4:46 Zac Medico (zmedico)
2011-12-10 0:50 Zac Medico (zmedico)
2011-12-09 20:29 Zac Medico (zmedico)
2011-12-09 17:59 Zac Medico (zmedico)
2011-12-08 22:44 Zac Medico (zmedico)
2011-11-02 5:26 Zac Medico (zmedico)
2011-07-12 17:59 Zac Medico (zmedico)
2011-07-10 14:03 Zac Medico (zmedico)
2011-05-06 4:21 Zac Medico (zmedico)
2011-02-25 20:46 Zac Medico (zmedico)
2010-09-20 4:32 Zac Medico (zmedico)
2010-08-30 22:16 Zac Medico (zmedico)
2010-08-30 21:55 Zac Medico (zmedico)
2010-08-14 18:55 Zac Medico (zmedico)
2010-07-27 7:52 Zac Medico (zmedico)
2010-04-28 7:26 Zac Medico (zmedico)
2010-03-28 5:49 Zac Medico (zmedico)
2010-03-25 2:38 Sebastian Pipping (sping)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111111182144.E0ADB2004B@flycatcher.gentoo.org \
--to=zmedico@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox