From: Zac Medico Date: Thu, 29 Mar 2007 22:28:27 +0000 (+0000) Subject: 2.1.2.3 maintenance release X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f56563353f71d134c51d6ff4d9d426bbcf70b29d;p=gentoo.git 2.1.2.3 maintenance release Package-Manager: portage-2.1.2.3 --- diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index c40023e7bb24..e2aad519d7ab 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.373 2007/03/12 09:36:49 yoswink Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.374 2007/03/29 22:28:27 zmedico Exp $ + +*portage-2.1.2.3 (29 Mar 2007) + + 29 Mar 2007; Zac Medico +portage-2.1.2.3.ebuild: + 2.1.2.3 maintenance release. This fixes bugs #163262, #170178, #171007, + #171117, #171212, #171840, #172033, #172539, and #172571. 12 Mar 2007; Jose Luis Rivero portage-2.1.2.2.ebuild: Stable on alpha wrt bug #169882 diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 64d0a16ea183..28b886a9e132 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -17,6 +17,7 @@ DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c4 DIST portage-2.1.1-r2.patch.bz2 5263 RMD160 6b749c6700784ea1ecc615b7b3ed39eade28e489 SHA1 4eaedfedf867346d67744d95d5cb3ad5b0da4417 SHA256 4d2bc33b66c6354f008d798507137a347e35ef7448a10ef17e5108160acb0414 DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 SHA1 6fdcb9897cef7f48d98829ab96caf37e31bd14a2 SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389 DIST portage-2.1.2.2.patch.bz2 36946 RMD160 cb55d2d2aa68ee149c8f6d9d94dfa3be5a884554 SHA1 2897ef16683d7cc8d5b8da04b67b93fcc83634d4 SHA256 1f5dd5105698773d46ce2345e9b5668271147d3b68e223216f965bf75a133f73 +DIST portage-2.1.2.3.patch.bz2 41518 RMD160 e30844294c3b7c803966a7da30f022c6b5e5b936 SHA1 1704b7f37a8cbdbc4ecaf51850d889536cc2d1d4 SHA256 bd0812aa965edd26c7b9ebcafbd87c86cce2521593f09fddf0da2078fedc9794 DIST portage-2.1.2.tar.bz2 311900 RMD160 75da869c02e3574babc2f40e07b18686f384cf99 SHA1 72980508e881d837e78b9309d53dba62ef76c247 SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f @@ -33,10 +34,14 @@ EBUILD portage-2.1.2.2.ebuild 7011 RMD160 e7bc1c9ce8788df19da8609c305a7c54ca3b4b MD5 4c835c577886243b275aa3d9d4ef00da portage-2.1.2.2.ebuild 7011 RMD160 e7bc1c9ce8788df19da8609c305a7c54ca3b4b96 portage-2.1.2.2.ebuild 7011 SHA256 9899d28591768c7d88e030bbb5d60375cdf292aa2eaef6000d4d16723a6563d8 portage-2.1.2.2.ebuild 7011 -MISC ChangeLog 20867 RMD160 774b450839eaa2200cf5e34707dd88881c9a2f7c SHA1 88ceee55de84f2acaf2cbfeab6e6f83b63f4d322 SHA256 83bb8e6a20f028965f2fb78a281a5576eeb3bcc04c353ee3bc7cfc2af524b808 -MD5 e5b15b1e020431ce2b7d4de3fd63c7df ChangeLog 20867 -RMD160 774b450839eaa2200cf5e34707dd88881c9a2f7c ChangeLog 20867 -SHA256 83bb8e6a20f028965f2fb78a281a5576eeb3bcc04c353ee3bc7cfc2af524b808 ChangeLog 20867 +EBUILD portage-2.1.2.3.ebuild 7024 RMD160 5c9047b5f4fd82b5c214c5571b340e6b068e1721 SHA1 c1223def3fea28fdbf895ecef7d51741ab5b55b9 SHA256 dd685fcd5437512551101d3f067863a863bcf9cf9ff81e0999aac2f1be13b916 +MD5 d9877fee4a3cab802546be0d41d4c0fc portage-2.1.2.3.ebuild 7024 +RMD160 5c9047b5f4fd82b5c214c5571b340e6b068e1721 portage-2.1.2.3.ebuild 7024 +SHA256 dd685fcd5437512551101d3f067863a863bcf9cf9ff81e0999aac2f1be13b916 portage-2.1.2.3.ebuild 7024 +MISC ChangeLog 21106 RMD160 6479b4651b66967cb16a5fb0a8839cbf20896073 SHA1 b2dc9baa80e4b1565b5d49ed8d6f4e76d0b582a5 SHA256 cc8720553abfc6f7b15285c54ef9e17f0a1803b29f7184220717afe5e09dbdea +MD5 204da8480248c347524c7897706af381 ChangeLog 21106 +RMD160 6479b4651b66967cb16a5fb0a8839cbf20896073 ChangeLog 21106 +SHA256 cc8720553abfc6f7b15285c54ef9e17f0a1803b29f7184220717afe5e09dbdea ChangeLog 21106 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282 @@ -50,10 +55,13 @@ SHA256 1dbfd88dcf8f81cff40287b480099fe80fd5e0a9f0b153e23d7706446c01be22 files/di MD5 925d42c079e45eec3f978b5f7016bc5e files/digest-portage-2.1.2.2 759 RMD160 5c05ea1481402ffdc98a69bb6e0f3307596cef33 files/digest-portage-2.1.2.2 759 SHA256 d8cbd61eab242247e3a0f76d5fafd63a398e4f1b4219e2193dd41f3a926fae05 files/digest-portage-2.1.2.2 759 +MD5 356e8100db292bd356319df6f08cec39 files/digest-portage-2.1.2.3 759 +RMD160 056b2ee35e80536b99048edeb9c0236192042afa files/digest-portage-2.1.2.3 759 +SHA256 35b33c67d81b1c8610528563db07b6a2791540f50a05d5aa305733ca595265d1 files/digest-portage-2.1.2.3 759 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGArV1/ejvha5XGaMRAnPPAJ9zRSUKAcC0w4Xltr+xGorPDaG4/gCfT9FS -dDPiiIWKJXvJ8UmSfwPDPEo= -=Rhvg +iD8DBQFGDD2P/ejvha5XGaMRAmXiAJsGrtEIezGFZnG+DiuOQXJlTSY+zQCeKOE/ ++iszArQfLtZIUHl8sen8VpE= +=RnQl -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.1.2.3 b/sys-apps/portage/files/digest-portage-2.1.2.3 new file mode 100644 index 000000000000..b02862303fe3 --- /dev/null +++ b/sys-apps/portage/files/digest-portage-2.1.2.3 @@ -0,0 +1,9 @@ +MD5 574d72a70e339eea3f516581cd6de8e0 portage-2.1.2.3.patch.bz2 41518 +RMD160 e30844294c3b7c803966a7da30f022c6b5e5b936 portage-2.1.2.3.patch.bz2 41518 +SHA256 bd0812aa965edd26c7b9ebcafbd87c86cce2521593f09fddf0da2078fedc9794 portage-2.1.2.3.patch.bz2 41518 +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.3.ebuild b/sys-apps/portage/portage-2.1.2.3.ebuild new file mode 100644 index 000000000000..d0dd7c50838b --- /dev/null +++ b/sys-apps/portage/portage-2.1.2.3.ebuild @@ -0,0 +1,228 @@ +# 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.3.ebuild,v 1.1 2007/03/29 22:28:27 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 + + 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/ + else + for mydir in bin pym pym/cache pym/elog_modules; do + rm "${ROOT}"/${portage_base}/${mydir}/*.pyc >& /dev/null + rm "${ROOT}"/${portage_base}/${mydir}/*.pyo >& /dev/null + done + fi +} + +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 +}