2.1.1_pre1 release

Package-Manager: portage-2.1.1_pre1

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 1960bc06b56a9a6a3bafcef715f1acf2a879df24..86d0e4b833547082ffdb238d60d27511405b9cf3 100644 (file)
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.179 2006/06/11 16:28:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.180 2006/06/16 16:46:28 zmedico Exp $
+
+*portage-2.1.1_pre1 (16 Jun 2006)
+
+  16 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre1.ebuild:
+  2.1.1_pre1 release. This fixes bugs #85576, #96331, #116637, #123677,
+  #126793, #132385, #133740, #136199, #136208, #136236, #136278, #136285,
+  #136313, #136404, #136532, #136705, and #136947.
 
   11 Jun 2006; Zac Medico <zmedico@gentoo.org> portage-2.1.ebuild:
   Add einfo about the default USE_ORDER change.

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 24083f00dd354ba33f98723639676fe60ae694ff..2d2441c82f0ba713bb5c2080fdc4afc54323d0da 100644 (file)
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -15,7 +15,9 @@ RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
 DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe SHA1 16459ce2b19592c94ec580bcfade5a89750a62fb SHA256 f0dac4366b5234b084645bbbd6b871a5abe05d501cf868046af2777e02a4100c
 DIST portage-2.0.54.tar.bz2 234784 RMD160 26c724df242a7d0c44d7fd06067bfcdbc4e3556b SHA1 0559bf8068976c124f0026ab65f3f4a62ae39d83 SHA256 69075ab4599958c4f7c7a932b95dcd77efa1b3c46ac28acb577284bc48a1db06
+DIST portage-2.1.1_pre1.tar.bz2 277982 RMD160 41fc05479ba8774ad35939b6b5f597e559602f0e SHA1 bd7787676d3db97932867983ab01781cf5f56b78 SHA256 de7d23e15681a6eff9199a505bc9bdf59a5a43d5c51e6223d6296659c1a0cc3e
 DIST portage-2.1.tar.bz2 277243 RMD160 e8290e18f0de5935cc263d76e7bce15da5c899d2 SHA1 459f59cc332e6b06d439af2cc18de57969f208d1 SHA256 29560a50df1de053c943582b277beb600c364edfe177d42affc74e98db412ef0
+DIST portage-man-pl-2.1.tar.bz2 52425 RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 SHA1 9942d024d0c29ccf1bc5d71954ed4668a2aaa424 SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817
 DIST portage-man-pl-2.1_rc4.tar.bz2 52266 RMD160 e250a0c2e6da46f3c5c21ac6ac6df47f9976243a SHA1 0f6700555da057af5d9d447ca7f3ddb5955931f0 SHA256 86e462a529471601f64ec6293c56f4f461c853201d0587fb0b7de8e845021fbb
 DIST portage-patches-2.0.54-1.tar.bz2 4398 RMD160 8b7520b99aec0cb53a117b46345a720f5c7a68c0 SHA1 43f27fb384c5dbca5cebd00951c1c89f15f5d10d SHA256 50a8c9a618ab0e15237a638635318f97f7c56c307d2d1abaeba12d34733ce08a
 DIST portage-patches-2.0.54-2.tar.bz2 6722 RMD160 a9fbb40ec45c62db6b94e79b33ebabf5de22b287 SHA1 44f0b24d6c5893e50f2e4315d9ca22a288062ba8 SHA256 6d6055f433411a42d0388b787fc353014cf527dba51dd0faee203e5dda2d1fcc
@@ -35,14 +37,18 @@ EBUILD portage-2.0.54.ebuild 3891 RMD160 4e64e86813b5bbdfbce76d76a56b5afd2305b2f
 MD5 f9c41fcd6a2155552f0cacbe7a62101c portage-2.0.54.ebuild 3891
 RMD160 4e64e86813b5bbdfbce76d76a56b5afd2305b2f8 portage-2.0.54.ebuild 3891
 SHA256 583690c187f8d9c7fdfaf83626cad866492f144104bee7d26f4beb5544f2a429 portage-2.0.54.ebuild 3891
