| 1 |
commit: 237d10fbc7863d2d96ab787602d9f625b5ac3706 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 13 18:22:23 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 13 18:22:49 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=237d10fb |
| 7 |
|
| 8 |
sys-apps/portage: Add dep on pyblake2, for new manifest-hashes |
| 9 |
|
| 10 |
...ortage-9999.ebuild => portage-2.3.13-r1.ebuild} | 33 ++++++++++++++++------ |
| 11 |
sys-apps/portage/portage-9999.ebuild | 2 ++ |
| 12 |
2 files changed, 26 insertions(+), 9 deletions(-) |
| 13 |
|
| 14 |
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-2.3.13-r1.ebuild |
| 15 |
similarity index 89% |
| 16 |
copy from sys-apps/portage/portage-9999.ebuild |
| 17 |
copy to sys-apps/portage/portage-2.3.13-r1.ebuild |
| 18 |
index f75533d5124..c2ecbb20eb5 100644 |
| 19 |
--- a/sys-apps/portage/portage-9999.ebuild |
| 20 |
+++ b/sys-apps/portage/portage-2.3.13-r1.ebuild |
| 21 |
@@ -1,7 +1,7 @@ |
| 22 |
# Copyright 1999-2017 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI=6 |
| 26 |
+EAPI=5 |
| 27 |
|
| 28 |
PYTHON_COMPAT=( |
| 29 |
pypy |
| 30 |
@@ -10,13 +10,13 @@ PYTHON_COMPAT=( |
| 31 |
) |
| 32 |
PYTHON_REQ_USE='bzip2(+),threads(+)' |
| 33 |
|
| 34 |
-inherit distutils-r1 git-r3 |
| 35 |
+inherit distutils-r1 |
| 36 |
|
| 37 |
DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
| 38 |
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
| 39 |
|
| 40 |
LICENSE="GPL-2" |
| 41 |
-KEYWORDS="" |
| 42 |
+KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86" |
| 43 |
SLOT="0" |
| 44 |
IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr" |
| 45 |
|
| 46 |
@@ -40,6 +40,8 @@ RDEPEND=" |
| 47 |
>=sys-apps/sed-4.0.5 |
| 48 |
app-shells/bash:0[readline] |
| 49 |
>=app-admin/eselect-1.2 |
| 50 |
+ $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ |
| 51 |
+ python{2_7,3_4,3_5} pypy) |
| 52 |
) |
| 53 |
elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
| 54 |
elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
| 55 |
@@ -63,7 +65,7 @@ PDEPEND=" |
| 56 |
|
| 57 |
REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" |
| 58 |
|
| 59 |
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage" |
| 60 |
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives" |
| 61 |
|
| 62 |
prefix_src_archives() { |
| 63 |
local x y |
| 64 |
@@ -74,8 +76,9 @@ prefix_src_archives() { |
| 65 |
done |
| 66 |
} |
| 67 |
|
| 68 |
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git |
| 69 |
- https://github.com/gentoo/portage.git" |
| 70 |
+TARBALL_PV=${PV} |
| 71 |
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 |
| 72 |
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" |
| 73 |
|
| 74 |
pkg_setup() { |
| 75 |
use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) |
| 76 |
@@ -130,7 +133,7 @@ python_prepare_all() { |
| 77 |
einfo "Adjusting repos.conf ..." |
| 78 |
sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ |
| 79 |
-i cnf/repos.conf || die "sed failed" |
| 80 |
- if prefix-guest ; then |
| 81 |
+ if use prefix-guest ; then |
| 82 |
sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ |
| 83 |
-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ |
| 84 |
-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ |
| 85 |
@@ -195,7 +198,7 @@ python_install_all() { |
| 86 |
fi |
| 87 |
|
| 88 |
# Due to distutils/python-exec limitations |
| 89 |
- # they must be installed to /usr/bin. |
| 90 |
+ # these must be installed to /usr/bin. |
| 91 |
local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' |
| 92 |
einfo "Moving admin scripts to the correct directory" |
| 93 |
dodir /usr/sbin |
| 94 |
@@ -225,12 +228,24 @@ pkg_preinst() { |
| 95 |
if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then |
| 96 |
chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} |
| 97 |
fi |
| 98 |
+ |
| 99 |
+ if has_version ">=${CATEGORY}/${PN}-2.3.1" && \ |
| 100 |
+ has_version "<${CATEGORY}/${PN}-2.3.3"; then |
| 101 |
+ SYNC_DEPTH_UPGRADE=true |
| 102 |
+ else |
| 103 |
+ SYNC_DEPTH_UPGRADE=false |
| 104 |
+ fi |
| 105 |
} |
| 106 |
|
| 107 |
pkg_postinst() { |
| 108 |
+ if ${SYNC_DEPTH_UPGRADE}; then |
| 109 |
+ ewarn "Please note that this release no longer respects sync-depth for" |
| 110 |
+ ewarn "git repositories. There have been too many problems and" |
| 111 |
+ ewarn "performance issues. See bugs 552814, 559008" |
| 112 |
+ fi |
| 113 |
einfo "" |
| 114 |
einfo "This release of portage NO LONGER contains the repoman code base." |
| 115 |
- einfo "Repoman now has it's own ebuild and release package." |
| 116 |
+ einfo "Repoman has its own ebuild and release package." |
| 117 |
einfo "For repoman functionality please emerge app-portage/repoman" |
| 118 |
einfo "Please report any bugs you may encounter." |
| 119 |
einfo "" |
| 120 |
|
| 121 |
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild |
| 122 |
index f75533d5124..c7453d27b01 100644 |
| 123 |
--- a/sys-apps/portage/portage-9999.ebuild |
| 124 |
+++ b/sys-apps/portage/portage-9999.ebuild |
| 125 |
@@ -40,6 +40,8 @@ RDEPEND=" |
| 126 |
>=sys-apps/sed-4.0.5 |
| 127 |
app-shells/bash:0[readline] |
| 128 |
>=app-admin/eselect-1.2 |
| 129 |
+ $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ |
| 130 |
+ python{2_7,3_4,3_5} pypy) |
| 131 |
) |
| 132 |
elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
| 133 |
elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
Archives