From: "Thomas Sachau" <tommy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/multilib-portage:master commit in: sys-apps/portage/
Date: Sat, 23 Mar 2013 16:48:26 +0000 (UTC) [thread overview]
Message-ID: <1364056303.416858d00bb3881248e865c64ea10f5238cc9abc.tommy@gentoo> (raw)
commit: 416858d00bb3881248e865c64ea10f5238cc9abc
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 16:31:43 2013 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 16:31:43 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=416858d0
Sync portage
---
sys-apps/portage/Manifest | 2 +-
...-r1.ebuild => portage-2.2.0_alpha169-r1.ebuild} | 92 +++++++++++++++-----
2 files changed, 70 insertions(+), 24 deletions(-)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 14ca485..832b3e1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha166-r1.ebuild 11941 SHA256 48b5077f719ce48b3f4f3871e895c244ea843039359bdc26c953a053374dcb63 SHA512 aba940bd673da0613a4f5489497064035d2d49b3bae05eb792c4837e4eb108fd18893faf9930cd8a3b91075ec6420a31ec26c1efc66f4c0ac0f1cce6d97b1991 WHIRLPOOL 68845b4d8dd61ad87af3cb83eb497331623987512a96c7710f6204ceaadb84e6f980497f4bcc95330756fbbdd61d58cf61a87295a258f9522396c8e5acb3d35e
+EBUILD portage-2.2.0_alpha169-r1.ebuild 13411 SHA256 3cc4b36d3de23eb3d25024f111788db8938217256e052adaae40989a1625d00d SHA512 e73f2787468b81649f8d92e490c7afab7d9f5caddb9a68cda91cbbe5f3c5970803d6683041c6530cab13b85e8b3c728e6174a57fd0c9d49f61107323d4f9fbaf WHIRLPOOL 90b52685e176516b50de75dd8cc1c966844c0b3a97cb939bfb43b658ba0b555a2361c5744dd6475754db63a09ac04762cbaa4cfb61d1952dcbcb3c3b55c2f079
MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630
diff --git a/sys-apps/portage/portage-2.2.0_alpha166-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha169-r1.ebuild
similarity index 81%
rename from sys-apps/portage/portage-2.2.0_alpha166-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha169-r1.ebuild
index 19bfeee..8fdb698 100644
--- a/sys-apps/portage/portage-2.2.0_alpha166-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha169-r1.ebuild
@@ -1,15 +1,20 @@
# 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.2.0_alpha161.ebuild,v 1.1 2013/01/24 22:13:22 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha169.ebuild,v 1.1 2013/03/22 02:43:09 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=3
+PYTHON_COMPAT=(
+ pypy1_9 pypy2_0
+ python3_1 python3_2 python3_3 python3_4
+ python2_6 python2_7
+)
inherit eutils git-2 python
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
EGIT_BRANCH="multilib"
-EGIT_COMMIT="6e28e4f677db82944f5658b47452f195641841bb"
+EGIT_COMMIT="5a1193e5acd717b0afa77b56ef15f47036bd3c31"
DESCRIPTION="Portage is the package management and distribution system for Gentoo"
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
LICENSE="GPL-2"
@@ -17,6 +22,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
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] )
@@ -29,8 +39,21 @@ 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 )
@@ -91,8 +114,8 @@ pkg_setup() {
! 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.}
+ for x in "${EPREFIX}"/usr/bin/python2.* ; do
+ x=${x#${EPREFIX}/usr/bin/python2.}
if [[ $x -ge 6 ]] 2>/dev/null ; then
eselect python set python2.$x
if compatible_python_is_selected ; then
@@ -236,12 +259,48 @@ src_install() {
doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
fi
- # Set PYTHONPATH for portage API consumers. This way we don't have
- # to rely on patched python having the correct path, since it has
- # been known to incorrectly add /usr/libx32/portage/pym to sys.path.
- echo "PYTHONPATH=\"${EPREFIX}/usr/lib/portage/pym\"" > \
- "${T}/05portage" || die
- doenvd "${T}/05portage" || die
+ # 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 files x
+ for impl in "${PYTHON_COMPAT[@]}" ; do
+ use "python_targets_${impl}" || continue
+ while read -r mod_dir ; do
+ cd "${S}/pym/${mod_dir}" || die
+ files=$(echo *.py)
+ if [ -z "${files}" ] || [ "${files}" = "*.py" ]; then
+ # __pycache__ directories contain no py files
+ continue
+ fi
+ dest_mod_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages/${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 "${S}"/pym || die ; find * -type d ! -path "portage/tests*")
+ dest_mod_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages
+ case "${impl}" in
+ python*)
+ python=${impl/_/.}
+ python=${EPREFIX}/usr/bin/${python}
+ "${python}" -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
+ "${python}" -OO -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
+ ;;
+ pypy*)
+ python=${impl/_/.}
+ python=${EPREFIX}/usr/bin/${python/pypy/pypy-c}
+ "${python}" -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
+ ;;
+ esac
+ done
}
pkg_preinst() {
@@ -260,15 +319,6 @@ pkg_preinst() {
ewarn "enable USE=python3 for $CATEGORY/$PN."
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
-
has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
@@ -281,10 +331,6 @@ pkg_preinst() {
}
pkg_postinst() {
- # Compile all source files recursively. Any orphans
- # will be identified and removed in postrm.
- python_mod_optimize /usr/lib/portage/pym
-
if $WORLD_MIGRATION_UPGRADE && \
grep -q "^@" "${EROOT}/var/lib/portage/world"; then
einfo "moving set references from the worldfile into world_sets"
next reply other threads:[~2013-03-23 16:48 UTC|newest]
Thread overview: 178+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-23 16:48 Thomas Sachau [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-05-22 12:51 [gentoo-commits] proj/multilib-portage:master commit in: sys-apps/portage/ Thomas Sachau
2023-05-21 10:59 Thomas Sachau
2023-05-20 15:28 Thomas Sachau
2023-05-20 15:27 Thomas Sachau
2023-05-20 15:27 Thomas Sachau
2023-05-20 15:27 Thomas Sachau
2023-05-20 15:27 Thomas Sachau
2023-05-20 14:45 Thomas Sachau
2023-05-20 14:34 Thomas Sachau
2023-05-20 14:34 Thomas Sachau
2023-05-20 14:34 Thomas Sachau
2023-05-20 14:04 Thomas Sachau
2022-09-10 14:41 Thomas Sachau
2022-03-21 12:04 Thomas Sachau
2022-03-21 12:04 Thomas Sachau
2022-03-21 12:04 Thomas Sachau
2022-03-21 12:02 Thomas Sachau
2022-03-21 11:40 Thomas Sachau
2022-03-21 11:33 Thomas Sachau
2022-03-21 11:23 Thomas Sachau
2022-03-21 11:23 Thomas Sachau
2022-03-21 11:23 Thomas Sachau
2022-03-21 11:23 Thomas Sachau
2022-03-21 11:23 Thomas Sachau
2022-02-11 21:25 Thomas Sachau
2021-12-25 19:04 Thomas Sachau
2021-07-25 19:02 Thomas Sachau
2021-07-25 19:02 Thomas Sachau
2021-04-03 8:42 Thomas Sachau
2021-04-03 8:42 Thomas Sachau
2021-01-23 10:00 Thomas Sachau
2021-01-23 10:00 Thomas Sachau
2021-01-23 9:59 Thomas Sachau
2021-01-15 17:21 Thomas Sachau
2021-01-15 17:21 Thomas Sachau
2020-11-01 10:05 Thomas Sachau
2020-08-23 12:30 Thomas Sachau
2020-08-23 12:11 Thomas Sachau
2020-08-23 12:11 Thomas Sachau
2020-02-29 15:29 Thomas Sachau
2020-02-29 15:29 Thomas Sachau
2019-12-26 14:21 Thomas Sachau
2019-12-26 14:21 Thomas Sachau
2019-12-26 14:21 Thomas Sachau
2019-03-17 11:42 Thomas Sachau
2019-03-17 11:33 Thomas Sachau
2019-03-17 11:33 Thomas Sachau
2018-09-01 11:07 Thomas Sachau
2018-05-23 13:17 Thomas Sachau
2018-05-23 13:17 Thomas Sachau
2018-04-14 12:39 Thomas Sachau
2018-04-14 12:39 Thomas Sachau
2018-04-14 12:39 Thomas Sachau
2018-03-03 15:34 Thomas Sachau
2018-03-03 15:34 Thomas Sachau
2018-01-07 14:28 Thomas Sachau
2018-01-07 14:28 Thomas Sachau
2018-01-07 14:28 Thomas Sachau
2018-01-07 14:28 Thomas Sachau
2018-01-07 14:28 Thomas Sachau
2016-02-28 13:00 Thomas Sachau
2016-02-28 13:00 Thomas Sachau
2016-02-28 13:00 Thomas Sachau
2015-10-04 15:34 Thomas Sachau
2015-10-04 15:34 Thomas Sachau
2015-10-04 15:34 Thomas Sachau
2015-05-31 10:44 Thomas Sachau
2015-05-31 10:44 Thomas Sachau
2015-05-05 11:48 Thomas Sachau
2015-05-05 11:48 Thomas Sachau
2014-12-12 20:47 Thomas Sachau
2014-06-02 20:21 Thomas Sachau
2013-09-15 20:58 Thomas Sachau
2013-09-15 11:45 Thomas Sachau
2013-09-15 11:45 Thomas Sachau
2013-09-15 11:37 Thomas Sachau
2013-09-15 11:37 Thomas Sachau
2013-09-10 17:17 Thomas Sachau
2013-08-25 19:55 Thomas Sachau
2013-08-18 21:13 Thomas Sachau
2013-08-04 22:14 Thomas Sachau
2013-08-04 22:14 Thomas Sachau
2013-08-04 22:14 Thomas Sachau
2013-08-04 22:14 Thomas Sachau
2013-05-31 12:19 Thomas Sachau
2013-05-20 10:51 Thomas Sachau
2013-05-10 8:05 Thomas Sachau
2013-04-14 13:33 Thomas Sachau
2013-04-03 11:55 Thomas Sachau
2013-03-28 19:34 Thomas Sachau
2013-03-08 17:49 Thomas Sachau
2013-03-03 15:18 Thomas Sachau
2013-02-27 20:19 Thomas Sachau
2013-02-16 19:10 Thomas Sachau
2013-02-16 19:10 Thomas Sachau
2013-01-26 17:26 Thomas Sachau
2013-01-26 17:26 Thomas Sachau
2013-01-12 11:31 Thomas Sachau
2012-12-16 12:37 Thomas Sachau
2012-12-14 20:20 Thomas Sachau
2012-12-14 20:20 Thomas Sachau
2012-12-09 10:57 Thomas Sachau
2012-12-07 22:28 Thomas Sachau
2012-11-30 17:01 Thomas Sachau
2012-11-30 17:01 Thomas Sachau
2012-11-30 17:01 Thomas Sachau
2012-10-29 12:26 Thomas Sachau
2012-10-22 9:47 Thomas Sachau
2012-10-22 9:47 Thomas Sachau
2012-10-22 9:47 Thomas Sachau
2012-10-22 9:47 Thomas Sachau
2012-10-14 9:40 Thomas Sachau
2012-10-06 12:17 Thomas Sachau
2012-09-29 13:22 Thomas Sachau
2012-09-24 20:45 Thomas Sachau
2012-09-24 20:45 Thomas Sachau
2012-09-22 15:57 Thomas Sachau
2012-09-22 15:35 Thomas Sachau
2012-09-22 15:35 Thomas Sachau
2012-09-22 15:35 Thomas Sachau
2012-09-17 20:17 Thomas Sachau
2012-09-17 20:17 Thomas Sachau
2012-09-17 20:17 Thomas Sachau
2012-09-08 13:01 Thomas Sachau
2012-07-08 10:31 Thomas Sachau
2012-07-08 10:31 Thomas Sachau
2012-07-01 12:40 Thomas Sachau
2012-07-01 12:40 Thomas Sachau
2012-06-10 12:45 Thomas Sachau
2012-06-03 12:37 Thomas Sachau
2012-05-28 10:20 Thomas Sachau
2012-05-17 10:05 Thomas Sachau
2012-05-12 7:59 Thomas Sachau
2012-05-11 20:41 Thomas Sachau
2012-05-01 14:35 Thomas Sachau
2012-05-01 14:35 Thomas Sachau
2012-04-24 21:27 Thomas Sachau
2012-04-06 11:51 Thomas Sachau
2012-04-04 12:43 Thomas Sachau
2012-04-01 22:01 Thomas Sachau
2012-03-30 18:56 Thomas Sachau
2012-03-25 20:33 Thomas Sachau
2012-03-24 16:35 Thomas Sachau
2012-03-24 16:35 Thomas Sachau
2012-03-24 16:35 Thomas Sachau
2012-03-24 16:35 Thomas Sachau
2012-03-24 16:35 Thomas Sachau
2012-03-24 16:35 Thomas Sachau
2012-03-24 16:35 Thomas Sachau
2012-03-24 16:35 Thomas Sachau
2012-03-24 16:35 Thomas Sachau
2012-03-24 16:35 Thomas Sachau
2012-03-24 16:35 Thomas Sachau
2012-03-24 16:35 Thomas Sachau
2012-03-24 16:35 Thomas Sachau
2012-03-07 19:54 Thomas Sachau
2012-03-07 19:54 Thomas Sachau
2012-03-07 19:54 Thomas Sachau
2012-02-23 19:12 Thomas Sachau
2012-02-18 16:16 Thomas Sachau
2012-02-18 16:16 Thomas Sachau
2012-02-18 16:16 Thomas Sachau
2012-02-06 20:25 Thomas Sachau
2011-12-28 13:36 Thomas Sachau
2011-12-24 14:22 Thomas Sachau
2011-12-16 17:30 Thomas Sachau
2011-12-07 21:35 Thomas Sachau
2011-11-26 14:06 Thomas Sachau
2011-11-19 14:28 Thomas Sachau
2011-11-18 23:30 Thomas Sachau
2011-11-15 17:53 Thomas Sachau
2011-11-15 17:53 Thomas Sachau
2011-11-15 17:53 Thomas Sachau
2011-11-15 17:53 Thomas Sachau
2011-10-31 19:59 Thomas Sachau
2011-10-24 20:46 Thomas Sachau
2011-10-23 11:43 Thomas Sachau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364056303.416858d00bb3881248e865c64ea10f5238cc9abc.tommy@gentoo \
--to=tommy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox