From a8f659ac39ba8a3e86ae4e4d4f4cb34858f853a1 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 7 Sep 2006 17:51:46 +0000 Subject: [PATCH] 2.1.1_rc1-r7 revbump for bugs #144011 and #146564. Package-Manager: portage-2.1.1_rc1-r7 --- sys-apps/portage/Manifest | 42 ++-- .../portage/files/2.1.1_rc1-r5-repoman.patch | 28 --- .../portage/files/digest-portage-2.1.1_rc1-r3 | 12 -- .../portage/files/digest-portage-2.1.1_rc1-r5 | 12 -- sys-apps/portage/portage-2.1.1_rc1-r3.ebuild | 200 ----------------- sys-apps/portage/portage-2.1.1_rc1-r5.ebuild | 202 ------------------ 6 files changed, 15 insertions(+), 481 deletions(-) delete mode 100644 sys-apps/portage/files/2.1.1_rc1-r5-repoman.patch delete mode 100644 sys-apps/portage/files/digest-portage-2.1.1_rc1-r3 delete mode 100644 sys-apps/portage/files/digest-portage-2.1.1_rc1-r5 delete mode 100644 sys-apps/portage/portage-2.1.1_rc1-r3.ebuild delete mode 100644 sys-apps/portage/portage-2.1.1_rc1-r5.ebuild diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 1af0fd2116c8..1cc8c7a8c134 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -9,10 +9,6 @@ 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_rc1-r5-repoman.patch 1083 RMD160 f10943ebc339cd83ae7d696c059ea57597ce9372 SHA1 016ac21c89f57189c02675b0497f722f746bc35b SHA256 4a1b83d908d9ad0f65c79296a6e5dfcdf8a55600cd9cfc637eaa782271cecab2 -MD5 2d2944de5a26d4414a63dd38534efc6a files/2.1.1_rc1-r5-repoman.patch 1083 -RMD160 f10943ebc339cd83ae7d696c059ea57597ce9372 files/2.1.1_rc1-r5-repoman.patch 1083 -SHA256 4a1b83d908d9ad0f65c79296a6e5dfcdf8a55600cd9cfc637eaa782271cecab2 files/2.1.1_rc1-r5-repoman.patch 1083 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137 @@ -20,9 +16,8 @@ SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/RE 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-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d57 SHA1 06ec20f96618271c7835ce505d4979b8f7914067 SHA256 854c61dd0232cca50d9bb9a3e9e13f22589b76029ea7eeacab2bc5d4ec7e48cc -DIST portage-2.1.1_rc1-r3.patch.bz2 4394 RMD160 3b0949cf71204141e04bc75483ff2bd29341b288 SHA1 9ae4f56ca905caef0a42d82a7a45d825714da3f1 SHA256 82c552476efd6f22245c4771f0f1b4468c9d29fb807ba10364e576daeee005f9 -DIST portage-2.1.1_rc1-r4.patch.bz2 5553 RMD160 49f92e226dd1e1c6179fa2d04f359bb4b7e00665 SHA1 b4bbb9192d873f79821ceb897cf00a774cdec67e SHA256 1dc0cab729ca61e4d5f994a1a848379a3e690b161b600320a8a586a51e7e58b2 DIST portage-2.1.1_rc1-r6.patch.bz2 6614 RMD160 444f710ced5c4e0a4cdadd006b5d807675b7c2d5 SHA1 45b3da8e5d502ac26f31e28a3f6d9836255e87ae SHA256 8ce1189e8860456cc5c0debec1692c7c8e1c4f0051281b239cd9bb66d12e95af +DIST portage-2.1.1_rc1-r7.patch.bz2 7784 RMD160 307257b2ea4e2e663b2a27680bf6a94529491259 SHA1 6eafa1171b7bb0474d5a83d4828c23c22e5d4358 SHA256 8dd678372a6106fbe28dbb750c8672f430a4e2429dbb523e13672786101869ee DIST portage-2.1.1_rc1.tar.bz2 295029 RMD160 5c1f8b9bd56843b5248d0be33b702008f9284695 SHA1 8a341d527b160a30e65ce97ea3455f835fa499c0 SHA256 d29a6adcb6684c965bfec91796aedbd7ab0cf2bb05794eb1acb79a5408cef95d 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 @@ -39,22 +34,18 @@ EBUILD portage-2.1-r2.ebuild 7077 RMD160 709488f3f40f375fbd8dc38c0fee414b2075dc4 MD5 1b28b65bd43e57ce31605f24e54732f1 portage-2.1-r2.ebuild 7077 RMD160 709488f3f40f375fbd8dc38c0fee414b2075dc4d portage-2.1-r2.ebuild 7077 SHA256 1a7fd886c4b04bff6cfa34e6d2c11255e87286a0a0ea14da1cac8feeda21a92d portage-2.1-r2.ebuild 7077 -EBUILD portage-2.1.1_rc1-r3.ebuild 5806 RMD160 2082752171c262aec1eafed092495b78c9f1be58 SHA1 b9f3169013c8d6a05906f9735548f4011d24e3b1 SHA256 1db2641e0647b19810193c38bd8a812d7b964798644d1b4bdeb2fac2f0114983 -MD5 d46414545afe54fff944fd0a28cf197f portage-2.1.1_rc1-r3.ebuild 5806 -RMD160 2082752171c262aec1eafed092495b78c9f1be58 portage-2.1.1_rc1-r3.ebuild 5806 -SHA256 1db2641e0647b19810193c38bd8a812d7b964798644d1b4bdeb2fac2f0114983 portage-2.1.1_rc1-r3.ebuild 5806 -EBUILD portage-2.1.1_rc1-r5.ebuild 5871 RMD160 35abcd67584aff476bafd876f77df317e7a67ef6 SHA1 90cbf3b0cb8cd7f3684207a1e8be7e2d0fd1e19b SHA256 50bae73f3d99b26f669adff8795ceb4e83699d39d4d904c0e283c325db56a80f -MD5 bf7243cf7f91b9648459829f433b7fe5 portage-2.1.1_rc1-r5.ebuild 5871 -RMD160 35abcd67584aff476bafd876f77df317e7a67ef6 portage-2.1.1_rc1-r5.ebuild 5871 -SHA256 50bae73f3d99b26f669adff8795ceb4e83699d39d4d904c0e283c325db56a80f portage-2.1.1_rc1-r5.ebuild 5871 EBUILD portage-2.1.1_rc1-r6.ebuild 5806 RMD160 469b3087c7462aad864889428552296a31f0da6b SHA1 e9aa0cd8e904e1aa24c910c442d5bb76e196a39c SHA256 3e65ad529e1ef4183786342dba0957b36699e06fe9361c6626bdb751ceb9d23d MD5 f9731bcfd9cc79dc2cab1fe1986eef55 portage-2.1.1_rc1-r6.ebuild 5806 RMD160 469b3087c7462aad864889428552296a31f0da6b portage-2.1.1_rc1-r6.ebuild 5806 SHA256 3e65ad529e1ef4183786342dba0957b36699e06fe9361c6626bdb751ceb9d23d portage-2.1.1_rc1-r6.ebuild 5806 -MISC ChangeLog 12676 RMD160 d5bf15f712de0a2aad820174da60e6a94f7883f9 SHA1 8ead3320732bed6812bb19600f4f0db9907b175d SHA256 028ed86149b702638c1a6bf544c66d64838df6d4f234cfb946e1858bdbf266ab -MD5 74da60990a21581270ab48f983c6fdc5 ChangeLog 12676 -RMD160 d5bf15f712de0a2aad820174da60e6a94f7883f9 ChangeLog 12676 -SHA256 028ed86149b702638c1a6bf544c66d64838df6d4f234cfb946e1858bdbf266ab ChangeLog 12676 +EBUILD portage-2.1.1_rc1-r7.ebuild 5806 RMD160 dc2b085aa040690353d69624672a22dbecb394da SHA1 de706fde6ca2286bf941f748f506cd8f55349fe5 SHA256 5b26b7eef41d8de848f081b20100757866a893840e062b331bab80247d3852f3 +MD5 87a87e548c1d3f98e24840a14a77cd87 portage-2.1.1_rc1-r7.ebuild 5806 +RMD160 dc2b085aa040690353d69624672a22dbecb394da portage-2.1.1_rc1-r7.ebuild 5806 +SHA256 5b26b7eef41d8de848f081b20100757866a893840e062b331bab80247d3852f3 portage-2.1.1_rc1-r7.ebuild 5806 +MISC ChangeLog 12844 RMD160 63651407c1d38870c42c886c599bac2e155b633c SHA1 8d7daa457cbbe9ebff8748e16b7ef40e610861cf SHA256 bc3a1288a638625a9b35320d0a8debbad6a6b4509fc865b200769abb44d15f28 +MD5 7a49eed2e2a26d04a797333ece9f59bf ChangeLog 12844 +RMD160 63651407c1d38870c42c886c599bac2e155b633c ChangeLog 12844 +SHA256 bc3a1288a638625a9b35320d0a8debbad6a6b4509fc865b200769abb44d15f28 ChangeLog 12844 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219 @@ -68,19 +59,16 @@ SHA256 e494cfdb2648a2b63f87602043fe2a34432e684159ec53347bdc6395a16cf17e files/di MD5 de7e755113f65dd715d1660e1fb0da21 files/digest-portage-2.1-r2 771 RMD160 0579c77c3080d58fc96b4087ab593fb0ea8f24c6 files/digest-portage-2.1-r2 771 SHA256 96af979679274f1696e26b58a1347812f388963a675147aa03bc7acd65a659b5 files/digest-portage-2.1-r2 771 -MD5 ff118cb081b8cf1601aaa1b2cec62f5d files/digest-portage-2.1.1_rc1-r3 1045 -RMD160 d001c6c1b3a517ec23eab55d423b1d8bdfef763d files/digest-portage-2.1.1_rc1-r3 1045 -SHA256 1523c1efbf7766e2c7a492cb9bae4987e3ec6a0dac253a0c39dc132affa25d7c files/digest-portage-2.1.1_rc1-r3 1045 -MD5 5fd3e821757cb73cd86a944fbcb7394d files/digest-portage-2.1.1_rc1-r5 1045 -RMD160 095082c241ab7c08820c4e5c76121842eb605e24 files/digest-portage-2.1.1_rc1-r5 1045 -SHA256 9f1e652e4277abcc8c3279be46efccee4451ee351d1c494c7b9d74bfa7f1703e files/digest-portage-2.1.1_rc1-r5 1045 MD5 bffa24236cd1af298ade3988a81220eb files/digest-portage-2.1.1_rc1-r6 1045 RMD160 89d608a189433380b5250334f060ad1a0399a99b files/digest-portage-2.1.1_rc1-r6 1045 SHA256 37c04363cd4c685df05362f3a15495d806634e6a3c3d5381b1ad5dfe2fb01e54 files/digest-portage-2.1.1_rc1-r6 1045 +MD5 462a21446ecbb08ad92acaeab6f27834 files/digest-portage-2.1.1_rc1-r7 1045 +RMD160 24751c26766cfa638e51695282d21f23f8868745 files/digest-portage-2.1.1_rc1-r7 1045 +SHA256 c09d58c4172e789b65c5ab14c25a670fe5db6ea6b3a40d2566465d2547f6ab13 files/digest-portage-2.1.1_rc1-r7 1045 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFE/zrb/ejvha5XGaMRAhu9AJ9z9kOLEgCvn0MBbg8ZEm/zjNLjoQCgpQXO -ar+NTAzakazf3/QCVvWubNw= -=e0sX +iD8DBQFFAFwk/ejvha5XGaMRAkaXAJ9rVqd8BPufXM0YaWXr4YLnL/Si9gCfUtcf +klX15arngLj61ZUcZ3Nnekg= +=60a0 -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/2.1.1_rc1-r5-repoman.patch b/sys-apps/portage/files/2.1.1_rc1-r5-repoman.patch deleted file mode 100644 index b20b9d000011..000000000000 --- a/sys-apps/portage/files/2.1.1_rc1-r5-repoman.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: bin/repoman -=================================================================== ---- bin/repoman (revision 4413) -+++ bin/repoman (revision 4415) -@@ -1130,14 +1130,21 @@ - config_profile_path=profdir, - config_incrementals=portage_const.INCREMENTALS) - arch_caches[prof[0]] = dep_settings -+ while True: -+ try: -+ # Protect ACCEPT_KEYWORDS from config.regenerate() -+ # (just in case) -+ dep_settings.incrementals.remove("ACCEPT_KEYWORDS") -+ except ValueError: -+ break - - trees["/"]["porttree"].settings = dep_settings - portdb.mysettings = dep_settings -+ # for package.use.mask support inside dep_check -+ dep_settings.setcpv("/".join((catdir, y))) - dep_settings["ACCEPT_KEYWORDS"] = " ".join(groups) - # just in case, prevent config.reset() from nuking these. - dep_settings.backup_changes("ACCEPT_KEYWORDS") -- # for package.use.mask support inside dep_check -- dep_settings.setcpv("/".join((catdir, y))) - - for myprovide in myaux["PROVIDE"].split(): - prov_cp = portage.dep_getkey(myprovide) diff --git a/sys-apps/portage/files/digest-portage-2.1.1_rc1-r3 b/sys-apps/portage/files/digest-portage-2.1.1_rc1-r3 deleted file mode 100644 index 4faf2c952e10..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1.1_rc1-r3 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 283b65a51b36b23409f933cdcdcb7e45 portage-2.1.1_rc1-r3.patch.bz2 4394 -RMD160 3b0949cf71204141e04bc75483ff2bd29341b288 portage-2.1.1_rc1-r3.patch.bz2 4394 -SHA256 82c552476efd6f22245c4771f0f1b4468c9d29fb807ba10364e576daeee005f9 portage-2.1.1_rc1-r3.patch.bz2 4394 -MD5 ad76c9fb311fd603e7c3c75f7d5b09c0 portage-2.1.1_rc1.tar.bz2 295029 -RMD160 5c1f8b9bd56843b5248d0be33b702008f9284695 portage-2.1.1_rc1.tar.bz2 295029 -SHA256 d29a6adcb6684c965bfec91796aedbd7ab0cf2bb05794eb1acb79a5408cef95d portage-2.1.1_rc1.tar.bz2 295029 -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/files/digest-portage-2.1.1_rc1-r5 b/sys-apps/portage/files/digest-portage-2.1.1_rc1-r5 deleted file mode 100644 index 6e406a513917..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1.1_rc1-r5 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 257bb7addbfaa93b697a7a305466b334 portage-2.1.1_rc1-r4.patch.bz2 5553 -RMD160 49f92e226dd1e1c6179fa2d04f359bb4b7e00665 portage-2.1.1_rc1-r4.patch.bz2 5553 -SHA256 1dc0cab729ca61e4d5f994a1a848379a3e690b161b600320a8a586a51e7e58b2 portage-2.1.1_rc1-r4.patch.bz2 5553 -MD5 ad76c9fb311fd603e7c3c75f7d5b09c0 portage-2.1.1_rc1.tar.bz2 295029 -RMD160 5c1f8b9bd56843b5248d0be33b702008f9284695 portage-2.1.1_rc1.tar.bz2 295029 -SHA256 d29a6adcb6684c965bfec91796aedbd7ab0cf2bb05794eb1acb79a5408cef95d portage-2.1.1_rc1.tar.bz2 295029 -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_rc1-r3.ebuild b/sys-apps/portage/portage-2.1.1_rc1-r3.ebuild deleted file mode 100644 index 2b0a1066e2fd..000000000000 --- a/sys-apps/portage/portage-2.1.1_rc1-r3.ebuild +++ /dev/null @@ -1,200 +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_rc1-r3.ebuild,v 1.1 2006/09/03 21:57:13 zmedico Exp $ - -inherit toolchain-funcs eutils flag-o-matic - -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}" != "r0" ] && 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" - 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() { - append-lfs-flags - - 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 -} diff --git a/sys-apps/portage/portage-2.1.1_rc1-r5.ebuild b/sys-apps/portage/portage-2.1.1_rc1-r5.ebuild deleted file mode 100644 index 15cb732fa4d5..000000000000 --- a/sys-apps/portage/portage-2.1.1_rc1-r5.ebuild +++ /dev/null @@ -1,202 +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_rc1-r5.ebuild,v 1.1 2006/09/06 07:54:37 zmedico Exp $ - -inherit toolchain-funcs eutils flag-o-matic - -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}" != "r0" ] && PATCHVER="-${PR}" -PATCHVER="-r4" -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_rc1-r5-repoman.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() { - append-lfs-flags - - 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 -} -- 2.26.2