+EBUILD portage-2.1.1_pre1.ebuild 5390 RMD160 7e8e3b316ed109122045ee70bffd9658851e55a5 SHA1 5132750b8787dd1a26c97c3486d4608845b919f4 SHA256 258f88b87165e1f1c9c559e6b65ee57362b9ea6a3cd1c2044861c7ddbd71964b
+MD5 b0dfb2cd59a5f88838f65af18d0e4b4c portage-2.1.1_pre1.ebuild 5390
+RMD160 7e8e3b316ed109122045ee70bffd9658851e55a5 portage-2.1.1_pre1.ebuild 5390
+SHA256 258f88b87165e1f1c9c559e6b65ee57362b9ea6a3cd1c2044861c7ddbd71964b portage-2.1.1_pre1.ebuild 5390
 EBUILD portage-2.1.ebuild 7254 RMD160 5096ee964b8b3f16ab8c28e31c590e23933ea3a0 SHA1 65b36177a0fed404db928c3e4513f48cee5501ef SHA256 7ebff440fba2ac47d2efb6721aa1f9e3aab91910cd6fb1b11d8a713f0432faf1
 MD5 f743b5d2b2ea83f172d8bcced911648d portage-2.1.ebuild 7254
 RMD160 5096ee964b8b3f16ab8c28e31c590e23933ea3a0 portage-2.1.ebuild 7254
 SHA256 7ebff440fba2ac47d2efb6721aa1f9e3aab91910cd6fb1b11d8a713f0432faf1 portage-2.1.ebuild 7254
-MISC ChangeLog 12451 RMD160 d562dce05e8ac18bb160b2530ec602ce6fc4e77c SHA1 5e5807d45b20afb6b6803b6145c0b058d755bb75 SHA256 250245024a1af8c44e11b3998ad9012291f1eae7da070489fe8ddc393055dc41
-MD5 61fc651fda4cf5259355e7106aba4441 ChangeLog 12451
-RMD160 d562dce05e8ac18bb160b2530ec602ce6fc4e77c ChangeLog 12451
-SHA256 250245024a1af8c44e11b3998ad9012291f1eae7da070489fe8ddc393055dc41 ChangeLog 12451
+MISC ChangeLog 12759 RMD160 22069d3909f904617a11e1d74a1cc9ea92faefa6 SHA1 54b81aec495a14343e13a259ffb43ffc21950009 SHA256 ff3cc8f563a50a73d7d33d1b148bb9e3b1539bb3fa69831f4bfa53bb5e25c38b
+MD5 44b2c30fb64c0ec7561cff8e22254980 ChangeLog 12759
+RMD160 22069d3909f904617a11e1d74a1cc9ea92faefa6 ChangeLog 12759
+SHA256 ff3cc8f563a50a73d7d33d1b148bb9e3b1539bb3fa69831f4bfa53bb5e25c38b ChangeLog 12759
 MISC metadata.xml 276 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 SHA1 73bd9b0dacf481b876934c38010be20a91eaf591 SHA256 b57f85b96f11cfb55dc61ac16d743816af60f09660b3f40defa0196d9044f1b7
 MD5 dc02eeaf8060043bfa8d483a42696963 metadata.xml 276
 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 metadata.xml 276
@@ -62,10 +68,13 @@ SHA256 e494cfdb2648a2b63f87602043fe2a34432e684159ec53347bdc6395a16cf17e files/di
 MD5 29d5cbd0a0736e68ab249a0b43ab6ca5 files/digest-portage-2.1 506
 RMD160 a911cf67209be2f99c4653406e4a124d59ad5734 files/digest-portage-2.1 506
 SHA256 998fe70d318d97ec7c596b0ab72151080acb5a41fe03ed92ad77e5eb2f511545 files/digest-portage-2.1 506
+MD5 38aab469f89370d815036a8e56e8fd5e files/digest-portage-2.1.1_pre1 515
+RMD160 9574a220bd30b1155ccac6510b90c7a966ca79e8 files/digest-portage-2.1.1_pre1 515
+SHA256 65c52cf44031acadd53f8642684b491be85684a72278cb7968626bb48c0ed1ee files/digest-portage-2.1.1_pre1 515
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEjETJ/ejvha5XGaMRAn+JAKCdGxNj1CIf5LNDrVgjoa1p5iihngCeO7ng
-aJaJ/olV44Xb+yBn1a5AMoM=
-=RrDU
+iD8DBQFEkuCB/ejvha5XGaMRAhHiAJ9bJ9SKJSb5NjBAntT+T/Y/nEXEJQCcDhMp
+ni/lmncQ54KDyqPE2LppNjk=
+=O7md
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre1 b/sys-apps/portage/files/digest-portage-2.1.1_pre1
new file mode 100644 (file)
index 0000000..617dfe8
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1.1_pre1
@@ -0,0 +1,6 @@
+MD5 3dc4fb1d5bc1aac640b579e82db58dfd portage-2.1.1_pre1.tar.bz2 277982
+RMD160 41fc05479ba8774ad35939b6b5f597e559602f0e portage-2.1.1_pre1.tar.bz2 277982
+SHA256 de7d23e15681a6eff9199a505bc9bdf59a5a43d5c51e6223d6296659c1a0cc3e portage-2.1.1_pre1.tar.bz2 277982
+MD5 3a1c6f874490e12965812fa0920c539f portage-man-pl-2.1.tar.bz2 52425
+RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 portage-man-pl-2.1.tar.bz2 52425
+SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817 portage-man-pl-2.1.tar.bz2 52425

