diff options
author | Zac Medico <zmedico@gentoo.org> | 2008-06-18 00:11:04 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2008-06-18 00:11:04 +0000 |
commit | 251361a542bd782238aa87997c3c6d181cf40aba (patch) | |
tree | 93f241fecf06f692c9f24ab8aa197636be3c0151 /sys-apps | |
parent | amd64 stable - 224637 (diff) | |
download | historical-251361a542bd782238aa87997c3c6d181cf40aba.tar.gz historical-251361a542bd782238aa87997c3c6d181cf40aba.tar.bz2 historical-251361a542bd782238aa87997c3c6d181cf40aba.zip |
2.1.5.6 bump. This fixes bug #223417 (random KeyError during merge
phase with <python-2.5). Bug #216231 tracks all bugs fixed since
2.1.4.x.
Package-Manager: portage-2.1.5.6
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/portage/ChangeLog | 9 | ||||
-rw-r--r-- | sys-apps/portage/Manifest | 10 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.1.5.6.ebuild | 263 |
3 files changed, 277 insertions, 5 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 1b64c3b58660..c766bc2334bb 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.527 2008/06/16 08:51:53 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.528 2008/06/18 00:11:04 zmedico Exp $ + +*portage-2.1.5.6 (17 Jun 2008) + + 17 Jun 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5.6.ebuild: + 2.1.5.6 bump. This fixes bug #223417 (random KeyError during merge + phase with <python-2.5). Bug #216231 tracks all bugs fixed since + 2.1.4.x. 16 Jun 2008; Zac Medico <zmedico@gentoo.org> portage-2.1.5.5.ebuild, portage-2.2_pre7-r1.ebuild, diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index af88adedcfa0..1a6c377923f2 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -11,6 +11,7 @@ DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f25 DIST portage-2.1.4.4.patch.bz2 15469 RMD160 c5fb833e97f4fced0d9c4b72056693f4b092fa51 SHA1 ebed38fd327e06c36d4b68a82ae205b65a7f1ebc SHA256 f832e388fe308f398597a0d0c5a0918898b7f06c9f146e7b105de40cff235803 DIST portage-2.1.4.tar.bz2 360454 RMD160 d320cbe7de572989b319326e442f4b5f28579179 SHA1 eedc99e9de390fddadcc2df77e8f9ed67e607e2b SHA256 a10b4b9f9855bc2b340b6d9080d8d423cd3249bfad34aaf0c52b4b70f798ae11 DIST portage-2.1.5.5.patch.bz2 38939 RMD160 454665a3602d9f1087dda6bbe7d21afb4f0ed3ec SHA1 f001cee80e4a4116077beaeb79c3f070adb8da05 SHA256 8bb21d13f1f2ed0544b8cc6ad130b805acdd33226756bf5e1ed367fb3991dbae +DIST portage-2.1.5.6.patch.bz2 43905 RMD160 1109eeb124f787470d4a48352515ed9bcfa3a3a2 SHA1 1913b30493e6eb7be7cbd844b4e4a7358cced0c3 SHA256 6e4667a7a95173e81311d746a5cfadfd8eaa37881d268f43728eef18c4f14232 DIST portage-2.1.5.tar.bz2 380031 RMD160 18cefc905c2a25b8c2bdfd71161d6326f7122dae SHA1 2143560f501b7ba1b284c8ee7a29f02c078a55e9 SHA256 e644bece703de9e407dda94b365f570f757e665a11243194ac2cb30d84578f69 DIST portage-2.2_pre7.tar.bz2 566688 RMD160 cef3093abd478c5abdb41f004cd1e89c8f3218cc SHA1 1cddfada440767f438292c0057ab9b121e947a7d SHA256 a178cf7b8e2352c84d19cf64a38485b768ca1ee68db5d18cf0f79ca11bac7a9a DIST portage-2.2_pre8.tar.bz2 577779 RMD160 66183661fe2ebc82156315e4ea4cdf380830e1f6 SHA1 41a584230b73b41e5d4c33ce228407a42225397b SHA256 614b949a0ef4b679730403c9a2ff0b9ae3b820fd2c619f5618e48a3224c3c72c @@ -21,14 +22,15 @@ EBUILD portage-2.0.51.22-r3.ebuild 5645 RMD160 aa9a32e18b1190c809eca4bf780d7a33a EBUILD portage-2.1.1-r2.ebuild 7131 RMD160 17e776429c7fa50a687660b44f0ed9fef7ae0a66 SHA1 957c90e2a19c6b961a6a817d368b42f18abecf04 SHA256 aa2cfb822e7bfc79829359650c1a8259635db72a47ff12976bbcfcc7cc416bea EBUILD portage-2.1.4.4.ebuild 8040 RMD160 a7503dd4cc751c71b9fc01b23b34c6a544c84355 SHA1 2079cbf4ad68622c340ab6971e3e01bc73a4781a SHA256 0b00f1d93651606931d3b6e6addd9fe70183f6d7a8127146d48e093b00ff6198 EBUILD portage-2.1.5.5.ebuild 8252 RMD160 b20de9e08389a5575beba7cf6cd82ca6795d63f2 SHA1 a4a30147a425f155cb4521bc80d6c4366139614c SHA256 ecba51578a0af3b36c58274ec281a3acf451ef30f81b58e06b0a078c170e7f33 +EBUILD portage-2.1.5.6.ebuild 8087 RMD160 4f60a69a380686583acb4de33c3d71abcaf9e304 SHA1 8998bc2244a040e23e6fc97dcd3135c2a46fdbb5 SHA256 c6af288fa2fa1636e41121f29a6b9cddd5ee42b00c6e4ae97ad5ecaa1cb74265 EBUILD portage-2.2_pre7-r1.ebuild 8363 RMD160 80632bed9c1125fc5c26c6021d1f9eb3cda01374 SHA1 33b0e34741703f585339c223dca65a1dd7771696 SHA256 ebc4fb4cb9ef2d77c619d303fb056e5cc946efe82b1ced9586fbf9e36ede58b8 EBUILD portage-2.2_pre8.ebuild 8360 RMD160 a1d355d95818f5a5815dfb546c11f7ec84b49b83 SHA1 c9e9c379b36f6c5b44716af752a4895f554875b6 SHA256 b072b12a92ddd2d91f64719a087b7aba83fccc348004c3857d84480dd13b68fa -MISC ChangeLog 10277 RMD160 6e9cde7bad9edaf8a8fb50e0c89ffaabf0b97395 SHA1 7e3baea29784004281f2d6fdfbdb611b85f6507e SHA256 59bb4a91fd041d729a10a2e5af8da66e3c4c07e139695bbfcefd3b5c9cde8bf0 +MISC ChangeLog 10529 RMD160 1c2e6c5d347d301c5742f4531869c82440d9992d SHA1 31f79607078fa111e7f13e2f42505cd38ca6104e SHA256 3c06e5b5ef67e2637f8a3b3a6efaf36ecc0b8cfe8b75cecc9614dd49956224d4 MISC metadata.xml 282 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 SHA1 91e4b3ed133aefe77b32ea6de69cd0062b8e40a4 SHA256 8f9dedd85eefb6985a8f28c79b4e7ec448ff3933fbac27cd169e15ed9e686c18 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkhWKbIACgkQ/ejvha5XGaOMfwCg65xQEvDLqVc/zvT889wGYyJs -uJIAn3XOYgjm65LAkCcl1ANa2vG885r0 -=nXVm +iEUEARECAAYFAkhYUqUACgkQ/ejvha5XGaNXkQCg3BQ2uV+voPwwgMx+U4X5AQ90 +Q2MAmKawDvxRkNOLY+2IeO6ArxgdEIY= +=FrlZ -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.1.5.6.ebuild b/sys-apps/portage/portage-2.1.5.6.ebuild new file mode 100644 index 000000000000..88854450e56c --- /dev/null +++ b/sys-apps/portage/portage-2.1.5.6.ebuild @@ -0,0 +1,263 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.5.6.ebuild,v 1.1 2008/06/18 00:11:04 zmedico Exp $ + +inherit eutils multilib + +DESCRIPTION="Portage is the 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" +IUSE="build doc epydoc selinux linguas_pl" +DEPEND=">=dev-lang/python-2.4 + !build? ( >=sys-apps/sed-4.0.5 ) + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + epydoc? ( >=dev-python/epydoc-2.0 )" +RDEPEND=">=dev-lang/python-2.4 + !build? ( >=sys-apps/sed-4.0.5 + >=app-shells/bash-3.2_p17 ) + elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) + elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) + elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) + >=app-misc/pax-utils-0.1.13 + selinux? ( >=dev-python/python-selinux-2.16 )" +PDEPEND=" + !build? ( + >=net-misc/rsync-2.6.4 + userland_GNU? ( >=sys-apps/coreutils-6.4 ) + || ( >=dev-lang/python-2.5 >=dev-python/pycrypto-2.0.1-r6 ) + )" +# 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="" +TARBALL_PV="2.1.5" +SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 + ${SRC_ARCHIVES}/${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="${PV}" +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}-${TARBALL_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() { + cd "${S}"/src + + if use doc; then + cd "${S}"/doc + touch fragment/date + sed -i "s/svn-trunk/${PVR}/" fragment/version + make xhtml xhtml-nochunks || die "failed to make docs" + 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 --no-frames --show-imports \ + --name "${PN}" --url "${HOMEPAGE}" \ + ${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 + + insinto /etc/logrotate.d + doins "${S}"/cnf/logrotate.d/elog-save-summary + + 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 * + dosym newins ${portage_base}/bin/donewins + + local mydir + 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 doc && dohtml "${S}"/doc/*.html + use epydoc && dohtml -r "${WORKDIR}"/api + + dodir /usr/bin + local x + for x in ebuild emerge portageq repoman 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() { + if ! use build && ! has_version dev-python/pycrypto && \ + has_version '>=dev-lang/python-2.5' ; then + if ! built_with_use '>=dev-lang/python-2.5' ssl ; then + echo "If you are a Gentoo developer and you plan to" \ + "commit ebuilds with this system then please install" \ + "pycrypto or enable python's ssl USE flag in order" \ + "to enable RMD160 hash support. See bug #198398 for" \ + "more information." | \ + fmt -w 70 | while read line ; do ewarn "${line}" ; done + fi + fi + local portage_base="/usr/$(get_libdir)/portage" + if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then + rm -rf "${D}"/${portage_base}/pym/* + rm -rf "${D}"/${portage_base}/bin/* + 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 + + # Compile all source files recursively. Any orphans + # will be identified and removed in postrm. + compile_all_python_bytecodes "${ROOT}usr/$(get_libdir)/portage/pym" + + echo "The metadata-transfer feature is now disabled" \ + "by default. This disables the \"Updating Portage cache\"" \ + "routine that used to run at the tail end of each" \ + "\`emerge --sync\` operation. If you use something" \ + "like the sqlite module and want to keep all metadata" \ + "in that format alone (useful for querying), enable" \ + "FEATURES=\"metadata-transfer\" in make.conf. You should" \ + "also enable FEATURES=\"metadata-transfer\" if you have" \ + "any eclasses from PORTDIR_OVERLAY that override eclasses" \ + "from PORTDIR (in this case, you may have disabled" \ + "a relevant warning message by setting" \ + "PORTAGE_ECLASS_WARNING_ENABLE=\"0\" in make.conf)." \ + | fmt -w 75 | while read x ; do elog "$x" ; done + + portage_docs +} + +pkg_postrm() { + remove_orphan_python_bytecodes "${ROOT}usr/$(get_libdir)/portage/pym" +} + +compile_all_python_bytecodes() { + python -c "from compileall import compile_dir; compile_dir('${1}', quiet=True)" + python -O -c "from compileall import compile_dir; compile_dir('${1}', quiet=True)" +} + +remove_orphan_python_bytecodes() { + [[ -d ${1} ]] || return + find "${1}" -name '*.py[co]' -print0 | \ + while read -d $'\0' f ; do + src_py=${f%[co]} + [[ -f ${src_py} ]] && continue + rm -f "${src_py}"[co] + done +} |