From: Zac Medico Date: Mon, 20 Nov 2006 14:34:18 +0000 (+0000) Subject: 2.1.2_rc2-r1 revbump. This fixes bugs #155559 and #155739. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=83222a00627877ef9b52abc6077a3b3794aab408;p=gentoo.git 2.1.2_rc2-r1 revbump. This fixes bugs #155559 and #155739. Package-Manager: portage-2.1.2_rc2-r1 --- diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 28ab0860aecc..24e4cafc37a1 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -18,9 +18,7 @@ DIST portage-2.1-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d DIST portage-2.1.1-r1.patch.bz2 4200 RMD160 e8c003983b1711e296774025f12f01463ed5e4d9 SHA1 9471d5412ef205e452dac985da3871346800c1cc SHA256 eee5bcc98558ca5300fa1f8dc37135c6ff73f4cd52b985218a30846176ad53f1 DIST portage-2.1.1-r2.patch.bz2 5263 RMD160 6b749c6700784ea1ecc615b7b3ed39eade28e489 SHA1 4eaedfedf867346d67744d95d5cb3ad5b0da4417 SHA256 4d2bc33b66c6354f008d798507137a347e35ef7448a10ef17e5108160acb0414 DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 SHA1 6fdcb9897cef7f48d98829ab96caf37e31bd14a2 SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389 -DIST portage-2.1.2_rc1-r6.patch.bz2 18716 RMD160 cb4c19dffddffeddaf526977e32c1ca3eb2075b6 SHA1 ff71da046f18a977ee8e99412444f8a2b8a50f53 SHA256 ea76596e268d0801104256f71dddc0bf7ef902bcdd67ca7f6739ecece3ed5a39 -DIST portage-2.1.2_rc1-r7.patch.bz2 25597 RMD160 c2c16e29aa9329b46b94e90b209d9246b9cac99c SHA1 56ac37e05a0c4b410677c534295706c499abad5b SHA256 46f2910c04688f4b574a5233560e80f619ff6988595e759d4c980fae3ffda231 -DIST portage-2.1.2_rc1.tar.bz2 313134 RMD160 b154c7994e12843f8dae4ddf2198636ce7d79e08 SHA1 17f6dfb1f01eb53a3d2046dc518373d2a1472bed SHA256 9a4ed0ac303a34e62b288424be26de47b56a48cd5cc9ce9c19d54dae2a85dc33 +DIST portage-2.1.2_rc2-r1.patch.bz2 4985 RMD160 331b6bbb160c54df26938b55cbb8a027b3ce5c42 SHA1 ffde9c685baded38a1016fd57a979c42a04fde46 SHA256 c8341e761a2eacd6776f9ad346cd3f6b7b47ce3f330ad7c649ff7a30d3408f79 DIST portage-2.1.2_rc2.tar.bz2 322321 RMD160 bb7db9529c3a86dd03b708f8fb498c11a55ded03 SHA1 d521fe93e7e39fa119fc3074ec926cc01ae79e7b SHA256 64345d0f836225be932e23bfcb9d3a253853067e9f0c842807a7ba2d9c31f0f1 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b DIST portage-man-pl-2.1.2_rc1.tar.bz2 53030 RMD160 9ed9037256f3eba59600028f2d8f78792a33383a SHA1 a511121897609bd5a261981fcc7f6789eb1deaaf SHA256 1d03dbfab182397a9fd739604ab526b644e07b9de397f029ea3e7f6969ed1e5a @@ -41,26 +39,18 @@ EBUILD portage-2.1.1-r2.ebuild 7234 RMD160 7516a62adb99ae3e88d6db389cccee1efca3b MD5 c583bfb1e33476953f90a66ab2557c53 portage-2.1.1-r2.ebuild 7234 RMD160 7516a62adb99ae3e88d6db389cccee1efca3b532 portage-2.1.1-r2.ebuild 7234 SHA256 2e517ceee2ec5a426effa4716c2e95b22db3acc62faab3fd637b78498634ef61 portage-2.1.1-r2.ebuild 7234 -EBUILD portage-2.1.1.ebuild 6243 RMD160 fe9e3907df7d62b778134ffb417615fdf00d506a SHA1 32016317a9f6bf814c477322ad88ca600b9b3ad6 SHA256 7875f1597c5e75c333ba3323b3ebea38a255426d447aa57cc6c95fd9da30756c -MD5 02773f7cafb9bbb12339af7f5107de87 portage-2.1.1.ebuild 6243 -RMD160 fe9e3907df7d62b778134ffb417615fdf00d506a portage-2.1.1.ebuild 6243 -SHA256 7875f1597c5e75c333ba3323b3ebea38a255426d447aa57cc6c95fd9da30756c portage-2.1.1.ebuild 6243 -EBUILD portage-2.1.2_rc1-r6.ebuild 6643 RMD160 34fdf60ef8475c59b343091aa05f1a8a32d6e32e SHA1 d085f228833fe41f41e8dcd8ad7a354e8df51b80 SHA256 a23e982205c52fc2c2dc22425f8c32df94e7b5ca90b1ff839e1f61960f3320f7 -MD5 760a7342a94940d6ae68aee2648f5936 portage-2.1.2_rc1-r6.ebuild 6643 -RMD160 34fdf60ef8475c59b343091aa05f1a8a32d6e32e portage-2.1.2_rc1-r6.ebuild 6643 -SHA256 a23e982205c52fc2c2dc22425f8c32df94e7b5ca90b1ff839e1f61960f3320f7 portage-2.1.2_rc1-r6.ebuild 6643 -EBUILD portage-2.1.2_rc1-r7.ebuild 6643 RMD160 dfb5dbdbd8cdbf9962a112fb2f80d26e95841b1d SHA1 28b41c80ec554948e0e81fd4862d1d13d314d452 SHA256 2807f63d60c6d703af0a9b1b6c4e160e233ce4bc80144033a644fe4743f96626 -MD5 acb24c2d79ad62ff1bb0b12ebeb833b1 portage-2.1.2_rc1-r7.ebuild 6643 -RMD160 dfb5dbdbd8cdbf9962a112fb2f80d26e95841b1d portage-2.1.2_rc1-r7.ebuild 6643 -SHA256 2807f63d60c6d703af0a9b1b6c4e160e233ce4bc80144033a644fe4743f96626 portage-2.1.2_rc1-r7.ebuild 6643 +EBUILD portage-2.1.2_rc2-r1.ebuild 7699 RMD160 41850c06b13c8b4f5357860125b17ee2fb7e10d7 SHA1 bec00a6086bc0a9dee9d143f24594b5c06763472 SHA256 93a7301b2d43101134836f16bf0afaa83e0505ab1ca45fdf9e6045b9beafb075 +MD5 fa885d0cfe1f163974190850105eaadf portage-2.1.2_rc2-r1.ebuild 7699 +RMD160 41850c06b13c8b4f5357860125b17ee2fb7e10d7 portage-2.1.2_rc2-r1.ebuild 7699 +SHA256 93a7301b2d43101134836f16bf0afaa83e0505ab1ca45fdf9e6045b9beafb075 portage-2.1.2_rc2-r1.ebuild 7699 EBUILD portage-2.1.2_rc2.ebuild 7696 RMD160 7e9e15263e1aa4b98b28a436cce8e532fa21e921 SHA1 3dbe35322adc7b0075651656eedeea7b8b7727b3 SHA256 b67737d8c7af0945cb0ffa7c795b6c55de8392143c558e1b08ad18f9fdf9d6a7 MD5 b0850048c5dc86631909900f0c0ba984 portage-2.1.2_rc2.ebuild 7696 RMD160 7e9e15263e1aa4b98b28a436cce8e532fa21e921 portage-2.1.2_rc2.ebuild 7696 SHA256 b67737d8c7af0945cb0ffa7c795b6c55de8392143c558e1b08ad18f9fdf9d6a7 portage-2.1.2_rc2.ebuild 7696 -MISC ChangeLog 19400 RMD160 e24dbcaf3bea1334c1c565022c0c069bf81277aa SHA1 f9f805ae945fb7af7c7c730bf90512b69b334543 SHA256 5514130098e20d2cf6b127e5e46abae4746c6221ac9b83ebd0fe1e623f9d3bdf -MD5 affdc48857a15a92fbf4c6b7b4dc2a07 ChangeLog 19400 -RMD160 e24dbcaf3bea1334c1c565022c0c069bf81277aa ChangeLog 19400 -SHA256 5514130098e20d2cf6b127e5e46abae4746c6221ac9b83ebd0fe1e623f9d3bdf ChangeLog 19400 +MISC ChangeLog 19577 RMD160 25c8993b2090203fd507b47707d9b5de3913edc4 SHA1 6ca9c569bed4b0b2b0a9b842d9b3434fef012482 SHA256 10f640d372f376ce1b802b29b16cf1fdc8bec79cc980dd202e427615064e585e +MD5 b4284a4872cdc57ac6e854c5dd213d54 ChangeLog 19577 +RMD160 25c8993b2090203fd507b47707d9b5de3913edc4 ChangeLog 19577 +SHA256 10f640d372f376ce1b802b29b16cf1fdc8bec79cc980dd202e427615064e585e ChangeLog 19577 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282 @@ -71,28 +61,22 @@ SHA256 ffe8e80d9f9a07f59b1ec992dc0e0c20aee41408302d64ffa0e2ef72deaf1686 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 0fbe2417c7f1a659d5f998bff6513a58 files/digest-portage-2.1.1 768 -RMD160 c42c75fd9111f0a9329ad0de9d63352f764527ed files/digest-portage-2.1.1 768 -SHA256 54848742dff9ea07bf01d3fc8988a31a868faf590b33982ef6f3f81f87c97e0c files/digest-portage-2.1.1 768 MD5 84cc321543f8146e88db8ed6060d554f files/digest-portage-2.1.1-r1 1021 RMD160 6b1ee9d511161b46d6b844985a27a9e57fd48898 files/digest-portage-2.1.1-r1 1021 SHA256 21f118dacba4951bac7c5e575c03cc09ead96ecaf45892cb963bba2fcd3d1d6d files/digest-portage-2.1.1-r1 1021 MD5 3add5888d02ad00946eb670f1d6eff5c files/digest-portage-2.1.1-r2 1021 RMD160 082589ba69cde6b349a156722316ba10bdcfe0cd files/digest-portage-2.1.1-r2 1021 SHA256 1dbfd88dcf8f81cff40287b480099fe80fd5e0a9f0b153e23d7706446c01be22 files/digest-portage-2.1.1-r2 1021 -MD5 b4bc00c97f385b631fe47587dc14698b files/digest-portage-2.1.2_rc1-r6 798 -RMD160 b0e5ae3a2944712efb869cbb2fb0e0f7d9f0d0ca files/digest-portage-2.1.2_rc1-r6 798 -SHA256 c85250868ddc8279506341c2f0dd3b69f02c8b719a2dd7ca48d56e4ca50d5734 files/digest-portage-2.1.2_rc1-r6 798 -MD5 660893b033d177eb4ff1191904b68d84 files/digest-portage-2.1.2_rc1-r7 798 -RMD160 ad29ad42389d467b27d7fa7611b967f1034219ef files/digest-portage-2.1.2_rc1-r7 798 -SHA256 56a1558c4b904c96409af835fe52c8c30ddfbbf59a0165f35083ea84c85f78fe files/digest-portage-2.1.2_rc1-r7 798 MD5 d519de49473722cf0e0d247df111c824 files/digest-portage-2.1.2_rc2 530 RMD160 33cdb9874578a770ddec6c82328ed51287e2f968 files/digest-portage-2.1.2_rc2 530 SHA256 d1b58c413f8901630d19365c5d02ef2fda1690c6abe6a66acfaaa55009f3dbf0 files/digest-portage-2.1.2_rc2 530 +MD5 40630be18e779efddce1ceed2fc714f5 files/digest-portage-2.1.2_rc2-r1 795 +RMD160 3864c2fd4b21288c42906179caddadfa0df327d3 files/digest-portage-2.1.2_rc2-r1 795 +SHA256 1e6a7e6dcdc3e9a2143fa2bcdd8f9b9e51dcc1698f8115aac830c98dbf5c7809 files/digest-portage-2.1.2_rc2-r1 795 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFXnP9/ejvha5XGaMRAq5fAJ9gR0BiR6ZlLf/MCkm/q5lys2FIdgCfRTx8 -gVonqYrbCAdaz7U8QK5ayto= -=tEIK +iD8DBQFFYbzj/ejvha5XGaMRAsQNAKDw3kwqzPLyDeK4COIBS9cYOvdaZwCfWYho +UQ4qeMt3ldaEug0lPjvWjyU= +=gvDW -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.1.1 b/sys-apps/portage/files/digest-portage-2.1.1 deleted file mode 100644 index e53893e02471..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1.1 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 5afb06072243013945e8e5bf91ef507f portage-2.1.1.tar.bz2 297006 -RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 portage-2.1.1.tar.bz2 297006 -SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389 portage-2.1.1.tar.bz2 297006 -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.2_rc1-r6 b/sys-apps/portage/files/digest-portage-2.1.2_rc1-r6 deleted file mode 100644 index 1d0752055281..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1.2_rc1-r6 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 a5f942f14d2873e6ec84211953bd0849 portage-2.1.2_rc1-r6.patch.bz2 18716 -RMD160 cb4c19dffddffeddaf526977e32c1ca3eb2075b6 portage-2.1.2_rc1-r6.patch.bz2 18716 -SHA256 ea76596e268d0801104256f71dddc0bf7ef902bcdd67ca7f6739ecece3ed5a39 portage-2.1.2_rc1-r6.patch.bz2 18716 -MD5 218eb9853085ed02f389e73258e7422e portage-2.1.2_rc1.tar.bz2 313134 -RMD160 b154c7994e12843f8dae4ddf2198636ce7d79e08 portage-2.1.2_rc1.tar.bz2 313134 -SHA256 9a4ed0ac303a34e62b288424be26de47b56a48cd5cc9ce9c19d54dae2a85dc33 portage-2.1.2_rc1.tar.bz2 313134 -MD5 624d18249325e364c13dc7ef7647f986 portage-man-pl-2.1.2_rc1.tar.bz2 53030 -RMD160 9ed9037256f3eba59600028f2d8f78792a33383a portage-man-pl-2.1.2_rc1.tar.bz2 53030 -SHA256 1d03dbfab182397a9fd739604ab526b644e07b9de397f029ea3e7f6969ed1e5a portage-man-pl-2.1.2_rc1.tar.bz2 53030 diff --git a/sys-apps/portage/files/digest-portage-2.1.2_rc1-r7 b/sys-apps/portage/files/digest-portage-2.1.2_rc1-r7 deleted file mode 100644 index ec9cf2dbba20..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1.2_rc1-r7 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 8db5ca4968272b23a28ecefc6296ba19 portage-2.1.2_rc1-r7.patch.bz2 25597 -RMD160 c2c16e29aa9329b46b94e90b209d9246b9cac99c portage-2.1.2_rc1-r7.patch.bz2 25597 -SHA256 46f2910c04688f4b574a5233560e80f619ff6988595e759d4c980fae3ffda231 portage-2.1.2_rc1-r7.patch.bz2 25597 -MD5 218eb9853085ed02f389e73258e7422e portage-2.1.2_rc1.tar.bz2 313134 -RMD160 b154c7994e12843f8dae4ddf2198636ce7d79e08 portage-2.1.2_rc1.tar.bz2 313134 -SHA256 9a4ed0ac303a34e62b288424be26de47b56a48cd5cc9ce9c19d54dae2a85dc33 portage-2.1.2_rc1.tar.bz2 313134 -MD5 624d18249325e364c13dc7ef7647f986 portage-man-pl-2.1.2_rc1.tar.bz2 53030 -RMD160 9ed9037256f3eba59600028f2d8f78792a33383a portage-man-pl-2.1.2_rc1.tar.bz2 53030 -SHA256 1d03dbfab182397a9fd739604ab526b644e07b9de397f029ea3e7f6969ed1e5a portage-man-pl-2.1.2_rc1.tar.bz2 53030 diff --git a/sys-apps/portage/portage-2.1.1.ebuild b/sys-apps/portage/portage-2.1.1.ebuild deleted file mode 100644 index 200301adc27b..000000000000 --- a/sys-apps/portage/portage-2.1.1.ebuild +++ /dev/null @@ -1,208 +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.ebuild,v 1.11 2006/11/02 23:59:06 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-1.2.17 ) - elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 ) - !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 - - ewarn "In portage-2.1.1, emerge --newuse is now sensitive to changes in IUSE." - ewarn "Immediately after upgrade from 2.1, users may notice a significantly larger" - ewarn "number of packages pulled in by --newuse, but that behavior is normal." - ewarn "For additional information regarding this change, please see bugs #116955," - ewarn "#144333, #144661, and #146060." - echo - elog "See NEWS and RELEASE-NOTES for further changes." - echo - portage_docs -} diff --git a/sys-apps/portage/portage-2.1.2_rc1-r6.ebuild b/sys-apps/portage/portage-2.1.2_rc1-r6.ebuild deleted file mode 100644 index 17228d215d09..000000000000 --- a/sys-apps/portage/portage-2.1.2_rc1-r6.ebuild +++ /dev/null @@ -1,217 +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.2_rc1-r6.ebuild,v 1.1 2006/11/12 01:57:33 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 ~sparc-fbsd ~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 epydoc selinux linguas_pl ${IUSE_ELIBC} ${IUSE_USERLAND}" -DEPEND=">=dev-lang/python-2.3 - !build? ( >=sys-apps/sed-4.0.5 ) - epydoc? ( >=dev-python/epydoc-2.0 )" -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-1.2.17 ) - elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 ) - !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.2_rc1" -PATCHVER_PL="" -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 - - if use epydoc; then - mkdir "${WORKDIR}"/api - local my_modules - my_modules="$(find "${S}/pym" -name "*.py" \ - | sed -e 's:.*__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ - -e 's:/:.:g')" || die "error listing modules" - PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \ - -qqqqq --ignore-param-mismatch ${my_modules} || die "epydoc failed" - 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 - use epydoc && dohtml -r "${WORKDIR}"/api - - 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 bin 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 "In portage-2.1.2, installation actions do not necessarily pull in build time" - ewarn "dependencies that are not strictly required. This behavior is adjustable" - ewarn "via the new --with-bdeps option that is documented in the emerge(1) man page." - ewarn "For more information regarding this change, please refer to bug #148870." - - portage_docs -} diff --git a/sys-apps/portage/portage-2.1.2_rc1-r7.ebuild b/sys-apps/portage/portage-2.1.2_rc1-r7.ebuild deleted file mode 100644 index d19a8bb7557c..000000000000 --- a/sys-apps/portage/portage-2.1.2_rc1-r7.ebuild +++ /dev/null @@ -1,217 +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.2_rc1-r7.ebuild,v 1.1 2006/11/15 02:40:42 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 ~sparc-fbsd ~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 epydoc selinux linguas_pl ${IUSE_ELIBC} ${IUSE_USERLAND}" -DEPEND=">=dev-lang/python-2.3 - !build? ( >=sys-apps/sed-4.0.5 ) - epydoc? ( >=dev-python/epydoc-2.0 )" -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-1.2.17 ) - elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 ) - !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.2_rc1" -PATCHVER_PL="" -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 - - if use epydoc; then - mkdir "${WORKDIR}"/api - local my_modules - my_modules="$(find "${S}/pym" -name "*.py" \ - | sed -e 's:.*__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ - -e 's:/:.:g')" || die "error listing modules" - PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \ - -qqqqq --ignore-param-mismatch ${my_modules} || die "epydoc failed" - 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 - use epydoc && dohtml -r "${WORKDIR}"/api - - 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 bin 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 "In portage-2.1.2, installation actions do not necessarily pull in build time" - ewarn "dependencies that are not strictly required. This behavior is adjustable" - ewarn "via the new --with-bdeps option that is documented in the emerge(1) man page." - ewarn "For more information regarding this change, please refer to bug #148870." - - portage_docs -}