dolsen 15/02/12 05:34:22 Modified: portage-9999.ebuild ChangeLog Added: portage-2.2.17.ebuild Removed: portage-2.2.16.ebuild Log: Version bump, remove masked version, /add cvs, git, subversion USE flags (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0xD80F5F1E1245142E)
Revision Changes Path 1.109 sys-apps/portage/portage-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.109&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.109&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.108&r2=1.109 Index: portage-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- portage-9999.ebuild 22 Dec 2014 11:14:55 -0000 1.108 +++ portage-9999.ebuild 12 Feb 2015 05:34:22 -0000 1.109 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# 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-9999.ebuild,v 1.108 2014/12/22 11:14:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.109 2015/02/12 05:34:22 dolsen Exp $ EAPI=5 @@ -20,7 +20,7 @@ LICENSE="GPL-2" KEYWORDS="" SLOT="0" -IUSE="build doc epydoc +ipc linguas_ru selinux xattr" +IUSE="build cvs doc epydoc git +ipc linguas_ru selinux subversion xattr" DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) dev-lang/python-exec:2 @@ -41,11 +41,14 @@ app-shells/bash:0[readline] >=app-admin/eselect-1.2 ) + cvs? ( dev-vcs/cvs ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) + git? ( dev-vcs/git ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + subversion? ( dev-vcs/subversion ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ @@ -77,6 +80,7 @@ https://github.com/gentoo/portage.git"; python_prepare_all() { + esetup.py select_plugins distutils-r1_python_prepare_all if ! use ipc ; then 1.1429 sys-apps/portage/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1429&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1429&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1428&r2=1.1429 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v retrieving revision 1.1428 retrieving revision 1.1429 diff -u -r1.1428 -r1.1429 --- ChangeLog 8 Feb 2015 18:06:12 -0000 1.1428 +++ ChangeLog 12 Feb 2015 05:34:22 -0000 1.1429 @@ -1,12 +1,20 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1428 2015/02/08 18:06:12 dolsen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1429 2015/02/12 05:34:22 dolsen Exp $ + +*portage-2.2.17 (12 Feb 2015) + + 12 Feb 2015; Brian Dolbec <dol...@gentoo.org> -portage-2.2.16.ebuild, + +portage-2.2.17.ebuild, portage-9999.ebuild: + Regression fix bump. Remove buggy version. Add git, cvs, subversion USE flags + to toggle installation and RDEPENDS of those sync modules. + Fixes bug 539746, 539478, 539402. *portage-2.2.16 (08 Feb 2015) 08 Feb 2015; Brian Dolbec <dol...@gentoo.org> +portage-2.2.16.ebuild: Version bump. First release with the new plug-in sync system. Fixes bugs - 583512, 538314, 537298, 534722, 536926, 536392, 492932, 142579, 282927, + 583512, 538314, 537298, 534722, 536926, 536392, 492932, 142579, 282927, 535850, 533036, 463266, 533884, 531656, 531724, 534070, 532670, 532784, 532594, 525718, 532224, 504116, 412471, 531690, 531854, 522032. 1.1 sys-apps/portage/portage-2.2.17.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.17.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.17.ebuild?rev=1.1&content-type=text/plain Index: portage-2.2.17.ebuild =================================================================== # 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.17.ebuild,v 1.1 2015/02/12 05:34:22 dolsen Exp $ EAPI=5 PYTHON_COMPAT=( pypy python3_2 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="http://www.gentoo.org/proj/en/portage/index.xml"; 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 cvs doc epydoc git +ipc linguas_ru selinux subversion 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*')] )" # 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 ) cvs? ( dev-vcs/cvs ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) git? ( dev-vcs/git ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) subversion? ( dev-vcs/subversion ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ python{2_7,3_2} 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="http://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() { esetup.py select_plugins 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 "The portage build now has USE flag enabled sync modules." einfo "The rsync and webrsync modules are installed by default." einfo "Enable the cvs, git and subversion USE flags to install " einfo "those sync modules as needed." }
