1 |
commit: a31780f7d5d601390f055bcd9457482fd8830d82 |
2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 1 10:57:27 2018 +0000 |
4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 1 10:57:27 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=a31780f7 |
7 |
|
8 |
Version bump, drop old |
9 |
|
10 |
sys-apps/portage/Manifest | 13 +------- |
11 |
...portage-2.3.28.ebuild => portage-2.3.48.ebuild} | 36 ++++++++-------------- |
12 |
2 files changed, 13 insertions(+), 36 deletions(-) |
13 |
|
14 |
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest |
15 |
index a24caa97a..9200dbdf7 100644 |
16 |
--- a/sys-apps/portage/Manifest |
17 |
+++ b/sys-apps/portage/Manifest |
18 |
@@ -1,16 +1,5 @@ |
19 |
------BEGIN PGP SIGNED MESSAGE----- |
20 |
-Hash: SHA256 |
21 |
- |
22 |
AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 |
23 |
AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c |
24 |
-EBUILD portage-2.3.28.ebuild 9472 BLAKE2B 1aff941173e46a1773970efc55a475241b9a4e7f48a265cd1b6e5227909d317b4ef02b7ff4284e3170923ce896ec3b0cfc42fa5e282b0a776d3527dc28069e64 SHA512 e227ac35eb4c57f6c7ad5c79f1d7b0cd7c39348c27dedecc9e81d28ad8e84ef774c1124b4ecac3b838540346dbfc34715ac2d9b3556702f537d0919549493dc5 |
25 |
EBUILD portage-2.3.38.ebuild 9488 BLAKE2B 612ab5e2a56c01242447390f4a241727732589d1a5dde7bec9c3c98b0b05196d41f6f5a7dfd89d8b7d78327a0fc33b4f0a9cecfe3b0587086072cb769b32f3c9 SHA512 a7171a525d60d590b37f403822325861995b5ab5f7280e31b6822dae76142c88e733cf0455a2b82044aca790d767b6fe862ae563b9122c0bb7ec7be570062d0d |
26 |
+EBUILD portage-2.3.48.ebuild 9180 BLAKE2B f0ef7de50ec4cbbd8aba17a54de8daccb26ebaa285a413e28a21a8445a728d564a0cc5653392bb6489f56e1195bb9f734174231926552e56ab989a01f3a0166c SHA512 1bc66f56d8bf7c49cd543b8e95053f5753bbf0951dceea788d7c48b71948c32051ffdf63b81c501ac9f8fadb6af3575c5a391b06909e66925088fa22e0ad6e4e |
27 |
MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59 |
28 |
------BEGIN PGP SIGNATURE----- |
29 |
- |
30 |
-iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCWwVi5AAKCRAbuSpxNYmQ |
31 |
-Z4REA/0dqnLkuz3U7zeNZ/rqFybrLT5vLkJweDuDnmMXs6sRHTDqHtnlEliaVnz8 |
32 |
-38LmjOXjwZ6r2gEIhucZ3/uFFr/8Ja/cIF5S0zE7gp+TvIb2zPjuOvo80clgJKph |
33 |
-stpqjtWUTpztA/uLLySyYWFqXq2m3JSB2JjgiiT2GnGzyUZxMA== |
34 |
-=ikeW |
35 |
------END PGP SIGNATURE----- |
36 |
|
37 |
diff --git a/sys-apps/portage/portage-2.3.28.ebuild b/sys-apps/portage/portage-2.3.48.ebuild |
38 |
similarity index 92% |
39 |
rename from sys-apps/portage/portage-2.3.28.ebuild |
40 |
rename to sys-apps/portage/portage-2.3.48.ebuild |
41 |
index 69cb0e980..c7e23d65e 100644 |
42 |
--- a/sys-apps/portage/portage-2.3.28.ebuild |
43 |
+++ b/sys-apps/portage/portage-2.3.48.ebuild |
44 |
@@ -5,7 +5,7 @@ EAPI=5 |
45 |
|
46 |
PYTHON_COMPAT=( |
47 |
pypy |
48 |
- python3_4 python3_5 python3_6 |
49 |
+ python3_4 python3_5 python3_6 python3_7 |
50 |
python2_7 |
51 |
) |
52 |
PYTHON_REQ_USE='bzip2(+),threads(+)' |
53 |
@@ -14,12 +14,12 @@ inherit distutils-r1 git-2 multilib systemd |
54 |
|
55 |
EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git" |
56 |
EGIT_BRANCH="multilib" |
57 |
-EGIT_COMMIT="bc55fa6c10f027ba1eb986d3fc6698cd009eff54" |
58 |
+EGIT_COMMIT="cb6737033d90f57168ed12e4b0cec8711b311b36" |
59 |
DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
60 |
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
61 |
|
62 |
LICENSE="GPL-2" |
63 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
64 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd" |
65 |
SLOT="0" |
66 |
IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" |
67 |
|
68 |
@@ -28,8 +28,8 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
69 |
dev-lang/python-exec:2 |
70 |
>=sys-apps/sed-4.0.5 sys-devel/patch |
71 |
doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
72 |
- epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] ) |
73 |
- >=sys-apps/abi-wrapper-1.0-r6" |
74 |
+ >=sys-apps/abi-wrapper-1.0-r6 |
75 |
+ epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" |
76 |
# Require sandbox-2.2 for bug #288863. |
77 |
# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's |
78 |
# quite slow, so it's not considered in the dependencies as an alternative to |
79 |
@@ -49,8 +49,8 @@ RDEPEND=" |
80 |
$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ |
81 |
python{2_7,3_4,3_5} pypy) |
82 |
rsync-verify? ( |
83 |
- >=app-portage/gemato-12.1 |
84 |
- app-crypt/gentoo-keys |
85 |
+ >=app-portage/gemato-14[${PYTHON_USEDEP}] |
86 |
+ >=app-crypt/openpgp-keys-gentoo-release-20180706 |
87 |
>=app-crypt/gnupg-2.2.4-r2[ssl(-)] |
88 |
) |
89 |
) |
90 |
@@ -66,7 +66,8 @@ RDEPEND=" |
91 |
python2_7 pypy) |
92 |
) ) |
93 |
!<app-admin/logrotate-3.8.0 |
94 |
- >=sys-apps/abi-wrapper-1.0-r6" |
95 |
+ >=sys-apps/abi-wrapper-1.0-r6 |
96 |
+ !<app-portage/repoman-2.3.10" |
97 |
PDEPEND=" |
98 |
!build? ( |
99 |
>=net-misc/rsync-2.6.4 |
100 |
@@ -87,7 +88,7 @@ python_prepare_all() { |
101 |
if use gentoo-dev; then |
102 |
einfo "Disabling --dynamic-deps by default for gentoo-dev..." |
103 |
sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ |
104 |
- -i pym/_emerge/create_depgraph_params.py || \ |
105 |
+ -i lib/_emerge/create_depgraph_params.py || \ |
106 |
die "failed to patch create_depgraph_params.py" |
107 |
|
108 |
einfo "Enabling additional FEATURES for gentoo-dev..." |
109 |
@@ -103,7 +104,7 @@ python_prepare_all() { |
110 |
if ! use ipc ; then |
111 |
einfo "Disabling ipc..." |
112 |
sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
113 |
- -i pym/_emerge/AbstractEbuildProcess.py || \ |
114 |
+ -i lib/_emerge/AbstractEbuildProcess.py || \ |
115 |
die "failed to patch AbstractEbuildProcess.py" |
116 |
fi |
117 |
|
118 |
@@ -126,7 +127,7 @@ python_prepare_all() { |
119 |
-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ |
120 |
-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ |
121 |
-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ |
122 |
- -i pym/portage/const.py || \ |
123 |
+ -i lib/portage/const.py || \ |
124 |
die "Failed to patch portage.const.EPREFIX" |
125 |
|
126 |
einfo "Prefixing shebangs ..." |
127 |
@@ -250,22 +251,9 @@ pkg_preinst() { |
128 |
if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then |
129 |
chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} |
130 |
fi |
131 |
- |
132 |
- if has_version ">=${CATEGORY}/${PN}-2.3.1" && \ |
133 |
- has_version "<${CATEGORY}/${PN}-2.3.3"; then |
134 |
- SYNC_DEPTH_UPGRADE=true |
135 |
- else |
136 |
- SYNC_DEPTH_UPGRADE=false |
137 |
- fi |
138 |
} |
139 |
|
140 |
pkg_postinst() { |
141 |
- if ${SYNC_DEPTH_UPGRADE}; then |
142 |
- ewarn "Please note that this release no longer respects sync-depth for" |
143 |
- ewarn "git repositories. There have been too many problems and" |
144 |
- ewarn "performance issues. See bugs 552814, 559008" |
145 |
- fi |
146 |
- |
147 |
einfo |
148 |
elog "For setup instructions after switching to portage-multilib" |
149 |
elog "read doc/portage-multilib-instructions inside the multilib overlay" |