portage-2.1_pre6 release

Package-Manager: portage-2.1_pre6

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c6ae1dbcf60578c2b805b55eb4d88a180ee9d6aa..6a75758943b6fa9a93ecea5d3a322a1370dd9d4c 100644 (file)
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -34,6 +34,9 @@ SHA256 3ad39a43bef0fa94b5fd3ffd2173c8b076ffbd3179e9c15c9844fdaddeaa6aed files/2.
 MD5 b0f0aee3708359245752289af4a8923b files/2.1_pre5/version_bump_2.1_pre5-r4.patch 378
 RMD160 3e96116e5c06994417fc3dfa2fd344676f8f7a53 files/2.1_pre5/version_bump_2.1_pre5-r4.patch 378
 SHA256 5619c164def7cd20db802ca878714669fe258ac285a219e24068f378f8e70d98 files/2.1_pre5/version_bump_2.1_pre5-r4.patch 378
+MD5 43e6f0038bd9660c6df8c3b6019b33d8 files/2.1_pre6/1000-r2849-quiet-spinner.patch 553
+RMD160 9f83e5d105348dcab20d37212e83422be4b4b86d files/2.1_pre6/1000-r2849-quiet-spinner.patch 553
+SHA256 7277668d65bb47fa5d82f7b9e098378872ff6c8b67b3caa2298324d242952d17 files/2.1_pre6/1000-r2849-quiet-spinner.patch 553
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
@@ -52,6 +55,9 @@ SHA256 31fbf92704c8c3836a781144c1fe6c1a5d7a81e14fa79973821df688baf3f63d files/di
 MD5 0ad32101e0f506d39355653da01063db files/digest-portage-2.1_pre5-r4 253
 RMD160 0fda55221331fa51f8a16e2dc1dbe917d6029f08 files/digest-portage-2.1_pre5-r4 253
 SHA256 d35accf261e03854d47f27e0b03e01bbad0768a0d0fcc8e1a7f0934af6e4b3a0 files/digest-portage-2.1_pre5-r4 253
+MD5 3fb2faffeb73793f7928e07619991317 files/digest-portage-2.1_pre6 253
+RMD160 db4da0bfd99ef42a13051e4089009e9ad3c316c2 files/digest-portage-2.1_pre6 253
+SHA256 bf94181b86808452bb19e43fe4d58aeeb6736924e7bd453f38c0f166b227957c files/digest-portage-2.1_pre6 253
 MD5 9e669b11a86a57aa8d2a452531085bb6 files/xterm-titles.patch 1115
 RMD160 60cea5a3cfd37b6a3a15ced00a778defaca09212 files/xterm-titles.patch 1115
 SHA256 0e23efd78cff2d7702a4e3ddcf6b53cd7de417f03234397321281066ea8c026c files/xterm-titles.patch 1115
@@ -73,10 +79,13 @@ SHA256 6f7f1500f7a6ab4a7d651a7dbe44695995fdd2a37e4c6826d5eb9de5749b458a portage-
 MD5 f1758097241d74ff2fbfecea1e831732 portage-2.1_pre5-r4.ebuild 5072
 RMD160 381f37b7fc7c2fd218fff4375f9f7672e4c69d10 portage-2.1_pre5-r4.ebuild 5072
 SHA256 f21564ed3d7f7ac1822464e8bc21d1f69cefe418582fba1ba6f146841899e99c portage-2.1_pre5-r4.ebuild 5072
