diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-04-19 23:28:13 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-04-19 23:28:13 +0000 |
commit | a97299073d3f9be770450ff39b912a7cb6e9902f (patch) | |
tree | 0c1b4c5344fd4be75cb0412cc613ecdecfabd881 /sys-apps | |
parent | Automated update of use.local.desc (diff) | |
download | historical-a97299073d3f9be770450ff39b912a7cb6e9902f.tar.gz historical-a97299073d3f9be770450ff39b912a7cb6e9902f.tar.bz2 historical-a97299073d3f9be770450ff39b912a7cb6e9902f.zip |
2.2_rc31 bump. This fixes bug #259994 (new --deselect[=n] option/action),
bug #265206, bug #265909 (warn about duplicate repo_name), bug #266211
(handle ESTALE in fetch code), and bug #266493 (only return int from
vercmp). Bug #210077 tracks all bugs fixed in the 2.2 branch.
Package-Manager: portage-2.2_rc31/cvs/Linux i686
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/portage/ChangeLog | 10 | ||||
-rw-r--r-- | sys-apps/portage/Manifest | 10 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.2_rc31.ebuild | 336 |
3 files changed, 351 insertions, 5 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index e3f2f8b2cd87..64aa74016c03 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,14 @@ # 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.596 2009/04/12 06:17:15 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.597 2009/04/19 23:28:13 zmedico Exp $ + +*portage-2.2_rc31 (19 Apr 2009) + + 19 Apr 2009; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc31.ebuild: + 2.2_rc31 bump. This fixes bug #259994 (new --deselect[=n] option/action), + bug #265206, bug #265909 (warn about duplicate repo_name), bug #266211 + (handle ESTALE in fetch code), and bug #266493 (only return int from + vercmp). Bug #210077 tracks all bugs fixed in the 2.2 branch. *portage-2.2_rc30 (12 Apr 2009) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 0af21a5f0101..b2e5f1f956e5 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -12,6 +12,7 @@ DIST portage-2.2_rc15.tar.bz2 685597 RMD160 ad814885c5c6b31899fd4cd7d5866d19132b DIST portage-2.2_rc28.patch.bz2 161536 RMD160 2e53c8a7b4140814b63f78677bc58e0641c5950c SHA1 3882d7f2a7ff4f90b17faf317bd45b5611e3f7a9 SHA256 e5603c711df09c543e07ec3b711badab198b03b94dd58e156f28b9ea72100e81 DIST portage-2.2_rc29.patch.bz2 177911 RMD160 e23d0f58daa59f71d2090e8e3c404caf821470c4 SHA1 ee0e31907fb164e92938d329f974c2195d4c3b84 SHA256 94919a10f19a25feb5c1a4df3764eb05402d68d0487c36f0a419a9697773b245 DIST portage-2.2_rc30.patch.bz2 180373 RMD160 ce0df535830062307d6ea29858c938f255d3abdb SHA1 35000f1c9250031fee911ca8931102fda1c005f1 SHA256 deb08e35ee1f1b96d9a218e1d2373be370693e5505bcaafa04d09afaa5e7c677 +DIST portage-2.2_rc31.patch.bz2 191240 RMD160 2a23d625fee681f75f6c0dfd005ad8153cdc18ab SHA1 14848030d471613442dd62ffe8617a43f98e0264 SHA256 eb6fe2e3ca3e09f86da12b8f9e401d2963bc703cd3fd57532eee40824ea9576f DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f EBUILD portage-2.1.4.5.ebuild 8038 RMD160 bbe69fdad5ee1226bccb1ccfdcf2d6cf6fb07f36 SHA1 d1177651b3af538eeda9de938ef791d584dbf197 SHA256 0277f7ee9197b4bb8747a7381f9b7ce8809b09aebcc30b7832b284a72ea4cd3c EBUILD portage-2.1.6.11.ebuild 9444 RMD160 60feaa83993dbfffcc9ef5d505e22a0b79623b08 SHA1 2d758f9c104c3a4b7d0008ba4a9d6d78e8fe5efe SHA256 8e7a9c27e71789d0c9437da34c077639afa1d256ef802966d454b05bd8f3e94e @@ -20,12 +21,13 @@ EBUILD portage-2.1.6.7.ebuild 8692 RMD160 88dc8f5e801b552419eb29671c7c999f45985e EBUILD portage-2.2_rc28.ebuild 9933 RMD160 90b3d818c67bc787229272b209ce4e4a480e5e98 SHA1 728cde592ce5b528e128a9ff444d89c02b97516f SHA256 1d640f072a9649284de8a35f9e31c7b6467c84b9b424785bcc01f0872e7c5c65 EBUILD portage-2.2_rc29.ebuild 9943 RMD160 8b1d062111e0227357f036ce0d53241d0d574d05 SHA1 2490a6bde99b0118769a782ecd51a13047a542ad SHA256 b963df1a7ed59e20fcf4316cc53e453fbe8486d5baa146fb7be5da9e5cd6867c EBUILD portage-2.2_rc30.ebuild 9943 RMD160 5f304db80efce82f7258c13d4236a3c1c11f29fb SHA1 7181cd1e77b5a2a35e5aa6bf64f0e4a560d3a3a6 SHA256 dc0cec19a20e8bb9d02a8a91897c9aa0d3148437bc7a3587624c648efaf2342b -MISC ChangeLog 29404 RMD160 fbdb5c6bb75e702a8a6a3dfc8c8b5a7deb5c4060 SHA1 5adced94fafb10cd76874375c9bd2dd523af39cc SHA256 33133577016d8032eab53fd3511564fd2a840ee7ba6075cd4fc9e69bc2b47514 +EBUILD portage-2.2_rc31.ebuild 10370 RMD160 359a491e6a3fa8fa5562bee320423f5771092b13 SHA1 539ee939a2eb9bc319154dc06a89f769f863be7c SHA256 d398707576ad938210067dbb35385ee7a5a06a1bd86e20d61420cde5f3bbe96d +MISC ChangeLog 29795 RMD160 da9a33823fad927210f9048b84bb0a9eb7fd8fae SHA1 33f01422c4fee2de397463dbc9b58f8011631803 SHA256 42684c0072b0f299598a2f2092e6dd21fdb5664ebc28b6d4251eecc655c8e777 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAknhh4IACgkQ/ejvha5XGaNUNQCfVtm+dEt6ehHj3yQk/PssviJ+ -MRUAnjtPHe6dYF3SVS3dyZuIJteaGM30 -=YuDD +iEYEARECAAYFAknrs5oACgkQ/ejvha5XGaPh6gCgx8rIW+A0AOoCB7oVCoXIWeee +RQ0AnA778eob1e0LvZkKVpgtK3oZW913 +=43rr -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.2_rc31.ebuild b/sys-apps/portage/portage-2.2_rc31.ebuild new file mode 100644 index 000000000000..1a8c19377c12 --- /dev/null +++ b/sys-apps/portage/portage-2.2_rc31.ebuild @@ -0,0 +1,336 @@ +# 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_rc31.ebuild,v 1.1 2009/04/19 23:28:13 zmedico Exp $ + +inherit eutils multilib python + +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" +PROVIDE="virtual/portage" +SLOT="0" +IUSE="build doc epydoc selinux linguas_pl" + +python_dep=">=dev-lang/python-2.4" + +DEPEND="${python_dep} + !build? ( >=sys-apps/sed-4.0.5 ) + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + epydoc? ( >=dev-python/epydoc-2.0 )" +RDEPEND="${python_dep} + !build? ( >=sys-apps/sed-4.0.5 + >=app-shells/bash-3.2_p17 + >=app-admin/eselect-news-20071201 ) + elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) + elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) + elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=dev-python/python-selinux-2.16 )" +PDEPEND=" + !build? ( + >=net-misc/rsync-2.6.4 + userland_GNU? ( >=sys-apps/coreutils-6.4 ) + || ( >=dev-lang/python-2.5 >=dev-python/pycrypto-2.0.1-r6 ) + )" +# 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="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="2.1.2" +PATCHVER_PL="" +TARBALL_PV="2.2_rc15" +SRC_URI="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=$PV +if [ -n "${PATCHVER}" ]; then + SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 + $(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)" +fi + +S="${WORKDIR}"/${PN}-${TARBALL_PV} +S_PL="${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=.*/VERSION=\"${PVR}\"/" pym/portage/__init__.py || \ + die "Failed to patch portage.VERSION" +} + +src_compile() { + + if use doc; then + cd "${S}"/doc + touch fragment/date + 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="" + # 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=/ has_version '>=dev-python/epydoc-3_pre0' && \ + epydoc_opts='--exclude-introspect portage\.dbapi' + my_modules="$(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="${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=$(get_libdir) + local portage_base="/usr/${libdir}/portage" + local portage_share_config=/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 arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + 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 + + dodir ${portage_base}/bin + exeinto ${portage_base}/bin + + # 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 + + cd "${S}"/bin || die "cd failed" + doexe $(find . -maxdepth 1 -type f) || die "doexe failed" + + local symlinks + dodir ${portage_base}/bin/ebuild-helpers || die "dodir failed" + exeinto ${portage_base}/bin/ebuild-helpers || die "exeinto failed" + cd "${S}"/bin/ebuild-helpers || die "cd failed" + doexe $(find . -type f ! -type l) || die "doexe failed" + symlinks=$(find . -type l) + if [ -n "$symlinks" ] ; then + cp -P $symlinks "${D}${portage_base}/bin/ebuild-helpers/" || \ + die "cp failed" + fi + + # These symlinks will be included in the next tarball. + # Until then, create them manually. + dosym ../portageq ${portage_base}/bin/ebuild-helpers/portageq || \ + die "dosym failed" + local x + for x in eerror einfo ewarn eqawarn ; do + dosym elog ${portage_base}/bin/ebuild-helpers/$x || die "dosym failed" + done + + for mydir in $(find "${S}"/pym -type d | sed -e "s:^${S}/::") ; do + dodir ${portage_base}/${mydir} + insinto ${portage_base}/${mydir} + cd "${S}"/${mydir} + doins *.py + symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) + [ -n "${symlinks}" ] && cp -P ${symlinks} "${D}${portage_base}/${mydir}" + 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=pl "${S_PL}"/man/pl/*.[0-9] + doman -i18n=pl_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="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 '>=dev-lang/python-2.5' ; then + if ! built_with_use '>=dev-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 >=dev-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=$? + + has_version "<=${CATEGORY}/${PN}-2.2_pre5" + WORLD_MIGRATION_UPGRADE=$? + + # 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 "$ROOT"var/lib/portage/preserved_libs_registry ] && \ + has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) + NEEDED_REBUILD_UPGRADE=$? + + has_version "<${CATEGORY}/${PN}-2.2_alpha" + ADD_SYSTEM_TO_WORLD=$? + + if [ $ADD_SYSTEM_TO_WORLD != 0 -a "$ROOT" != / ] && \ + ! has_version "${CATEGORY}/${PN}" ; then + # building stage 1 + ADD_SYSTEM_TO_WORLD=0 + fi + + [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.2_rc29" + REPO_LAYOUT_CONF_WARN=$? +} + +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 = 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 = 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 = 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=${line% *} + needed=${line#* } + needed=${needed//+/++} + needed=${needed//#/##} + needed=${needed//%/%%} + newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename) + newline=${newline// - } + echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2" + done < "${cpv}/NEEDED" + fi + done + fi + + if [ $REPO_LAYOUT_CONF_WARN = 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 ; 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=3" + einfo + + if [ $MINOR_UPGRADE = 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/*_pre*}" ]; then + elog "If you always want to use the latest development version of portage" + 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 +} |