1 |
commit: 55135f1140367fcf93695f6183a470068d1701ae |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 16 09:27:35 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 16 10:45:01 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55135f11 |
7 |
|
8 |
sys-apps/portage-mgorny: Bump to 2.3.43.2 |
9 |
|
10 |
sys-apps/portage-mgorny/Manifest | 1 + |
11 |
.../portage-mgorny/portage-mgorny-2.3.43.2.ebuild | 198 +++++++++++++++++++++ |
12 |
2 files changed, 199 insertions(+) |
13 |
|
14 |
diff --git a/sys-apps/portage-mgorny/Manifest b/sys-apps/portage-mgorny/Manifest |
15 |
index 28ca9b96286..45fa6d05cf9 100644 |
16 |
--- a/sys-apps/portage-mgorny/Manifest |
17 |
+++ b/sys-apps/portage-mgorny/Manifest |
18 |
@@ -2,3 +2,4 @@ DIST portage-mgorny-2.3.26.1.tar.gz 1237698 BLAKE2B 73dcce2f57930bd074f6de5103a3 |
19 |
DIST portage-mgorny-2.3.31.1.tar.gz 1245744 BLAKE2B f9085fd7b66c2e018736cd1b5740d03cd61ab50d18113d651289521c3cb7786bd7963b24fe9a8d55e9dd107a01bc77c5ca2e8f343e4728a844fc17fd608a3680 SHA512 d2f6188f78c94341c97ca71915bd1428b49d26ea2d22f34b71029128dbd9ec0c9673b2835af730f17d81aba96927bcf05e46ef82ba1e94c3ae7249b6ac8ee235 |
20 |
DIST portage-mgorny-2.3.33.1.tar.gz 1246760 BLAKE2B 5502b60a889d224008d9cdd3befce80bc831ab15bf1a9dd43599e6da307d108939fe21ba272f19b785e2e927c582bef55dd2baa2186f0dcb882a5ea9b37accc4 SHA512 1fcc239abbb4288dc8863e3d5aea84fe59dcb1ecd989616cfabc477dc8516722d174021e96105ded26952d7e900c83dd32da27c35fd1e429af6431ee32dfa877 |
21 |
DIST portage-mgorny-2.3.36.1.tar.gz 1247357 BLAKE2B e3adcb48a2261d55956e9d5da291936aa581f485a88b815097f93bec4b0300f98677064207a60b2d98c10c1c6082e6f58221f7bea87b689a920c0c50a81bd583 SHA512 16284e06531cdad65f8ea3efd8f4fb9e4f3ff5c127c7d24f5a3fc3d0ba1a3cebe18e32b89ed85759f6b3df3841eaf618390c5b401a7e621a02cfce1da71c4ea4 |
22 |
+DIST portage-mgorny-2.3.43.2.tar.gz 1254672 BLAKE2B 2fc3b7d1fa617b0032525fcef475c53d8a59b2c5b34a6685b7c34d88d41930bd24bd4203966922537ef243f30e4377060ba7f94e89c1bb3c9941cbc3297a690b SHA512 b23386616dac61295460c823bb24959e3adb926d97d1d6e188df8958089bfec20cd87b2f6090e74bba249c0006496571d3807b20edf1947655659e777423a691 |
23 |
|
24 |
diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.43.2.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.43.2.ebuild |
25 |
new file mode 100644 |
26 |
index 00000000000..ccc6052e205 |
27 |
--- /dev/null |
28 |
+++ b/sys-apps/portage-mgorny/portage-mgorny-2.3.43.2.ebuild |
29 |
@@ -0,0 +1,198 @@ |
30 |
+# Copyright 1999-2018 Gentoo Foundation |
31 |
+# Distributed under the terms of the GNU General Public License v2 |
32 |
+ |
33 |
+EAPI=6 |
34 |
+ |
35 |
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy ) |
36 |
+PYTHON_REQ_USE='bzip2(+),threads(+)' |
37 |
+ |
38 |
+inherit distutils-r1 |
39 |
+ |
40 |
+DESCRIPTION="Fork of Portage focused on cleaning up and useful features" |
41 |
+HOMEPAGE="https://github.com/mgorny/portage-mgorny" |
42 |
+SRC_URI="https://github.com/mgorny/portage-mgorny/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
43 |
+ |
44 |
+LICENSE="GPL-2" |
45 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" |
46 |
+SLOT="0" |
47 |
+IUSE="build +ipc +native-extensions selinux xattr kernel_linux" |
48 |
+ |
49 |
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
50 |
+ >=app-arch/tar-1.27 |
51 |
+ >=sys-apps/sed-4.0.5 |
52 |
+ sys-devel/patch" |
53 |
+RDEPEND=" |
54 |
+ >=app-arch/tar-1.27 |
55 |
+ !build? ( |
56 |
+ >=app-admin/eselect-1.2 |
57 |
+ app-crypt/openpgp-keys-gentoo-release |
58 |
+ >=app-crypt/gnupg-2.2.4-r2[ssl(-)] |
59 |
+ >=app-portage/gemato-10[${PYTHON_USEDEP}] |
60 |
+ app-shells/bash:0[readline] |
61 |
+ $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ |
62 |
+ python{2_7,3_4,3_5} pypy) |
63 |
+ >=dev-python/lxml-3.6.0[${PYTHON_USEDEP}] |
64 |
+ >=sys-apps/sed-4.0.5 |
65 |
+ ) |
66 |
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
67 |
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
68 |
+ elibc_musl? ( >=sys-apps/sandbox-2.2 ) |
69 |
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
70 |
+ >=app-misc/pax-utils-0.1.17 |
71 |
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) |
72 |
+ xattr? ( kernel_linux? ( |
73 |
+ >=sys-apps/install-xattr-0.3 |
74 |
+ $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ |
75 |
+ python2_7 pypy) |
76 |
+ ) ) |
77 |
+ !app-portage/repoman |
78 |
+ !sys-apps/portage" |
79 |
+PDEPEND=" |
80 |
+ !build? ( |
81 |
+ >=net-misc/rsync-2.6.4 |
82 |
+ )" |
83 |
+# NOTE: FEATURES=installsources requires debugedit and rsync |
84 |
+ |
85 |
+pkg_pretend() { |
86 |
+ if [[ -f ${EROOT%/}/etc/make.conf ]]; then |
87 |
+ eerror "You seem to be using /etc/make.conf. Please migrate to the new" |
88 |
+ eerror "/etc/portage/make.conf location before upgrading." |
89 |
+ if [[ ! -f ${EROOT%/}/etc/portage/make.conf ]]; then |
90 |
+ eerror |
91 |
+ eerror " mv ${EROOT%/}/etc/make.conf ${EROOT%/}/etc/portage/make.conf" |
92 |
+ else |
93 |
+ ewarn |
94 |
+ ewarn "WARNING: You seem to have make.conf in both locations. Please take" |
95 |
+ ewarn "care not to accientally overwrite one with the other." |
96 |
+ fi |
97 |
+ die "${EROOT%/}/etc/make.conf present" |
98 |
+ fi |
99 |
+ |
100 |
+ if [[ -f ${EROOT%/}/etc/portage/package.keywords ]]; then |
101 |
+ eerror "You seem to be using /etc/portage/package.keywords. Please migrate" |
102 |
+ eerror "to the new /etc/portage/package.accept_keywords location before" |
103 |
+ eerror "upgrading." |
104 |
+ eerror |
105 |
+ if [[ -d ${EROOT%/}/etc/portage/package.accept_keywords ]]; then |
106 |
+ eerror " mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords/99old" |
107 |
+ else |
108 |
+ if [[ -f ${EROOT%/}/etc/portage/package.accept_keywords ]]; then |
109 |
+ eerror " cat ${EROOT%/}/etc/portage/package.accept_keywords >> ${EROOT%/}/etc/portage/package.keywords" |
110 |
+ fi |
111 |
+ eerror " mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords" |
112 |
+ fi |
113 |
+ die "${EROOT%/}/etc/portage/package.keywords present" |
114 |
+ fi |
115 |
+ |
116 |
+ if has_version sys-apps/portage; then |
117 |
+ ewarn "If you are migrating from sys-apps/portage to sys-apps/portage-mgorny," |
118 |
+ ewarn "please note that Portage will abort upon having to unmerge itself." |
119 |
+ ewarn "However, sys-apps/portage-mgorny will already be installed at this" |
120 |
+ ewarn "point, so you simply have to restart emerge and it will successfully" |
121 |
+ ewarn "clean the old package afterwards." |
122 |
+ ewarn |
123 |
+ ewarn "If you did not use '--dynamic-deps n' in Portage, your VDB dependency" |
124 |
+ ewarn "graph is probably broken. You may need to use '--changed-deps y'" |
125 |
+ ewarn "for your first @world upgrade to resolve the conflicts. Afterwards," |
126 |
+ ewarn "--changed-deps should no longer be necessary and any conflicts" |
127 |
+ ewarn "introduced afterwards should be reported to bugs.gentoo.org." |
128 |
+ fi |
129 |
+} |
130 |
+ |
131 |
+python_prepare_all() { |
132 |
+ distutils-r1_python_prepare_all |
133 |
+ |
134 |
+ if ! use ipc ; then |
135 |
+ einfo "Disabling ipc..." |
136 |
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
137 |
+ -i pym/_emerge/AbstractEbuildProcess.py || |
138 |
+ die "failed to patch AbstractEbuildProcess.py" |
139 |
+ fi |
140 |
+ |
141 |
+ if use xattr && use kernel_linux ; then |
142 |
+ einfo "Adding FEATURES=xattr to make.globals ..." |
143 |
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ |
144 |
+ || die "failed to append to make.globals" |
145 |
+ fi |
146 |
+ |
147 |
+ if [[ -n ${EPREFIX} ]] ; then |
148 |
+ einfo "Setting portage.const.EPREFIX ..." |
149 |
+ sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ |
150 |
+ -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ |
151 |
+ -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ |
152 |
+ -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ |
153 |
+ -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ |
154 |
+ -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ |
155 |
+ -i pym/portage/const.py || |
156 |
+ die "Failed to patch portage.const.EPREFIX" |
157 |
+ |
158 |
+ einfo "Prefixing shebangs ..." |
159 |
+ while read -r -d $'\0' ; do |
160 |
+ local shebang=$(head -n1 "${REPLY}") |
161 |
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then |
162 |
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${REPLY}" || |
163 |
+ die "sed failed" |
164 |
+ fi |
165 |
+ done < <(find . -type f -print0) |
166 |
+ |
167 |
+ einfo "Adjusting make.globals ..." |
168 |
+ sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ |
169 |
+ -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ |
170 |
+ -i cnf/make.globals || die "sed failed" |
171 |
+ |
172 |
+ einfo "Adjusting repos.conf ..." |
173 |
+ sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ |
174 |
+ -e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \ |
175 |
+ -i cnf/repos.conf || die "sed failed" |
176 |
+ if prefix-guest ; then |
177 |
+ sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ |
178 |
+ -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ |
179 |
+ -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ |
180 |
+ -i cnf/repos.conf || die "sed failed" |
181 |
+ fi |
182 |
+ |
183 |
+ einfo "Adding FEATURES=force-prefix to make.globals ..." |
184 |
+ echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ |
185 |
+ || die "failed to append to make.globals" |
186 |
+ fi |
187 |
+ |
188 |
+ cd "${S}/cnf" || die |
189 |
+ if [[ -f make.conf.example.${ARCH}.diff ]]; then |
190 |
+ patch make.conf.example "make.conf.example.${ARCH}.diff" || |
191 |
+ die "Failed to patch make.conf.example" |
192 |
+ else |
193 |
+ eerror "" |
194 |
+ eerror "Portage does not have an arch-specific configuration for this arch." |
195 |
+ eerror "Please notify the arch maintainer about this issue. Using generic." |
196 |
+ eerror "" |
197 |
+ fi |
198 |
+} |
199 |
+ |
200 |
+python_configure_all() { |
201 |
+ cat >> setup.cfg <<-EOF || die |
202 |
+ [build_ext] |
203 |
+ portage-ext-modules=$(usex native-extensions true false) |
204 |
+ EOF |
205 |
+} |
206 |
+ |
207 |
+python_test() { |
208 |
+ esetup.py test |
209 |
+} |
210 |
+ |
211 |
+python_install() { |
212 |
+ distutils-r1_python_install \ |
213 |
+ --system-prefix="${EPREFIX}/usr" \ |
214 |
+ --bindir="$(python_get_scriptdir)" \ |
215 |
+ --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ |
216 |
+ --sysconfdir="${EPREFIX}/etc" \ |
217 |
+ "${@}" |
218 |
+ |
219 |
+ keepdir /var/log/portage/elog |
220 |
+} |
221 |
+ |
222 |
+pkg_preinst() { |
223 |
+ # This is allowed to fail if the user/group are invalid for prefix users. |
224 |
+ if chown portage:portage "${ED%/}"/var/log/portage{,/elog} 2>/dev/null ; then |
225 |
+ chmod g+s,ug+rwx "${ED%/}"/var/log/portage{,/elog} |
226 |
+ fi |
227 |
+} |