From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 121661381F3 for ; Sun, 18 Aug 2013 21:13:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E285AE0A8F; Sun, 18 Aug 2013 21:13:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61F15E0A8F for ; Sun, 18 Aug 2013 21:13:44 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0762D33EB88 for ; Sun, 18 Aug 2013 21:13:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 87E46E468F for ; Sun, 18 Aug 2013 21:13:41 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: <1376860117.89c65fa142fd4cb52bb5229f7ea12b53df730fa6.tommy@gentoo> Subject: [gentoo-commits] proj/multilib-portage:master commit in: sys-apps/portage/ X-VCS-Repository: proj/multilib-portage X-VCS-Files: sys-apps/portage/Manifest sys-apps/portage/portage-2.2.0-r1.ebuild sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild X-VCS-Directories: sys-apps/portage/ X-VCS-Committer: tommy X-VCS-Committer-Name: Thomas Sachau X-VCS-Revision: 89c65fa142fd4cb52bb5229f7ea12b53df730fa6 X-VCS-Branch: master Date: Sun, 18 Aug 2013 21:13:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0c61ef15-7651-449c-bf31-f4208959069a X-Archives-Hash: b30e29f7343ce62b241d8c84759500ac commit: 89c65fa142fd4cb52bb5229f7ea12b53df730fa6 Author: Thomas Sachau gentoo org> AuthorDate: Sun Aug 18 21:08:37 2013 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Sun Aug 18 21:08:37 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=89c65fa1 Sync portage --- sys-apps/portage/Manifest | 2 +- ..._alpha193-r1.ebuild => portage-2.2.0-r1.ebuild} | 50 +++++++++++++--------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 3ce2db0..c09903e 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,2 +1,2 @@ -EBUILD portage-2.2.0_alpha193-r1.ebuild 18950 SHA256 157484fe57693f8b1e72a2c451f93d4d6821aca29e72fa38016f76ac7381870d SHA512 644211e6ca649a5dafd57111493a9be010a0bcd4cbb0051034965cbb431c5413ef2b0f0563fe0ce37669ce948477b2549c8e77e8968bfe6e094a2f52c1c80a88 WHIRLPOOL 4bc887845abb592325fa1557ec7bd2d16ecb333f9688909cab5e020114e9ded1430173ec148c7db892bc4ab81fc4302428b7110ba5dd50c1e1e920602a767344 +EBUILD portage-2.2.0-r1.ebuild 19302 SHA256 0d1d21b536fc8758bfd8519e9781f8509472bf65f4bc76b04932ab6dcdd39fa6 SHA512 6e7fbdfeace0833bcd5a3337e592255eefd29c761ce48eb635deb6af1c9d986ee19fe3969421233531788a19db18edac578b53329e4086a7a6e1a08bddc235b0 WHIRLPOOL fc34782a6bf462b1cdbc8733a810ef350ce915e216204117bba01ddc326014d7068e522c9adaf3357919ef6fddb908158ebf38a925e73365fd6e362c575203e0 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630 diff --git a/sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild b/sys-apps/portage/portage-2.2.0-r1.ebuild similarity index 92% rename from sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild rename to sys-apps/portage/portage-2.2.0-r1.ebuild index 6e164c7..561b4aa 100644 --- a/sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild +++ b/sys-apps/portage/portage-2.2.0-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha193.ebuild,v 1.1 2013/08/03 22:44:58 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0.ebuild,v 1.2 2013/08/13 00:59:44 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. -EAPI=3 +EAPI=2 PYTHON_COMPAT=( pypy1_9 pypy2_0 python3_1 python3_2 python3_3 python3_4 @@ -14,11 +14,11 @@ inherit eutils git-2 multilib EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git" EGIT_BRANCH="multilib" -EGIT_COMMIT="c7f1ce526769123ea129eb3ec0d5239aa1b5e610" +EGIT_COMMIT="2efeb36f8e3fff17de8230d84081bf6b8a733ea2" 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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~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 pypy2_0 python2 python3 selinux xattr" @@ -124,10 +124,10 @@ get_python_interpreter() { get_python_sitedir() { [ $# -eq 1 ] || die "expected 1 argument, got $#: $*" local impl=$1 - local site_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages - [[ -d ${EROOT}${site_dir} ]] || \ - ewarn "site-packages dir missing for ${impl}: ${EROOT}${site_dir}" - echo "${site_dir}" + local site_dir=usr/$(get_libdir)/${impl/_/.}/site-packages + [[ -d ${EROOT:-${ROOT}}${site_dir} ]] || \ + ewarn "site-packages dir missing for ${impl}: ${EROOT:-${ROOT}}${site_dir}" + echo "/${site_dir}" } python_compileall() { @@ -339,7 +339,7 @@ src_install() { continue fi while read -r mod_dir ; do - cd "${ED}/usr/lib/portage/pym/${mod_dir}" || die + cd "${ED:-${D}}usr/lib/portage/pym/${mod_dir}" || die files=$(echo *.py) if [ -z "${files}" ] || [ "${files}" = "*.py" ]; then # __pycache__ directories contain no py files @@ -357,7 +357,7 @@ src_install() { dosym "${relative_path}/${x}" \ "${dest_mod_dir}/${x}" || die done - done < <(cd "${ED}"/usr/lib/portage/pym || die ; find * -type d ! -path "portage/tests*") + done < <(cd "${ED:-${D}}"usr/lib/portage/pym || die ; find * -type d ! -path "portage/tests*") cd "${S}" || die EPYTHON=$(get_python_interpreter ${impl}) \ python_compileall "$(get_python_sitedir ${impl})" @@ -371,7 +371,7 @@ src_install() { pkg_preinst() { if [[ $ROOT == / ]] ; then # Run some minimal tests as a sanity check. - local test_runner=$(find "$ED" -name runTests) + local test_runner=$(find "${ED:-${D}}" -name runTests) if [[ -n $test_runner && -x $test_runner ]] ; then einfo "Running preinst sanity tests..." "$test_runner" || die "preinst sanity tests failed" @@ -389,14 +389,14 @@ pkg_preinst() { # 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} + if chown portage:portage "${ED:-${D}}"var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED:-${D}}"var/log/portage{,/elog} fi # If portage-2.1.6 is installed and the preserved_libs_registry exists, # assume that the NEEDED.ELF.2 files have already been generated. has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \ - ! { [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \ + ! { [ -e "${EROOT:-${ROOT}}"var/lib/portage/preserved_libs_registry ] && \ has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ; } \ && NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false @@ -456,12 +456,17 @@ pkg_postinst() { [[ -f ${PORTDIR}/profiles/repo_name ]] && \ repo_name=$(< "${PORTDIR}/profiles/repo_name") if [[ -z ${REPOS_CONF_SYNC} ]] ; then - REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT}/usr/share/portage/config/repos.conf") + 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} @@ -471,19 +476,22 @@ pkg_postinst() { sync-type = ${sync_type:-rsync} sync-uri = ${REPOS_CONF_SYNC} EOF - local dest=${EROOT}/etc/portage/repos.conf + + [[ ${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}/etc/portage/repos.conf/${repo_name:-gentoo}.conf + 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}/etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \ + [[ -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}/etc/make.conf" "${EROOT}/etc/portage/make.conf" ; do + 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 @@ -505,7 +513,7 @@ pkg_postinst() { if ${NEEDED_REBUILD_UPGRADE} ; then einfo "rebuilding NEEDED.ELF.2 files" local cpv filename line newline - for cpv in "${EROOT}/var/db/pkg"/*/*; do + for cpv in "${EROOT:-${ROOT}}var/db/pkg"/*/*; do [[ -f "${cpv}/NEEDED" && ! -f "${cpv}/NEEDED.ELF.2" ]] || continue while read -r line; do filename=${line% *} @@ -545,7 +553,7 @@ pkg_postinst() { local ownership=$(get_ownership "${distdir}") if [[ ${ownership#*:} == portage ]] ; then einfo "Adjusting DISTDIR permissions for userpriv" - find "${distdir}" -maxdepth 1 -type d -uid 0 \ + find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \ -exec chown -R portage:portage {} + fi fi