* [gentoo-commits] proj/android:master commit in: sys-apps/portage/files/, sys-apps/portage/
@ 2015-03-05 3:00 Benda XU
0 siblings, 0 replies; 8+ messages in thread
From: Benda XU @ 2015-03-05 3:00 UTC (permalink / raw
To: gentoo-commits
commit: 245cca39b77c03307e53a4e4c830154882b7d79e
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 5 09:39:10 2015 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jan 5 09:49:43 2015 +0000
URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=245cca39
sys-apps/portage: update patch, test if ldconfig exists. Bug 532100
sys-apps/portage/Manifest | 2 +-
sys-apps/portage/files/portage-2.2.14-ldconfig.patch | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8005081..53a4c7a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -9,7 +9,7 @@ AUX portage-2.2.01.19981-ebuildshell.patch 3304 SHA256 2b7f313afe62815b791835da8
AUX portage-2.2.01.20020-ebuildshell.patch 4736 SHA256 92f91c788e3591fb71f55b7a04df8bd0baee767e2561649182bf1b814a0451a8 SHA512 785059ad71e1d9172338926df22883bf70560c3f22f84da74aa21b872b52c9dd05ca61fe8bb786a2da7e4756ae3568f35ca6d7a6ec22b9be419efab6529b8f52 WHIRLPOOL 63ba30a2fa005cca2a6866178938e4ce83bed8ca3a5cbc9bcbcffc888ef4561c27d45f29707db26574c96b8a0c0ed565a0224d64bed8191a1179ae6ace325904
AUX portage-2.2.01.20239-ebuildshell.patch 5292 SHA256 602efac969b76b33e46f927bb6d5ddaff837f2d69dba446c05116fd6e9d6aaf9 SHA512 9f79c62482cacfe4d52d9b7a42969c5090ec1dd6c55ac67ac0697fa3261d00d437e32a46987d242d3380b459d1af2cdfdacec5d72b7aa905146bbf5759158bdf WHIRLPOOL 2ee6f82ec9dc8c44704c1badeafa207656dac9ce49443616b4ebfd402e872c71434e049f4436ed04009e633a00b4863dd35e79a80ba4e710ac1af6579a9decdf
AUX portage-2.2.10.1-case-insensitive-fs.patch 13475 SHA256 e9ca3560b580e1df7bdf7424c76b5bf022c4189ed6ae51370f88895d5c00031d SHA512 6c7b4cba0827d0b29f1be1fc6fb42b1703f373f6825be14f43506921e71075b6967191cf79e4e659c0f37c96de6cbdbdc1e04cd0e668a563a4a3c3be9e97f773 WHIRLPOOL 839ebc4214add69531f9f8a387ed155006c77c396031a116a6b79814a09e6591d5e8905e8398541ca213e60aacd0265e2f941858bbfcc3551a2ff5768a87f432
-AUX portage-2.2.14-ldconfig.patch 1139 SHA256 3ccf2649dd76a1093aec62479da57bd53f3e2a4995bec5bd312149aa78ecff9b SHA512 c94602e611edc8363abc0c904ac9b12fb5d19bc3d80a6cfda5d4aef70c936b77eb376bf0c63cb21b4e6fce14c113f6be1ae9950705b3f6e9d35fba766a35e147 WHIRLPOOL 02128e5ddde6969450fb17da55e335f2d64423d73864b98806092db8e669d290f56e57b3e166df7909408729068c9637f72ea97b418958203f35efc87e5d8cae
+AUX portage-2.2.14-ldconfig.patch 1230 SHA256 50c5f886599aeeec6776da812ebd32964ef138ab63792dc84d0545d3072c20de SHA512 bdc4ee5642e5347e8ad5e776147bfa0ca8901ca312648d02406365c9929a703698321d6b1fd44dcac6225e5099b9140eaed785f7da368ef80c2645e9a33e3869 WHIRLPOOL 62c153821af6924593d8c61b31d66e478634c350b217a1cc7da3728b2ff393e706fe408b1c5e09783f7898dcd4cf983f9d2e748980234e65cd392b38bb0e82aa
AUX portage-2.2.7-ebuildshell.patch 6030 SHA256 c654f5e0b60a4a930ec973b306246d9e920d89b7536bda56c72f38d1ed56445d SHA512 c4bfa44be5d706a9206fcab884e3ad7b0530ec315f9b824fd77f06ff5482414af3e3aaadbc059a49712b2a2e203320f367e2d8c64bf1fceb78495d940fd3fd2a WHIRLPOOL a468e4d5b5d1c493415188c500ea04388e34bc5e5f5a03d61ea5aea8d5b029e2a4426c52471729345a4293eb7c9b747948f75b64982452d96a920a3ac5e528e6
AUX portage-2.2.7-macho-relative-install_names.patch 2811 SHA256 de767ffb6d29625ca9ba0f33765a59a55bbdf2f3b2c1d9989a73a474ae55c388 SHA512 8555d04e4fc361c500d6c18c30f54f178164477f6c1fbb5fd30d5f89671f95915243e92b655e4264f748c2f29f0cf3e7a5fe439316cc6faebc752172557f0a89 WHIRLPOOL f5f92a762e7455dddfa2ffe3ba27c78ec1533c40920acc96a5e65d89ea93f7657f8bf7771e805d7d62c6f60944dccde72de3f34cee1d14c7db667b27cdd76d55
AUX portage-2.2.7-sandbox.patch 723 SHA256 b6b941659a4cdbdafc65bf9977d7a92255b553c49e8f445862dcb00567906fec SHA512 fcf4bc7826bab92b1847dcecaf5def212b4eecdb4ac87b10b0668ea470d5836f3d68eb4ccf61345b39f9265c7f31ef3562de58b2ee4bb3096a71c0567343d810 WHIRLPOOL 3699c7a2a0e6229d337760d07ce40e45b949614518ae292d74ca4297d3e9e5f3eb5edeb7f59c8821a6bfcf981cf1363f4f3d03c16af533276f577b1ff3d8c264
diff --git a/sys-apps/portage/files/portage-2.2.14-ldconfig.patch b/sys-apps/portage/files/portage-2.2.14-ldconfig.patch
index 76fc348..9a44649 100644
--- a/sys-apps/portage/files/portage-2.2.14-ldconfig.patch
+++ b/sys-apps/portage/files/portage-2.2.14-ldconfig.patch
@@ -1,4 +1,4 @@
-commit 3fb24230a2369513b1f36cba3d772bc517265e81
+commit eaf1d1bc3d25dbbbba7de8eb09f6db7ec5f2dd28
Author: Benda Xu <heroxbd@gentoo.org>
Date: Wed Dec 10 10:45:31 2014 +0900
@@ -7,10 +7,10 @@ Date: Wed Dec 10 10:45:31 2014 +0900
It does not affect prefix-rpath, and handles prefix-libc(RAP) correctly.
diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py
-index ace492c..4437881 100644
+index ace492c..5e732ad 100644
--- a/pym/portage/util/env_update.py
+++ b/pym/portage/util/env_update.py
-@@ -306,13 +306,13 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env,
+@@ -306,13 +306,15 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env,
if not libdir_contents_changed:
makelinks = False
@@ -19,6 +19,8 @@ index ace492c..4437881 100644
if "CHOST" in settings and "CBUILD" in settings and \
settings["CHOST"] != settings["CBUILD"]:
ldconfig = find_binary("%s-ldconfig" % settings["CHOST"])
++ elif not (os.access(ldconfig, os.X_OK) and os.path.isfile(ldconfig)):
++ ldconfig = None
# Only run ldconfig as needed
- if makelinks and ldconfig and not eprefix:
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/android:master commit in: sys-apps/portage/files/, sys-apps/portage/
@ 2016-05-26 4:05 Benda XU
0 siblings, 0 replies; 8+ messages in thread
From: Benda XU @ 2016-05-26 4:05 UTC (permalink / raw
To: gentoo-commits
commit: b5f0db858c7bf14a79ce8b281941d387c52be103
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 08:09:30 2016 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun May 22 08:09:30 2016 +0000
URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=b5f0db85
sys-apps/portage: bump to 2.3.0_rc1-r1.
sys-apps/portage/Manifest | 4 +
.../portage/files/portage-2.3.0-scanelf-path.patch | 21 ++
sys-apps/portage/files/portage-2.3.0_rc1.patch | 52 +++
sys-apps/portage/portage-2.3.0_rc1-r1.ebuild | 369 +++++++++++++++++++++
4 files changed, 446 insertions(+)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ae9158f..2d7a412 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,5 +1,9 @@
AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
AUX portage-2.2.28-distcc-eprefix.patch 909 SHA256 b59a7e6a03a0d32d77900944befc4de0e311a4e1046c2188d123a696a39481c8 SHA512 f0264739185b6ec6ec9cd1353130832e7b53be694f34c8cc050df3c04e98dbdf3b861d6d961d2c04034f826ef456833a4990958c59e0524f5540edacc14c5f85 WHIRLPOOL 8beb2a0b9d929fdb8201d9ca3f502724f8ba6c9d176155b4a88d3ce18e58afd7bd4b0de2931457645ddbebb8ad7fdc3d032ddd8fed470de4d617d299433730b5
+AUX portage-2.3.0-scanelf-path.patch 959 SHA256 8d3bcfdebc601ce32ddb8d64a6542141cd46c2d743c8dd66db5250fcd4f44c32 SHA512 d1e9a64fb8aa9ebe63fee1a84a2065cdc46f5b5b9eb571c0a3706e1e75665bc8111bf752ed69f8ec0049fc69f5c0db2d5acd701134d803b92f576b806ebebc79 WHIRLPOOL 03770b83f58a9adb6ad3907c3de33d88ffb2ce4c0d491da82d7e50f3e1595f310ac852f6852d36cd8b550f438d657029aff036ce9f00c84e52428632de614680
+AUX portage-2.3.0_rc1.patch 2278 SHA256 5c10f7bf71250a87576bf81635a765e6fdfdaa7882fe7e1949c736ae1472c2d6 SHA512 0e26adc69b3b716c7435d54a2ed4252045cb24e7891eed5d88514e6066ee4b1fc32ba89d63dc63e2341456110bc7def0bf1a49c1cb3cb53c0d9092bb251f9151 WHIRLPOOL 3964864f80131293283aa79ef1e87e5975e2543e456515c00cf6bd38905c2502539b9698634a44123db9e8ab3c566645b5424c29390a0f47ae7df62431355928
DIST portage-2.2.28.tar.bz2 969138 SHA256 da8148a1a9275c87f535679e41b1bb3a1380ba0f903b80510017517e4c5229d0 SHA512 d21bf7e7dcc0a779a13df6a959e5d4291492fce2a5525b67e9a4705888021f9c08b8d78cd32b2eb930ac5428c40383e4e46da5a7b1ed5c9c9c42314c0f1c6a0b WHIRLPOOL 1b9584b0243b46c70d0778aad57df2d3ea99e19f243280e542c29e6fed0634b72de6b203a3c296c2977d1a6e5e5250b910574176c692d2c7c27c0938528bb43d
+DIST portage-2.3.0_rc1.tar.bz2 910204 SHA256 52cf0837975c4b2a8e1d3d18e3334a735b14e4ebdbdca8992548b86c1d5bebd1 SHA512 d7a5ce8800668606a2e3549621686bb8bb30bd2f5d7a57b106efc1c58d34b95cef4605f5067824db0beb6f870c9e81cb3fdb5c074e9e64bef40a9df6f524ad13 WHIRLPOOL c4c86fe20606e93ecf4d125f436077ec4d15cb453c98e83894a8383f1654a9b294107c9c04bb3019f66a643ff42c333060319d59dda47c323e9711723c3b9cfe
EBUILD portage-2.2.28.ebuild 11798 SHA256 167af8bf2aaa76fa2b36dce1b3396f81f1bd5af2b0daffc710402780eeb823b3 SHA512 a7500e828da21775412b655eae1f7dac49eab7cd55c18f774ddbec501d4f2c2364cdff94b6d2faa4b230ff9ca63084dd3c8c8d28234c3f40150bb9a02d6e3935 WHIRLPOOL 9267f3f7ecd8aecf126dd4d92b9412dedf0335365798dc411f51d062f0328f852b387b5594f797ee49603fe0355670eb6ff401b71fcf736a944b4e2970da01c5
+EBUILD portage-2.3.0_rc1-r1.ebuild 11742 SHA256 16a44f6f84abba677edfc9d434bbf08cbd82c4e45cfe15f407d9994a34f35881 SHA512 3e7f6b453af1e1c66091a0817997bb5fe757644aaf90ad60939dbeb633729de49329687c766d3f5b5ab643f426cdee0d8ddc79fea3030beb8b18596c5171e06d WHIRLPOOL 7b0d365f845606250fa646d7132d80211c280e333ac2583e8f55ac200853db2d0dbd310b02b89ee6914dca881dfd6f2259f4c0fcdc7f17e84fe1de836e46fb4f
MISC metadata.xml 1017 SHA256 78bf0d7e87b917ab6eb9c43835c9c688dc3c5ab0a1043608448e12e6bad715bc SHA512 40315f8375409a6e8b86b2d11dc33b28a019911348d66f05fdd1194a4f0859f3f2ebf9c6922b795194669d992901c1fdda4cd147100979a7f661915c4094fd35 WHIRLPOOL c2817f5c0005da6f1bf0ecb8d1bde9a6b9379e3022b9e456ee5e932974493a0454166e0113092aae7de2725b0718b3cd10e05ba25012b321644403ab0677c166
diff --git a/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch b/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch
new file mode 100644
index 0000000..56e7934
--- /dev/null
+++ b/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch
@@ -0,0 +1,21 @@
+Index: site-packages/portage/util/_dyn_libs/LinkageMapELF.py
+===================================================================
+--- site-packages.orig/portage/util/_dyn_libs/LinkageMapELF.py
++++ site-packages/portage/util/_dyn_libs/LinkageMapELF.py
+@@ -19,6 +19,7 @@ from portage.util import normalize_path
+ from portage.util import varexpand
+ from portage.util import writemsg_level
+ from portage.util._dyn_libs.NeededEntry import NeededEntry
++from portage.const import EPREFIX
+
+ # Map ELF e_machine values from NEEDED.ELF.2 to approximate multilib
+ # categories. This approximation will produce incorrect results on x32
+@@ -259,7 +260,7 @@ class LinkageMapELF(object):
+ continue
+ plibs.update((x, cpv) for x in items)
+ if plibs:
+- args = ["/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"]
++ args = [EPREFIX + "/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"]
+ args.extend(os.path.join(root, x.lstrip("." + os.sep)) \
+ for x in plibs)
+ try:
diff --git a/sys-apps/portage/files/portage-2.3.0_rc1.patch b/sys-apps/portage/files/portage-2.3.0_rc1.patch
new file mode 100644
index 0000000..8464462
--- /dev/null
+++ b/sys-apps/portage/files/portage-2.3.0_rc1.patch
@@ -0,0 +1,52 @@
+From 9ba1bea5e24fe839ef5bd833c3974a55d5333bf1 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Mon, 16 May 2016 02:45:45 -0700
+Subject: [PATCH] portage.const.py: Remove repoman from PORTAGE_PYM_PACKAGES
+
+Decca (in IRC) got a traceback due to the missing repoman install
+
+sysresccd / # emerge -e @system
+Calculating dependencies... done!
+Traceback (most recent call last):
+ File "/usr/lib/python-exec/python3.5/emerge", line 50, in <module>
+ retval = emerge_main()
+ File "/usr/lib64/python3.5/site-packages/_emerge/main.py", line 1185, in emerge_main
+ return run_action(emerge_config)
+ File "/usr/lib64/python3.5/site-packages/_emerge/actions.py", line 3236, in run_action
+ emerge_config.args, spinner)
+ File "/usr/lib64/python3.5/site-packages/_emerge/actions.py", line 505, in action_build
+ retval = mergetask.merge()
+ File "/usr/lib64/python3.5/site-packages/_emerge/Scheduler.py", line 958, in merge
+ rval = self._handle_self_update()
+ File "/usr/lib64/python3.5/site-packages/_emerge/Scheduler.py", line 323, in _handle_self_update
+ _prepare_self_update(self.settings)
+ File "/usr/lib64/python3.5/site-packages/portage/package/ebuild/doebuild.py", line 2489, in _prepare_self_update
+ symlinks=True)
+ File "/usr/lib64/python3.5/site-packages/portage/__init__.py", line 259, in __call__
+ rval = self._func(*wrapped_args, **wrapped_kwargs)
+ File "/usr/lib64/python3.5/shutil.py", line 303, in copytree
+ names = os.listdir(src)
+FileNotFoundError: [Errno 2] No such file or directory: b'/usr/lib64/python3.5/site-packages/repoman'
+
+Dirkjan <djc> found repoman was still included in the PORTAGE_PYM_PACKAGES which
+caused the traceback.
+---
+ pym/portage/const.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pym/portage/const.py b/pym/portage/const.py
+index 814d7f4..179efce 100644
+--- a/pym/portage/const.py
++++ b/pym/portage/const.py
+@@ -278,7 +278,7 @@ SUPPORTED_XPAK_EXTENSIONS = (".tbz2", ".xpak")
+ TIMESTAMP_FORMAT = "%a, %d %b %Y %H:%M:%S +0000" # to be used with time.gmtime()
+
+ # Top-level names of Python packages installed by Portage.
+-PORTAGE_PYM_PACKAGES = ("_emerge", "portage", "repoman")
++PORTAGE_PYM_PACKAGES = ("_emerge", "portage")
+
+ RETURNCODE_POSTINST_FAILURE = 5
+
+--
+2.8.2
+
diff --git a/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild b/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild
new file mode 100644
index 0000000..8bf15ca
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild
@@ -0,0 +1,369 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(
+ pypy
+ python3_3 python3_4 python3_5
+ python2_7
+)
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ >=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[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ !build? (
+ >=sys-apps/sed-4.0.5
+ app-shells/bash:0[readline]
+ >=app-admin/eselect-1.2
+ )
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+ >=app-misc/pax-utils-0.1.17
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+ xattr? ( kernel_linux? (
+ >=sys-apps/install-xattr-0.3
+ $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+ python2_7 pypy)
+ ) )
+ !<app-admin/logrotate-3.8.0"
+PDEPEND="
+ !build? (
+ >=net-misc/rsync-2.6.4
+ userland_GNU? ( >=sys-apps/coreutils-6.4 )
+ )"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
+
+prefix_src_archives() {
+ local x y
+ for x in ${@}; do
+ for y in ${SRC_ARCHIVES}; do
+ echo ${y}/${x}
+ done
+ done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+PATCHES=("${FILESDIR}/portage-2.3.0_rc1.patch"
+ "${FILESDIR}"/${PN}-2.2.28-distcc-eprefix.patch
+ "${FILESDIR}"/${PN}-2.3.0-scanelf-path.patch
+)
+
+pkg_setup() {
+ use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ if ! use ipc ; then
+ einfo "Disabling ipc..."
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+ -i pym/_emerge/AbstractEbuildProcess.py || \
+ die "failed to patch AbstractEbuildProcess.py"
+ fi
+
+ if use xattr && use kernel_linux ; then
+ einfo "Adding FEATURES=xattr to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
+ if [[ -n ${EPREFIX} ]] ; then
+ einfo "Setting portage.const.EPREFIX ..."
+ sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+ -i pym/portage/const.py || \
+ die "Failed to patch portage.const.EPREFIX"
+
+ einfo "Prefixing shebangs ..."
+ while read -r -d $'\0' ; do
+ local shebang=$(head -n1 "$REPLY")
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+ die "sed failed"
+ fi
+ done < <(find . -type f -print0)
+
+ einfo "Adjusting make.globals ..."
+ sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+ -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+ -i cnf/make.globals || die "sed failed"
+
+ einfo "Adjusting repos.conf ..."
+ sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+ -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+ -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
+ -i cnf/repos.conf || die "sed failed"
+
+ einfo "Adding FEATURES=force-prefix to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
+ cd "${S}/cnf" || die
+ if [ -f "make.conf.example.${ARCH}".diff ]; then
+ patch make.conf.example "make.conf.example.${ARCH}".diff || \
+ die "Failed to patch make.conf.example"
+ else
+ eerror ""
+ eerror "Portage does not have an arch-specific configuration for this arch."
+ eerror "Please notify the arch maintainer about this issue. Using generic."
+ eerror ""
+ fi
+}
+
+python_compile_all() {
+ local targets=()
+ use doc && targets+=( docbook )
+ use epydoc && targets+=( epydoc )
+
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
+ fi
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install() {
+ # Install sbin scripts to bindir for python-exec linking
+ # they will be relocated in pkg_preinst()
+ distutils-r1_python_install \
+ --system-prefix="${EPREFIX}/usr" \
+ --bindir="$(python_get_scriptdir)" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+ --sbindir="$(python_get_scriptdir)" \
+ --sysconfdir="${EPREFIX}/etc" \
+ "${@}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ local targets=()
+ use doc && targets+=( install_docbook )
+ use epydoc && targets+=( install_epydoc )
+
+ # install docs
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
+ fi
+
+ # Due to distutils/python-exec limitations
+ # these must be installed to /usr/bin.
+ local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+ einfo "Moving admin scripts to the correct directory"
+ dodir /usr/sbin
+ for target in ${sbin_relocations}; do
+ einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+ mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+ done
+}
+
+pkg_preinst() {
+ # comment out sanity test until it is fixed to work
+ # with the new PORTAGE_PYM_PATH
+ #if [[ $ROOT == / ]] ; then
+ ## Run some minimal tests as a sanity check.
+ #local test_runner=$(find "${ED}" -name runTests)
+ #if [[ -n $test_runner && -x $test_runner ]] ; then
+ #einfo "Running preinst sanity tests..."
+ #"$test_runner" || die "preinst sanity tests failed"
+ #fi
+ #fi
+
+ # elog dir must exist to avoid logrotate error for bug #415911.
+ # This code runs in preinst in order to bypass the mapping of
+ # portage:portage to root:root which happens after src_install.
+ keepdir /var/log/portage/elog
+ # This is allowed to fail if the user/group are invalid for prefix users.
+ if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+ chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+ fi
+
+ if has_version "<${CATEGORY}/${PN}-2.1.13" || \
+ {
+ has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
+ has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
+ } ; then
+ USERPRIV_UPGRADE=true
+ USERSYNC_UPGRADE=true
+ REPOS_CONF_UPGRADE=true
+ REPOS_CONF_SYNC=
+ type -P portageq >/dev/null 2>&1 && \
+ REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
+ else
+ USERPRIV_UPGRADE=false
+ USERSYNC_UPGRADE=false
+ REPOS_CONF_UPGRADE=false
+ fi
+}
+
+get_ownership() {
+ case ${USERLAND} in
+ BSD)
+ stat -f '%Su:%Sg' "${1}"
+ ;;
+ *)
+ stat -c '%U:%G' "${1}"
+ ;;
+ esac
+}
+
+new_config_protect() {
+ # Generate a ._cfg file even if the target file
+ # does not exist, ensuring that the user will
+ # notice the config change.
+ local basename=${1##*/}
+ local dirname=${1%/*}
+ local i=0
+ while true ; do
+ local filename=$(
+ echo -n "${dirname}/._cfg"
+ printf "%04d" ${i}
+ echo -n "_${basename}"
+ )
+ [[ -e ${filename} ]] || break
+ (( i++ ))
+ done
+ echo "${filename}"
+}
+
+pkg_postinst() {
+
+ if ${REPOS_CONF_UPGRADE} ; then
+ einfo "Generating repos.conf"
+ local repo_name=
+ [[ -f ${PORTDIR}/profiles/repo_name ]] && \
+ repo_name=$(< "${PORTDIR}/profiles/repo_name")
+ if [[ -z ${REPOS_CONF_SYNC} ]] ; then
+ REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
+ REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
+ fi
+ local sync_type=
+ [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
+
+ if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
+ sync_type=cvs
+ REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
+ fi
+
+ cat <<-EOF > "${T}/repos.conf"
+ [DEFAULT]
+ main-repo = ${repo_name:-gentoo}
+
+ [${repo_name:-gentoo}]
+ location = ${PORTDIR:-${EPREFIX}/usr/portage}
+ sync-type = ${sync_type:-rsync}
+ sync-uri = ${REPOS_CONF_SYNC}
+ EOF
+
+ [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
+
+ local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
+ if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
+ dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
+ fi
+ # Don't install the config update if the desired repos.conf directory
+ # and config file exist, since users may accept it blindly and break
+ # their config (bug #478726).
+ [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
+ mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
+
+ if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
+ einfo "Generating make.conf PORTDIR setting for backward compatibility"
+ for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
+ [[ -e ${dest} ]] && break
+ done
+ [[ -d ${dest} ]] && dest=${dest}/portdir.conf
+ rm -rf "${T}/make.conf"
+ [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
+ cat <<-EOF >> "${T}/make.conf"
+
+ # Set PORTDIR for backward compatibility with various tools:
+ # gentoo-bashcomp - bug #478444
+ # euse - bug #474574
+ # euses and ufed - bug #478318
+ PORTDIR="${EPREFIX}/usr/portage"
+ EOF
+ mkdir -p "${dest%/*}"
+ mv "${T}/make.conf" "$(new_config_protect "${dest}")"
+ fi
+ fi
+
+ local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
+
+ if ${USERSYNC_UPGRADE} && \
+ [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
+ local ownership=$(get_ownership "${PORTDIR}")
+ if [[ -n ${ownership} ]] ; then
+ einfo "Adjusting PORTDIR permissions for usersync"
+ find "${PORTDIR}" -path "${distdir%/}" -prune -o \
+ ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
+ -exec chown "${ownership}" {} +
+ fi
+ fi
+
+ # Do this last, since it could take a long time if there
+ # are lots of live sources, and the user may be tempted
+ # to kill emerge while it is running.
+ if ${USERPRIV_UPGRADE} && \
+ [[ -d ${distdir} && -w ${distdir} ]] ; then
+ local ownership=$(get_ownership "${distdir}")
+ if [[ ${ownership#*:} == portage ]] ; then
+ einfo "Adjusting DISTDIR permissions for userpriv"
+ find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
+ -exec chown -R portage:portage {} +
+ fi
+ fi
+
+ einfo ""
+ einfo "This release of portage NO LONGER contains the repoman code base."
+ einfo "Repoman has it's own ebuild and release package."
+ einfo "For repoman functionality please emerge app-portage/repoman"
+ einfo "Please report any bugs you may encounter."
+ einfo ""
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/android:master commit in: sys-apps/portage/files/, sys-apps/portage/
2016-05-25 5:03 [gentoo-commits] dev/heroxbd:master " Benda XU
@ 2016-05-26 4:05 ` Benda XU
0 siblings, 0 replies; 8+ messages in thread
From: Benda XU @ 2016-05-26 4:05 UTC (permalink / raw
To: gentoo-commits
commit: f002bdacdef18ecb3aee63202c70633f043de6ec
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 13:46:56 2016 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue May 24 13:46:56 2016 +0000
URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=f002bdac
sys-apps/portage: scanelf prefix path.
sys-apps/portage/Manifest | 2 +-
sys-apps/portage/files/portage-2.3.0-scanelf-path.patch | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 2d7a412..8111c8c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,6 @@
AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
AUX portage-2.2.28-distcc-eprefix.patch 909 SHA256 b59a7e6a03a0d32d77900944befc4de0e311a4e1046c2188d123a696a39481c8 SHA512 f0264739185b6ec6ec9cd1353130832e7b53be694f34c8cc050df3c04e98dbdf3b861d6d961d2c04034f826ef456833a4990958c59e0524f5540edacc14c5f85 WHIRLPOOL 8beb2a0b9d929fdb8201d9ca3f502724f8ba6c9d176155b4a88d3ce18e58afd7bd4b0de2931457645ddbebb8ad7fdc3d032ddd8fed470de4d617d299433730b5
-AUX portage-2.3.0-scanelf-path.patch 959 SHA256 8d3bcfdebc601ce32ddb8d64a6542141cd46c2d743c8dd66db5250fcd4f44c32 SHA512 d1e9a64fb8aa9ebe63fee1a84a2065cdc46f5b5b9eb571c0a3706e1e75665bc8111bf752ed69f8ec0049fc69f5c0db2d5acd701134d803b92f576b806ebebc79 WHIRLPOOL 03770b83f58a9adb6ad3907c3de33d88ffb2ce4c0d491da82d7e50f3e1595f310ac852f6852d36cd8b550f438d657029aff036ce9f00c84e52428632de614680
+AUX portage-2.3.0-scanelf-path.patch 805 SHA256 4b7f154acedfd1746ff994283272c2443721b47b7dfa3601cf1e2fab94b54272 SHA512 1e65c64eabb08b5052fef6ef4516ea09686720672fea759bb55a69f623b55ebd9a15cccb1bcdb953d86afc2dbe684323227e5000cf6e5732ff942cfcb1c57e9a WHIRLPOOL 31f47ca0c3a868c6be1211f94bf9ea01f89ab09ba58f85c54a076b5da49c231ec43386c8ac7a9731bb82782aeec91350d92719dc7282233a3ed088b7a171f4be
AUX portage-2.3.0_rc1.patch 2278 SHA256 5c10f7bf71250a87576bf81635a765e6fdfdaa7882fe7e1949c736ae1472c2d6 SHA512 0e26adc69b3b716c7435d54a2ed4252045cb24e7891eed5d88514e6066ee4b1fc32ba89d63dc63e2341456110bc7def0bf1a49c1cb3cb53c0d9092bb251f9151 WHIRLPOOL 3964864f80131293283aa79ef1e87e5975e2543e456515c00cf6bd38905c2502539b9698634a44123db9e8ab3c566645b5424c29390a0f47ae7df62431355928
DIST portage-2.2.28.tar.bz2 969138 SHA256 da8148a1a9275c87f535679e41b1bb3a1380ba0f903b80510017517e4c5229d0 SHA512 d21bf7e7dcc0a779a13df6a959e5d4291492fce2a5525b67e9a4705888021f9c08b8d78cd32b2eb930ac5428c40383e4e46da5a7b1ed5c9c9c42314c0f1c6a0b WHIRLPOOL 1b9584b0243b46c70d0778aad57df2d3ea99e19f243280e542c29e6fed0634b72de6b203a3c296c2977d1a6e5e5250b910574176c692d2c7c27c0938528bb43d
DIST portage-2.3.0_rc1.tar.bz2 910204 SHA256 52cf0837975c4b2a8e1d3d18e3334a735b14e4ebdbdca8992548b86c1d5bebd1 SHA512 d7a5ce8800668606a2e3549621686bb8bb30bd2f5d7a57b106efc1c58d34b95cef4605f5067824db0beb6f870c9e81cb3fdb5c074e9e64bef40a9df6f524ad13 WHIRLPOOL c4c86fe20606e93ecf4d125f436077ec4d15cb453c98e83894a8383f1654a9b294107c9c04bb3019f66a643ff42c333060319d59dda47c323e9711723c3b9cfe
diff --git a/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch b/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch
index 56e7934..ae5c0d6 100644
--- a/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch
+++ b/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch
@@ -1,7 +1,5 @@
-Index: site-packages/portage/util/_dyn_libs/LinkageMapELF.py
-===================================================================
---- site-packages.orig/portage/util/_dyn_libs/LinkageMapELF.py
-+++ site-packages/portage/util/_dyn_libs/LinkageMapELF.py
+--- pym/portage/util/_dyn_libs/LinkageMapELF.py
++++ pym/portage/util/_dyn_libs/LinkageMapELF.py
@@ -19,6 +19,7 @@ from portage.util import normalize_path
from portage.util import varexpand
from portage.util import writemsg_level
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/android:master commit in: sys-apps/portage/files/, sys-apps/portage/
@ 2016-06-07 6:06 Benda XU
0 siblings, 0 replies; 8+ messages in thread
From: Benda XU @ 2016-06-07 6:06 UTC (permalink / raw
To: gentoo-commits
commit: bd1af908818cc8c8ca6f7f9dac2615c29ac95c42
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 7 03:17:09 2016 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 03:17:09 2016 +0000
URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=bd1af908
sys-apps/portage: update patches.
sys-apps/portage/Manifest | 4 ++--
.../files/portage-2.2.28-distcc-eprefix.patch | 20 ++++++++++++++------
.../portage/files/portage-2.3.0-scanelf-path.patch | 6 ++++--
3 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index fa2190a..b9432dc 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,6 @@
AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
-AUX portage-2.2.28-distcc-eprefix.patch 909 SHA256 b59a7e6a03a0d32d77900944befc4de0e311a4e1046c2188d123a696a39481c8 SHA512 f0264739185b6ec6ec9cd1353130832e7b53be694f34c8cc050df3c04e98dbdf3b861d6d961d2c04034f826ef456833a4990958c59e0524f5540edacc14c5f85 WHIRLPOOL 8beb2a0b9d929fdb8201d9ca3f502724f8ba6c9d176155b4a88d3ce18e58afd7bd4b0de2931457645ddbebb8ad7fdc3d032ddd8fed470de4d617d299433730b5
-AUX portage-2.3.0-scanelf-path.patch 818 SHA256 37d7a5b2922a13b9840161320e87c26f38423b30ef05f2de393fd4a1b05e3d6b SHA512 76c0734f2604fc111984215b56f7d3acc2ef592835b17de08deef281f0d65a7f5b0306b3e468fd4ab3f2a522b8e5fc8ac3358dd15af3effd9eb12401c8712ee8 WHIRLPOOL 344c6ab6a99ce17b43f811b80638387b38f626e3a2b360113da37d78dd7545e312660560227e2f16357649c3b3d30c43300a1590c3373e051a6c8d11528d9893
+AUX portage-2.2.28-distcc-eprefix.patch 1215 SHA256 15de29f5b8bf9b3f49c730bbeaa4414b55866a82874a54f0ecbbb0f58a16d781 SHA512 bb630624d61d546d2ecfaad18274ae66139d3e0848293c64c69806ae13d380dc979ff658b517801ba407062270a49ca525b62ee89c47b83c324b664b364e37b6 WHIRLPOOL ccc5c5aff1d2b426e9603a16ef455a81ee5ae0cd03043adf704b7b091b536543018a8f32e995c0668fe02fdfc7bec5a6c6b1060162c424061375458fd0e820c8
+AUX portage-2.3.0-scanelf-path.patch 948 SHA256 b87d80dcdb9588ae92ab8824ad64df43351b89142a9a2f0a0a20dbd3f0b8a8f5 SHA512 fef3ae7a5f6ee4d6a2469670a2ec04b697d4a5cd1950c638fdd3ab4f290f8b45f26f3c521c614140ea22d05be60080bb7c685f3b167a7554a17f51903278a25d WHIRLPOOL a2b6287f7f367e599a70df50cfd541b9d2ddf9f7c72140055cc1674b22997bdacb1a6b414765db63ebdb98f6d8231f59c8e3e223369d8f386c001fd5c6cd2db4
AUX portage-2.3.0_rc1.patch 2278 SHA256 5c10f7bf71250a87576bf81635a765e6fdfdaa7882fe7e1949c736ae1472c2d6 SHA512 0e26adc69b3b716c7435d54a2ed4252045cb24e7891eed5d88514e6066ee4b1fc32ba89d63dc63e2341456110bc7def0bf1a49c1cb3cb53c0d9092bb251f9151 WHIRLPOOL 3964864f80131293283aa79ef1e87e5975e2543e456515c00cf6bd38905c2502539b9698634a44123db9e8ab3c566645b5424c29390a0f47ae7df62431355928
DIST portage-2.2.28.tar.bz2 969138 SHA256 da8148a1a9275c87f535679e41b1bb3a1380ba0f903b80510017517e4c5229d0 SHA512 d21bf7e7dcc0a779a13df6a959e5d4291492fce2a5525b67e9a4705888021f9c08b8d78cd32b2eb930ac5428c40383e4e46da5a7b1ed5c9c9c42314c0f1c6a0b WHIRLPOOL 1b9584b0243b46c70d0778aad57df2d3ea99e19f243280e542c29e6fed0634b72de6b203a3c296c2977d1a6e5e5250b910574176c692d2c7c27c0938528bb43d
DIST portage-2.3.0_rc1.tar.bz2 910204 SHA256 52cf0837975c4b2a8e1d3d18e3334a735b14e4ebdbdca8992548b86c1d5bebd1 SHA512 d7a5ce8800668606a2e3549621686bb8bb30bd2f5d7a57b106efc1c58d34b95cef4605f5067824db0beb6f870c9e81cb3fdb5c074e9e64bef40a9df6f524ad13 WHIRLPOOL c4c86fe20606e93ecf4d125f436077ec4d15cb453c98e83894a8383f1654a9b294107c9c04bb3019f66a643ff42c333060319d59dda47c323e9711723c3b9cfe
diff --git a/sys-apps/portage/files/portage-2.2.28-distcc-eprefix.patch b/sys-apps/portage/files/portage-2.2.28-distcc-eprefix.patch
index 58f701b..728eb8c 100644
--- a/sys-apps/portage/files/portage-2.2.28-distcc-eprefix.patch
+++ b/sys-apps/portage/files/portage-2.2.28-distcc-eprefix.patch
@@ -1,19 +1,27 @@
-Index: portage-2.2.28/pym/portage/package/ebuild/prepare_build_dirs.py
+Index: portage-2.3.0_rc1/pym/portage/package/ebuild/prepare_build_dirs.py
===================================================================
---- portage-2.2.28.orig/pym/portage/package/ebuild/prepare_build_dirs.py
-+++ portage-2.2.28/pym/portage/package/ebuild/prepare_build_dirs.py
-@@ -153,12 +153,12 @@ def _prepare_features_dirs(mysettings):
+--- portage-2.3.0_rc1.orig/pym/portage/package/ebuild/prepare_build_dirs.py
++++ portage-2.3.0_rc1/pym/portage/package/ebuild/prepare_build_dirs.py
+@@ -19,6 +19,7 @@ from portage.localization import _
+ from portage.output import colorize
+ from portage.util import apply_recursive_permissions, \
+ apply_secpass_permissions, ensure_dirs, normalize_path, writemsg
++from portage.const import EPREFIX
+
+ def prepare_build_dirs(myroot=None, settings=None, cleanup=False):
+ """
+@@ -153,12 +154,12 @@ def _prepare_features_dirs(mysettings):
features_dirs = {
"ccache":{
- "path_dir": "/usr/%s/ccache/bin" % (libdir,),
-+ "path_dir": "%s/usr/%s/ccache/bin" % (mysettings["EPREFIX"], libdir),
++ "path_dir": "%s/usr/%s/ccache/bin" % (EPREFIX, libdir),
"basedir_var":"CCACHE_DIR",
"default_dir":os.path.join(mysettings["PORTAGE_TMPDIR"], "ccache"),
"always_recurse":False},
"distcc":{
- "path_dir": "/usr/%s/distcc/bin" % (libdir,),
-+ "path_dir": "%s/usr/%s/distcc/bin" % (mysettings["EPREFIX"], libdir),
++ "path_dir": "%s/usr/%s/distcc/bin" % (EPREFIX, libdir),
"basedir_var":"DISTCC_DIR",
"default_dir":os.path.join(mysettings["BUILD_PREFIX"], ".distcc"),
"subdirs":("lock", "state"),
diff --git a/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch b/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch
index 48a1cf9..9e47448 100644
--- a/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch
+++ b/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch
@@ -1,4 +1,6 @@
---- pym/portage/util/_dyn_libs/LinkageMapELF.py
+Index: pym/portage/util/_dyn_libs/LinkageMapELF.py
+===================================================================
+--- pym/portage/util/_dyn_libs/LinkageMapELF.py.orig
+++ pym/portage/util/_dyn_libs/LinkageMapELF.py
@@ -19,6 +19,7 @@ from portage.util import normalize_path
from portage.util import varexpand
@@ -13,7 +15,7 @@
plibs.update((x, cpv) for x in items)
if plibs:
- args = ["/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"]
-+ args = [os.path.join(EPREFIX, "/usr/bin/scanelf"), "-qF", "%a;%F;%S;%r;%n"]
++ args = [os.path.join(EPREFIX or "/", "usr/bin/scanelf"), "-qF", "%a;%F;%S;%r;%n"]
args.extend(os.path.join(root, x.lstrip("." + os.sep)) \
for x in plibs)
try:
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/android:master commit in: sys-apps/portage/files/, sys-apps/portage/
2016-07-21 2:23 [gentoo-commits] dev/heroxbd:master " Benda XU
@ 2016-06-15 3:18 ` Benda XU
0 siblings, 0 replies; 8+ messages in thread
From: Benda XU @ 2016-06-15 3:18 UTC (permalink / raw
To: gentoo-commits
commit: 5166c7d8597780616103b48132d33049d740964f
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 03:17:26 2016 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 03:17:26 2016 +0000
URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=5166c7d8
sys-apps/portage: remove host PATH.
Bug: 585986
sys-apps/portage/Manifest | 3 ++-
.../files/portage-2.3.0-prefix-path-only.patch | 31 ++++++++++++++++++++++
sys-apps/portage/portage-2.3.0_rc1-r1.ebuild | 1 +
3 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b9432dc..794f025 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,9 +1,10 @@
AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
AUX portage-2.2.28-distcc-eprefix.patch 1215 SHA256 15de29f5b8bf9b3f49c730bbeaa4414b55866a82874a54f0ecbbb0f58a16d781 SHA512 bb630624d61d546d2ecfaad18274ae66139d3e0848293c64c69806ae13d380dc979ff658b517801ba407062270a49ca525b62ee89c47b83c324b664b364e37b6 WHIRLPOOL ccc5c5aff1d2b426e9603a16ef455a81ee5ae0cd03043adf704b7b091b536543018a8f32e995c0668fe02fdfc7bec5a6c6b1060162c424061375458fd0e820c8
+AUX portage-2.3.0-prefix-path-only.patch 1089 SHA256 e72cb1f1c1ad9d2c5b6179930d87fcb5fc58cc8a25eed654a166463d5a75749a SHA512 6b28b9df57651237599736bf582e286e44353f47d5f0f0e4a65cd6d3ff87a0f216e0948f0e0aa2874d86233e14c832f0060cc264eee7c668e2d9be3df1279823 WHIRLPOOL eb100086ebd20f7956c47320159f6ce1aed22edd5f48671f8e2bd11d66e979fd0175a6e0bf1ad1caf5860ae51635fe197d74ae7c13f025778ede8f5a81bf4caa
AUX portage-2.3.0-scanelf-path.patch 948 SHA256 b87d80dcdb9588ae92ab8824ad64df43351b89142a9a2f0a0a20dbd3f0b8a8f5 SHA512 fef3ae7a5f6ee4d6a2469670a2ec04b697d4a5cd1950c638fdd3ab4f290f8b45f26f3c521c614140ea22d05be60080bb7c685f3b167a7554a17f51903278a25d WHIRLPOOL a2b6287f7f367e599a70df50cfd541b9d2ddf9f7c72140055cc1674b22997bdacb1a6b414765db63ebdb98f6d8231f59c8e3e223369d8f386c001fd5c6cd2db4
AUX portage-2.3.0_rc1.patch 2278 SHA256 5c10f7bf71250a87576bf81635a765e6fdfdaa7882fe7e1949c736ae1472c2d6 SHA512 0e26adc69b3b716c7435d54a2ed4252045cb24e7891eed5d88514e6066ee4b1fc32ba89d63dc63e2341456110bc7def0bf1a49c1cb3cb53c0d9092bb251f9151 WHIRLPOOL 3964864f80131293283aa79ef1e87e5975e2543e456515c00cf6bd38905c2502539b9698634a44123db9e8ab3c566645b5424c29390a0f47ae7df62431355928
DIST portage-2.2.28.tar.bz2 969138 SHA256 da8148a1a9275c87f535679e41b1bb3a1380ba0f903b80510017517e4c5229d0 SHA512 d21bf7e7dcc0a779a13df6a959e5d4291492fce2a5525b67e9a4705888021f9c08b8d78cd32b2eb930ac5428c40383e4e46da5a7b1ed5c9c9c42314c0f1c6a0b WHIRLPOOL 1b9584b0243b46c70d0778aad57df2d3ea99e19f243280e542c29e6fed0634b72de6b203a3c296c2977d1a6e5e5250b910574176c692d2c7c27c0938528bb43d
DIST portage-2.3.0_rc1.tar.bz2 910204 SHA256 52cf0837975c4b2a8e1d3d18e3334a735b14e4ebdbdca8992548b86c1d5bebd1 SHA512 d7a5ce8800668606a2e3549621686bb8bb30bd2f5d7a57b106efc1c58d34b95cef4605f5067824db0beb6f870c9e81cb3fdb5c074e9e64bef40a9df6f524ad13 WHIRLPOOL c4c86fe20606e93ecf4d125f436077ec4d15cb453c98e83894a8383f1654a9b294107c9c04bb3019f66a643ff42c333060319d59dda47c323e9711723c3b9cfe
EBUILD portage-2.2.28.ebuild 11798 SHA256 167af8bf2aaa76fa2b36dce1b3396f81f1bd5af2b0daffc710402780eeb823b3 SHA512 a7500e828da21775412b655eae1f7dac49eab7cd55c18f774ddbec501d4f2c2364cdff94b6d2faa4b230ff9ca63084dd3c8c8d28234c3f40150bb9a02d6e3935 WHIRLPOOL 9267f3f7ecd8aecf126dd4d92b9412dedf0335365798dc411f51d062f0328f852b387b5594f797ee49603fe0355670eb6ff401b71fcf736a944b4e2970da01c5
-EBUILD portage-2.3.0_rc1-r1.ebuild 11554 SHA256 311c46e34390c121074a2d838d73baf03b428a6ad9dde3534f51a1c59554d0ec SHA512 8c8a4dcd5c123568716cbfc1609786b31e084b92c42084b3d86ddd460798e68223511beb2924e545f050dd53583d1a27a44a6c36baf03338721b43ceaef3e558 WHIRLPOOL 85f0bfec78682942b4f75e0ca78c83b83265e977c6d6110c7bdfe5637d6ecbdf2339ea6fb200431bc6c36cf30e7e26a94302358c1934995a00ec9e76aa5d8567
+EBUILD portage-2.3.0_rc1-r1.ebuild 11604 SHA256 2b2425bce224c20b1491d8917ab6288cf2936cda29426fbf2a3d37f4c936f458 SHA512 b82f75de8aa1e91242eae29864121cf5a1420be8eea715168f8b13ae1dd01d0c1d5e9b18160055a079d1176e4e2a2bb3d6b6f93e8c3052e590c881c31fa07698 WHIRLPOOL c5cb05de853f8e26aa59b9675efac221c800baed720b5fb388816bbe2374cc4452e372ec2d1c45a50e4fe1cfc2317b425814f842aa811406803a2862f9c24db0
MISC metadata.xml 1017 SHA256 78bf0d7e87b917ab6eb9c43835c9c688dc3c5ab0a1043608448e12e6bad715bc SHA512 40315f8375409a6e8b86b2d11dc33b28a019911348d66f05fdd1194a4f0859f3f2ebf9c6922b795194669d992901c1fdda4cd147100979a7f661915c4094fd35 WHIRLPOOL c2817f5c0005da6f1bf0ecb8d1bde9a6b9379e3022b9e456ee5e932974493a0454166e0113092aae7de2725b0718b3cd10e05ba25012b321644403ab0677c166
diff --git a/sys-apps/portage/files/portage-2.3.0-prefix-path-only.patch b/sys-apps/portage/files/portage-2.3.0-prefix-path-only.patch
new file mode 100644
index 0000000..f2fe0f0
--- /dev/null
+++ b/sys-apps/portage/files/portage-2.3.0-prefix-path-only.patch
@@ -0,0 +1,31 @@
+When eprefix is defined, no host tools should be used.
+
+diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
+index 26e6123..c266c83 100644
+--- a/pym/portage/package/ebuild/doebuild.py
++++ b/pym/portage/package/ebuild/doebuild.py
+@@ -205,11 +205,6 @@ def _doebuild_path(settings, eapi=None):
+ overrides = [x for x in settings.get(
+ "__PORTAGE_TEST_PATH_OVERRIDE", "").split(":") if x]
+
+- prefixes = []
+- if eprefix:
+- prefixes.append(eprefix)
+- prefixes.append("/")
+-
+ path = overrides
+
+ if "xattr" in settings.features:
+@@ -231,9 +226,9 @@ def _doebuild_path(settings, eapi=None):
+ path.append(os.path.join(x, "ebuild-helpers"))
+ path.extend(prerootpath)
+
+- for prefix in prefixes:
+- for x in ("usr/local/sbin", "usr/local/bin", "usr/sbin", "usr/bin", "sbin", "bin"):
+- path.append(os.path.join(prefix, x))
++ prefix = eprefix if eprefix else "/"
++ for x in ("usr/local/sbin", "usr/local/bin", "usr/sbin", "usr/bin", "sbin", "bin"):
++ path.append(os.path.join(prefix, x))
+
+ path.extend(rootpath)
+ settings["PATH"] = ":".join(path)
diff --git a/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild b/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild
index 970ee5f..c76e5b2 100644
--- a/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild
@@ -81,6 +81,7 @@ SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
PATCHES=("${FILESDIR}/portage-2.3.0_rc1.patch"
"${FILESDIR}"/${PN}-2.2.28-distcc-eprefix.patch
"${FILESDIR}"/${PN}-2.3.0-scanelf-path.patch
+ "${FILESDIR}"/${PN}-2.3.0-prefix-path-only.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/android:master commit in: sys-apps/portage/files/, sys-apps/portage/
@ 2016-10-09 5:47 Benda XU
0 siblings, 0 replies; 8+ messages in thread
From: Benda XU @ 2016-10-09 5:47 UTC (permalink / raw
To: gentoo-commits
commit: 184de8bf21d167e3e3719fbc1d00963a673b2514
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 9 05:19:33 2016 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Oct 9 05:19:33 2016 +0000
URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=184de8bf
sys-apps/portage: track 2.3.1.
...ert-URI-changes-related-to-docbook-schema.patch | 39 +++
sys-apps/portage/portage-2.3.1.ebuild | 365 +++++++++++++++++++++
2 files changed, 404 insertions(+)
diff --git a/sys-apps/portage/files/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch b/sys-apps/portage/files/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch
new file mode 100644
index 0000000..ee191ff
--- /dev/null
+++ b/sys-apps/portage/files/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch
@@ -0,0 +1,39 @@
+From 35863a80b915939aac3ce6bf017d942cac879df8 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 20 Jul 2016 12:30:05 -0400
+Subject: [PATCH] doc: Revert URI changes related to docbook schema
+
+This partially reverts b5365341dad167e314023df95d2c5e0f955962f0.
+
+X-Gentoo-Bug: 589210
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/589210
+---
+ doc/custom.xsl | 2 +-
+ doc/portage.docbook | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/custom.xsl b/doc/custom.xsl
+index 11a2b9e..a7763ec 100644
+--- a/doc/custom.xsl
++++ b/doc/custom.xsl
+@@ -1,4 +1,4 @@
+-<xsl:stylesheet xmlns:xsl="https://www.w3.org/1999/XSL/Transform" version="1.0">
++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:param name="toc.section.depth" select="20"/>
+ <xsl:param name="chunk.section.depth" select="2"/>
+ <xsl:param name="generate.section.toc.level" select="2"/>
+diff --git a/doc/portage.docbook b/doc/portage.docbook
+index f7d539a..811544f 100644
+--- a/doc/portage.docbook
++++ b/doc/portage.docbook
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
+- "https://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
++ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+ <!ENTITY date SYSTEM "fragment/date">
+ <!ENTITY version SYSTEM "fragment/version">
+--
+2.10.0
+
diff --git a/sys-apps/portage/portage-2.3.1.ebuild b/sys-apps/portage/portage-2.3.1.ebuild
new file mode 100644
index 0000000..4ea4ef7
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.1.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(
+ pypy
+ python3_3 python3_4 python3_5
+ python2_7
+)
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ >=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[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ !build? (
+ >=sys-apps/sed-4.0.5
+ app-shells/bash:0[readline]
+ >=app-admin/eselect-1.2
+ )
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+ >=app-misc/pax-utils-0.1.17
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+ xattr? ( kernel_linux? (
+ >=sys-apps/install-xattr-0.3
+ $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+ python2_7 pypy)
+ ) )
+ !<app-admin/logrotate-3.8.0"
+PDEPEND="
+ !build? (
+ >=net-misc/rsync-2.6.4
+ userland_GNU? ( >=sys-apps/coreutils-6.4 )
+ )"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
+
+prefix_src_archives() {
+ local x y
+ for x in ${@}; do
+ for y in ${SRC_ARCHIVES}; do
+ echo ${y}/${x}
+ done
+ done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+PATCHES=(
+ "${FILESDIR}/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch"
+)
+
+pkg_setup() {
+ use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ if ! use ipc ; then
+ einfo "Disabling ipc..."
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+ -i pym/_emerge/AbstractEbuildProcess.py || \
+ die "failed to patch AbstractEbuildProcess.py"
+ fi
+
+ if use xattr && use kernel_linux ; then
+ einfo "Adding FEATURES=xattr to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
+ if [[ -n ${EPREFIX} ]] ; then
+ einfo "Setting portage.const.EPREFIX ..."
+ sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+ -i pym/portage/const.py || \
+ die "Failed to patch portage.const.EPREFIX"
+
+ einfo "Prefixing shebangs ..."
+ while read -r -d $'\0' ; do
+ local shebang=$(head -n1 "$REPLY")
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+ die "sed failed"
+ fi
+ done < <(find . -type f -print0)
+
+ einfo "Adjusting make.globals ..."
+ sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+ -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+ -i cnf/make.globals || die "sed failed"
+
+ einfo "Adjusting repos.conf ..."
+ sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+ -i cnf/repos.conf || die "sed failed"
+
+ einfo "Adding FEATURES=force-prefix to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
+ cd "${S}/cnf" || die
+ if [ -f "make.conf.example.${ARCH}".diff ]; then
+ patch make.conf.example "make.conf.example.${ARCH}".diff || \
+ die "Failed to patch make.conf.example"
+ else
+ eerror ""
+ eerror "Portage does not have an arch-specific configuration for this arch."
+ eerror "Please notify the arch maintainer about this issue. Using generic."
+ eerror ""
+ fi
+}
+
+python_compile_all() {
+ local targets=()
+ use doc && targets+=( docbook )
+ use epydoc && targets+=( epydoc )
+
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
+ fi
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install() {
+ # Install sbin scripts to bindir for python-exec linking
+ # they will be relocated in pkg_preinst()
+ distutils-r1_python_install \
+ --system-prefix="${EPREFIX}/usr" \
+ --bindir="$(python_get_scriptdir)" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+ --sbindir="$(python_get_scriptdir)" \
+ --sysconfdir="${EPREFIX}/etc" \
+ "${@}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ local targets=()
+ use doc && targets+=( install_docbook )
+ use epydoc && targets+=( install_epydoc )
+
+ # install docs
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
+ fi
+
+ # Due to distutils/python-exec limitations
+ # these must be installed to /usr/bin.
+ local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+ einfo "Moving admin scripts to the correct directory"
+ dodir /usr/sbin
+ for target in ${sbin_relocations}; do
+ einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+ mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+ done
+}
+
+pkg_preinst() {
+ # comment out sanity test until it is fixed to work
+ # with the new PORTAGE_PYM_PATH
+ #if [[ $ROOT == / ]] ; then
+ ## Run some minimal tests as a sanity check.
+ #local test_runner=$(find "${ED}" -name runTests)
+ #if [[ -n $test_runner && -x $test_runner ]] ; then
+ #einfo "Running preinst sanity tests..."
+ #"$test_runner" || die "preinst sanity tests failed"
+ #fi
+ #fi
+
+ # elog dir must exist to avoid logrotate error for bug #415911.
+ # This code runs in preinst in order to bypass the mapping of
+ # portage:portage to root:root which happens after src_install.
+ keepdir /var/log/portage/elog
+ # This is allowed to fail if the user/group are invalid for prefix users.
+ if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+ chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+ fi
+
+ if has_version "<${CATEGORY}/${PN}-2.1.13" || \
+ {
+ has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
+ has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
+ } ; then
+ USERPRIV_UPGRADE=true
+ USERSYNC_UPGRADE=true
+ REPOS_CONF_UPGRADE=true
+ REPOS_CONF_SYNC=
+ type -P portageq >/dev/null 2>&1 && \
+ REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
+ else
+ USERPRIV_UPGRADE=false
+ USERSYNC_UPGRADE=false
+ REPOS_CONF_UPGRADE=false
+ fi
+}
+
+get_ownership() {
+ case ${USERLAND} in
+ BSD)
+ stat -f '%Su:%Sg' "${1}"
+ ;;
+ *)
+ stat -c '%U:%G' "${1}"
+ ;;
+ esac
+}
+
+new_config_protect() {
+ # Generate a ._cfg file even if the target file
+ # does not exist, ensuring that the user will
+ # notice the config change.
+ local basename=${1##*/}
+ local dirname=${1%/*}
+ local i=0
+ while true ; do
+ local filename=$(
+ echo -n "${dirname}/._cfg"
+ printf "%04d" ${i}
+ echo -n "_${basename}"
+ )
+ [[ -e ${filename} ]] || break
+ (( i++ ))
+ done
+ echo "${filename}"
+}
+
+pkg_postinst() {
+
+ if ${REPOS_CONF_UPGRADE} ; then
+ einfo "Generating repos.conf"
+ local repo_name=
+ [[ -f ${PORTDIR}/profiles/repo_name ]] && \
+ repo_name=$(< "${PORTDIR}/profiles/repo_name")
+ if [[ -z ${REPOS_CONF_SYNC} ]] ; then
+ REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
+ REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
+ fi
+ local sync_type=
+ [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
+
+ if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
+ sync_type=cvs
+ REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
+ fi
+
+ cat <<-EOF > "${T}/repos.conf"
+ [DEFAULT]
+ main-repo = ${repo_name:-gentoo}
+
+ [${repo_name:-gentoo}]
+ location = ${PORTDIR:-${EPREFIX}/usr/portage}
+ sync-type = ${sync_type:-rsync}
+ sync-uri = ${REPOS_CONF_SYNC}
+ EOF
+
+ [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
+
+ local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
+ if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
+ dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
+ fi
+ # Don't install the config update if the desired repos.conf directory
+ # and config file exist, since users may accept it blindly and break
+ # their config (bug #478726).
+ [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
+ mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
+
+ if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
+ einfo "Generating make.conf PORTDIR setting for backward compatibility"
+ for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
+ [[ -e ${dest} ]] && break
+ done
+ [[ -d ${dest} ]] && dest=${dest}/portdir.conf
+ rm -rf "${T}/make.conf"
+ [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
+ cat <<-EOF >> "${T}/make.conf"
+
+ # Set PORTDIR for backward compatibility with various tools:
+ # gentoo-bashcomp - bug #478444
+ # euse - bug #474574
+ # euses and ufed - bug #478318
+ PORTDIR="${EPREFIX}/usr/portage"
+ EOF
+ mkdir -p "${dest%/*}"
+ mv "${T}/make.conf" "$(new_config_protect "${dest}")"
+ fi
+ fi
+
+ local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
+
+ if ${USERSYNC_UPGRADE} && \
+ [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
+ local ownership=$(get_ownership "${PORTDIR}")
+ if [[ -n ${ownership} ]] ; then
+ einfo "Adjusting PORTDIR permissions for usersync"
+ find "${PORTDIR}" -path "${distdir%/}" -prune -o \
+ ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
+ -exec chown "${ownership}" {} +
+ fi
+ fi
+
+ # Do this last, since it could take a long time if there
+ # are lots of live sources, and the user may be tempted
+ # to kill emerge while it is running.
+ if ${USERPRIV_UPGRADE} && \
+ [[ -d ${distdir} && -w ${distdir} ]] ; then
+ local ownership=$(get_ownership "${distdir}")
+ if [[ ${ownership#*:} == portage ]] ; then
+ einfo "Adjusting DISTDIR permissions for userpriv"
+ find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
+ -exec chown -R portage:portage {} +
+ fi
+ fi
+
+ einfo ""
+ einfo "This release of portage NO LONGER contains the repoman code base."
+ einfo "Repoman has its own ebuild and release package."
+ einfo "For repoman functionality please emerge app-portage/repoman"
+ einfo "Please report any bugs you may encounter."
+ einfo ""
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/android:master commit in: sys-apps/portage/files/, sys-apps/portage/
@ 2016-10-09 5:47 Benda XU
0 siblings, 0 replies; 8+ messages in thread
From: Benda XU @ 2016-10-09 5:47 UTC (permalink / raw
To: gentoo-commits
commit: 832757f6636c5a2208494b1d92867eed78c7952c
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 9 05:46:44 2016 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Oct 9 05:46:44 2016 +0000
URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=832757f6
sys-apps/portage: for rap.
sys-apps/portage/Manifest | 5 ++++-
sys-apps/portage/files/portage-2.3.0-ldconfig-path.patch | 16 ++++++++--------
sys-apps/portage/portage-2.3.1.ebuild | 2 ++
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8073174..310a653 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,9 +1,12 @@
+AUX 2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch 1394 SHA256 a076b70b775aef23e89127d2fc64065f2d7a895b3b56a723122f641375b7c3d3 SHA512 fb3488ec9c5a849bdc9ae2cfaed3732c939072cd847534fdeaaff28560b62ad5b184f15bfb6943b921f417ec7de8e1fd3845322a0ba4d3e55f625a12cf903dcd WHIRLPOOL ddf6cd307f063404f53e9e819b01965b053df7554790d1332a5d131c11e5e6eec466412c17c4d8b3dd124ab81797641001ec3bbcfadd7ff06f5e59b2f40dc7d2
AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
-AUX portage-2.3.0-ldconfig-path.patch 1349 SHA256 f39a31df3beeedbe031b09a60a62dd0de65487aece21d3755d03de54acb09e0a SHA512 0443a5fc650b5115827091a363223ca769e59f023ce6fbe9f5c90f326c1468c31a6833494e084e95111c98da48992732f1f25ce40f9320e51e9b63b6fa773617 WHIRLPOOL 7378ad8de383670bfeb01564db760dcd122b34f268a73b108980f478cf11c500b366cc82e0069c4367fcfea0d32584544ce3df864d234ce14faf5897eb51d1ab
+AUX portage-2.3.0-ldconfig-path.patch 1311 SHA256 7cd9acd6c1cd2a304348819a7232abe4a71473769a94ef1af9d8a956c81749ac SHA512 22ada6f4d39bdd35ffbc5e248f6ca490af8f84eb471d44bc39c8a517e61a1d04071fd1bbf3f78aed92f2c8b61ddc1465f4ccfb298dcce24ee1808d48b83c3d16 WHIRLPOOL 0023fafb781932e484278017cbf72637eed91f83673c34d5094d4c65cf981ba16d5c7c3b10879e4013fc83a8f941a99acd5d71b40673b4372f689de5a3d2e2ac
AUX portage-2.3.0-prefix-path-only.patch 1089 SHA256 e72cb1f1c1ad9d2c5b6179930d87fcb5fc58cc8a25eed654a166463d5a75749a SHA512 6b28b9df57651237599736bf582e286e44353f47d5f0f0e4a65cd6d3ff87a0f216e0948f0e0aa2874d86233e14c832f0060cc264eee7c668e2d9be3df1279823 WHIRLPOOL eb100086ebd20f7956c47320159f6ce1aed22edd5f48671f8e2bd11d66e979fd0175a6e0bf1ad1caf5860ae51635fe197d74ae7c13f025778ede8f5a81bf4caa
AUX portage-2.3.0_rc1.patch 2278 SHA256 5c10f7bf71250a87576bf81635a765e6fdfdaa7882fe7e1949c736ae1472c2d6 SHA512 0e26adc69b3b716c7435d54a2ed4252045cb24e7891eed5d88514e6066ee4b1fc32ba89d63dc63e2341456110bc7def0bf1a49c1cb3cb53c0d9092bb251f9151 WHIRLPOOL 3964864f80131293283aa79ef1e87e5975e2543e456515c00cf6bd38905c2502539b9698634a44123db9e8ab3c566645b5424c29390a0f47ae7df62431355928
DIST portage-2.3.0.tar.bz2 907500 SHA256 1fbed03f78587c80f5afd36b57d7ac085ed5e5b2cc19fea63fc8a43a477e4067 SHA512 85d15a234e446677dc3458de8dacaa0d91164b190c59f8002ff98dc27a9ad699cba6c4f871ac785ba6116ed53f1f3530ec3ed662ce7f4b3e8c49380b4b206074 WHIRLPOOL 979a7fc61a65dca790a077d4839fbbb22fc8ef31ccbe534b12b87c699a25a1930586dd6ddfb9013d57a71c03ed8d976612ea15e9dc3541aff0b67e3d604a5be2
DIST portage-2.3.0_rc1.tar.bz2 910204 SHA256 52cf0837975c4b2a8e1d3d18e3334a735b14e4ebdbdca8992548b86c1d5bebd1 SHA512 d7a5ce8800668606a2e3549621686bb8bb30bd2f5d7a57b106efc1c58d34b95cef4605f5067824db0beb6f870c9e81cb3fdb5c074e9e64bef40a9df6f524ad13 WHIRLPOOL c4c86fe20606e93ecf4d125f436077ec4d15cb453c98e83894a8383f1654a9b294107c9c04bb3019f66a643ff42c333060319d59dda47c323e9711723c3b9cfe
+DIST portage-2.3.1.tar.bz2 918411 SHA256 a3c5ee98791c579687ad5ec6a7882a6b6a486a54c14d1bc73ccc9a79b4a507e9 SHA512 75a713cfa077ac271ad7fad0a48bbc923beedd2ec47000602576297fabae2de47ee69e7e6d52e02c87f9ba5d9e5b27c10fa9be7b308f72c6dcc8e7f6c321f2c6 WHIRLPOOL 4ee7942d73e8e5b977d0260b568d31d0b49387787f7ffa2e77d4ec49e00b3e67c54506840be463cb5a6da070683013192f46bb47df1df1a328457de1796d05c0
EBUILD portage-2.3.0.ebuild 11517 SHA256 16b10e751c98dc45735697b50a4df638ccce75745f2a04004dbc5c0897d4b0ed SHA512 bc44fd3cdab534b513fc00a6c27a06f42a9448c53008a470c976f2b520b0f606ec14f532eeff1c3740abd520a09bf886b005ec427a730bfbd1086093b4b7a6c3 WHIRLPOOL 068f283095fbe0bc417fd2856cc30be867001708e8d9b8daaa3a1027995bc0a2ef2ab7a9fa6bcc3fb892628e597fb55e1bc5a3795d609650c5c98b1c30d56e91
EBUILD portage-2.3.0_rc1-r1.ebuild 11651 SHA256 2ad29bbb196cf1aee3101e40d18b81537371358327614c1752e427ee713801fe SHA512 b289f6fb24e159ad99248438739607d5e670b1c3d5353d64708e4751961e249d81a9fabf7fe3fc274533982aeca96c091f5cb2787af7a6030d18b313d3172728 WHIRLPOOL 77b92fbecfc492aef0edeffc1742dc839bbe21fae0b6308c9f91bb96909b17d97933c15b2cacf7ec746847c63a376c280ecb28b293e7e1876df657ed3b4841b0
+EBUILD portage-2.3.1.ebuild 11594 SHA256 8551819a28d41a6fb7e291e37bf9289efa329dc0addb21b7a729cbabdd96aa65 SHA512 c864bf3a6a916a9865738de504dfeef82ffe48177c1635b7a6dd4e3dcec3e78daa33be5ff6fb6edc15e5e91b8551046ff0a318579ee60f40fc1d96ad1614619a WHIRLPOOL 46a0652cf699e0c3435a7a8ba3c09705ea53b030f501bfec267a0f4020c908817e35c05b5d278791657739892f7b6e078c48107a5f1a6d05dde78b5e4f4d6eb3
MISC metadata.xml 1017 SHA256 78bf0d7e87b917ab6eb9c43835c9c688dc3c5ab0a1043608448e12e6bad715bc SHA512 40315f8375409a6e8b86b2d11dc33b28a019911348d66f05fdd1194a4f0859f3f2ebf9c6922b795194669d992901c1fdda4cd147100979a7f661915c4094fd35 WHIRLPOOL c2817f5c0005da6f1bf0ecb8d1bde9a6b9379e3022b9e456ee5e932974493a0454166e0113092aae7de2725b0718b3cd10e05ba25012b321644403ab0677c166
diff --git a/sys-apps/portage/files/portage-2.3.0-ldconfig-path.patch b/sys-apps/portage/files/portage-2.3.0-ldconfig-path.patch
index 65fbd3e..335d0cd 100644
--- a/sys-apps/portage/files/portage-2.3.0-ldconfig-path.patch
+++ b/sys-apps/portage/files/portage-2.3.0-ldconfig-path.patch
@@ -1,29 +1,29 @@
-commit dde7fb0919d40cc5585e8a603046e7098371ad69
+commit c70609e72f7eef422af122543d66c595ee139719
Author: Benda Xu <heroxbd@gentoo.org>
-Date: Wed Dec 10 10:45:31 2014 +0900
+Date: Mon Jun 20 09:12:35 2016 +0900
let env-update call ldconfig if it exists
In Prefix, let env-update call ldconfig if it exists.
It does not affect prefix-rpath, and handles prefix-libc(RAP) correctly.
-
- Signed-off-by: Fabian Groffen <grobian@gentoo.org>
diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py
-index ace492c..5e732ad 100644
+index c0a93a8..fde2f66 100644
--- a/pym/portage/util/env_update.py
+++ b/pym/portage/util/env_update.py
-@@ -306,13 +306,15 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env,
+@@ -306,13 +306,17 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env,
if not libdir_contents_changed:
makelinks = False
- ldconfig = "/sbin/ldconfig"
-+ ldconfig = eprefix + "/sbin/ldconfig"
if "CHOST" in settings and "CBUILD" in settings and \
settings["CHOST"] != settings["CBUILD"]:
ldconfig = find_binary("%s-ldconfig" % settings["CHOST"])
-+ elif not (os.access(ldconfig, os.X_OK) and os.path.isfile(ldconfig)):
++ else:
++ ldconfig = os.path.join(eroot, "sbin", "ldconfig")
++
++ if not (os.access(ldconfig, os.X_OK) and os.path.isfile(ldconfig)):
+ ldconfig = None
# Only run ldconfig as needed
diff --git a/sys-apps/portage/portage-2.3.1.ebuild b/sys-apps/portage/portage-2.3.1.ebuild
index 4ea4ef7..1e432c4 100644
--- a/sys-apps/portage/portage-2.3.1.ebuild
+++ b/sys-apps/portage/portage-2.3.1.ebuild
@@ -80,6 +80,8 @@ SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
PATCHES=(
"${FILESDIR}/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch"
+ "${FILESDIR}"/${PN}-2.3.0-ldconfig-path.patch
+ "${FILESDIR}"/${PN}-2.3.0-prefix-path-only.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/android:master commit in: sys-apps/portage/files/, sys-apps/portage/
@ 2016-10-24 7:15 Benda XU
0 siblings, 0 replies; 8+ messages in thread
From: Benda XU @ 2016-10-24 7:15 UTC (permalink / raw
To: gentoo-commits
commit: 908c65964befc90d5548ee35e807ec52ef88e5c6
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 24 07:14:59 2016 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Oct 24 07:14:59 2016 +0000
URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=908c6596
sys-apps/portage: prefixify 2.3.2.
sys-apps/portage/Manifest | 4 +-
.../files/portage-2.3.0-prefix-path-only.patch | 45 ++++++++++++++--------
sys-apps/portage/portage-2.3.2.ebuild | 5 +++
3 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 310a653..4429da2 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,12 +1,14 @@
AUX 2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch 1394 SHA256 a076b70b775aef23e89127d2fc64065f2d7a895b3b56a723122f641375b7c3d3 SHA512 fb3488ec9c5a849bdc9ae2cfaed3732c939072cd847534fdeaaff28560b62ad5b184f15bfb6943b921f417ec7de8e1fd3845322a0ba4d3e55f625a12cf903dcd WHIRLPOOL ddf6cd307f063404f53e9e819b01965b053df7554790d1332a5d131c11e5e6eec466412c17c4d8b3dd124ab81797641001ec3bbcfadd7ff06f5e59b2f40dc7d2
AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
AUX portage-2.3.0-ldconfig-path.patch 1311 SHA256 7cd9acd6c1cd2a304348819a7232abe4a71473769a94ef1af9d8a956c81749ac SHA512 22ada6f4d39bdd35ffbc5e248f6ca490af8f84eb471d44bc39c8a517e61a1d04071fd1bbf3f78aed92f2c8b61ddc1465f4ccfb298dcce24ee1808d48b83c3d16 WHIRLPOOL 0023fafb781932e484278017cbf72637eed91f83673c34d5094d4c65cf981ba16d5c7c3b10879e4013fc83a8f941a99acd5d71b40673b4372f689de5a3d2e2ac
-AUX portage-2.3.0-prefix-path-only.patch 1089 SHA256 e72cb1f1c1ad9d2c5b6179930d87fcb5fc58cc8a25eed654a166463d5a75749a SHA512 6b28b9df57651237599736bf582e286e44353f47d5f0f0e4a65cd6d3ff87a0f216e0948f0e0aa2874d86233e14c832f0060cc264eee7c668e2d9be3df1279823 WHIRLPOOL eb100086ebd20f7956c47320159f6ce1aed22edd5f48671f8e2bd11d66e979fd0175a6e0bf1ad1caf5860ae51635fe197d74ae7c13f025778ede8f5a81bf4caa
+AUX portage-2.3.0-prefix-path-only.patch 1725 SHA256 1d087d0855c3f68fce817d31192209f4fe271f5bbf98030ab72621671cd4529e SHA512 408fcc71ca0dc0b8cdc99aff29c8c94e22ab1205257cc6a48e439abb0b34ddc4366f093d46719899c6c9a52075e2a72db31a28f13ca9aace45b9350266c609db WHIRLPOOL e3c2e1e27496c41d9b84188f2692f6f91b18b9317097ffe517515687a853e0c01f93fe5ec4059177892ead2bf851f9eb68c2a23905f081f13193032d5c8bf535
AUX portage-2.3.0_rc1.patch 2278 SHA256 5c10f7bf71250a87576bf81635a765e6fdfdaa7882fe7e1949c736ae1472c2d6 SHA512 0e26adc69b3b716c7435d54a2ed4252045cb24e7891eed5d88514e6066ee4b1fc32ba89d63dc63e2341456110bc7def0bf1a49c1cb3cb53c0d9092bb251f9151 WHIRLPOOL 3964864f80131293283aa79ef1e87e5975e2543e456515c00cf6bd38905c2502539b9698634a44123db9e8ab3c566645b5424c29390a0f47ae7df62431355928
DIST portage-2.3.0.tar.bz2 907500 SHA256 1fbed03f78587c80f5afd36b57d7ac085ed5e5b2cc19fea63fc8a43a477e4067 SHA512 85d15a234e446677dc3458de8dacaa0d91164b190c59f8002ff98dc27a9ad699cba6c4f871ac785ba6116ed53f1f3530ec3ed662ce7f4b3e8c49380b4b206074 WHIRLPOOL 979a7fc61a65dca790a077d4839fbbb22fc8ef31ccbe534b12b87c699a25a1930586dd6ddfb9013d57a71c03ed8d976612ea15e9dc3541aff0b67e3d604a5be2
DIST portage-2.3.0_rc1.tar.bz2 910204 SHA256 52cf0837975c4b2a8e1d3d18e3334a735b14e4ebdbdca8992548b86c1d5bebd1 SHA512 d7a5ce8800668606a2e3549621686bb8bb30bd2f5d7a57b106efc1c58d34b95cef4605f5067824db0beb6f870c9e81cb3fdb5c074e9e64bef40a9df6f524ad13 WHIRLPOOL c4c86fe20606e93ecf4d125f436077ec4d15cb453c98e83894a8383f1654a9b294107c9c04bb3019f66a643ff42c333060319d59dda47c323e9711723c3b9cfe
DIST portage-2.3.1.tar.bz2 918411 SHA256 a3c5ee98791c579687ad5ec6a7882a6b6a486a54c14d1bc73ccc9a79b4a507e9 SHA512 75a713cfa077ac271ad7fad0a48bbc923beedd2ec47000602576297fabae2de47ee69e7e6d52e02c87f9ba5d9e5b27c10fa9be7b308f72c6dcc8e7f6c321f2c6 WHIRLPOOL 4ee7942d73e8e5b977d0260b568d31d0b49387787f7ffa2e77d4ec49e00b3e67c54506840be463cb5a6da070683013192f46bb47df1df1a328457de1796d05c0
+DIST portage-2.3.2.tar.bz2 919270 SHA256 724a9924209c5da5e7ba7f19812db0675bb3b4309f911e37da8c35bbc3fede67 SHA512 bee95d0308a613083a28b05e5276bc3c4eb5841e17985e3c943a92bc5b9a659eb18ae822219d26da80144febf47b5ad30766536f820162812549f0bc83975bec WHIRLPOOL 0836aac5d9e331d896053160d8e829f997697f83bd3dbe4f14b924b9aa7c41a7c53e48e4ea5873fba05d4d23d715b310e92a10fed348b7ad55afbde149864f20
EBUILD portage-2.3.0.ebuild 11517 SHA256 16b10e751c98dc45735697b50a4df638ccce75745f2a04004dbc5c0897d4b0ed SHA512 bc44fd3cdab534b513fc00a6c27a06f42a9448c53008a470c976f2b520b0f606ec14f532eeff1c3740abd520a09bf886b005ec427a730bfbd1086093b4b7a6c3 WHIRLPOOL 068f283095fbe0bc417fd2856cc30be867001708e8d9b8daaa3a1027995bc0a2ef2ab7a9fa6bcc3fb892628e597fb55e1bc5a3795d609650c5c98b1c30d56e91
EBUILD portage-2.3.0_rc1-r1.ebuild 11651 SHA256 2ad29bbb196cf1aee3101e40d18b81537371358327614c1752e427ee713801fe SHA512 b289f6fb24e159ad99248438739607d5e670b1c3d5353d64708e4751961e249d81a9fabf7fe3fc274533982aeca96c091f5cb2787af7a6030d18b313d3172728 WHIRLPOOL 77b92fbecfc492aef0edeffc1742dc839bbe21fae0b6308c9f91bb96909b17d97933c15b2cacf7ec746847c63a376c280ecb28b293e7e1876df657ed3b4841b0
EBUILD portage-2.3.1.ebuild 11594 SHA256 8551819a28d41a6fb7e291e37bf9289efa329dc0addb21b7a729cbabdd96aa65 SHA512 c864bf3a6a916a9865738de504dfeef82ffe48177c1635b7a6dd4e3dcec3e78daa33be5ff6fb6edc15e5e91b8551046ff0a318579ee60f40fc1d96ad1614619a WHIRLPOOL 46a0652cf699e0c3435a7a8ba3c09705ea53b030f501bfec267a0f4020c908817e35c05b5d278791657739892f7b6e078c48107a5f1a6d05dde78b5e4f4d6eb3
+EBUILD portage-2.3.2.ebuild 11529 SHA256 cce0948c655eed88b0e3e0e9dc283cb05a47c778440cd4b576796a680cb84a52 SHA512 791ce4506b24ced68dd0d09cf5cf9a1fac08b11b6b3b1dfd13831c2b2276db7d701c08b03771732e59b710c7bbd2b5cb0d92942c81123d3dfc070716ab4fefdf WHIRLPOOL b528eee31f6721e680739db5486afbf6982d01329611cc402f048ceffbae6ac550def47ce378608fdbcf7ff8c781ad00cb249bfae7c97f1d60313dc91eb5bd6a
MISC metadata.xml 1017 SHA256 78bf0d7e87b917ab6eb9c43835c9c688dc3c5ab0a1043608448e12e6bad715bc SHA512 40315f8375409a6e8b86b2d11dc33b28a019911348d66f05fdd1194a4f0859f3f2ebf9c6922b795194669d992901c1fdda4cd147100979a7f661915c4094fd35 WHIRLPOOL c2817f5c0005da6f1bf0ecb8d1bde9a6b9379e3022b9e456ee5e932974493a0454166e0113092aae7de2725b0718b3cd10e05ba25012b321644403ab0677c166
diff --git a/sys-apps/portage/files/portage-2.3.0-prefix-path-only.patch b/sys-apps/portage/files/portage-2.3.0-prefix-path-only.patch
index f2fe0f0..378b9d8 100644
--- a/sys-apps/portage/files/portage-2.3.0-prefix-path-only.patch
+++ b/sys-apps/portage/files/portage-2.3.0-prefix-path-only.patch
@@ -1,31 +1,44 @@
-When eprefix is defined, no host tools should be used.
+commit b3e47525357322433126389533501c42cd092979
+Author: Benda Xu <heroxbd@gentoo.org>
+Date: Sat Jun 18 14:32:07 2016 +0900
+
+ do not use host PATH by default and prepend EPREFIX PATH.
+
+ EPREFIX could be overridden in cross-eprefix, in that case tools
+ inside EPREFIX should be prioritized.
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
-index 26e6123..c266c83 100644
+index 52dbf8b..304b164 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
-@@ -205,11 +205,6 @@ def _doebuild_path(settings, eapi=None):
+@@ -199,16 +199,18 @@ def _doebuild_path(settings, eapi=None):
+ if portage_bin_path[0] != portage.const.PORTAGE_BIN_PATH:
+ # Add a fallback path for restarting failed builds (bug 547086)
+ portage_bin_path.append(portage.const.PORTAGE_BIN_PATH)
+- eprefix = portage.const.EPREFIX
+ prerootpath = [x for x in settings.get("PREROOTPATH", "").split(":") if x]
+ rootpath = [x for x in settings.get("ROOTPATH", "").split(":") if x]
overrides = [x for x in settings.get(
"__PORTAGE_TEST_PATH_OVERRIDE", "").split(":") if x]
-- prefixes = []
+ prefixes = []
- if eprefix:
- prefixes.append(eprefix)
- prefixes.append("/")
--
++ # tools in EPREFIX can only be executed when ROOT is /.
++ if settings["ROOT"] == "/":
++ prefixes.append(settings["EPREFIX"])
++ # settings["EPREFIX"] could be overridden during cross-eprefix
++ if portage.const.EPREFIX != settings["EPREFIX"]:
++ prefixes.append(portage.const.EPREFIX)
+
path = overrides
- if "xattr" in settings.features:
-@@ -231,9 +226,9 @@ def _doebuild_path(settings, eapi=None):
- path.append(os.path.join(x, "ebuild-helpers"))
+@@ -232,6 +234,7 @@ def _doebuild_path(settings, eapi=None):
path.extend(prerootpath)
-- for prefix in prefixes:
-- for x in ("usr/local/sbin", "usr/local/bin", "usr/sbin", "usr/bin", "sbin", "bin"):
-- path.append(os.path.join(prefix, x))
-+ prefix = eprefix if eprefix else "/"
-+ for x in ("usr/local/sbin", "usr/local/bin", "usr/sbin", "usr/bin", "sbin", "bin"):
-+ path.append(os.path.join(prefix, x))
+ for prefix in prefixes:
++ prefix = prefix if prefix else "/"
+ for x in ("usr/local/sbin", "usr/local/bin", "usr/sbin", "usr/bin", "sbin", "bin"):
+ path.append(os.path.join(prefix, x))
- path.extend(rootpath)
- settings["PATH"] = ":".join(path)
diff --git a/sys-apps/portage/portage-2.3.2.ebuild b/sys-apps/portage/portage-2.3.2.ebuild
index a9c7910..3c35c22 100644
--- a/sys-apps/portage/portage-2.3.2.ebuild
+++ b/sys-apps/portage/portage-2.3.2.ebuild
@@ -78,6 +78,11 @@ TARBALL_PV=${PV}
SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.0-ldconfig-path.patch
+ "${FILESDIR}"/${PN}-2.3.0-prefix-path-only.patch
+)
+
pkg_setup() {
use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-10-24 7:15 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-24 7:15 [gentoo-commits] proj/android:master commit in: sys-apps/portage/files/, sys-apps/portage/ Benda XU
-- strict thread matches above, loose matches on Subject: below --
2016-10-09 5:47 Benda XU
2016-10-09 5:47 Benda XU
2016-07-21 2:23 [gentoo-commits] dev/heroxbd:master " Benda XU
2016-06-15 3:18 ` [gentoo-commits] proj/android:master " Benda XU
2016-06-07 6:06 Benda XU
2016-05-26 4:05 Benda XU
2016-05-25 5:03 [gentoo-commits] dev/heroxbd:master " Benda XU
2016-05-26 4:05 ` [gentoo-commits] proj/android:master " Benda XU
2015-03-05 3:00 Benda XU
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox