sys-apps/portage: Version bump.
authorBrian Dolbec <dolsen@gentoo.org>
Thu, 8 Oct 2015 06:11:14 +0000 (23:11 -0700)
committerBrian Dolbec <dolsen@gentoo.org>
Thu, 8 Oct 2015 06:12:11 +0000 (23:12 -0700)
Fixes bugs 561474, 561596, 561264, 554084, 562108, 561846, 5634022.

Package-Manager: portage-2.2.23

sys-apps/portage/Manifest
sys-apps/portage/portage-2.2.23.ebuild [new file with mode: 0644]

index bbba34b5fad26bc2d3e434ce3f5f3afe151fafda..598a7590ea8732ab891bd87f137d30cd260ccc8c 100644 (file)
@@ -3,4 +3,5 @@ DIST portage-2.2.18.tar.bz2 942561 SHA256 e0d54f2fbcdc8b5fce716475183fa6e889b6fa
 DIST portage-2.2.20.1.tar.bz2 950298 SHA256 84dd3ed1d9fd0a3336e956d057590c75834a906ae62a450411232fe5a842475c SHA512 5f7373da20d448059e8fdc8a3593eaca780be3184f0494bac66f5eea7c33d00dd61b9e74cbe9a52413f08cef29d426ed8751e20e16be09178468c18d77a6ae2e WHIRLPOOL 99643ce0ab74c5df64fb5239948c6102bc39847ff88eaf210c069c0c9587c1e8bdd1a032a7e61c1225b6113645387861d439e9c4f103df4d0f042b73e1afc328
 DIST portage-2.2.20.tar.bz2 950293 SHA256 483ce0b20960840f6499452ca4ef7df36fde08f835dcadf3cdd118c1ff7207a4 SHA512 fffb43a4c25a70cae071246fde7e379107535e607b9e8dd9fb513315a10750db92209bb436f532930a44cac06ba43aade06a7c2b0a1d675fd816968ba0fce7ae WHIRLPOOL aa1e560007cdafebd2bf56964d61e55a91fef4be5cd9bc50560891140287f6827ecda9d99e31ceb4e5a64691863fde325b51594cfdcfe88eb260fba47dad5fb9
 DIST portage-2.2.22.tar.bz2 973737 SHA256 d8ae50e2306452c4f8c2772e4001fbfffbcb8f6e3606d61fad039c7c11a3f180 SHA512 8acfe71880bdd1a681f54c8225d73f9dea52192c056b9cf64ed50aff2cc822568bebc5a8d7bac46f2d1f16093b6950434004926b10007c9591c18a435465e689 WHIRLPOOL 30d95197c63bac768f08e2397f1be79f077619f92833db6e86cb06e967ae982eed004106d869c86d37ac1b3cd66ca0a6c8acb4915dfb0385904caf09a901c93e
+DIST portage-2.2.23.tar.bz2 960229 SHA256 9aecc9f4c813810f99f6604a9806e268b162d90243a9769f1410b3a96822cdfb SHA512 17b8fe4967719bacd8f3ca324bde3328d82f5b7748a05b66cca165dcc8a4abbaf7e05ec61a54684cd1b001297dc0adc04c3771d0fd3cc4732f17ac9e0810e6ad WHIRLPOOL da7229c2be8330e898ef1e422a62683a003c16a640fee9d183c8afc8474779d302c0de639072099c8d47372fa0c74e2a635c485d8c7ed2b2344cacc857199578
 DIST portage-2.2.8.tar.bz2 874672 SHA256 c1074e01173df5384e003598dbc5f64f09e92f83fd26faab2f88f9f0bc64aa7e SHA512 acc47d94ff8c08e5a7bf2d4c4e600863430dd1e7d0bb8b4254d6477a498933cae663db84debf9487d2243c2cba689629ef8e8b6cf108e10d40e89e8e8d7e1257 WHIRLPOOL d54290ede8d3d85e5211cda7e86ed740178121ef2f47cf0858c27941d8679d29c11445befff962986d40a47ded50d0d4654de19e7d4aef3fdf2546655a0d6fe2
diff --git a/sys-apps/portage/portage-2.2.23.ebuild b/sys-apps/portage/portage-2.2.23.ebuild
new file mode 100644 (file)
index 0000000..99d5c1c
--- /dev/null
@@ -0,0 +1,363 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(
+       pypy
+       python3_3 python3_4
+       python2_7
+)
+# Note: substituted below
+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_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
+       >=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)"
+
+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 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 "Please report any bugs you may encounter."
+       einfo ""
+}