From 45f23dde3627320f92fbaabd258f365805db3a62 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 20 Jul 2006 22:01:34 +0000 Subject: 2.1.1_pre3-r3 regression fix revbump for a syntax error in etc-update. Thanks to SuperLag for reporting. Package-Manager: portage-2.1.1_pre3-r3 --- sys-apps/portage/Manifest | 36 ++-- sys-apps/portage/files/2.1.1_pre3-r2-fixes.patch | 14 -- .../portage/files/digest-portage-2.1.1_pre3-r2 | 12 -- sys-apps/portage/portage-2.1.1_pre3-r2.ebuild | 198 --------------------- 4 files changed, 18 insertions(+), 242 deletions(-) delete mode 100644 sys-apps/portage/files/2.1.1_pre3-r2-fixes.patch delete mode 100644 sys-apps/portage/files/digest-portage-2.1.1_pre3-r2 delete mode 100644 sys-apps/portage/portage-2.1.1_pre3-r2.ebuild (limited to 'sys-apps') diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 17fdfa126aa0..aaec55935d38 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -9,10 +9,10 @@ AUX 2.0.51.22-fixes.patch 10579 RMD160 aecbf663449b7b6c5fc8f4f343c30c1de7515fb3 MD5 bb9cb80f927bcc2b9e0f512d8a200e18 files/2.0.51.22-fixes.patch 10579 RMD160 aecbf663449b7b6c5fc8f4f343c30c1de7515fb3 files/2.0.51.22-fixes.patch 10579 SHA256 a6ae22f6513e9c5160204d9ba2ca8bab00091a88089139ff64bee68aaf63a95c files/2.0.51.22-fixes.patch 10579 -AUX 2.1.1_pre3-r2-fixes.patch 494 RMD160 1db1cf6bc5a10dc98a1fc6d41b8f8ae22c3353fc SHA1 a241ac271f833c8f7010f024ad93372b87442ce0 SHA256 2675cc5ddbeb9e1938d6052ddf3643a5336a3d7b31c1a2db45848e0334f6a588 -MD5 19d8457771719f8c8cd69e555058c99e files/2.1.1_pre3-r2-fixes.patch 494 -RMD160 1db1cf6bc5a10dc98a1fc6d41b8f8ae22c3353fc files/2.1.1_pre3-r2-fixes.patch 494 -SHA256 2675cc5ddbeb9e1938d6052ddf3643a5336a3d7b31c1a2db45848e0334f6a588 files/2.1.1_pre3-r2-fixes.patch 494 +AUX 2.1.1_pre3-r3-fixes.patch 1131 RMD160 6c57ebfad97ce8eedcfade09fddb34fb6d3432b5 SHA1 8970cef6153474eb492d559903aa30e04745f002 SHA256 ad53abf35190e25dad135bcfe1bb8ef575cc6dfea62fe9e32404368525badb94 +MD5 64f9bc5ed596e40881144987e53c92f6 files/2.1.1_pre3-r3-fixes.patch 1131 +RMD160 6c57ebfad97ce8eedcfade09fddb34fb6d3432b5 files/2.1.1_pre3-r3-fixes.patch 1131 +SHA256 ad53abf35190e25dad135bcfe1bb8ef575cc6dfea62fe9e32404368525badb94 files/2.1.1_pre3-r3-fixes.patch 1131 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137 @@ -43,14 +43,14 @@ EBUILD portage-2.1.1_pre3-r1.ebuild 5740 RMD160 fa182d1623ad3edb2c0278c31673e707 MD5 bb7820a52013adca1fb4716e5f6b668d portage-2.1.1_pre3-r1.ebuild 5740 RMD160 fa182d1623ad3edb2c0278c31673e7078a26b541 portage-2.1.1_pre3-r1.ebuild 5740 SHA256 3c2534e6572c7298a61fe5e32e21676e5dc52287de92df39365424aeca12cad6 portage-2.1.1_pre3-r1.ebuild 5740 -EBUILD portage-2.1.1_pre3-r2.ebuild 5789 RMD160 386caf305f9fed6dd9105343f48e2f837af12370 SHA1 41c01a98c0052c22fb676e0515ac0856e3d41554 SHA256 6d35aa7d816b929ca038248be4a7959e734340b4f4ca54beded2b2965a4303a5 -MD5 139f4bbd35270b4eda38e8d0b85ac41e portage-2.1.1_pre3-r2.ebuild 5789 -RMD160 386caf305f9fed6dd9105343f48e2f837af12370 portage-2.1.1_pre3-r2.ebuild 5789 -SHA256 6d35aa7d816b929ca038248be4a7959e734340b4f4ca54beded2b2965a4303a5 portage-2.1.1_pre3-r2.ebuild 5789 -MISC ChangeLog 18095 RMD160 9ad2ff6a41110c9fddb7bfaf2e3972e985df5f89 SHA1 49712aca642537659782bccbd9ab1aec9334e5f3 SHA256 aa34f63822682535575db85d551ce18155a6ea9b0c983cb60eeff8fe427e67f1 -MD5 c6fd0b43c9b4361b76a8acbd622c64df ChangeLog 18095 -RMD160 9ad2ff6a41110c9fddb7bfaf2e3972e985df5f89 ChangeLog 18095 -SHA256 aa34f63822682535575db85d551ce18155a6ea9b0c983cb60eeff8fe427e67f1 ChangeLog 18095 +EBUILD portage-2.1.1_pre3-r3.ebuild 5786 RMD160 b7851c75d5aa62a47b3786e6198f9c5a437098f7 SHA1 7736481d1c7e0f9a72ef28948cc7a6253b716854 SHA256 a1f80c48e45476d59429c3b72ade8ba3a1b639f746bbc10dd546faa866c8732d +MD5 943cee83e01790d08e1b47a10addac66 portage-2.1.1_pre3-r3.ebuild 5786 +RMD160 b7851c75d5aa62a47b3786e6198f9c5a437098f7 portage-2.1.1_pre3-r3.ebuild 5786 +SHA256 a1f80c48e45476d59429c3b72ade8ba3a1b639f746bbc10dd546faa866c8732d portage-2.1.1_pre3-r3.ebuild 5786 +MISC ChangeLog 18321 RMD160 8e5caeb41b6e6e2b1d24c10c78218171158b6945 SHA1 71955e9e7eab8964ad0232144a841b709fee6236 SHA256 841f40bdf8fcdfde1b1191bf76b05693bd65617f36459225549541ac83f3f2fa +MD5 759a4fec56228c4d7b35328eab38bb08 ChangeLog 18321 +RMD160 8e5caeb41b6e6e2b1d24c10c78218171158b6945 ChangeLog 18321 +SHA256 841f40bdf8fcdfde1b1191bf76b05693bd65617f36459225549541ac83f3f2fa ChangeLog 18321 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219 @@ -67,13 +67,13 @@ SHA256 9f002b314a87d8dfad176863f83c6963acec51093a45494201b53e9c0cf87cd8 files/di MD5 a2aed6debbc258ec0f5d2a18058a0478 files/digest-portage-2.1.1_pre3-r1 1051 RMD160 524b26c4219a753e79aedce39d3b8a8fe08c19f6 files/digest-portage-2.1.1_pre3-r1 1051 SHA256 811e4aa81ab2fc5f71b3f123288bdb84a53328f3b7c6b48342d559b523761f68 files/digest-portage-2.1.1_pre3-r1 1051 -MD5 a939c56bf0de6fc08e05610f2e1c2c21 files/digest-portage-2.1.1_pre3-r2 1054 -RMD160 4791a28d53a2a2814a85c5a706fc6b9c770e712b files/digest-portage-2.1.1_pre3-r2 1054 -SHA256 5c1d606818465a0c7d4d8d7a33b2f2f1edf42c8b49ae1dfa91d60f3ae842d9ed files/digest-portage-2.1.1_pre3-r2 1054 +MD5 a939c56bf0de6fc08e05610f2e1c2c21 files/digest-portage-2.1.1_pre3-r3 1054 +RMD160 4791a28d53a2a2814a85c5a706fc6b9c770e712b files/digest-portage-2.1.1_pre3-r3 1054 +SHA256 5c1d606818465a0c7d4d8d7a33b2f2f1edf42c8b49ae1dfa91d60f3ae842d9ed files/digest-portage-2.1.1_pre3-r3 1054 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.4 (GNU/Linux) -iD8DBQFEv+8b/ejvha5XGaMRAml3AKDoBqaAg8DVkjB7XCWGAKKwVlTGewCgoNuF -MhFJX/gK5m5JBRc6Jr5vtp8= -=aRkB +iD8DBQFEv/0+/ejvha5XGaMRAlJXAJ9OZD1uoi2YS7ocg5QwCyF2kj+OeQCeOjyV +NhMTQavILb0czyRA1OBCiQQ= +=CjoK -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/2.1.1_pre3-r2-fixes.patch b/sys-apps/portage/files/2.1.1_pre3-r2-fixes.patch deleted file mode 100644 index 1ea15108666f..000000000000 --- a/sys-apps/portage/files/2.1.1_pre3-r2-fixes.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: bin/repoman -=================================================================== ---- bin/repoman (revision 3970) -+++ bin/repoman (revision 3971) -@@ -843,7 +843,8 @@ - - if mymode == "commit": - repoman_settings["O"] = checkdir -- portage.digestgen([], repoman_settings, manifestonly=1, myportdb=portage.portdb) -+ portage.digestgen( -+ [], repoman_settings, manifestonly=1, myportdb=portdb) - - mf = Manifest(checkdir, repoman_settings["DISTDIR"]) - mydigests=mf.getTypeDigests("DIST") diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre3-r2 b/sys-apps/portage/files/digest-portage-2.1.1_pre3-r2 deleted file mode 100644 index 55feeda31775..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1.1_pre3-r2 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 107c86eac94eb783682a2565b3e64150 portage-2.1.1_pre3-r2.patch.bz2 21497 -RMD160 9bedc652591a06ffcf663b45c87bec549dec873a portage-2.1.1_pre3-r2.patch.bz2 21497 -SHA256 cd8014ffbfcc6a6fa6ad501f9bf8cd01465e73e4931ce6d6a867e15a2826d339 portage-2.1.1_pre3-r2.patch.bz2 21497 -MD5 78baab083cf81f14f5929da16550584a portage-2.1.1_pre3.tar.bz2 287206 -RMD160 f3224349459899e33b9f29e60c5a8c49f63807af portage-2.1.1_pre3.tar.bz2 287206 -SHA256 baf1535f9d02201b7bbeba55953aeee588727d8e43dc10dabe7c91eaba772363 portage-2.1.1_pre3.tar.bz2 287206 -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.1_pre3-r2.ebuild b/sys-apps/portage/portage-2.1.1_pre3-r2.ebuild deleted file mode 100644 index 05fec082f3ef..000000000000 --- a/sys-apps/portage/portage-2.1.1_pre3-r2.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# 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_pre3-r2.ebuild,v 1.1 2006/07/20 21:01:08 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_Darwin? ( >=app-shells/bash-3.0 ) ) - 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" -PATCHVER_PL="-r1" -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 )" - -PATCHVER="-${PR}" -if [ -n "${PATCHVER}" ]; then - SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2 - ${SRC_ARCHIVES}/${PN}-${PV}${PATCHVER}.patch.bz2" -fi - -if [ -n "${PATCHVER_PL}" ]; then - SRC_URI="${SRC_URI} 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() { - elog "" - elog "For help with using portage please consult the Gentoo Handbook" - elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3" - elog "" -} - -src_unpack() { - unpack ${A} - cd "${S}" - if [ -n "${PATCHVER}" ]; then - cd "${S}" - epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch" - epatch "${FILESDIR}/2.1.1_pre3-r2-fixes.patch" - fi - if [ "${PR}" != "r0" ]; then - elog "Setting portage.VERSION to ${PVR} ..." - sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \ - die "Failed to patch portage.VERSION" - eend 0 - fi - if [ -n "${PATCHVER_PL}" ]; then - use linguas_pl && \ - epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch" - 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 -} -- cgit v1.2.3-65-gdbad