+MD5 554f57ec14091df85593fa00a44cb5c7 portage-2.1_pre6.ebuild 4895
+RMD160 fc38095e984202c6f85502d5dee779b69e35d38f portage-2.1_pre6.ebuild 4895
+SHA256 e53c3f78e9053c18bf9e477f53eff00ec50e8280bd833827e356cba2b3895cfc portage-2.1_pre6.ebuild 4895
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEEzYj/ejvha5XGaMRAvc5AJ9oMWkz0dtFmM7cNaRoqNpHrZyR6QCfTiI/
-ZZudxVaRmr2N+zFwSTbtjaw=
-=CvzE
+iD8DBQFEEzey/ejvha5XGaMRAqFnAJ9dWj+yceu0O0LzWQeRiT/YfZsGCQCeJUYC
+rqDIkocYiBAwYz093FktsCM=
+=aJqZ
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/files/2.1_pre6/1000-r2849-quiet-spinner.patch b/sys-apps/portage/files/2.1_pre6/1000-r2849-quiet-spinner.patch
new file mode 100644 (file)
index 0000000..eb2b77c
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre6/1000-r2849-quiet-spinner.patch
@@ -0,0 +1,16 @@
+Modified: bin/emerge
+===================================================================
+--- bin/emerge 2006-03-11 09:52:31 UTC (rev 2848)
++++ bin/emerge 2006-03-11 10:33:26 UTC (rev 2849)
+@@ -411,8 +411,9 @@
+ if ("--nocolor" in myopts) and (sys.stdout.isatty()):
+       nocolor()
+ 
+-if not sys.stdout.isatty() or ("--nospinner" in myopts):
+-      update_spinner = update_basic_spinner
++if not ("--quiet" in myopts):
++      if not sys.stdout.isatty() or ("--nospinner" in myopts):
++              update_spinner = update_basic_spinner
+ 
+ CLEAN_DELAY = 5
+ EMERGE_WARNING_DELAY = 10

diff --git a/sys-apps/portage/files/digest-portage-2.1_pre6 b/sys-apps/portage/files/digest-portage-2.1_pre6
new file mode 100644 (file)
index 0000000..b5fd1fd
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1_pre6
@@ -0,0 +1,3 @@
+MD5 59198ce8f82c45cb47227ea6ff4dc641 portage-2.1_pre6.tar.bz2 260675
+RMD160 3f1ee96ebda74b0095e1078c048ec3197c05aa79 portage-2.1_pre6.tar.bz2 260675
+SHA256 ee026ade6e26fd21b3c013c1a1a36727e6170030d22af8c2e8c5e1337e2723ce portage-2.1_pre6.tar.bz2 260675

