From: Zac Medico Date: Fri, 23 Dec 2011 18:54:48 +0000 (+0000) Subject: 2.1.10.42 version bump. This fixes bug #390489 (export COLUMNS variable X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=052ed6b19c3dc90bc1761e5655883160c339ac9c;p=gentoo.git 2.1.10.42 version bump. This fixes bug #390489 (export COLUMNS variable so java-utils-2.eclass doesn't die in java-pkg_init when stdin is not a tty), bug #394091 (export valid COLUMNS variable so perl doesn't die when output is redirected), bug #394995 (InvalidDependString triggered by REQUIRED_USE containing a flag not in IUSE), and bug #395705 (OSError: [Errno 121] Remote I/O error when PORTAGE_RO_DISTDIRS refers to NFS). Bug #395831 tracks all bugs fixed since portage-2.1.10.41. Package-Manager: portage-2.2.0_alpha82/cvs/Linux i686 --- diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index c0e1bb0dcca2..ffe97f758678 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.937 2011/12/23 18:35:17 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.938 2011/12/23 18:54:48 zmedico Exp $ + +*portage-2.1.10.42 (23 Dec 2011) + + 23 Dec 2011; Zac Medico +portage-2.1.10.42.ebuild: + 2.1.10.42 version bump. This fixes bug #390489 (export COLUMNS variable so + java-utils-2.eclass doesn't die in java-pkg_init when stdin is not a tty), bug + #394091 (export valid COLUMNS variable so perl doesn't die when output is + redirected), bug #394995 (InvalidDependString triggered by REQUIRED_USE + containing a flag not in IUSE), and bug #395705 (OSError: [Errno 121] Remote + I/O error when PORTAGE_RO_DISTDIRS refers to NFS). Bug #395831 tracks all bugs + fixed since portage-2.1.10.41. 23 Dec 2011; Zac Medico -portage-2.1.9.42.ebuild, -portage-2.2.0_alpha51.ebuild: diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 5a33209ad40f..273ad893956b 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -4,6 +4,7 @@ Hash: SHA1 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 DIST portage-2.1.10.11.tar.bz2 849505 RMD160 ae1fae8df7e42978a988ae7f66c3bb335bfd31b4 SHA1 a0c35facd342cc32a4e713925809e72530b98ec9 SHA256 c9d47d2211fa5feec398bc155cf64ec911fb30eb11a32a9ae7ca38dbeb9b37de DIST portage-2.1.10.41.tar.bz2 920129 RMD160 c0f425eeb78d9e17d1abfd17787d27df72337931 SHA1 3fb7ab592ceb28544b0ca4a9ddcd1298e73eaaa3 SHA256 e29c94fda9bb2eb2eb191df26ea1db7f709db728d6c3844f7b23a3660b7c5bf9 +DIST portage-2.1.10.42.tar.bz2 924704 RMD160 330a328dd7a69866025b79a4b0f626c09cd9f520 SHA1 d44322252aff4aa8edd484619d3e65b3ff0f4dc8 SHA256 6fe0e837b9f080a1b9615c27933ba35b580c3063a680e722c3f931d960a3712a DIST portage-2.1.6.13.patch.bz2 177383 RMD160 ef6388ca4a55a7defb319d54c9d80625cb8e12dc SHA1 5298feb6f881c25abdbde4a353d341fd36fdee51 SHA256 2cc897b6fa43b3329ef51f6304c064237be6bc326f1f0c221a19c0f96b69cd9c DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0efb489 SHA1 02021be38b0f829d45b342483834652a1985a952 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0 DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c63 SHA1 a28b191904296b551b22a7af83dacd1c336340a5 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647 @@ -12,16 +13,17 @@ DIST portage-2.2.0_alpha81.patch.bz2 10884 RMD160 e12fa7d351db2de76923e1e0383d5b DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f EBUILD portage-2.1.10.11.ebuild 11500 RMD160 b1bd438bf34fd97e28a881df86eb5f8e8ee96df9 SHA1 9b9bb0f9d9b0799eee7b0893968b47171a620e0d SHA256 794358ef93f1082061d2dd355cd5e000b7de1e77d6fe56d63019882362812e9c EBUILD portage-2.1.10.41.ebuild 11545 RMD160 0cf87979384741d061cbe0606ac7def0de7c7d34 SHA1 50d11fde71bcb1b9d80a92717d6fa55ca595e15e SHA256 0674e50bb5cffbdb629a4f0b2ee183b11defa3b4ceb9bdb9a8a60152ec95b71f +EBUILD portage-2.1.10.42.ebuild 11549 RMD160 d9c8cebc4d0eb6fa690145210c501f4dad605335 SHA1 d4d5df0145beb247e54217f3823edbf93d8ec373 SHA256 b7101b329f6a97c757bb51be968abb637601ba64cd89744c05dd3ce6fef67e54 EBUILD portage-2.1.6.13.ebuild 9923 RMD160 d27d0aec5dca631deb00f9dc0d415e5d3b3b8140 SHA1 c88f3873cdb95dea9dc2f66101d43ad370254bf9 SHA256 6b4794c017d59118697193c9cb208285c13eb6bf377eb97546c5c072b7073048 EBUILD portage-2.1.6.7.ebuild 8574 RMD160 b7d3514fa7042b756c3b9d4bb91f5c696abd27c1 SHA1 4f6b8bac1f951311382b1c8f92969c71e54fb4f1 SHA256 08a1ef8de3117a1e48d7650cbce7828c8d1e8855ebfb5081b4069086bc189d26 EBUILD portage-2.2.0_alpha81.ebuild 14633 RMD160 bf8c4325d02c88b142e1663a2e58e11684d338dc SHA1 6afe40ef7e47fa17f5836fd9792920d0496bfb6c SHA256 babe03cfd284767dc702d12097eda7b76f2b92d6b1d61a2bda2e13a643000c1c EBUILD portage-9999.ebuild 13929 RMD160 f6aad5112e7c55fc08b7115fa9a7a5cce34dfec1 SHA1 b5fc31b1f86a3bdedfb6ecad513bde57d3bd6af5 SHA256 c7c63fe695f6de5056ccccf78bd885c501ee8d010feb2e0411979373654f9d5b -MISC ChangeLog 71419 RMD160 aa3d178662f84e13520d3abdab70ee050d61de4c SHA1 332e5c2b3903c8e43ef759b2801e45142a1158e0 SHA256 02d69f32a5e9692456ab12129b962c419d31779d1b8c11e26986aa803e68b099 +MISC ChangeLog 72029 RMD160 80ed33afafe812565bdb8d49ee54a16dcf40ece4 SHA1 d88dd5fbad8f00d2b34de6e63f9f8d165a1fb94a SHA256 773dfd5626b71b18dbf4127c83d3f68e4244ae1ddcaa418cba31e6985b5df167 MISC metadata.xml 859 RMD160 e1a193ff07810cbcb5c7b3678164d3339187dc1c SHA1 b3edbe35c41d34ada1a2284e47d4e7019546486a SHA256 da1fb9571919aa3b23bea0879a4fb6fee69c97a77a7097d5fbbd2fb04169f57f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk70yesACgkQ/ejvha5XGaMUyQCdF38BA5o78sLUdDaQo0VxWM0W -PXUAnjNd8aUiS8S5KD4e42yMvwuShUHK -=LGJ5 +iEYEARECAAYFAk70zn4ACgkQ/ejvha5XGaMxhwCgnqsLKnGUp51RqVq/3OBwowqq +XAgAnRAmvI3r5gvIA8ZrTaxRhVgFC7ka +=wBiI -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.1.10.42.ebuild b/sys-apps/portage/portage-2.1.10.42.ebuild new file mode 100644 index 000000000000..eac295218d1c --- /dev/null +++ b/sys-apps/portage/portage-2.1.10.42.ebuild @@ -0,0 +1,354 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.42.ebuild,v 1.1 2011/12/23 18:54:48 zmedico Exp $ + +# Require EAPI 2 since we now require at least python-2.6 (for python 3 +# syntax support) which also requires EAPI 2. +EAPI=2 +inherit eutils multilib python + +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 ~x86 ~sparc-fbsd ~x86-fbsd" +SLOT="0" +IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux" + +# Import of the io module in python-2.6 raises ImportError for the +# thread module if threading is disabled. +python_dep="python3? ( =dev-lang/python-3* ) + !python2? ( !python3? ( + build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) + !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) ) + ) ) + python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )" + +# The pysqlite blocker is for bug #282760. +DEPEND="${python_dep} + !build? ( >=sys-apps/sed-4.0.5 ) + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )" +# Require sandbox-2.2 for bug #288863. +RDEPEND="${python_dep} + !build? ( >=sys-apps/sed-4.0.5 + >=app-shells/bash-3.2_p17 + >=app-admin/eselect-1.2 ) + elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) + >=app-misc/pax-utils-0.1.17 + selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] = 0x2060000 and "good" or "bad")') = good ]] +} + +pkg_setup() { + # Bug #359731 - Die early if get_libdir fails. + [[ -z $(get_libdir) ]] && \ + die "get_libdir returned an empty string" + + if use python2 && use python3 ; then + ewarn "Both python2 and python3 USE flags are enabled, but only one" + ewarn "can be in the shebangs. Using python3." + fi + if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then + ewarn "Attempting to select a compatible default python interpreter" + local x success=0 + for x in /usr/bin/python2.* ; do + x=${x#/usr/bin/python2.} + if [[ $x -ge 6 ]] 2>/dev/null ; then + eselect python set python2.$x + if compatible_python_is_selected ; then + elog "Default python interpreter is now set to python-2.$x" + success=1 + break + fi + fi + done + if [ $success != 1 ] ; then + eerror "Unable to select a compatible default python interpreter!" + die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)." + fi + fi + + if use python3; then + python_set_active_version 3 + elif use python2; then + python_set_active_version 2 + fi +} + +src_prepare() { + if [ -n "${PATCHVER}" ] ; then + if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then + rm "$S/bin/ebuild-helpers/portageq" \ + || die "failed to remove portageq helper symlink" + fi + epatch "${WORKDIR}/${PN}-${PATCHVER}.patch" + fi + einfo "Setting portage.VERSION to ${PVR} ..." + sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \ + die "Failed to patch portage.VERSION" + sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \ + die "Failed to patch VERSION in doc/fragment/version" + sed -e "1s/VERSION/${PVR}/" -i man/* || \ + die "Failed to patch VERSION in man page headers" + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i pym/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use python3; then + einfo "Converting shebangs for python3..." + python_convert_shebangs -r 3 . + elif use python2; then + einfo "Converting shebangs for python2..." + python_convert_shebangs -r 2 . + fi +} + +src_compile() { + if use doc; then + cd "${S}"/doc + touch fragment/date + make xhtml xhtml-nochunks || die "failed to make docs" + fi + + if use epydoc; then + einfo "Generating api docs" + mkdir "${WORKDIR}"/api + local my_modules epydoc_opts="" + my_modules="$(find "${S}/pym" -name "*.py" \ + | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ + -e 's:/:.:g' | sort)" || die "error listing modules" + # workaround for bug 282760 + > "$S/pym/pysqlite2.py" + PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \ + epydoc -o "${WORKDIR}"/api \ + -qqqqq --no-frames --show-imports $epydoc_opts \ + --name "${PN}" --url "${HOMEPAGE}" \ + ${my_modules} || die "epydoc failed" + rm "$S/pym/pysqlite2.py" + fi +} + +src_test() { + # make files executable, in case they were created by patch + find bin -type f | xargs chmod +x + ./pym/portage/tests/runTests || die "test(s) failed" +} + +src_install() { + local libdir=$(get_libdir) + local portage_base="/usr/${libdir}/portage" + local portage_share_config=/usr/share/portage/config + + cd "${S}"/cnf + insinto /etc + doins etc-update.conf dispatch-conf.conf || die + + insinto "$portage_share_config" + doins "$S/cnf/make.globals" || die + 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 || die + 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 || die + fi + + dosym ..${portage_share_config}/make.globals /etc/make.globals + + insinto /etc/logrotate.d + doins "${S}"/cnf/logrotate.d/elog-save-summary || die + + # BSD and OSX need a sed wrapper so that find/xargs work properly + if use userland_GNU; then + rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper" + fi + + local x symlinks files + + cd "$S" || die "cd failed" + for x in $(find bin -type d) ; do + exeinto $portage_base/$x || die "exeinto failed" + cd "$S"/$x || die "cd failed" + files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l) + if [ -n "$files" ] ; then + doexe $files || die "doexe failed" + fi + symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) + if [ -n "$symlinks" ] ; then + cp -P $symlinks "$D$portage_base/$x" || die "cp failed" + fi + done + + cd "$S" || die "cd failed" + for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do + insinto $portage_base/$x || die "insinto failed" + cd "$S"/$x || die "cd failed" + # __pycache__ directories contain no py files + [[ "*.py" != $(echo *.py) ]] || continue + doins *.py || die "doins failed" + symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) + if [ -n "$symlinks" ] ; then + cp -P $symlinks "$D$portage_base/$x" || die "cp failed" + fi + done + + # We install some minimal tests for use as a preinst sanity check. + # These tests must be able to run without a full source tree and + # without relying on a previous portage instance being installed. + cd "$S" || die "cd failed" + exeinto $portage_base/pym/portage/tests || die + doexe pym/portage/tests/runTests || die + insinto $portage_base/pym/portage/tests || die + doins pym/portage/tests/*.py || die + insinto $portage_base/pym/portage/tests/lint || die + doins pym/portage/tests/lint/*.py || die + doins pym/portage/tests/lint/__test__ || die + + # Symlinks to directories cause up/downgrade issues and the use of these + # modules outside of portage is probably negligible. + for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do + [ ! -L "${x}" ] && continue + die "symlink to directory will cause upgrade/downgrade issues: '${x}'" + 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,NEWS,RELEASE-NOTES} + use doc && dohtml -r "${S}"/doc/* + use epydoc && dohtml -r "${WORKDIR}"/api + + dodir /usr/bin + for x in ebuild egencache emerge portageq quickpkg repoman ; 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 + 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 +} + +pkg_preinst() { + if [[ $ROOT == / ]] ; then + # Run some minimal tests as a sanity check. + local test_runner=$(find "$D" -name runTests) + if [[ -n $test_runner && -x $test_runner ]] ; then + einfo "Running preinst sanity tests..." + "$test_runner" || die "preinst sanity tests failed" + fi + fi + + if ! use build && ! has_version dev-python/pycrypto && \ + ! has_version '>=dev-lang/python-2.6[ssl]' ; then + ewarn "If you are an ebuild developer and you plan to commit ebuilds" + ewarn "with this system then please install dev-python/pycrypto or" + ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order" + ewarn "to enable RMD160 hash support." + ewarn "See bug #198398 for more information." + fi + if [ -f "${ROOT}/etc/make.globals" ]; then + rm "${ROOT}/etc/make.globals" + fi + + if [[ -d ${ROOT}var/log/portage && \ + $(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \ + has_version '