diff options
author | 2007-05-25 08:51:07 +0000 | |
---|---|---|
committer | 2007-05-25 08:51:07 +0000 | |
commit | 21adfc963a6163db596dd415de8b8c1de4088da7 (patch) | |
tree | 9e8e089054e059f692dace8423a85e443ab9e488 /sys-apps | |
parent | x86 stable, bug 179562 (diff) | |
download | gentoo-2-21adfc963a6163db596dd415de8b8c1de4088da7.tar.gz gentoo-2-21adfc963a6163db596dd415de8b8c1de4088da7.tar.bz2 gentoo-2-21adfc963a6163db596dd415de8b8c1de4088da7.zip |
2.1.2.8 maintenance release.
(Portage version: 2.1.2.8)
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/portage/ChangeLog | 224 | ||||
-rw-r--r-- | sys-apps/portage/files/digest-portage-2.1.2.8 | 9 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.1.2.8.ebuild | 240 |
3 files changed, 256 insertions, 217 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 8bb40876c08a..ac4694cb992c 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,12 @@ # 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.386 2007/05/25 06:26:01 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.387 2007/05/25 08:51:07 zmedico Exp $ + +*portage-2.1.2.8 (25 May 2007) + + 25 May 2007; Zac Medico <zmedico@gentoo.org> +portage-2.1.2.8.ebuild: + 2.1.2.8 maintenance release. This fixes bugs #176539, #177591, + #177601, #177763, #178293, #178544, #179008, and #179206. 25 May 2007; Joshua Kinard <kumba@gentoo.org> portage-2.1.2.7.ebuild: Stable on mips, per #179036. @@ -375,219 +381,3 @@ 09 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.ebuild: 2.1 final release. - - 29 May 2006; Joshua Kinard <kumba@gentoo.org> portage-2.0.54-r2.ebuild: - Marked stable on mips to plug Bug #131207. - - 25 May 2006; Zac Medico <zmedico@gentoo.org> - portage-2.0.54-r2.ebuild, portage-2.1_rc2-r3.ebuild: - Make bash-3.0 conditional on !userland_Darwin for bug #133218. - - 25 May 2006; Petteri Räty <betelgeuse@gentoo.org> - portage-2.0.54-r2.ebuild, portage-2.1_rc2-r2.ebuild: - Portage now depends on >=app-shells/bash-3.0. Fixes bug #133218. - - 20 May 2006; Bryan Østergaard <kloeri@gentoo.org> - portage-2.0.54-r2.ebuild: - Stable on ia64. - - 20 May 2006; Bryan Østergaard <kloeri@gentoo.org> - portage-2.0.54-r2.ebuild: - Stable on alpha. - - 14 May 2006; Luis Medinas <metalgod@gentoo.org> portage-2.0.54-r2.ebuild: - Stable on amd64. See bug #130527. - - 13 May 2006; Joseph Jezak <josejx@gentoo.org> portage-2.0.54-r2.ebuild: - Marked ppc stable for bug #130527. - - 11 May 2006; Joshua Jackson <tsunam@gentoo.org> portage-2.0.54-r2.ebuild: - Stable x86; bug #130527 - - 10 May 2006; Markus Rothe <corsair@gentoo.org> portage-2.0.54-r2.ebuild: - Stable on ppc64; bug #130527 - - 09 May 2006; Gustavo Zacarias <gustavoz@gentoo.org> - portage-2.0.54-r2.ebuild: - Stable on hppa wrt #130527 - - 09 May 2006; Gustavo Zacarias <gustavoz@gentoo.org> - portage-2.0.54-r2.ebuild: - Stable on sparc - -*portage-2.0.54-r2 (03 May 2006) - - 03 May 2006; <solar@gentoo.org> +portage-2.0.54-r2.ebuild: - - QA_TEXTREL/EXECSTACK bug 131779; emptytree system restarts after emerging - portage. bug 131207 - - 29 Apr 2006; Joseph Jezak <josejx@gentoo.org> portage-2.0.54-r1.ebuild: - Marked ppc stable for bug #130527. - - 26 Apr 2006; Mark Loeser <halcy0n@gentoo.org> portage-2.0.54-r1.ebuild: - Stable on x86; bug #130527 - - 24 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org> - portage-2.0.54-r1.ebuild: - Stable on sparc wrt #130527 - - 24 Apr 2006; Joshua Kinard <kumba@gentoo.org> portage-2.0.54-r1.ebuild: - Marked stable on mips. - -*portage-2.0.54-r1 (18 Apr 2006) - - 18 Apr 2006; <solar@gentoo.org> metadata.xml, - +files/2.0.54/bin_ebuild.sh.patch, +files/2.0.54/bin_emerge.patch, - +files/2.0.54/bin_fowners.patch, +files/2.0.54/bin_fperms.patch, - +files/2.0.54/bin_prepallstrip.patch, +files/2.0.54/bin_prepstrip.patch, - +files/2.0.54/man_ebuild.5.patch, +files/2.0.54/man_portage.5.patch, - +portage-2.0.54-r1.ebuild: - - backported a few fixes from 2.1 - - 19 Feb 2006; Joshua Kinard <kumba@gentoo.org> portage-2.0.54.ebuild: - Marked stable on mips. - - 19 Feb 2006; Marius Mauch <genone@gentoo.org> files/README.RESCUE: - Update the horribly out of date README.RESCUE with a link to - proj/en/portage/doc/manually-fixing-portage.xml. - - 07 Feb 2006; Aron Griffis <agriffis@gentoo.org> portage-2.0.54.ebuild: - Mark 2.0.54 stable on ia64 - - 03 Feb 2006; Markus Rothe <corsair@gentoo.org> portage-2.1_pre4-r1.ebuild: - Added ~ppc64; bug #120716 - - 02 Feb 2006; Marius Mauch <genone@gentoo.org> portage-2.1_pre4-r1.ebuild: - Bump pycrpyto dep for ia64 (bug #121182).. - - 29 Jan 2006; Jason Stubbs <jstubbs@gentoo.org> - +portage-2.1_pre4-r1.ebuild: - Regression fix for ebuilds that use or deps without a default atom. - Also specifying version on pycrypto due to amd64 issues. - - 28 Jan 2006; Jason Stubbs <jstubbs@gentoo.org> - Add pycrypto dependency to 2.1_pre4. - -*portage-2.1_pre4 (28 Jan 2006) - - 28 Jan 2006; Jason Stubbs <jstubbs@gentoo.org> - +portage-2.1_pre4.ebuild: - Bug fix release for 2.1. - - 23 Jan 2006; Jeroen Roovers <jer@gentoo.org> portage-2.0.54.ebuild: - Stable on hppa (bug #108262). - - 22 Jan 2006; Bryan Østergaard <kloeri@gentoo.org portage-2.0.54.ebuild: - Stable on alpha. - - 21 Jan 2006; Michael Hanselmann <hansmi@gentoo.org> portage-2.0.54.ebuild: - Stable on ppc. - - 20 Jan 2006; Luis Medinas <metalgod@gentoo.org> portage-2.0.54.ebuild: - Stable on amd64. See bug #108262. - - 20 Jan 2006; Markus Rothe <corsair@gentoo.org> portage-2.0.54.ebuild: - Stable on ppc64; bug #108262 - - 20 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> portage-2.0.54.ebuild: - Marking stable on x86 wrt bug #108262. - - 20 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org> portage-2.0.54.ebuild: - Stable on sparc wrt #108262 - - 20 Jan 2006; Jason Stubbs <jstubbs@gentoo.org> - portage-2.0.53.ebuild, portage-2.0.54.ebuild, portage-2.1_pre3.ebuild: - Moving portage-manpages dependency from PDEPEND to RDEPEND as there's no - specific need for it to be installed after portage and is triggering a - long-standing bug. - - 01 Jan 2006; Jason Stubbs <jstubbs@gentoo.org> - portage-2.1_pre3-r1.ebuild: - Interim fix for xterm titles leaking to the terminal. - - 31 Dec 2005; Mike Frysinger <vapier@gentoo.org> - portage-2.0.51.22-r3.ebuild, portage-2.0.53.ebuild, portage-2.0.54.ebuild, - portage-2.1_pre3.ebuild: - Pull in portage-manpages automagically via USE=doc. - -*portage-2.1_pre3 (31 Dec 2005) - - 31 Dec 2005; Jason Stubbs <jstubbs@gentoo.org> - +portage-2.1_pre3.ebuild: - Bug fix release for 2.1. - -*portage-2.0.54 (31 Dec 2005) - - 31 Dec 2005; Jason Stubbs <jstubbs@gentoo.org> - +portage-2.0.54.ebuild: - Maintenance release for 2.0. - - 27 Dec 2005; Jason Stubbs <jstubbs@gentoo.org> - portage-2.1_pre2.ebuild: - Updated python dependency to 2.3 as python 2.2 can no longer cut it. - - 26 Dec 2005; Jose Luis Rivero <yoswink@gentoo.org> portage-2.0.53.ebuild: - Stable on alpha wrt #108082 - -*portage-2.1_pre2 (25 Dec 2005) - - 25 Dec 2005; Jason Stubbs <jstubbs@gentoo.org> - +portage-2.1_pre2.ebuild: - Second release of subversion trunk. - - 24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org> portage-2.0.53.ebuild: - Stable on ppc. - - 22 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org> portage-2.0.53.ebuild: - Stable on sparc wrt #108082 - - 21 Dec 2005; Luis Medinas <metalgod@gentoo.org> portage-2.0.53.ebuild: - Stable on amd64. See bug #108082. - - 21 Dec 2005; Markus Rothe <corsair@gentoo.org> portage-2.0.53.ebuild: - Stable on ppc64 - - 21 Dec 2005; Petteri Räty <betelgeuse@gentoo.org> portage-2.0.53.ebuild: - Marked stable on x86 for bug #108082. - - 18 Dec 2005; Jason Stubbs <jstubbs@gentoo.org> - portage-2.1_pre1.ebuild: - Add a notice informing of the cache format change and to `emerge - metadata` before using emerge. - - 17 Dec 2005; Jason Stubbs <jstubbs@gentoo.org> - portage-2.1_pre1.ebuild: - Add a warning with regard to custom cache modules. - - 17 Dec 2005; Jason Stubbs <jstubbs@gentoo.org> - portage-2.1_pre1.ebuild: - cache -> pym/cache typo. - - 17 Dec 2005; Jason Stubbs <jstubbs@gentoo.org> - portage-2.1_pre1.ebuild: - Add pym/cache and pym/elog_modules to those that get installed. - -*portage-2.1_pre1 (17 Dec 2005) - - 17 Dec 2005; Jason Stubbs <jstubbs@gentoo.org> - +portage-2.1_pre1.ebuild: - Beginning of regular releases of subversion trunk until it's feature set - stables. - - 02 Dec 2005; Ciaran McCreesh <ciaranm@gentoo.org> - portage-2.0.51.22-r3.ebuild: - Make sandbox dep !mips? in stable Portage for now. - -*portage-2.0.53 (01 Dec 2005) - - 01 Dec 2005; Jason Stubbs <jstubbs@gentoo.org> - +portage-2.0.53.ebuild - 2.0.53 final release. Yay! :) - - 03 Oct 2005; Aron Griffis <agriffis@gentoo.org> - portage-2.1.0_alpha20050718.ebuild: - Mark 2.1.0_alpha20050718 ~ia64 - - 17 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> - portage-2.1.0_alpha20050718.ebuild: - Marked ~mips. diff --git a/sys-apps/portage/files/digest-portage-2.1.2.8 b/sys-apps/portage/files/digest-portage-2.1.2.8 new file mode 100644 index 000000000000..1c5ab19f62d8 --- /dev/null +++ b/sys-apps/portage/files/digest-portage-2.1.2.8 @@ -0,0 +1,9 @@ +MD5 87ee23ade6b78e8560a18f9098034e67 portage-2.1.2.8.patch.bz2 58116 +RMD160 657d45f912c962e6df6f5f5eaf8cc8c4dc735435 portage-2.1.2.8.patch.bz2 58116 +SHA256 a17167242347fd75dc52b80ef91bb2ed6ee21900730c84ad1285bc2eb456f620 portage-2.1.2.8.patch.bz2 58116 +MD5 74c705793edb37ac2fb1d3b2e06c689d portage-2.1.2.tar.bz2 311900 +RMD160 75da869c02e3574babc2f40e07b18686f384cf99 portage-2.1.2.tar.bz2 311900 +SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008 portage-2.1.2.tar.bz2 311900 +MD5 6409f79dd5efe7922dd8fa36340c4912 portage-man-pl-2.1.2.tar.bz2 53893 +RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c portage-man-pl-2.1.2.tar.bz2 53893 +SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f portage-man-pl-2.1.2.tar.bz2 53893 diff --git a/sys-apps/portage/portage-2.1.2.8.ebuild b/sys-apps/portage/portage-2.1.2.8.ebuild new file mode 100644 index 000000000000..1c603ff6d6b6 --- /dev/null +++ b/sys-apps/portage/portage-2.1.2.8.ebuild @@ -0,0 +1,240 @@ +# 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.2.8.ebuild,v 1.1 2007/05/25 08:51:07 zmedico Exp $ + +inherit toolchain-funcs eutils flag-o-matic multilib + +DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo." +HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +PROVIDE="virtual/portage" +SLOT="0" +# USE_EXPAND_HIDDEN hides ELIBC and USERLAND expansions from emerge output (see make.conf.5). +IUSE_ELIBC="elibc_glibc elibc_uclibc elibc_FreeBSD" +IUSE_USERLAND="userland_Darwin userland_GNU" +IUSE="build doc epydoc selinux linguas_pl ${IUSE_ELIBC} ${IUSE_USERLAND}" +DEPEND=">=dev-lang/python-2.3 + !build? ( >=sys-apps/sed-4.0.5 ) + epydoc? ( >=dev-python/epydoc-2.0 )" +RDEPEND=">=dev-lang/python-2.3 + !build? ( >=sys-apps/sed-4.0.5 + dev-python/python-fchksum + !userland_Darwin? ( >=app-shells/bash-3.0 ) ) + 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 ) + userland_GNU? ( !selinux? ( >=sys-apps/coreutils-6.4 ) ) + selinux? ( >=dev-python/python-selinux-2.16 ) + doc? ( app-portage/portage-manpages ) + >=dev-python/pycrypto-2.0.1-r5 + >=net-misc/rsync-2.6.4" +# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 +# rsync-2.6.4 rdep is for the --filter option #167668 +SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives" + +PV_PL="2.1.2" +PATCHVER_PL="" +SRC_URI="mirror://gentoo/${PN}-${PV%.*}.tar.bz2 + ${SRC_ARCHIVES}/${PN}-${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} +if [ -n "${PATCHVER}" ]; then + SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 + ${SRC_ARCHIVES}/${PN}-${PATCHVER}.patch.bz2" +fi + +if [ -n "${PATCHVER_PL}" ]; then + SRC_URI="${SRC_URI} linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2 + ${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2 )" +fi + +S="${WORKDIR}"/${PN}-${PV%.*} +S_PL="${WORKDIR}"/${PN}-${PV_PL} + +portage_docs() { + elog "" + elog "For help with using portage please consult the Gentoo Handbook" + elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3" + elog "" +} + +src_unpack() { + unpack ${A} + cd "${S}" + if [ -n "${PATCHVER}" ]; then + cd "${S}" + epatch "${WORKDIR}/${PN}-${PATCHVER}.patch" + fi + einfo "Setting portage.VERSION to ${PVR} ..." + sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \ + die "Failed to patch portage.VERSION" + eend 0 + if [ -n "${PATCHVER_PL}" ]; then + use linguas_pl && \ + epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch" + fi +} + +src_compile() { + append-lfs-flags + + cd "${S}"/src + $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \ + die "Failed to build tbz2tool" + + if use elibc_FreeBSD; then + cd "${S}"/src/bsd-flags + chmod +x setup.py + ./setup.py build || die "Failed to install bsd-chflags module" + fi + + if use epydoc; then + einfo "Generating api docs" + mkdir "${WORKDIR}"/api + local my_modules + my_modules="$(find "${S}/pym" -name "*.py" \ + | sed -e 's:.*__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ + -e 's:/:.:g')" || die "error listing modules" + PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \ + -qqqqq --ignore-param-mismatch ${my_modules} || die "epydoc failed" + fi +} + +src_test() { + ./tests/runTests || \ + die "test(s) failed" +} + +src_install() { + local libdir=$(get_libdir) + local portage_base="/usr/${libdir}/portage" + cd "${S}"/cnf + insinto /etc + doins etc-update.conf dispatch-conf.conf make.globals + if [ -f "make.conf.${ARCH}".diff ]; then + patch make.conf "make.conf.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + newins make.conf make.conf.example + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + newins make.conf make.conf.example + fi + + if use elibc_FreeBSD; then + cd "${S}"/src/bsd-flags + ./setup.py install --root "${D}" || \ + die "Failed to install bsd-chflags module" + fi + + dodir ${portage_base}/bin + exeinto ${portage_base}/bin + # BSD and OSX need a sed wrapper so that find/xargs work properly + if use userland_GNU; then + rm "${S}"/bin/sed || die "Failed to remove sed wrapper" + fi + cd "${S}"/bin + doexe * + doexe "${S}"/src/tbz2tool + dosym newins ${portage_base}/bin/donewins + + for mydir in pym pym/cache pym/elog_modules; do + dodir ${portage_base}/${mydir} + insinto ${portage_base}/${mydir} + cd "${S}"/${mydir} + doins *.py + done + + doman "${S}"/man/*.[0-9] + if use linguas_pl; then + doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] + doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] + fi + dodoc "${S}"/ChangeLog + dodoc "${S}"/NEWS + dodoc "${S}"/RELEASE-NOTES + use epydoc && dohtml -r "${WORKDIR}"/api + + dodir /usr/bin + for x in ebuild emerge portageq repoman tbz2tool xpak; do + dosym ../${libdir}/portage/bin/${x} /usr/bin/${x} + done + + dodir /usr/sbin + local my_syms="archive-conf + dispatch-conf + emaint + emerge-webrsync + env-update + etc-update + fixpackages + quickpkg + regenworld" + local x + for x in ${my_syms}; do + dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x} + done + dosym env-update /usr/sbin/update-env + dosym etc-update /usr/sbin/update-etc + + dodir /etc/portage + keepdir /etc/portage + + echo PYTHONPATH=\"${portage_base}/pym\" > "${WORKDIR}"/05portage.envd + doenvd "${WORKDIR}"/05portage.envd +} + +pkg_preinst() { + local portage_base="/usr/$(get_libdir)/portage" + if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then + rm -rf "${D}"/${portage_base}/pym/* + mv "${D}"/${portage_base}/bin/tbz2tool "${T}" + rm -rf "${D}"/${portage_base}/bin/* + mv "${T}"/tbz2tool "${D}"/${portage_base}/bin/ + fi + remove_python_bytecodes +} + +pkg_postinst() { + local x + + if [ ! -f "${ROOT}/var/lib/portage/world" ] && + [ -f "${ROOT}"/var/cache/edb/world ] && + [ ! -h "${ROOT}"/var/cache/edb/world ]; then + mv "${ROOT}"/var/cache/edb/world "${ROOT}"/var/lib/portage/world + ln -s ../../lib/portage/world /var/cache/edb/world + fi + + for x in "${ROOT}"/etc/._cfg????_make.globals; do + # Overwrite the globals file automatically. + [ -e "${x}" ] && mv -f "${x}" "${ROOT}etc/make.globals" + done + + ewarn "In portage-2.1.2, installation actions do not necessarily pull in build time" + ewarn "dependencies that are not strictly required. This behavior is adjustable" + ewarn "via the new --with-bdeps option that is documented in the emerge(1) man page." + ewarn "For more information regarding this change, please refer to bug #148870." + echo + elog "See NEWS and RELEASE-NOTES for further changes." + echo + portage_docs +} + +pkg_postrm() { + remove_python_bytecodes +} + +remove_python_bytecodes() { + local d="${ROOT}/usr/$(get_libdir)/portage/pym" + [ -d "${d}" ] || return + find "${d}" -type d -print0 | \ + while read -d $'\0' d ; do + cd "${d}" + rm -f *.pyc *.pyo + done +} |