diff --git a/sys-apps/portage/portage-2.1.1_pre1.ebuild b/sys-apps/portage/portage-2.1.1_pre1.ebuild
new file mode 100644 (file)
index 0000000..c50c116
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.1_pre1.ebuild
@@ -0,0 +1,184 @@
+# 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.1_pre1.ebuild,v 1.1 2006/06/16 16:46:28 zmedico Exp $
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="The Portage Package Management System. The primary 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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+PROVIDE="virtual/portage"
+SLOT="0"
+# USE_EXPAND_HIDDEN hides ELIBC and USERLAND expansions from emerge output (see make.conf.5).
+IUSE_ELIBC="elibc_glibc elibc_uclibc elibc_FreeBSD"
+IUSE_USERLAND="userland_Darwin userland_GNU"
+IUSE="build doc selinux linguas_pl ${IUSE_ELIBC} ${IUSE_USERLAND}"
+DEPEND=">=dev-lang/python-2.3
+       !build? ( >=sys-apps/sed-4.0.5 )"
+RDEPEND=">=dev-lang/python-2.3
+       !build? ( >=sys-apps/sed-4.0.5
+               dev-python/python-fchksum
+               userland_GNU? ( sys-apps/debianutils )
+               !userland_Darwin? ( >=app-shells/bash-3.0 )
+               userland_Darwin? ( >=app-shells/bash-2.05a ) )
+       elibc_glibc? ( sys-apps/sandbox )
+       elibc_uclibc? ( sys-apps/sandbox )
+       !userland_Darwin? ( >=app-misc/pax-utils-0.1.13 )
+       selinux? ( >=dev-python/python-selinux-2.16 )
+       doc? ( app-portage/portage-manpages )
+       >=dev-python/pycrypto-2.0.1-r5"
+SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
+PV_PL="2.1"
+SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
+       ${SRC_ARCHIVES}/${PN}-${PV}.tar.bz2
+       linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
+       ${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}.tar.bz2 )"
+
+if [ "${PR}" != "r0" ]; then
+       PATCHVER="-${PR}"
+       SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2"
+fi
+
+S="${WORKDIR}"/${PN}-${PV}
+S_PL="${WORKDIR}"/${PN}-${PV_PL}
+
+portage_docs() {
+       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 ""
+}
+
+src_unpack() {
+       unpack ${A}
+       if [ "${PR}" != "r0" ]; then
+               cd "${S}"
+               epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
+               einfo "Setting portage.VERSION to ${PVR} ..."
+               sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
+                       die "Failed to patch portage.VERSION"
+               eend 0
+       fi
+}
+
+src_compile() {
+       cd "${S}"/src
+       $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \
+               die "Failed to build tbz2tool"
+
+       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() {
+       local portage_base="/usr/lib/portage"
+       cd "${S}"/cnf
+       insinto /etc
+       doins etc-update.conf dispatch-conf.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
+
+       if use elibc_FreeBSD; then
+               cd "${S}"/src/bsd-flags
+               ./setup.py install --root "${D}" || \
+                       die "Failed to install bsd-chflags module"
+       fi
+
+       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/sed || die "Failed to remove sed wrapper"
+       fi
+       cd "${S}"/bin
+       doexe *
+       doexe "${S}"/src/tbz2tool
+       dosym newins ${portage_base}/bin/donewins
+
+       for mydir in pym pym/cache pym/elog_modules; do
+               dodir ${portage_base}/${mydir}
+               insinto ${portage_base}/${mydir}
+               cd "${S}"/${mydir}
+               doins *.py
+       done
+
+       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
+       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
+       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 ../lib/portage/bin/${x} /usr/sbin/${x}
+       done
+
+       dodir /etc/portage
+       keepdir /etc/portage
+
+       doenvd "${FILESDIR}"/05portage.envd
+}
+
+pkg_preinst() {
+       local portage_base="/usr/lib/portage"
+       if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
+               rm -rf "${IMAGE}"/${portage_base}/pym/*
+               mv "${IMAGE}"/${portage_base}/bin/tbz2tool "${T}"
+               rm -rf "${IMAGE}"/${portage_base}/bin/*
+               mv "${T}"/tbz2tool "${IMAGE}"/${portage_base}/bin/
+       else
+               for mydir in pym pym/cache pym/elog_modules; do
+                       rm "${ROOT}"/${portage_base}/${mydir}/*.pyc >& /dev/null
+                       rm "${ROOT}"/${portage_base}/${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
+
+       portage_docs
+}