From: Zac Medico Date: Wed, 21 Jun 2006 07:06:40 +0000 (+0000) Subject: 2.1-r1 revbump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fb0d013201fcbb27c9befd0e161dfdfcec7b019a;p=gentoo.git 2.1-r1 revbump Package-Manager: portage-2.1-r1 --- diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 8523d9958288..9148006d19ac 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,15 @@ # 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.181 2006/06/18 04:36:01 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.182 2006/06/21 07:06:39 zmedico Exp $ + +*portage-2.1-r1 (21 Jun 2006) + + 21 Jun 2006; Zac Medico +portage-2.1-r1.ebuild: + 2.1-r1 revbump. This fixes bugs #85576, #96331, #116637, #123677, #126793, + #133740, #136199, #136208, #136236, #136278, #136313, #136404, #136532 + 136705, #136818, #136947, #137032, #137177, and #137269. For compatibility + with catalyst, the change in unmerge behavior from bug #118515 has been + reverted. *portage-2.1.1_pre1-r1 (18 Jun 2006) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index b31898b9e929..a3576f37375d 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -15,9 +15,11 @@ 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-r1.patch.bz2 12201 RMD160 ceff46c18d8e28f341cc0c1a0c41150733c2dc98 SHA1 0948e3de6cdd8869c9abbb7c8a3ad54e0aebb937 SHA256 78bdf92a43e8d34d090592bcd92779383dbaca9a9295418e4cc9b39f217fbf80 DIST portage-2.1.1_pre1-r1.patch.bz2 4452 RMD160 3970f09512a98808fbd5c683aa339c3901dbb681 SHA1 2c3f5b0a9b76b76068d641e8da4d9e6f4a2fa257 SHA256 6e6ca45b448e1852cfd2532d804025a6607abc2c2178b5bd7939c3e79e779490 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-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b 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 @@ -38,6 +40,10 @@ 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-r1.ebuild 7563 RMD160 908917e2beb5e45f1f97c674e8d4bdf732d5109c SHA1 de6a9eac0b96e774cea0d0f20e8d19baaa1595a3 SHA256 d3f901b1e76e3749c40305ec16264e2c338e45cb4076261d17e215cae35e576d +MD5 f56f6cf9bc69063454f78809af2e220a portage-2.1-r1.ebuild 7563 +RMD160 908917e2beb5e45f1f97c674e8d4bdf732d5109c portage-2.1-r1.ebuild 7563 +SHA256 d3f901b1e76e3749c40305ec16264e2c338e45cb4076261d17e215cae35e576d portage-2.1-r1.ebuild 7563 EBUILD portage-2.1.1_pre1-r1.ebuild 5393 RMD160 ba8fee268f6ea483dd50ca6825e4c72a27e25644 SHA1 bacdaa8d3aa1b9edac94b5b7d2efa4b119ae1980 SHA256 af94398b676eb048c5242a08eddcc88a31f5af1d40b4afdcb3f3a18fc33ac579 MD5 80980ac7276f82ad05a8f742f77fb549 portage-2.1.1_pre1-r1.ebuild 5393 RMD160 ba8fee268f6ea483dd50ca6825e4c72a27e25644 portage-2.1.1_pre1-r1.ebuild 5393 @@ -46,10 +52,10 @@ EBUILD portage-2.1.ebuild 7248 RMD160 e54df351244bb056247dc870e8cae61f9d4d69c2 S MD5 34ee3d531b703420790ae14a8dbb5f79 portage-2.1.ebuild 7248 RMD160 e54df351244bb056247dc870e8cae61f9d4d69c2 portage-2.1.ebuild 7248 SHA256 93eeb65fc06e62c619785c7ac4dbf8aaf2f2a07d547f7e1d2a860ad1cdce2d13 portage-2.1.ebuild 7248 -MISC ChangeLog 12949 RMD160 3f418fa1c403060bc31b35f1225cc842df178124 SHA1 1b3782cedc173c2864d39705de7598a51a5d2057 SHA256 2218de9cce536ee3eed7b8efea6b74e51d28bf6db72b0f4ab83e3d5f8d7d9ebf -MD5 307ea70e493531165e3c0c0e1c4d2f2a ChangeLog 12949 -RMD160 3f418fa1c403060bc31b35f1225cc842df178124 ChangeLog 12949 -SHA256 2218de9cce536ee3eed7b8efea6b74e51d28bf6db72b0f4ab83e3d5f8d7d9ebf ChangeLog 12949 +MISC ChangeLog 13366 RMD160 2ad804ebdd8bcf5378202b9cbfd70228ed408206 SHA1 1fe4b99cd9a4bd8b419276f7a07fb9a7d1e903b9 SHA256 dc535cf8a959ead156cdfd39e2afd07722ea1f11ea5890adbc35d75e1e2d3a0a +MD5 ebbb7c14a2e413d72de74fa13ff18c1b ChangeLog 13366 +RMD160 2ad804ebdd8bcf5378202b9cbfd70228ed408206 ChangeLog 13366 +SHA256 dc535cf8a959ead156cdfd39e2afd07722ea1f11ea5890adbc35d75e1e2d3a0a ChangeLog 13366 MISC metadata.xml 276 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 SHA1 73bd9b0dacf481b876934c38010be20a91eaf591 SHA256 b57f85b96f11cfb55dc61ac16d743816af60f09660b3f40defa0196d9044f1b7 MD5 dc02eeaf8060043bfa8d483a42696963 metadata.xml 276 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 metadata.xml 276 @@ -69,13 +75,16 @@ 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 5a9aac645d5a2bdb9d987f45813d495a files/digest-portage-2.1-r1 1012 +RMD160 ae625221b6669b5f4f1aef277b2a8ea3ae70e1ae files/digest-portage-2.1-r1 1012 +SHA256 9f002b314a87d8dfad176863f83c6963acec51093a45494201b53e9c0cf87cd8 files/digest-portage-2.1-r1 1012 MD5 724735f60f36cd6a5e6afa30041703e5 files/digest-portage-2.1.1_pre1-r1 783 RMD160 dcb17c4c2b88db10a358be333e22e8e8376e93af files/digest-portage-2.1.1_pre1-r1 783 SHA256 bee2bb6462c1fcbbc5850c4f53fea19888cd4a819225e6fb8ebd56f03555203f files/digest-portage-2.1.1_pre1-r1 783 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEmHVOamhnQswr0vIRAhg3AJ9XBZjFUtcWXwKZCPmIiQ6djNWHjgCgiHNb -y2VEG1oszY3ahI27scQzQOc= -=mOZF +iD8DBQFEmPAZ/ejvha5XGaMRAleOAJ9otn2XYQE4wPACGeh4vN+a4+hBJACgggNU +vCvJkrqDCZ4gB5LSm7YqXyI= +=RNMQ -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.1-r1 b/sys-apps/portage/files/digest-portage-2.1-r1 new file mode 100644 index 000000000000..e692220690de --- /dev/null +++ b/sys-apps/portage/files/digest-portage-2.1-r1 @@ -0,0 +1,12 @@ +MD5 ab61296a369547a788a09b40b9b4e916 portage-2.1-r1.patch.bz2 12201 +RMD160 ceff46c18d8e28f341cc0c1a0c41150733c2dc98 portage-2.1-r1.patch.bz2 12201 +SHA256 78bdf92a43e8d34d090592bcd92779383dbaca9a9295418e4cc9b39f217fbf80 portage-2.1-r1.patch.bz2 12201 +MD5 cb8c8af28d59f267377bba27ceea2337 portage-2.1.tar.bz2 277243 +RMD160 e8290e18f0de5935cc263d76e7bce15da5c899d2 portage-2.1.tar.bz2 277243 +SHA256 29560a50df1de053c943582b277beb600c364edfe177d42affc74e98db412ef0 portage-2.1.tar.bz2 277243 +MD5 c6fe647803cc354a5b8ab22660caeb26 portage-man-pl-2.1-r1.patch.bz2 2076 +RMD160 be3898714b94fb0253c1826909649ea51da205ad portage-man-pl-2.1-r1.patch.bz2 2076 +SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b portage-man-pl-2.1-r1.patch.bz2 2076 +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-r1.ebuild b/sys-apps/portage/portage-2.1-r1.ebuild new file mode 100644 index 000000000000..4a13764575db --- /dev/null +++ b/sys-apps/portage/portage-2.1-r1.ebuild @@ -0,0 +1,225 @@ +# 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-r1.ebuild,v 1.1 2006/06/21 07:06:40 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}" + PATCHVER_PL="-${PR}" + SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2 + ${SRC_ARCHIVES}/${PN}-${PV}${PATCHVER}.patch.bz2 + linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2 + ${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.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" + use linguas_pl && \ + epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.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 + + ewarn "Portage 2.1 contains a completely rewritten caching framework." + ewarn "If you are using any cache modules from portage-2.0.x (such as" + ewarn "the CDB cache module), portage will not work until they have" + ewarn "been disabled via /etc/portage/modules." + echo + einfo "The default cache format has changed between 2.0.x and 2.1" + einfo "versions. If you have upgraded from 2.0.x, before using" + einfo "emerge, run \`emerge --metadata\` to restore portage's local" + einfo "cache." + echo + einfo "With the new metadata_overlay cache module, it is possible to" + einfo "disable FEATURES=\"metadata-transfer\" (see make.conf.5)." + einfo "When this module is used, eclasses in \${PORTDIR} must never" + einfo "be modified by the user because portage will not be able to" + einfo "detect that cache regeneration is necessary." + einfo "When metadata_overlay is initially enabled by setting" + einfo "portdbapi.auxdbmodule = cache.metadata_overlay.database" + einfo "in /etc/portage/modules, the user must completely remove" + einfo "/var/cache/edb/dep/\${PORTDIR} in order to avoid unecessary" + einfo "cache regeneration." + 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 "The default USE_ORDER setting (see make.conf.5) has changed in" + einfo "2.1 so that auto USE flags (from use.defaults) are no longer" + einfo "enabled. In order to find out which flags have been disabled," + einfo "the command \`env USE_ORDER=auto portageq envvar USE\` may be" + einfo "helpful. These flags can be manually added to make.conf by the" + einfo "user (the command output may contain a few other automatically" + einfo "generated flags that do not need to be added to make.conf)." + echo + einfo "See NEWS and RELEASE-NOTES for further changes." + + portage_docs +}