From: Zac Medico Date: Sun, 23 Oct 2011 22:56:06 +0000 (+0000) Subject: 2.1.10.31 version bump. This fixes bug #388187 (InvalidAtom traceback X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=74b99442c4c900abbc6d4017a10f4cd417f27374;p=gentoo.git 2.1.10.31 version bump. This fixes bug #388187 (InvalidAtom traceback triggered by invalid atom in global updates after emerge --sync). Bug #381649 tracks all bugs fixed since portage-2.1.10.11. Package-Manager: portage-2.2.0_alpha71/cvs/Linux i686 --- diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 8f7c2eb9bc9c..24efc5249ed2 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,13 @@ # 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.892 2011/10/21 09:17:47 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.893 2011/10/23 22:56:06 zmedico Exp $ + +*portage-2.1.10.31 (23 Oct 2011) + + 23 Oct 2011; Zac Medico +portage-2.1.10.31.ebuild: + 2.1.10.31 version bump. This fixes bug #388187 (InvalidAtom traceback + triggered by invalid atom in global updates after emerge --sync). Bug #381649 + tracks all bugs fixed since portage-2.1.10.11. *portage-2.2.0_alpha70 (21 Oct 2011) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 7a2ff19fa759..6d75887d0b05 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -6,6 +6,7 @@ DIST portage-2.1.10.11.tar.bz2 849505 RMD160 ae1fae8df7e42978a988ae7f66c3bb335bf DIST portage-2.1.10.27.tar.bz2 892513 RMD160 306a240591c070ec7da222a62a4b15d8c84a94db SHA1 c2b7dac65e31a62a95d18e5644b0a67f3e26ffb6 SHA256 991f04f556d6feface3d1142345ef58aeb29ebb4fbc16eba09add10822ada7d3 DIST portage-2.1.10.29.tar.bz2 899328 RMD160 b3be8efca0bf790bf4046cbfb6e3093404ce2e24 SHA1 4bd99d6b09eecbecd1d57fb415424400dd901e2e SHA256 7c8028a21f1206512646eb5f0de0238a0b11a93c71ec49a16c6d560dbb1c4595 DIST portage-2.1.10.30.tar.bz2 901202 RMD160 b6af0c9612e18b7cb081989d21f496a1caf0a6a4 SHA1 ae54feeddf3de098ddc2da7af089e8c7100aa22b SHA256 0526acda67c809723fafbc8757c37c9301fa224aac08594ae921267c0634398d +DIST portage-2.1.10.31.tar.bz2 901742 RMD160 0b18560b2f8e03ff25fc4e18fc21a9305949a5b5 SHA1 3a1c8a2ab562dda02eb235be728d335154e515a7 SHA256 043e5a027d3041dcaca672943b0f96b60e5c25b856525e5ecdb4ec609745ead4 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 @@ -19,6 +20,7 @@ EBUILD portage-2.1.10.11.ebuild 11660 RMD160 4d52b4ce74bc553ec0f3502bdc03ebfa0d9 EBUILD portage-2.1.10.27.ebuild 11641 RMD160 702f2e04d2b35062315df1454bb6dd2cca80fffe SHA1 87106f71ba0951efc9f8374176273742f04bfe6b SHA256 2ff9011269e163fd74598f9ec01bf1d0e50acb97b11de6e060b871d9fcbcc252 EBUILD portage-2.1.10.29.ebuild 11641 RMD160 e4e9a6f7f5cda9b514e7e3fae6a444898b487f60 SHA1 7b6b93068cd05fb6e51c3fae1e5dc998bdd40d69 SHA256 6b8858b0c4bd455a57f76ad6df684146c93092c97bf1b4640e66aee445b1e5ae EBUILD portage-2.1.10.30.ebuild 11641 RMD160 f70c8fa44fd06661df7348e4b8924a6e4d6058fe SHA1 f4fde178cd82fbeb31c64404534970c149912cbe SHA256 823d9b36cfa57b7d2cae7dd4d8f1de3d9c9af96e782ee8449bf5d11fe1f6bcad +EBUILD portage-2.1.10.31.ebuild 11641 RMD160 459c486a0f2408517388c62173f09783a3ee6d8a SHA1 778924bd4e8c3646ca14c461861aedb857c962e0 SHA256 81b8c83f238584a9cf78d03c6df8ac44e44162a50f3853a639af7bc8532b23e4 EBUILD portage-2.1.6.13.ebuild 10038 RMD160 a40e576c31f07f89387bda834607e62708b47e79 SHA1 ecbd0bae4ca5f340627f1dca792d137870be4d5e SHA256 c507d206aa08c39b387f464f1fe973d15b1b39baadd2a8feafc4867f8856e1a9 EBUILD portage-2.1.6.7.ebuild 8689 RMD160 a04a6f87a6ded5b3c20413c79cc5d854f4083574 SHA1 1782ad24f77a56d2c8cbd88828d50451a1254f7e SHA256 a3f0e6639db74003108c933fcd4557bd4dccbfd913fc6fde7546dbec3987797a EBUILD portage-2.1.9.42.ebuild 10283 RMD160 60ac7fd535e83626095d2ef11466da8e8aa9b209 SHA1 b204bf62ad13b3c3d116fff53bc7a482eb89b7d8 SHA256 1b7968c34b0fc83aa1b388540a155340fdeb93df19de4515826af205fbcb9a3e @@ -27,12 +29,12 @@ EBUILD portage-2.2.0_alpha67.ebuild 12906 RMD160 e3f26d94b1e36d00ec684cef550014e EBUILD portage-2.2.0_alpha69.ebuild 12906 RMD160 75a15c7a9428148e2a58751ea215fa2de6878f07 SHA1 fcdc05cdbaa9473aaa6cdf686fe1fc33cb2faef4 SHA256 efe2d4c593c069b6ae8ce80c1cd7143596f664a9433be83adf273665ca68a9dc EBUILD portage-2.2.0_alpha70.ebuild 12906 RMD160 631bbf230f84a75d4ee137891624acf383a27b82 SHA1 1f4e4f9495d8ce4d8699d6a64f1f2de71b4aeb17 SHA256 6f60675f0d2a93f7b061476574de98efb39a74d54bf1b484587c1e5ce2b0552c EBUILD portage-9999.ebuild 12214 RMD160 497e432fe756c9fda839cd2268a206e80e0ce1ca SHA1 9e9ef38845fa47767919d117c6f9e3c3b7924537 SHA256 ad0d82b6f9b62379595404695abebd73d0158fe257b2eedf117d9e49725ec8e7 -MISC ChangeLog 59996 RMD160 85468295f90d60322c0698bf60949f29aca2a5da SHA1 db4bdc3b82d3e6db450f2e97ff6596e7724b72a8 SHA256 bcefe63360f6b7abcc4c18cc9ffb5e6adffe47e361a2400d646cf2c25e50db6e +MISC ChangeLog 60306 RMD160 d54b24013655fdb905845f1bc006af88f5d5e69f SHA1 cfd76d83d954cda78ec00874d9415d7c457c027e SHA256 b86a02d0769409b007513224d80356dee92a2b08aa9e745a15b405d2d384351e MISC metadata.xml 784 RMD160 ed548c07d0a96be62f1854b92abb4ebc0ae2f281 SHA1 338c4eb3cbb626b8830eddb2f0ef23a48b1c9e12 SHA256 3ec8e42f1532859a3697a5870febeb90c635740da85cdf8f913c7529dfc767f2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6hOMEACgkQ/ejvha5XGaMgKwCg8zYOGdLtzs+pYQCu7zB6inVU -VKQAn0XYkMbynXU8KyEUH0Z3wkQBFAOr -=didZ +iEYEARECAAYFAk6km20ACgkQ/ejvha5XGaO0JwCeIltKHoo4cj6QzMWe4gwtYjXV +msAAoOY34pGuhDMsr1W6XyrWnNs62ngx +=WGq6 -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.1.10.31.ebuild b/sys-apps/portage/portage-2.1.10.31.ebuild new file mode 100644 index 000000000000..00e91b966b55 --- /dev/null +++ b/sys-apps/portage/portage-2.1.10.31.ebuild @@ -0,0 +1,359 @@ +# 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.31.ebuild,v 1.1 2011/10/23 22:56:06 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 )" + +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-1.6 ) + elibc_uclibc? ( >=sys-apps/sandbox-1.6 ) + >=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 '