| 1 |
commit: 664e56b780e2a5380a0beeab93e99b2b2ce1fc32 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 28 12:45:07 2016 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 28 12:45:07 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=664e56b7 |
| 7 |
|
| 8 |
Sync with main tree version |
| 9 |
|
| 10 |
sys-apps/portage/Manifest | 2 +- |
| 11 |
sys-apps/portage/portage-2.2.27-r1.ebuild | 13 ++++++++----- |
| 12 |
2 files changed, 9 insertions(+), 6 deletions(-) |
| 13 |
|
| 14 |
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest |
| 15 |
index d45abaa..e9977f9 100644 |
| 16 |
--- a/sys-apps/portage/Manifest |
| 17 |
+++ b/sys-apps/portage/Manifest |
| 18 |
@@ -1,2 +1,2 @@ |
| 19 |
-EBUILD portage-2.2.27-r1.ebuild 11882 SHA256 9f4d60b0f1350609293442e8b083cc437b2495b70dedf3a9df29739c08efd90b SHA512 9fea7694f401348d0e267bbc8cf945293655627bb11805dfb3c59f697de156604dfc1b5931a87b1d7e86c83ca045b70b3386d8f10bfd26473d01e5f70091cb6b WHIRLPOOL 94395ac746ba1b17685ae02b3996a89e692e723ce6420222af965b131c3689158021226764df4576e5e30c456e83f48309693d8569a47ca61f76cc04c724cf0f |
| 20 |
+EBUILD portage-2.2.27-r1.ebuild 11932 SHA256 54920803594f786f6075ebdd8d68831b04805936d18bf9c32c48d4ef1f2362d0 SHA512 eb3122cdb47a75b23b93e157d4666b356a49311397b67060664128b86775c762234c74ad1e45f6c0874e09b1dc63281e7dd53fb6ebe47deea58b04cea3f6ede2 WHIRLPOOL eed819493e8a222591d36aa8d86ede7c6b6f570bda37e60685f180ea0b2f3bd27c854601cfd238f932c82c163d91b9d15f6e91e30f15735edae68d84176ed55a |
| 21 |
MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630 |
| 22 |
|
| 23 |
diff --git a/sys-apps/portage/portage-2.2.27-r1.ebuild b/sys-apps/portage/portage-2.2.27-r1.ebuild |
| 24 |
index f81b38c..a1bfb3d 100644 |
| 25 |
--- a/sys-apps/portage/portage-2.2.27-r1.ebuild |
| 26 |
+++ b/sys-apps/portage/portage-2.2.27-r1.ebuild |
| 27 |
@@ -1,4 +1,4 @@ |
| 28 |
-# Copyright 1999-2015 Gentoo Foundation |
| 29 |
+# Copyright 1999-2016 Gentoo Foundation |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
# $Id$ |
| 32 |
|
| 33 |
@@ -6,17 +6,16 @@ EAPI=5 |
| 34 |
|
| 35 |
PYTHON_COMPAT=( |
| 36 |
pypy |
| 37 |
- python3_3 python3_4 |
| 38 |
+ python3_3 python3_4 python3_5 |
| 39 |
python2_7 |
| 40 |
) |
| 41 |
-# Note: substituted below |
| 42 |
PYTHON_REQ_USE='bzip2(+)' |
| 43 |
|
| 44 |
inherit distutils-r1 git-2 multilib |
| 45 |
|
| 46 |
EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git" |
| 47 |
EGIT_BRANCH="multilib" |
| 48 |
-EGIT_COMMIT="259272b9ffcf2c3d813487bf0119f761f32476e6" |
| 49 |
+EGIT_COMMIT="58fb9ace0cb1bf49df2ce68b13999d303fa25756" |
| 50 |
DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
| 51 |
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
| 52 |
|
| 53 |
@@ -25,7 +24,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s |
| 54 |
SLOT="0" |
| 55 |
IUSE="build doc epydoc +ipc linguas_ru selinux xattr" |
| 56 |
|
| 57 |
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) |
| 58 |
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
| 59 |
>=app-arch/tar-1.27 |
| 60 |
dev-lang/python-exec:2 |
| 61 |
>=sys-apps/sed-4.0.5 sys-devel/patch |
| 62 |
@@ -69,6 +68,10 @@ PDEPEND=" |
| 63 |
|
| 64 |
REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" |
| 65 |
|
| 66 |
+pkg_setup() { |
| 67 |
+ use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) |
| 68 |
+} |
| 69 |
+ |
| 70 |
python_prepare_all() { |
| 71 |
distutils-r1_python_prepare_all |
Archives