commit: adca31f32c6af0be80798e27035e5737df1be982 Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> AuthorDate: Sun Oct 4 11:56:01 2015 +0000 Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> CommitDate: Sun Oct 4 11:56:01 2015 +0000 URL: https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=adca31f3
Sync with main tree: portage-2.2.22 sys-apps/portage/Manifest | 3 +- sys-apps/portage/portage-2.2.18-r2.ebuild | 349 --------------------- ...e-2.2.18-r1.ebuild => portage-2.2.22-r1.ebuild} | 2 +- 3 files changed, 2 insertions(+), 352 deletions(-) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index de97c19..6aab9b5 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,3 +1,2 @@ -EBUILD portage-2.2.18-r1.ebuild 11531 SHA256 f76ea14152df9db2a1c5cea42b63da88f3d247b4983bfa91d5b6a1028f10b1ec SHA512 57ebe740d6a8099f1121d06e4b478ce1c889552909fea29eb984276eee1ba9c1784fa47355ee27b11c69574895b4f25596a0a44894d132f226eeb01175218be3 WHIRLPOOL 0135931c190dd8276088aba25b83837debce91c43f60cd96b0972c4ff510ba650d3cccd0c16b4ef80d4c26c69aee5131f7bf531440d3c2a53576ea770f456fe0 -EBUILD portage-2.2.18-r2.ebuild 11531 SHA256 929f450333687b27d188418a7d06224158310a3044718dd100c08f1dc50dce57 SHA512 76f2c79498e6f2ef44ea7ca6c02dbd30185aa22f456bab869f98bc5a219745ab3755d99ec303f2f13a1807956483601d8673df831f91206541119433342af0d1 WHIRLPOOL 0f496a99925deb084fccfd81a8636a5782b6c8f1a271bb173140ed453ae79fa919d53a817da4cb0ddca90ce236a77b6dddc32f086c093a8a64127228c6284762 +EBUILD portage-2.2.22-r1.ebuild 11531 SHA256 e6037e2d6d1beb24b4a02ae67d1490e0761dc9f9bef2a5db7af888bf161b1194 SHA512 05898a198abaa569f6b4635e943072093889adcf3e5e331d9e298fd3b22996c784e0c73d8277253222bc6d1570ee2c2d188d7f0d976bac133f3da0890cb43a4a WHIRLPOOL 4178fe1de35da39f9f6bd291a37516b0f75765370b59235364d1f67a3154c2afeb57f8908be9ae07f0e240bbbb3f7084ffa0f33436301b7daad04ed10e9a53ef MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630 diff --git a/sys-apps/portage/portage-2.2.18-r2.ebuild b/sys-apps/portage/portage-2.2.18-r2.ebuild deleted file mode 100644 index ace3816..0000000 --- a/sys-apps/portage/portage-2.2.18-r2.ebuild +++ /dev/null @@ -1,349 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.18.ebuild,v 1.9 2015/04/26 15:42:47 zlogene Exp $ - -EAPI=5 - -PYTHON_COMPAT=( - pypy - python3_3 python3_4 - python2_7 -) -# Note: substituted below -PYTHON_REQ_USE='bzip2(+)' - -inherit distutils-r1 git-2 multilib - -EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git" -EGIT_BRANCH="multilib" -EGIT_COMMIT="cf7284cba66a1d6e747ce916de24a5c25b5654f8" -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_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) - 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*')] ) - >=sys-apps/abi-wrapper-1.0-r6" -# 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=" - 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 - >=sys-apps/abi-wrapper-1.0-r6" -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*') )" - -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 - - einfo - elog "For setup instructions after switching to portage-multilib" - elog "read doc/portage-multilib-instructions inside the multilib overlay" - einfo - elog "The bin/ dir of the overlay has some scripts to switch from lib32" - elog "to MULTILIB_ABI or to add the default MULTILIB_ABI flags" - - # 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 -} diff --git a/sys-apps/portage/portage-2.2.18-r1.ebuild b/sys-apps/portage/portage-2.2.22-r1.ebuild similarity index 99% rename from sys-apps/portage/portage-2.2.18-r1.ebuild rename to sys-apps/portage/portage-2.2.22-r1.ebuild index d270faf..d8ae83a 100644 --- a/sys-apps/portage/portage-2.2.18-r1.ebuild +++ b/sys-apps/portage/portage-2.2.22-r1.ebuild @@ -16,7 +16,7 @@ inherit distutils-r1 git-2 multilib EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git" EGIT_BRANCH="multilib" -EGIT_COMMIT="600cb1fd9daed3b01d8f51b38c29f000376b6513" +EGIT_COMMIT="0c879b950b70c54cd672ddc0541744d7785ee04b" DESCRIPTION="Portage is the package management and distribution system for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
