commit:     f4d7438d093f5263ba07e229377ed8002f08506f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 09:13:44 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 09:14:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f4d7438d

sys-apps/portage: version bump to 2.3.18, includes seatbelt fix for High Sierra

Bug: https://bugs.gentoo.org/640240
Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6

 sys-apps/portage/Manifest                            |  2 +-
 .../{portage-2.3.11.ebuild => portage-2.3.18.ebuild} | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3b63ea0d87..d8a1695c45 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 DIST prefix-portage-2.2.28.tar.bz2 1187416 SHA256 
e4bb6c08a65252cfb3faf777ff9bb6aab162174766202f811154c0bbe301b45e SHA512 
ea0661783d421d204272b9a210745aa2040a18ea347299b3d768588e10ca8dd2e24b46975249bf30010bf565514aea640f4edb9db2ca064312c899304a8c1f42
 WHIRLPOOL 
d2d3feab14c4b0dc706db9336e08637897d963d0cbd7e1995431701c8c1914f6f42f57917470a2c89cdc8596d2ed8183c80f3814eba7512b5216611595da38a1
-DIST prefix-portage-2.3.11.tar.bz2 1204510 SHA256 
58532d75cf08a1bced4ed8b2fe9693d00f825d0b15b01961c1df5736a314edb1 SHA512 
f84820c076273fa40c036910b9482141221a78dd640b7c7a56e4b0b8b619452e87e9d2ea60ff922391ab344c68cbaf5135ebe7f5c70888400b97cb78cb89c1f7
 WHIRLPOOL 
fdb70b14b810dd0013947836b5769de266a85b13d1ffeee22133bd9b57eb4f441621e5c019576a1d115c2a5d4f5f86f532ce288ba8a9004742873e0cb5d54156
 DIST prefix-portage-2.3.13.tar.bz2 1205509 SHA256 
70378a489aad579972fa12ca8cb64297964fcb3b4758e52f37d129d25cc14272 SHA512 
4d59d04b9d6a896a545a40e04973a1c29f421b5d90f08012cb00a27ba1081eb914ddb625f543c26c93c8c75ba690f6ec72e4d9301f4f8e01a5fc68a3438cf46c
 WHIRLPOOL 
d91f0e70436c14b3fc22fb0d708439b0a9a402fb9461e9e6ee776e826859d1786beabd0c81f6db6d1205f3da9f717d02c57588109970d8954123ef8c9f56a25e
+DIST prefix-portage-2.3.18.tar.bz2 1230290 SHA256 
297e637a380c44dde8b725d5c194eacca8e92fc107ae85c7a082abe9d2b9d8ad SHA512 
508a5891fc28297e68baf031f4e99674a58c6268b16d50e094adc6676fb42f81bb81bd6f3dc70c24636be64ae015db51df86c49267c8c5a98129fe5e006310d7
 WHIRLPOOL 
9105c69d47171c92342e4349f9986bd8f45fcdaf3624090bb7a2ef019fec2028b4d16ee907d884473ba5cd8bd4cfdae37d594fc9ea6b32beda05d980126ead67

diff --git a/sys-apps/portage/portage-2.3.11.ebuild 
b/sys-apps/portage/portage-2.3.18.ebuild
similarity index 94%
rename from sys-apps/portage/portage-2.3.11.ebuild
rename to sys-apps/portage/portage-2.3.18.ebuild
index 9471ca7f8d..a7abe3406a 100644
--- a/sys-apps/portage/portage-2.3.11.ebuild
+++ b/sys-apps/portage/portage-2.3.18.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 PYTHON_COMPAT=(
        pypy
-       python3_3 python3_4 python3_5 python3_6
+       python3_4 python3_5 python3_6
        python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
@@ -13,7 +13,7 @@ PYTHON_REQ_USE='bzip2(+),threads(+)'
 inherit eutils distutils-r1 multilib
 
 DESCRIPTION="Portage package manager used in Gentoo Prefix"
-HOMEPAGE="http://prefix.gentoo.org/";
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
 LICENSE="GPL-2"
 KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
@@ -39,6 +39,8 @@ RDEPEND="
                >=sys-apps/sed-4.0.5
                app-shells/bash:0[readline]
                >=app-admin/eselect-1.2
+               $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+                       python{2_7,3_4,3_5} pypy)
        )
        elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
        elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
@@ -54,7 +56,7 @@ RDEPEND="
                $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
                        python2_7 pypy)
        ) )
-       !prefix? ( !<app-admin/logrotate-3.8.0 )"
+       !<app-admin/logrotate-3.8.0"
 PDEPEND="
        !build? (
                >=net-misc/rsync-2.6.4
@@ -65,7 +67,7 @@ PDEPEND="
 
 REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
 
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage 
https://dev.gentoo.org/~grobian/distfiles";
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives 
https://dev.gentoo.org/~grobian/distfiles";
 
 prefix_src_archives() {
        local x y
@@ -213,8 +215,14 @@ python_install_all() {
        distutils-r1_python_install_all
 
        local targets=()
-       use doc && targets+=( install_docbook )
-       use epydoc && targets+=( install_epydoc )
+       use doc && targets+=(
+               install_docbook
+               --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+       )
+       use epydoc && targets+=(
+               install_epydoc
+               --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+       )
 
        # install docs
        if [[ ${targets[@]} ]]; then

Reply via email to