From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BDE4B1381F3 for ; Fri, 12 Apr 2013 07:45:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E7E8E0B0C; Fri, 12 Apr 2013 07:45:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2F89E0B0C for ; Fri, 12 Apr 2013 07:45:56 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6F25F33DF9B for ; Fri, 12 Apr 2013 07:45:55 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2098) id 355472171D; Fri, 12 Apr 2013 07:45:53 +0000 (UTC) From: "Zac Medico (zmedico)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, zmedico@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-2.1.11.62.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: portage-2.1.11.62.ebuild ChangeLog X-VCS-Directories: sys-apps/portage X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130412074554.355472171D@flycatcher.gentoo.org> Date: Fri, 12 Apr 2013 07:45:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f4da4905-3c8d-4793-a1b9-df99f150dcda X-Archives-Hash: 87798f9562779832864d1d0a671d4e23 zmedico 13/04/12 07:45:53 Modified: ChangeLog Added: portage-2.1.11.62.ebuild Log: 2.1.11.62 version bump. This fixes a repoman bug which randomly triggered incorrect package.use.stable.* handling. Bug #462382 tracks all bugs fixed since portage-2.1.11.55. (Portage version: 2.2.0_alpha173/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3) Revision Changes Path 1.1248 sys-apps/portage/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1248&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1248&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1247&r2=1.1248 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v retrieving revision 1.1247 retrieving revision 1.1248 diff -u -r1.1247 -r1.1248 --- ChangeLog 11 Apr 2013 23:43:44 -0000 1.1247 +++ ChangeLog 12 Apr 2013 07:45:53 -0000 1.1248 @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1247 2013/04/11 23:43:44 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1248 2013/04/12 07:45:53 zmedico Exp $ + +*portage-2.1.11.62 (12 Apr 2013) + + 12 Apr 2013; Zac Medico +portage-2.1.11.62.ebuild: + 2.1.11.62 version bump. This fixes a repoman bug which randomly triggered + incorrect package.use.stable.* handling. Bug #462382 tracks all bugs fixed + since portage-2.1.11.55. *portage-2.2.0_alpha172 (11 Apr 2013) 1.1 sys-apps/portage/portage-2.1.11.62.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.62.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.62.ebuild?rev=1.1&content-type=text/plain Index: portage-2.1.11.62.ebuild =================================================================== # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.62.ebuild,v 1.1 2013/04/12 07:45:53 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 PYTHON_COMPAT=( pypy1_9 pypy2_0 python3_1 python3_2 python3_3 python3_4 python2_6 python2_7 ) 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 ~x86 ~sparc-fbsd ~x86-fbsd" SLOT="0" IUSE="build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr" for _pyimpl in ${PYTHON_COMPAT[@]} ; do IUSE+=" python_targets_${_pyimpl}" done unset _pyimpl # Import of the io module in python-2.6 raises ImportError for the # thread module if threading is disabled. python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )" python_dep="${python_dep_ssl//\[ssl\]}" python_dep="${python_dep//,ssl}" python_dep="${python_dep//ssl,}" python_dep="${python_dep} python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) " # The pysqlite blocker is for bug #282760. # make-3.82 is for bug #455858 DEPEND="${python_dep} >=sys-devel/make-3.82 >=sys-apps/sed-4.0.5 sys-devel/patch 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. # For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's # quite slow, so it's not considered in the dependencies as an alternative to # to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so # for now, don't pull in xattr deps for other kernels. # For whirlpool hash, require python[ssl] or python-mhash (bug #425046). # For compgen, require bash[readline] (bug #445576). RDEPEND="${python_dep} !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( =app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( ${python_dep_ssl} dev-python/python-mhash ) ) 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 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] = 0x2060000 and "good" or "bad")') = good ]] } current_python_has_xattr() { [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).' local PYTHON=/usr/bin/${EPYTHON} [[ $("${PYTHON}" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \ "${PYTHON}" -c 'import xattr' 2>/dev/null } call_with_python_impl() { [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).' env EPYTHON=${EPYTHON} "$@" } get_python_interpreter() { [ $# -eq 1 ] || die "expected 1 argument, got $#: $*" local impl=$1 python case "${impl}" in python*) python=${impl/_/.} ;; pypy*) python=${impl/_/.} python=${python/pypy/pypy-c} ;; *) die "Unrecognized python target: ${impl}" esac echo ${python} } get_python_sitedir() { [ $# -eq 1 ] || die "expected 1 argument, got $#: $*" local impl=$1 local site_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages [[ -d ${ROOT}${site_dir} ]] || \ ewarn "site-packages dir missing for ${impl}: ${ROOT}${site_dir}" echo "${site_dir}" } python_compileall() { [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).' local d=$1 PYTHON=/usr/bin/${EPYTHON} local d_image=${D}${d#/} [[ -d ${d_image} ]] || die "directory does not exist: ${d_image}" case "${EPYTHON}" in python*) "${PYTHON}" -m compileall -q -f -d "${d}" "${d_image}" || die # Note: Using -OO breaks emaint, since it requires __doc__, # and __doc__ is None when -OO is used. "${PYTHON}" -O -m compileall -q -f -d "${d}" "${d_image}" || die ;; pypy*) "${PYTHON}" -m compileall -q -f -d "${d}" "${d_image}" || die ;; *) die "Unrecognized EPYTHON value: ${EPYTHON}" esac } pkg_setup() { 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 pypy2_0 && use python3 ; then ewarn "Both pypy2_0 and python3 USE flags are enabled, but only one" ewarn "can be in the shebangs. Using python3." fi if use pypy2_0 && use python2 ; then ewarn "Both pypy2_0 and python2 USE flags are enabled, but only one" ewarn "can be in the shebangs. Using python2" fi if ! use pypy2_0 && ! 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 # We use EPYTHON to designate the active python interpreter, # but we only export when needed, via call_with_python_impl. EPYTHON=python export -n EPYTHON if use python3; then EPYTHON=python3 elif use python2; then EPYTHON=python2 elif use pypy2_0; then EPYTHON=pypy-c2.0 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 $(find man -type f) || \ 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 xattr && use kernel_linux ; then einfo "Adding FEATURES=xattr to make.globals ..." echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ || die "failed to append to make.globals" fi local set_shebang= if use python3; then set_shebang=python3 elif use python2; then set_shebang=python2 elif use pypy2_0; then set_shebang=pypy-c2.0 fi if [[ -n ${set_shebang} ]] ; then einfo "Converting shebangs for ${set_shebang}..." while read -r -d $'\0' ; do local shebang=$(head -n1 "$REPLY") if [[ ${shebang} == "#!/usr/bin/python"* ]] ; then sed -i -e "1s:python:${set_shebang}:" "$REPLY" || \ die "sed failed" fi done < <(find . -type f -print0) fi cd "${S}/cnf" || die if [ -f "make.conf.${ARCH}".diff ]; then patch make.conf "make.conf.${ARCH}".diff || \ die "Failed to patch 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 "" fi } src_compile() { if use doc; then call_with_python_impl \ emake docbook || die fi if use epydoc; then einfo "Generating api docs" call_with_python_impl \ emake epydoc || die fi } src_test() { call_with_python_impl \ emake test || die } src_install() { call_with_python_impl \ emake DESTDIR="${D}" \ sysconfdir="/etc" \ prefix="/usr" \ install || die # Extended set config is currently disabled in portage-2.1.x. rm -rf "${D}/usr/share/portage/config/sets" || die # Use dodoc for compression, since the Makefile doesn't do that. dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die if use linguas_pl; then doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die fi # Allow external portage API consumers to import portage python modules # (this used to be done with PYTHONPATH setting in /etc/env.d). # For each of PYTHON_TARGETS, install a tree of *.py symlinks in # site-packages, and compile with the corresponding interpreter. local impl files mod_dir dest_mod_dir python relative_path x for impl in "${PYTHON_COMPAT[@]}" ; do use "python_targets_${impl}" || continue if use build && [[ ${ROOT} == / && ! -x /usr/bin/$(get_python_interpreter ${impl}) ]] ; then # Tolerate --nodeps at beginning of stage1 for catalyst ewarn "skipping python_targets_${impl}, interpreter not found" continue fi while read -r mod_dir ; do cd "${D}/usr/lib/portage/pym/${mod_dir}" || die files=$(echo *.py) if [ -z "${files}" ] || [ "${files}" = "*.py" ]; then # __pycache__ directories contain no py files continue fi dest_mod_dir=$(get_python_sitedir ${impl})/${mod_dir} dodir "${dest_mod_dir}" || die relative_path=../../../lib/portage/pym/${mod_dir} x=/${mod_dir} while [ -n "${x}" ] ; do relative_path=../${relative_path} x=${x%/*} done for x in ${files} ; do dosym "${relative_path}/${x}" \ "${dest_mod_dir}/${x}" || die done done < <(cd "${D}"/usr/lib/portage/pym || die ; find * -type d ! -path "portage/tests*") cd "${S}" || die EPYTHON=$(get_python_interpreter ${impl}) \ python_compileall "$(get_python_sitedir ${impl})" done # Compile /usr/lib/portage/pym with the active interpreter, since portage # internal commands force this directory to the beginning of sys.path. python_compileall /usr/lib/portage/pym } 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 xattr && ! current_python_has_xattr ; then ewarn "For optimal performance in xattr handling, install" ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and" ewarn "enable USE=python3 for $CATEGORY/$PN." fi if [[ -d ${ROOT}var/log/portage && \ $(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \ has_version '