diff options
author | 2016-07-01 05:02:24 +0900 | |
---|---|---|
committer | 2016-07-01 05:02:24 +0900 | |
commit | ccaf4051612bbff71447bdcdb9a9b888bffbbbbc (patch) | |
tree | 74253ceba7c45aca3feb8d6eb63425c28041df7c | |
parent | sys-apps/baselayout: merged (diff) | |
download | heroxbd-ccaf4051612bbff71447bdcdb9a9b888bffbbbbc.tar.gz heroxbd-ccaf4051612bbff71447bdcdb9a9b888bffbbbbc.tar.bz2 heroxbd-ccaf4051612bbff71447bdcdb9a9b888bffbbbbc.zip |
sys-apps/portage: bump to 2.3.0.
-rw-r--r-- | sys-apps/portage/Manifest | 6 | ||||
-rw-r--r-- | sys-apps/portage/files/portage-2.2.28-distcc-eprefix.patch | 27 | ||||
-rw-r--r-- | sys-apps/portage/files/portage-2.3.0-scanelf-path.patch | 21 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.3.0.ebuild (renamed from sys-apps/portage/portage-2.2.28.ebuild) | 22 |
4 files changed, 11 insertions, 65 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 6017c18..8073174 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,11 +1,9 @@ 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-ldconfig-path.patch 1349 SHA256 f39a31df3beeedbe031b09a60a62dd0de65487aece21d3755d03de54acb09e0a SHA512 0443a5fc650b5115827091a363223ca769e59f023ce6fbe9f5c90f326c1468c31a6833494e084e95111c98da48992732f1f25ce40f9320e51e9b63b6fa773617 WHIRLPOOL 7378ad8de383670bfeb01564db760dcd122b34f268a73b108980f478cf11c500b366cc82e0069c4367fcfea0d32584544ce3df864d234ce14faf5897eb51d1ab 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.tar.bz2 907500 SHA256 1fbed03f78587c80f5afd36b57d7ac085ed5e5b2cc19fea63fc8a43a477e4067 SHA512 85d15a234e446677dc3458de8dacaa0d91164b190c59f8002ff98dc27a9ad699cba6c4f871ac785ba6116ed53f1f3530ec3ed662ce7f4b3e8c49380b4b206074 WHIRLPOOL 979a7fc61a65dca790a077d4839fbbb22fc8ef31ccbe534b12b87c699a25a1930586dd6ddfb9013d57a71c03ed8d976612ea15e9dc3541aff0b67e3d604a5be2 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.ebuild 11517 SHA256 16b10e751c98dc45735697b50a4df638ccce75745f2a04004dbc5c0897d4b0ed SHA512 bc44fd3cdab534b513fc00a6c27a06f42a9448c53008a470c976f2b520b0f606ec14f532eeff1c3740abd520a09bf886b005ec427a730bfbd1086093b4b7a6c3 WHIRLPOOL 068f283095fbe0bc417fd2856cc30be867001708e8d9b8daaa3a1027995bc0a2ef2ab7a9fa6bcc3fb892628e597fb55e1bc5a3795d609650c5c98b1c30d56e91 EBUILD portage-2.3.0_rc1-r1.ebuild 11651 SHA256 2ad29bbb196cf1aee3101e40d18b81537371358327614c1752e427ee713801fe SHA512 b289f6fb24e159ad99248438739607d5e670b1c3d5353d64708e4751961e249d81a9fabf7fe3fc274533982aeca96c091f5cb2787af7a6030d18b313d3172728 WHIRLPOOL 77b92fbecfc492aef0edeffc1742dc839bbe21fae0b6308c9f91bb96909b17d97933c15b2cacf7ec746847c63a376c280ecb28b293e7e1876df657ed3b4841b0 MISC metadata.xml 1017 SHA256 78bf0d7e87b917ab6eb9c43835c9c688dc3c5ab0a1043608448e12e6bad715bc SHA512 40315f8375409a6e8b86b2d11dc33b28a019911348d66f05fdd1194a4f0859f3f2ebf9c6922b795194669d992901c1fdda4cd147100979a7f661915c4094fd35 WHIRLPOOL c2817f5c0005da6f1bf0ecb8d1bde9a6b9379e3022b9e456ee5e932974493a0454166e0113092aae7de2725b0718b3cd10e05ba25012b321644403ab0677c166 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 deleted file mode 100644 index 728eb8c..0000000 --- a/sys-apps/portage/files/portage-2.2.28-distcc-eprefix.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: portage-2.3.0_rc1/pym/portage/package/ebuild/prepare_build_dirs.py -=================================================================== ---- 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" % (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" % (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 deleted file mode 100644 index 9e47448..0000000 --- a/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 - 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 = [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: diff --git a/sys-apps/portage/portage-2.2.28.ebuild b/sys-apps/portage/portage-2.3.0.ebuild index 77293b6..e4f475c 100644 --- a/sys-apps/portage/portage-2.2.28.ebuild +++ b/sys-apps/portage/portage-2.3.0.ebuild @@ -11,13 +11,13 @@ PYTHON_COMPAT=( ) PYTHON_REQ_USE='bzip2(+)' -inherit eutils distutils-r1 multilib +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" +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" @@ -78,6 +78,9 @@ 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 ) } @@ -85,8 +88,6 @@ pkg_setup() { python_prepare_all() { distutils-r1_python_prepare_all - epatch "${FILESDIR}"/${PN}-2.2.28-distcc-eprefix.patch - if ! use ipc ; then einfo "Disabling ipc..." sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ @@ -126,10 +127,7 @@ python_prepare_all() { -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|" \ + sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ -i cnf/repos.conf || die "sed failed" einfo "Adding FEATURES=force-prefix to make.globals ..." @@ -358,11 +356,9 @@ pkg_postinst() { fi einfo "" - einfo "This release of portage contains the new repoman code base" - einfo "This code base is still being developed. So its API's are" - einfo "not to be considered stable and are subject to change." - einfo "The code released has been tested and considered ready for use." - einfo "This however does not guarantee it to be completely bug free." + 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 "" } |