diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/Manifest | 38 | ||||
| -rw-r--r-- | sys-apps/portage/files/bug_138131.patch | 32 | ||||
| -rw-r--r-- | sys-apps/portage/files/digest-portage-2.1.1_pre1-r4 | 12 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.1.1_pre1-r4.ebuild | 190 |
4 files changed, 19 insertions, 253 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 414689dbc1ad..27c1bccae16a 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -13,15 +13,15 @@ AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8f MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137 -AUX bug_138131.patch 1205 RMD160 a7d398de68e1fc872f6178f37a4a82b20356d846 SHA1 ec7440ae87850ef63a9fc83fb3fc156f3d00aa81 SHA256 2bb5eb75d2e76ad3aba5635bbb156963010e6e739a68eaabe43667132419385d -MD5 ce54c4ddd5f8d6587860790a3117b33b files/bug_138131.patch 1205 -RMD160 a7d398de68e1fc872f6178f37a4a82b20356d846 files/bug_138131.patch 1205 -SHA256 2bb5eb75d2e76ad3aba5635bbb156963010e6e739a68eaabe43667132419385d files/bug_138131.patch 1205 +AUX bugs_138246_138259.patch 3224 RMD160 a82a7fc3fcbbee64c377c9a99cd76e29dbc7a6a0 SHA1 84d746b9c21369febe7c897b6f83fd00c176601a SHA256 7dd6cc900dbf83e8efd85e1c2fad86e18fb8489d8d3f70b7b0dabbe183b1d664 +MD5 216e8e331f34339920c5eb492e6871b7 files/bugs_138246_138259.patch 3224 +RMD160 a82a7fc3fcbbee64c377c9a99cd76e29dbc7a6a0 files/bugs_138246_138259.patch 3224 +SHA256 7dd6cc900dbf83e8efd85e1c2fad86e18fb8489d8d3f70b7b0dabbe183b1d664 files/bugs_138246_138259.patch 3224 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-r2.patch.bz2 28543 RMD160 0070ce2403ba2db4c1910833de5d61e392b060e2 SHA1 ab0bd2c718f2dd5f5c9d72883ffcddd4ad978299 SHA256 53f9852725670c3e5e8602afa2b32882072bfe99a18757ebcbc59caa7db25990 -DIST portage-2.1.1_pre1-r3.patch.bz2 37455 RMD160 ed30d2e90c51e3bd3805649e0ee430b4b7e30f4a SHA1 932893dc624f7839b783cc2a0604be8e66aca6ef SHA256 8c2e31c386144a2b69af9bb42b3bdac0c4efca6a474bef5f479efa05980d02ef +DIST portage-2.1.1_pre1-r5.patch.bz2 39728 RMD160 d82b4203462e77c17dc4f3ba87c62a09b53745a7 SHA1 01ffcc7123c7b89109699d043a86ddafb2cbb80b SHA256 abe00224559f2ae45261d46b36cea9b6a1add88aa145093482e1786b5b866bea 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 @@ -44,18 +44,18 @@ EBUILD portage-2.1.1_pre1-r2.ebuild 5644 RMD160 d2dd3334b7a642d12da053c66c20da5c MD5 cdfe661aeaa0cb765a0e04e82a855e72 portage-2.1.1_pre1-r2.ebuild 5644 RMD160 d2dd3334b7a642d12da053c66c20da5cc8bd4f5c portage-2.1.1_pre1-r2.ebuild 5644 SHA256 3661a35f30ef5d432d07c0fabb6145416cae17cc846be29e3bd014476e416f05 portage-2.1.1_pre1-r2.ebuild 5644 -EBUILD portage-2.1.1_pre1-r4.ebuild 5681 RMD160 b1fcc3648d8172047d877c252660673d064f122f SHA1 3c8b0d8236d75dff716e88b9e7dbd7f342674f39 SHA256 3ed69768de35bcc1e63122e14b46ec9a54d0c2ae06013eb9d08f65dd0519eec0 -MD5 94b992e937326114ea4c98ad87fedf7d portage-2.1.1_pre1-r4.ebuild 5681 -RMD160 b1fcc3648d8172047d877c252660673d064f122f portage-2.1.1_pre1-r4.ebuild 5681 -SHA256 3ed69768de35bcc1e63122e14b46ec9a54d0c2ae06013eb9d08f65dd0519eec0 portage-2.1.1_pre1-r4.ebuild 5681 +EBUILD portage-2.1.1_pre1-r5.ebuild 5692 RMD160 1d0b157a7b3c74cbee5bfd4f67a2631e8dbbd766 SHA1 89c8aaf599345f6a8939f1ffb351768d7fb8d884 SHA256 26df65f5f419c00e2c345fb2b8c808dd9c84551c23eb52b528018d5fc6e72c16 +MD5 210a4557c343011fcdf8a5077cdeef3e portage-2.1.1_pre1-r5.ebuild 5692 +RMD160 1d0b157a7b3c74cbee5bfd4f67a2631e8dbbd766 portage-2.1.1_pre1-r5.ebuild 5692 +SHA256 26df65f5f419c00e2c345fb2b8c808dd9c84551c23eb52b528018d5fc6e72c16 portage-2.1.1_pre1-r5.ebuild 5692 EBUILD portage-2.1.ebuild 7248 RMD160 e54df351244bb056247dc870e8cae61f9d4d69c2 SHA1 820a21fbe6b7b1d60987a9bda32df12cd85b76e7 SHA256 93eeb65fc06e62c619785c7ac4dbf8aaf2f2a07d547f7e1d2a860ad1cdce2d13 MD5 34ee3d531b703420790ae14a8dbb5f79 portage-2.1.ebuild 7248 RMD160 e54df351244bb056247dc870e8cae61f9d4d69c2 portage-2.1.ebuild 7248 SHA256 93eeb65fc06e62c619785c7ac4dbf8aaf2f2a07d547f7e1d2a860ad1cdce2d13 portage-2.1.ebuild 7248 -MISC ChangeLog 14810 RMD160 9f9a8c17ae7b2615c22b5d9d9a5ff753d975f05c SHA1 04c6bab3688e34b809e4171d9fe3d8dcd1b06aa6 SHA256 32e98e8fcbae1d60f25b07934ce8546addf373967466c30682f0c08f1e0e362f -MD5 6e4ef1b3590a5692f70d92f77462ca09 ChangeLog 14810 -RMD160 9f9a8c17ae7b2615c22b5d9d9a5ff753d975f05c ChangeLog 14810 -SHA256 32e98e8fcbae1d60f25b07934ce8546addf373967466c30682f0c08f1e0e362f ChangeLog 14810 +MISC ChangeLog 15036 RMD160 13cc37dea6196bd4f10829ab026109bd496bcbd3 SHA1 892b4edcb8db62792f2d47708e3ef867f4b6897e SHA256 dd591e178b29b9f959eebb5f88badd2f23d214c5a4817c8f78372d0044e68710 +MD5 04242e0ff677e4905eede34c8742bc5f ChangeLog 15036 +RMD160 13cc37dea6196bd4f10829ab026109bd496bcbd3 ChangeLog 15036 +SHA256 dd591e178b29b9f959eebb5f88badd2f23d214c5a4817c8f78372d0044e68710 ChangeLog 15036 MISC metadata.xml 276 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 SHA1 73bd9b0dacf481b876934c38010be20a91eaf591 SHA256 b57f85b96f11cfb55dc61ac16d743816af60f09660b3f40defa0196d9044f1b7 MD5 dc02eeaf8060043bfa8d483a42696963 metadata.xml 276 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 metadata.xml 276 @@ -75,13 +75,13 @@ SHA256 9f002b314a87d8dfad176863f83c6963acec51093a45494201b53e9c0cf87cd8 files/di MD5 ee378755043ca7f32e9d4bcc3808ecfe files/digest-portage-2.1.1_pre1-r2 1054 RMD160 92bb8c4c4df24f07b6dc9789c08bc71bd80a6048 files/digest-portage-2.1.1_pre1-r2 1054 SHA256 7c19b83520d83f0121c07343cdb9ea0a46de2606a5f55df361bfc16a6b448dfa files/digest-portage-2.1.1_pre1-r2 1054 -MD5 b793c4bdfbc2685627d7cad4e3e81413 files/digest-portage-2.1.1_pre1-r4 1054 -RMD160 19a5b1fb0d9dccf5f2f3ba52ab422b9fcb783d47 files/digest-portage-2.1.1_pre1-r4 1054 -SHA256 f99dc463d99fc08a4eda80045583351189d0227217f17d7da8ac3fe39fb22fe0 files/digest-portage-2.1.1_pre1-r4 1054 +MD5 65e33a514b2084c868cb3ee45f7fda32 files/digest-portage-2.1.1_pre1-r5 1054 +RMD160 2c1a5753d848cd1c61d917ec06f346ce838a19bf files/digest-portage-2.1.1_pre1-r5 1054 +SHA256 76b054610dbdad6aa3cb0e21cefa2a8f3a9470494f8b57cf49b99799f6a84573 files/digest-portage-2.1.1_pre1-r5 1054 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEoQHY/ejvha5XGaMRAlkhAKCBijU+MPBhQa4DGs44qsDyWgF0eQCfYDJe -+gGJxHr6UMUndNKxI2yqTwg= -=B4NU +iD8DBQFEoZix/ejvha5XGaMRAp6MAKDTHuunrh4zyd54BXKhCoywtgFFbACeOexb +OV1z+UOnGhm6mJoVXbMrMbQ= +=Ekph -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/bug_138131.patch b/sys-apps/portage/files/bug_138131.patch deleted file mode 100644 index e5851927a1bc..000000000000 --- a/sys-apps/portage/files/bug_138131.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: bin/emerge -=================================================================== ---- bin/emerge (revision 3672) -+++ bin/emerge (revision 3674) -@@ -2816,7 +2816,7 @@ - mybestpv=portage.portdb.xmatch("bestmatch-visible","sys-apps/portage") - mypvs=portage.best(portage.db[portage.root]["vartree"].dbapi.match("sys-apps/portage")) - -- chk_updated_cfg_files() -+ chk_updated_cfg_files("/", settings.get("CONFIG_PROTECT","").split()) - - if myaction != "metadata": - if os.access(portage.USER_CONFIG_PATH + "/bin/post_sync", os.X_OK): -@@ -3089,7 +3089,7 @@ - if "cvs_id_string" in dir(module): - print "%s: %s" % (str(x), str(module.cvs_id_string)) - --def action_search(myopts, myfiles, spinner): -+def action_search(settings, vartree, myopts, myfiles, spinner): - if not myfiles: - print "emerge: no search terms provided." - else: -@@ -3795,7 +3795,8 @@ - - # SEARCH action - elif "search"==myaction: -- action_search(myopts, myfiles) -+ action_search(settings, trees["/"]["vartree"], -+ myopts, myfiles, spinner) - elif "unmerge"==myaction or "prune"==myaction or "clean"==myaction: - vartree = trees[settings["ROOT"]]["vartree"] - if 1 == unmerge(settings, myopts, vartree, myaction, myfiles, diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre1-r4 b/sys-apps/portage/files/digest-portage-2.1.1_pre1-r4 deleted file mode 100644 index 7f33c5d068e1..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1.1_pre1-r4 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 a42ada6ce0ca56bb381905df9a558059 portage-2.1.1_pre1-r3.patch.bz2 37455 -RMD160 ed30d2e90c51e3bd3805649e0ee430b4b7e30f4a portage-2.1.1_pre1-r3.patch.bz2 37455 -SHA256 8c2e31c386144a2b69af9bb42b3bdac0c4efca6a474bef5f479efa05980d02ef portage-2.1.1_pre1-r3.patch.bz2 37455 -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 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_pre1-r4.ebuild b/sys-apps/portage/portage-2.1.1_pre1-r4.ebuild deleted file mode 100644 index 277d6e0583cb..000000000000 --- a/sys-apps/portage/portage-2.1.1_pre1-r4.ebuild +++ /dev/null @@ -1,190 +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_pre1-r4.ebuild,v 1.1 2006/06/27 10:00:41 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 ) ) - 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="-r3" - PATCHVER_PL="-r1" - 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" - epatch "${FILESDIR}/bug_138131.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 - - portage_docs -} |