diff --git a/sys-apps/portage/portage-2.1_pre6.ebuild b/sys-apps/portage/portage-2.1_pre6.ebuild
new file mode 100644 (file)
index 0000000..a1e629f
--- /dev/null
+++ b/sys-apps/portage/portage-2.1_pre6.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre6.ebuild,v 1.3 2006/03/11 20:48:42 zmedico Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo."
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/${PN}-${PV}.tar.bz2"
+LICENSE="GPL-2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+SLOT="0"
+IUSE="build doc selinux"
+DEPEND=">=dev-lang/python-2.3"
+RDEPEND="!build? ( >=sys-apps/sed-4.0.5 \
+                                       dev-python/python-fchksum \
+                                       >=dev-lang/python-2.3 \
+                                       userland_GNU? ( sys-apps/debianutils ) \
+                                       >=app-shells/bash-2.05a ) \
+               !userland_Darwin? ( >=app-misc/pax-utils-0.1.10 sys-apps/sandbox ) \
+               selinux? ( >=dev-python/python-selinux-2.15 ) \
+               doc? ( app-portage/portage-manpages )
+               >=dev-python/pycrypto-2.0.1-r4"
+
+PROVIDE="virtual/portage"
+
+S=${WORKDIR}/${PN}-${PV}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       local my_patches="1000-r2849-quiet-spinner.patch"
+       for patch_name in ${my_patches}; do
+               einfo "Applying ${patch_name} ..."
+               patch -p0 --no-backup-if-mismatch < "${FILESDIR}"/${PV}/${patch_name} >/dev/null || die "Failed to apply patch"
+       done
+}
+
+src_compile() {
+       python -O -c "import compileall; compileall.compile_dir('${S}/pym')"
+
+       cd "${S}"/src
+       $(tc-getCC) ${CFLAGS} -o tbz2tool tbz2tool.c
+
+       if ! use userland_Darwin; then
+               cd "${S}"/src/python-missingos
+               chmod +x setup.py
+               ./setup.py build || die "Failed to build missingos module"
+       fi
+
+       if use elibc_FreeBSD; then
+               cd "${S}"/src/bsd-flags
+               chmod +x setup.py
+               ./setup.py build || die "Failed to install bsd-chflags module"
+       fi
+}
+
+src_install() {
+       cd "${S}"/cnf
+       insinto /etc
+       doins etc-update.conf dispatch-conf.conf make.globals
+       if [ -f "make.conf.${ARCH}" ]; then
+               newins make.conf.${ARCH} 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
+
+       if ! use userland_Darwin; then
+               cd "${S}"/src/python-missingos
+               ./setup.py install --root ${D} || die "Failed to install missingos module"
+       fi
+
+       if use elibc_FreeBSD; then
+               cd "${S}"/src/bsd-flags
+               ./setup.py install --root ${D} || die "Failed to install bsd-chflags module"
+       fi
+
+       dodir /usr/lib/portage/bin
+       exeinto /usr/lib/portage/bin
+       cd "${S}"/bin
+       doexe *
+       doexe "${S}"/src/tbz2tool
+       dosym newins /usr/lib/portage/bin/donewins
+
+       for mydir in pym pym/cache pym/elog_modules; do
+               dodir /usr/lib/portage/${mydir}
+               insinto /usr/lib/portage/${mydir}
+               cd "${S}"/${mydir}
+               doins *.py *.pyo
+       done
+
+       doman "${S}"/man/*.[0-9]
+       dodoc "${S}"/ChangeLog
+       dodoc "${S}"/NEWS
+       dodoc "${S}"/RELEASE-NOTES
+
+       dodir /usr/bin
+       for x in ebuild emerge portageq repoman tbz2tool xpak; do
+               dosym ../lib/portage/bin/${x} /usr/bin/${x}
+       done
+
+       dodir /usr/sbin
+       for x in archive-conf dispatch-conf emaint emerge-webrsync env-update etc-update fixpackages quickpkg regenworld; do
+               dosym ../lib/portage/bin/${x} /usr/sbin/${x}
+       done
+
+       dodir /etc/portage
+       keepdir /etc/portage
+
+       doenvd "${FILESDIR}"/05portage.envd
+}
+
+pkg_preinst() {
+       if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
+               rm -rf ${IMAGE}/usr/lib/portage/pym/*
+               mv ${IMAGE}/usr/lib/portage/bin/tbz2tool ${T}
+               rm -rf ${IMAGE}/usr/lib/portage/bin/*
+               mv ${T}/tbz2tool ${IMAGE}/usr/lib/portage/bin/
+       else
+               for mydir in pym pym/cache pym/elog_modules; do
+                       rm /usr/lib/portage/${mydir}/*.pyc >& /dev/null
+                       rm /usr/lib/portage/${mydir}/*.pyo >& /dev/null
+               done
+       fi
+}
+
+pkg_postinst() {
+       local x
+
+       if [ ! -f "${ROOT}/var/lib/portage/world" ] &&
+          [ -f ${ROOT}/var/cache/edb/world ] &&
+          [ ! -h ${ROOT}/var/cache/edb/world ]; then
+               mv ${ROOT}/var/cache/edb/world ${ROOT}/var/lib/portage/world
+               ln -s ../../lib/portage/world /var/cache/edb/world
+       fi
+
+       for x in ${ROOT}etc/._cfg????_make.globals; do
+               # Overwrite the globals file automatically.
+               [ -e "${x}" ] && mv -f "${x}" "${ROOT}etc/make.globals"
+       done
+
+       ewarn "This series contains a completely rewritten caching framework."
+       ewarn "If you are using any cache modules (such as the CDB cache"
+       ewarn "module) portage will not work until they have been disabled."
+       echo
+       einfo "The default cache format has changed beginning with this"
+       einfo "version. Before using emerge, run \`emerge --metadata\` to"
+       einfo "restore portage's local cache."
+       echo
+       einfo "Flag ordering has changed for \`emerge --pretend --verbose\`."
+       einfo "Add EMERGE_DEFAULT_OPTS=\"--alphabetical\" to /etc/make.conf"
+       einfo "to restore the previous ordering."
+       echo
+       einfo "See NEWS and RELEASE-NOTES for further changes."
+}