From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MY6RO-0005OT-Eq for garchives@archives.gentoo.org; Mon, 03 Aug 2009 22:55:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79D75E043D; Mon, 3 Aug 2009 22:55:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1F3EDE043D for ; Mon, 3 Aug 2009 22:55:37 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id BEEEC6444C for ; Mon, 3 Aug 2009 22:55:36 +0000 (UTC) Received: from zmedico by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MY6RM-00062n-3H for gentoo-commits@lists.gentoo.org; Mon, 03 Aug 2009 22:55:36 +0000 From: "Zac Medico (zmedico)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, zmedico@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/portage: ChangeLog portage-2.2_rc34.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog portage-2.2_rc34.ebuild X-VCS-Directories: sys-apps/portage X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico Content-Type: text/plain; charset=utf8 Message-Id: Sender: Zac Medico Date: Mon, 03 Aug 2009 22:55:36 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6f2dbf35-14c2-4422-a654-1f699ec3e831 X-Archives-Hash: 8fd12add896a68086d7f6c25d96f252d zmedico 09/08/03 22:55:36 Modified: ChangeLog Added: portage-2.2_rc34.ebuild Log: 03 Aug 2009; Zac Medico +portage-2.2_rc34.ebuild: 2.2_rc34 bump. This fixes bug #82488 (problem in evaluation of conditio= nal PROVIDE), bug #137562 (backtracking for unsatisfied deps), bug #236786 (repoman warning for test useflag in RDEPEND), bug #253467 (fix possibl= e interference with portage environment variables), bug #258684 (move san= dbox variables from ebuild.sh), bug #264434 (lazy evaluation of || deps), bug #268929 (strict-aliasing check for gcc 4.4), bug #270040 (fix repom= an to handle overlay categories), bug #270658 (fix usev to comply with PMS= ), bug #270953 (fix !!atom blockers to work for package is same slot), bug #272063 (fix docbook xml to work with xmlto-0.0.22), bug #273020 (document FEATURES=3Dmultilib-strict), bug #274279 (color.map support f= or color=3Dcolor), bug #274742 (remove repoman quoting check for "dir" var= iable, bug #275047 (split _emerge python module), bug #275217 (backtracking fo= r slot conflicts), bug #275796 (make || deps prefer packages in graph ove= r installed packages), bug #275821 (make emerge reject !!atom blockers fo= r old EAPIs), bug #275901 (make emerge reject USE deps for old EAPIs), bug #275945 (make emerge avoid updates unless --update is enabled), bug #275947 (enable build.log on selinux), bug #276264 (document cache issues with eclass-overrides), bug #276813 (performance improvements), bug #276866 (--binpkg-respect-use option), and bug #278729 (prevent interaction between || deps and unsatisfied USE deps). (Portage version: 2.2_rc34/cvs/Linux i686) Revision Changes Path 1.620 sys-apps/portage/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/C= hangeLog?rev=3D1.620&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/C= hangeLog?rev=3D1.620&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/C= hangeLog?r1=3D1.619&r2=3D1.620 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v retrieving revision 1.619 retrieving revision 1.620 diff -u -r1.619 -r1.620 --- ChangeLog 2 Aug 2009 19:51:34 -0000 1.619 +++ ChangeLog 3 Aug 2009 22:55:35 -0000 1.620 @@ -1,6 +1,30 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.619 20= 09/08/02 19:51:34 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.620 20= 09/08/03 22:55:35 zmedico Exp $ + +*portage-2.2_rc34 (03 Aug 2009) + + 03 Aug 2009; Zac Medico +portage-2.2_rc34.ebuild: + 2.2_rc34 bump. This fixes bug #82488 (problem in evaluation of conditi= onal + PROVIDE), bug #137562 (backtracking for unsatisfied deps), bug #236786 + (repoman warning for test useflag in RDEPEND), bug #253467 (fix possib= le + interference with portage environment variables), bug #258684 (move sa= ndbox + variables from ebuild.sh), bug #264434 (lazy evaluation of || deps), + bug #268929 (strict-aliasing check for gcc 4.4), bug #270040 (fix repo= man + to handle overlay categories), bug #270658 (fix usev to comply with PM= S), + bug #270953 (fix !!atom blockers to work for package is same slot), + bug #272063 (fix docbook xml to work with xmlto-0.0.22), bug #273020 + (document FEATURES=3Dmultilib-strict), bug #274279 (color.map support = for + color=3Dcolor), bug #274742 (remove repoman quoting check for "dir" va= riable, + bug #275047 (split _emerge python module), bug #275217 (backtracking f= or + slot conflicts), bug #275796 (make || deps prefer packages in graph ov= er + installed packages), bug #275821 (make emerge reject !!atom blockers f= or + old EAPIs), bug #275901 (make emerge reject USE deps for old EAPIs), + bug #275945 (make emerge avoid updates unless --update is enabled), + bug #275947 (enable build.log on selinux), bug #276264 (document cache + issues with eclass-overrides), bug #276813 (performance improvements), + bug #276866 (--binpkg-respect-use option), and bug #278729 (prevent + interaction between || deps and unsatisfied USE deps). =20 02 Aug 2009; Zac Medico portage-2.1.6.13.ebuild, portage-2.2_rc33.ebuild: 1.1 sys-apps/portage/portage-2.2_rc34.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/p= ortage-2.2_rc34.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/p= ortage-2.2_rc34.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: portage-2.2_rc34.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc34.ebui= ld,v 1.1 2009/08/03 22:55:36 zmedico Exp $ inherit eutils multilib python DESCRIPTION=3D"Portage is the package management and distribution system = for Gentoo" HOMEPAGE=3D"http://www.gentoo.org/proj/en/portage/index.xml" LICENSE=3D"GPL-2" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 = ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" PROVIDE=3D"virtual/portage" SLOT=3D"0" IUSE=3D"build doc epydoc selinux linguas_pl" python_dep=3D">=3Ddev-lang/python-2.5 =3Dsys-apps/sed-4.0.5 ) doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=3Ddev-python/epydoc-2.0 )" RDEPEND=3D"${python_dep} !build? ( >=3Dsys-apps/sed-4.0.5 >=3Dapp-shells/bash-3.2_p17 || ( >=3Dapp-admin/eselect-news-20071201 >=3Dapp-admin/eselect-1.1 ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=3Dsys-apps/sandbox-1.6 ) elibc_uclibc? ( >=3Dsys-apps/sandbox-1.6 ) >=3Dapp-misc/pax-utils-0.1.17 selinux? ( >=3Ddev-python/python-selinux-2.16 )" PDEPEND=3D" !build? ( >=3Dnet-misc/rsync-2.6.4 userland_GNU? ( >=3Dsys-apps/coreutils-6.4 ) )" # coreutils-6.4 rdep is for date format in emerge-webrsync #164532 # rsync-2.6.4 rdep is for the --filter option #167668 SRC_ARCHIVES=3D"http://dev.gentoo.org/~zmedico/portage/archives" prefix_src_archives() { local x y for x in ${@}; do for y in ${SRC_ARCHIVES}; do echo ${y}/${x} done done } PV_PL=3D"2.1.2" PATCHVER_PL=3D"" TARBALL_PV=3D$PV SRC_URI=3D"mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2) linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2 $(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )" PATCHVER=3D if [ -n "${PATCHVER}" ]; then SRC_URI=3D"${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 $(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)" fi S=3D"${WORKDIR}"/${PN}-${TARBALL_PV} S_PL=3D"${WORKDIR}"/${PN}-${PV_PL} src_unpack() { unpack ${A} cd "${S}" if [ -n "${PATCHVER}" ]; then cd "${S}" epatch "${WORKDIR}/${PN}-${PATCHVER}.patch" fi einfo "Setting portage.VERSION to ${PVR} ..." sed -i "s/^VERSION=3D.*/VERSION=3D\"${PVR}\"/" pym/portage/__init__.py |= | \ die "Failed to patch portage.VERSION" } src_compile() { if use doc; then cd "${S}"/doc touch fragment/date # Workaround for bug #272063, remove in next portage release. sed 's:^XMLTO_FLAGS =3D:XMLTO_FLAGS =3D --skip-validation:' -i Makefile make xhtml xhtml-nochunks || die "failed to make docs" fi if use epydoc; then einfo "Generating api docs" mkdir "${WORKDIR}"/api local my_modules epydoc_opts=3D"" # A name collision between the portage.dbapi class and the # module with the same name triggers an epydoc crash unless # portage.dbapi is excluded from introspection. ROOT=3D/ has_version '>=3Ddev-python/epydoc-3_pre0' && \ epydoc_opts=3D'--exclude-introspect portage\.dbapi' my_modules=3D"$(find "${S}/pym" -name "*.py" \ | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ -e 's:/:.:g' | sort)" || die "error listing modules" PYTHONPATH=3D"${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \ -qqqqq --no-frames --show-imports $epydoc_opts \ --name "${PN}" --url "${HOMEPAGE}" \ ${my_modules} || die "epydoc failed" fi } src_test() { ./pym/portage/tests/runTests || \ die "test(s) failed" } src_install() { local libdir=3D$(get_libdir) local portage_base=3D"/usr/${libdir}/portage" local portage_share_config=3D/usr/share/portage/config cd "${S}"/cnf insinto /etc doins etc-update.conf dispatch-conf.conf dodir "${portage_share_config}" insinto "${portage_share_config}" doins "${S}/cnf/"{sets.conf,make.globals} if [ -f "make.conf.${ARCH}".diff ]; then patch make.conf "make.conf.${ARCH}".diff || \ die "Failed to patch make.conf.example" newins make.conf make.conf.example else eerror "" eerror "Portage does not have an arch-specific configuration for this a= rch." eerror "Please notify the arch maintainer about this issue. Using gener= ic." eerror "" newins make.conf make.conf.example fi dosym ..${portage_share_config}/make.globals /etc/make.globals insinto /etc/logrotate.d doins "${S}"/cnf/logrotate.d/elog-save-summary # BSD and OSX need a sed wrapper so that find/xargs work properly if use userland_GNU; then rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper" fi for x in $(find "$S"/bin -type d) ; do x=3D${x#$S/} dodir $portage_base/$x || die "dodir failed" exeinto $portage_base/$x || die "exeinto failed" cd "$S"/$x || die "cd failed" doexe $(find . -mindepth 1 -maxdepth 1 -type f ! -type l) || \ die "doexe failed" symlinks=3D$(find . -mindepth 1 -maxdepth 1 -type l) if [ -n "$symlinks" ] ; then cp -P $symlinks "$D$portage_base/$x" || die "cp failed" fi done for x in $(find "$S"/pym -type d) ; do x=3D${x#$S/} dodir $portage_base/$x || die "dodir failed" insinto $portage_base/$x || die "insinto failed" cd "$S"/$x || die "cd failed" doins *.py || die "doins failed" symlinks=3D$(find . -mindepth 1 -maxdepth 1 -type l) if [ -n "$symlinks" ] ; then cp -P $symlinks "$D$portage_base/$x" || die "cp failed" fi done # Symlinks to directories cause up/downgrade issues and the use of these # modules outside of portage is probably negligible. for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do [ ! -L "${x}" ] && continue die "symlink to directory will cause upgrade/downgrade issues: '${x}'" done exeinto ${portage_base}/pym/portage/tests doexe "${S}"/pym/portage/tests/runTests doman "${S}"/man/*.[0-9] if use linguas_pl; then doman -i18n=3Dpl "${S_PL}"/man/pl/*.[0-9] doman -i18n=3Dpl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] fi dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} use doc && dohtml -r "${S}"/doc/* use epydoc && dohtml -r "${WORKDIR}"/api dodir /usr/bin for x in ebuild egencache emerge portageq repoman xpak; do dosym ../${libdir}/portage/bin/${x} /usr/bin/${x} done dodir /usr/sbin local my_syms=3D"archive-conf dispatch-conf emaint emerge-webrsync env-update etc-update fixpackages quickpkg regenworld" local x for x in ${my_syms}; do dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x} done dosym env-update /usr/sbin/update-env dosym etc-update /usr/sbin/update-etc dodir /etc/portage keepdir /etc/portage } pkg_preinst() { if ! use build && ! has_version dev-python/pycrypto && \ has_version '>=3Ddev-lang/python-2.5' ; then if ! built_with_use '>=3Ddev-lang/python-2.5' ssl ; then ewarn "If you are an ebuild developer and you plan to commit ebuilds" ewarn "with this system then please install dev-python/pycrypto or" ewarn "enable the ssl USE flag for >=3Ddev-lang/python-2.5 in order" ewarn "to enable RMD160 hash support." ewarn "See bug #198398 for more information." fi fi if [ -f "${ROOT}/etc/make.globals" ]; then rm "${ROOT}/etc/make.globals" fi has_version "<${CATEGORY}/${PN}-2.2_alpha" MINOR_UPGRADE=3D$? has_version "<=3D${CATEGORY}/${PN}-2.2_pre5" WORLD_MIGRATION_UPGRADE=3D$? # 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 "<=3D${CATEGORY}/${PN}-2.2_pre7" && \ ! ( [ -e "$ROOT"var/lib/portage/preserved_libs_registry ] && \ has_version ">=3D${CATEGORY}/${PN}-2.1.6_rc" ) NEEDED_REBUILD_UPGRADE=3D$? has_version "<${CATEGORY}/${PN}-2.2_alpha" ADD_SYSTEM_TO_WORLD=3D$? if [ $ADD_SYSTEM_TO_WORLD !=3D 0 -a "$ROOT" !=3D / ] && \ ! has_version "${CATEGORY}/${PN}" ; then # building stage 1 ADD_SYSTEM_TO_WORLD=3D0 fi [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" REPO_LAYOUT_CONF_WARN=3D$? } pkg_postinst() { # Compile all source files recursively. Any orphans # will be identified and removed in postrm. python_mod_optimize /usr/$(get_libdir)/portage/pym if [ $ADD_SYSTEM_TO_WORLD =3D 0 ] && \ [ ! -e "$ROOT"var/lib/portage/world_sets ] ; then einfo "adding @system to world_sets for backward compatibility" echo @system > "$ROOT"var/lib/portage/world_sets fi if [ $WORLD_MIGRATION_UPGRADE =3D 0 ] ; then einfo "moving set references from the worldfile into world_sets" cd "${ROOT}/var/lib/portage/" grep "^@" world >> world_sets sed -i -e '/^@/d' world fi if [ $NEEDED_REBUILD_UPGRADE =3D 0 ] ; then einfo "rebuilding NEEDED.ELF.2 files" for cpv in "${ROOT}/var/db/pkg"/*/*; do if [ -f "${cpv}/NEEDED" ]; then rm -f "${cpv}/NEEDED.ELF.2" while read line; do filename=3D${line% *} needed=3D${line#* } needed=3D${needed//+/++} needed=3D${needed//#/##} needed=3D${needed//%/%%} newline=3D$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename) newline=3D${newline// - } echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2" done < "${cpv}/NEEDED" fi done fi if [ $REPO_LAYOUT_CONF_WARN =3D 0 ] ; then ewarn echo "If you want overlay eclasses to override eclasses from" \ "other repos then see the portage(5) man page" \ "for information about the new layout.conf and repos.conf" \ "configuration files." \ | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done ewarn fi einfo einfo "For help with using portage please consult the Gentoo Handbook" einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3D= 3" einfo if [ $MINOR_UPGRADE =3D 0 ] ; then elog "If you're upgrading from a pre-2.2 version of portage you might" elog "want to remerge world (emerge -e world) to take full advantage" elog "of some of the new features in 2.2." elog "This is not required however for portage to function properly." elog fi if [ -z "${PV/*_rc*}" ]; then elog "If you always want to use the latest development version of porta= ge" elog "please read http://www.gentoo.org/proj/en/portage/doc/testing.xml= " elog fi } pkg_postrm() { python_mod_cleanup /usr/$(get_libdir)/portage/pym }