diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-06-15 10:46:04 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-15 10:46:04 +0000 |
| commit | 728e65ebc1b04b84065f621264e64f31fa6b4381 (patch) | |
| tree | 4c89494687903e23e786523738f04ec457a7b082 | |
| parent | adding emacs team as maintaining herd; version bump (diff) | |
| download | gentoo-2-728e65ebc1b04b84065f621264e64f31fa6b4381.tar.gz gentoo-2-728e65ebc1b04b84065f621264e64f31fa6b4381.tar.bz2 gentoo-2-728e65ebc1b04b84065f621264e64f31fa6b4381.zip | |
2.1.3_rc2 bump for bug #182105.
(Portage version: 2.1.3_rc2)
| -rw-r--r-- | sys-apps/portage/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-apps/portage/files/digest-portage-2.1.3_rc2 (renamed from sys-apps/portage/files/digest-portage-2.1.3_rc1) | 0 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.1.3_rc2.ebuild (renamed from sys-apps/portage/portage-2.1.3_rc1.ebuild) | 8 |
3 files changed, 13 insertions, 4 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index bf25beef23da..f13428e7d178 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.391 2007/06/15 03:10:57 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.392 2007/06/15 10:46:04 zmedico Exp $ + +*portage-2.1.3_rc2 (15 Jun 2007) + + 15 Jun 2007; Zac Medico <zmedico@gentoo.org> -portage-2.1.3_rc1.ebuild, + +portage-2.1.3_rc2.ebuild: + 2.1.3_rc2 bump for bug #182105 (fix a traceback that is triggered at + emerge exit if PROMPT_COMMAND is exported). *portage-2.1.3_rc1 (15 Jun 2007) diff --git a/sys-apps/portage/files/digest-portage-2.1.3_rc1 b/sys-apps/portage/files/digest-portage-2.1.3_rc2 index 96ffaaa90692..96ffaaa90692 100644 --- a/sys-apps/portage/files/digest-portage-2.1.3_rc1 +++ b/sys-apps/portage/files/digest-portage-2.1.3_rc2 diff --git a/sys-apps/portage/portage-2.1.3_rc1.ebuild b/sys-apps/portage/portage-2.1.3_rc2.ebuild index c5e9aa34ba43..a167d76c14a6 100644 --- a/sys-apps/portage/portage-2.1.3_rc1.ebuild +++ b/sys-apps/portage/portage-2.1.3_rc2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.3_rc1.ebuild,v 1.1 2007/06/15 03:10:57 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.3_rc2.ebuild,v 1.1 2007/06/15 10:46:04 zmedico Exp $ inherit toolchain-funcs eutils flag-o-matic multilib @@ -24,7 +24,7 @@ RDEPEND=">=dev-lang/python-2.4 elibc_FreeBSD? ( dev-python/py-freebsd ) elibc_glibc? ( >=sys-apps/sandbox-1.2.17 ) elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 ) - !userland_Darwin? ( >=app-misc/pax-utils-0.1.13 ) + >=app-misc/pax-utils-0.1.13 userland_GNU? ( >=sys-apps/coreutils-6.4 ) selinux? ( >=dev-python/python-selinux-2.16 ) doc? ( app-portage/portage-manpages ) @@ -42,7 +42,7 @@ SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2 ${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}.tar.bz2 )" -PATCHVER=${PVR} +PATCHVER="2.1.3_rc1" if [ -n "${PATCHVER}" ]; then SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 ${SRC_ARCHIVES}/${PN}-${PATCHVER}.patch.bz2" @@ -70,6 +70,8 @@ src_unpack() { cd "${S}" epatch "${WORKDIR}/${PN}-${PATCHVER}.patch" fi + sed -i "s/fdpipes=/fd_pipes=/" pym/output.py || \ + die "Failed to patch output.py for bug #182105" einfo "Setting portage.VERSION to ${PVR} ..." sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \ die "Failed to patch portage.VERSION" |