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: Sat, 23 Jun 2012 07:32:47 +0000 (UTC) [thread overview]
Message-ID: <20120623073247.724482004B@flycatcher.gentoo.org> (raw)
zmedico 12/06/23 07:32:47
Modified: portage-9999.ebuild ChangeLog
Log:
Merge diff from 2.2.0_alpha111 ebuild.
(Portage version: 2.1.11/cvs/Linux i686)
Revision Changes Path
1.50 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.49&r2=1.50
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- portage-9999.ebuild 13 Jun 2012 06:11:55 -0000 1.49
+++ portage-9999.ebuild 23 Jun 2012 07:32:47 -0000 1.50
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.49 2012/06/13 06:11:55 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.50 2012/06/23 07:32:47 zmedico Exp $
EAPI=3
inherit git-2 eutils multilib python
@@ -262,13 +262,11 @@
ewarn "to enable RMD160 hash support."
ewarn "See bug #198398 for more information."
fi
- if [ ! -L "${EROOT}/etc/make.globals" ]; then
- rm -f "${EROOT}/etc/make.globals"
+ if [[ ! -L "${EROOT}/etc/make.globals" &&
+ -f "${EROOT}/etc/make.globals" ]]; then
+ rm "${EROOT}/etc/make.globals"
fi
- has_version "<${CATEGORY}/${PN}-2.2_alpha" \
- && MINOR_UPGRADE=true || MINOR_UPGRADE=false
-
has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
@@ -278,9 +276,6 @@
! ( [ -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=true || REPO_LAYOUT_CONF_WARN=false
}
pkg_postinst() {
@@ -288,7 +283,8 @@
# will be identified and removed in postrm.
python_mod_optimize /usr/$(get_libdir)/portage/pym
- if $WORLD_MIGRATION_UPGRADE ; then
+ 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
@@ -313,24 +309,6 @@
fi
done
fi
-
- 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" \
- "for information about the new layout.conf and repos.conf" \
- "configuration files." \
- | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
- ewarn
- fi
-
- 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."
- elog "This is not required however for portage to function properly."
- elog
- fi
}
pkg_postrm() {
1.1039 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1039&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1039&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1038&r2=1.1039
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1038
retrieving revision 1.1039
diff -u -r1.1038 -r1.1039
--- ChangeLog 23 Jun 2012 07:29:07 -0000 1.1038
+++ ChangeLog 23 Jun 2012 07:32:47 -0000 1.1039
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1038 2012/06/23 07:29:07 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1039 2012/06/23 07:32:47 zmedico Exp $
+
+ 23 Jun 2012; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Merge diff from 2.2.0_alpha111 ebuild.
*portage-2.2.0_alpha111 (23 Jun 2012)
next reply other threads:[~2012-06-23 7:33 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-23 7:32 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-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-11 18:21 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=20120623073247.724482004B@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