# ChangeLog for sys-apps/portage
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.361 2007/03/03 12:28:19 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.362 2007/03/04 03:10:14 zmedico Exp $
+
+*portage-2.1.2.1 (04 Mar 2007)
+
+ 04 Mar 2007; Zac Medico <zmedico@gentoo.org> +portage-2.1.2.1.ebuild:
+ 2.1.2.1 release. This fixes bug #169187. Bug #167107 tracks fixes
+ since 2.1.2-r9.
*portage-2.1.2-r14 (03 Mar 2007)
DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe SHA1 16459ce2b19592c94ec580bcfade5a89750a62fb SHA256 f0dac4366b5234b084645bbbd6b871a5abe05d501cf868046af2777e02a4100c
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-r13.patch.bz2 31882 RMD160 758af8d310a94028b3761301d92e48683e629d14 SHA1 50e75a5571130fdb9f9ea3862e52379d3942fd6f SHA256 d9d934b280680ab84c220844faff7995a341d88ebe8bb02c56bba0b40c01f4d6
-DIST portage-2.1.2-r14.patch.bz2 35100 RMD160 1bfe20078ccef6a0d7f8c4653c5d9c14d2d1e979 SHA1 19e0fd479b616336d7d13fa216d08ab1f5e720fc SHA256 78c4e15fb49ee1871d3a90b7ab9d2104ec87609a89c2bedd756ce7a7ecc0b48f
DIST portage-2.1.2-r9.patch.bz2 20357 RMD160 bae73f052e413a71328865083ce46923de46d9fd SHA1 d5a07fc92791c2d69c8614de5413659803aa9e5d SHA256 73080e708293a1df5419567c1d9cd143922ca7806070e54b3adce29fe14937e3
+DIST portage-2.1.2.1.patch.bz2 36104 RMD160 97d0f19e0a53c9b73bc052bb976be6109492e21c SHA1 fb0cde80e9958d8dd397714dd7d94f851f663d8a SHA256 2558751de2b4b054a83149d722a14f6dc6e20f0ce4a3e48bf76de42893297dc7
DIST portage-2.1.2.tar.bz2 311900 RMD160 75da869c02e3574babc2f40e07b18686f384cf99 SHA1 72980508e881d837e78b9309d53dba62ef76c247 SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008
DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
MD5 45a27b243a84ea96fd2eca5de47beb61 portage-2.1.1-r2.ebuild 7223
RMD160 47f9d8c0f9a4d5860fff8c8aac8a589816e5ac11 portage-2.1.1-r2.ebuild 7223
SHA256 f113b16b9e7ac6756ab75a99057b7a956de7c2d90dc681df6f41ee87518e06ba portage-2.1.1-r2.ebuild 7223
-EBUILD portage-2.1.2-r13.ebuild 7045 RMD160 9e57daa681c8a793689e4d372ccfc06216085f77 SHA1 df0f2402a4fbf38e1c017d161f0f48515cdb7fc5 SHA256 b9f0fe32b69dc5616d5d63d97220e0a09b9d44e153db48a552bf12607d163eaa
-MD5 abf26fa6d8bf46e704134cbe1c1c7ebc portage-2.1.2-r13.ebuild 7045
-RMD160 9e57daa681c8a793689e4d372ccfc06216085f77 portage-2.1.2-r13.ebuild 7045
-SHA256 b9f0fe32b69dc5616d5d63d97220e0a09b9d44e153db48a552bf12607d163eaa portage-2.1.2-r13.ebuild 7045
-EBUILD portage-2.1.2-r14.ebuild 7045 RMD160 e32047c6b83bdcd80bc1d343cf3bded7dc6b33cb SHA1 50887ff7d44047e374bb4da9466716a9d8083142 SHA256 cbe535ed268e4e21d84f529ad65ef8a695dcb8dfde1896f78004f0acc2f03a76
-MD5 3e9c3804213ce2abd1d03895abdc75cf portage-2.1.2-r14.ebuild 7045
-RMD160 e32047c6b83bdcd80bc1d343cf3bded7dc6b33cb portage-2.1.2-r14.ebuild 7045
-SHA256 cbe535ed268e4e21d84f529ad65ef8a695dcb8dfde1896f78004f0acc2f03a76 portage-2.1.2-r14.ebuild 7045
EBUILD portage-2.1.2-r9.ebuild 6926 RMD160 7e76724ca5b6c91df87001c46da9caa354f21a70 SHA1 8efc1afb2ba3b527551869ed4d59829e9bdcc4b4 SHA256 2aeb3be0f96a07f4e30f33f701f8dc77914c113215719de3498437dc6d3b0431
MD5 5d2f5123b0e9b00f81cf6b0c226f76ef portage-2.1.2-r9.ebuild 6926
RMD160 7e76724ca5b6c91df87001c46da9caa354f21a70 portage-2.1.2-r9.ebuild 6926
SHA256 2aeb3be0f96a07f4e30f33f701f8dc77914c113215719de3498437dc6d3b0431 portage-2.1.2-r9.ebuild 6926
-MISC ChangeLog 19231 RMD160 bb5a02a17b3a218489894b1bd60c56cea5ab487c SHA1 56dee2cad8a9089aea4359d95efcaee271af5821 SHA256 3785635e627d9d2918bcac1af629ee52a2f83dbd6fac227a89ea144a38da1f75
-MD5 6ac903f475944d9663ec139d6fa9bfc2 ChangeLog 19231
-RMD160 bb5a02a17b3a218489894b1bd60c56cea5ab487c ChangeLog 19231
-SHA256 3785635e627d9d2918bcac1af629ee52a2f83dbd6fac227a89ea144a38da1f75 ChangeLog 19231
+EBUILD portage-2.1.2.1.ebuild 6961 RMD160 84643bed7aefdf842d305c032c4caf320eb6aa2b SHA1 a3395b8238bd2df48621ec957e930d0a9ea364fd SHA256 2accb2887b877bbba458e860026fd6bbfb8573c4f7fe2492a777da92e834fa57
+MD5 7bd463df2a8539a97ccb807bf3e66051 portage-2.1.2.1.ebuild 6961
+RMD160 84643bed7aefdf842d305c032c4caf320eb6aa2b portage-2.1.2.1.ebuild 6961
+SHA256 2accb2887b877bbba458e860026fd6bbfb8573c4f7fe2492a777da92e834fa57 portage-2.1.2.1.ebuild 6961
+MISC ChangeLog 19424 RMD160 15397a04818f7d3b7bd3e5c3186c81c6e8ca95e2 SHA1 8bddabfbbafa93703a80afbd54f31a9c72605569 SHA256 910eb4517fcd8b05391606d40f0e6ba0389c92ca7d6e310164d6bbb3a1c20253
+MD5 c5592ca81a848ce1974fb980ab5b4443 ChangeLog 19424
+RMD160 15397a04818f7d3b7bd3e5c3186c81c6e8ca95e2 ChangeLog 19424
+SHA256 910eb4517fcd8b05391606d40f0e6ba0389c92ca7d6e310164d6bbb3a1c20253 ChangeLog 19424
MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
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 714beaadffa1e189cab1868384320846 files/digest-portage-2.1.2-r13 765
-RMD160 6d37cbe990969bb6c5d1a5c68b6543ac35649f56 files/digest-portage-2.1.2-r13 765
-SHA256 bc70dba9b6e62893cde3e2d380438db6cbec9edd0ade6ec59b020bc8ed56ebaf files/digest-portage-2.1.2-r13 765
-MD5 f7d02987039e2682b2d5401db8b0c940 files/digest-portage-2.1.2-r14 765
-RMD160 62ee6325d2610db50dafcb8f666e6072ec9e1693 files/digest-portage-2.1.2-r14 765
-SHA256 8c51ecdb326c87bf64562d851b859d224cc9c905624b77ac2188e998f188a381 files/digest-portage-2.1.2-r14 765
MD5 c8470f45ecc797cf3d11955e8f289f27 files/digest-portage-2.1.2-r9 762
RMD160 a8ddfbbe84d19146aeca5f44c6996c9d5b6fe476 files/digest-portage-2.1.2-r9 762
SHA256 c5dca1f067e2d2e51ede6a1a1fea63510256018bc286401be1f55f9d2307bfa0 files/digest-portage-2.1.2-r9 762
+MD5 c33e1ca0a2b3f94add467f3d34e46461 files/digest-portage-2.1.2.1 759
+RMD160 7cd9b8e7263cebc7d8644bad2de694435d327435 files/digest-portage-2.1.2.1 759
+SHA256 047d82b57ba0724451914a883bbd8128829cf20371dae92ce1437c8646a05611 files/digest-portage-2.1.2.1 759
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.2 (GNU/Linux)
-iD8DBQFF6Wno/ejvha5XGaMRAp78AKChD0n5+dRmQCbzP3j16b7GKaTWFQCeMLOH
-xJtkHIVU4Pp8tPlh4jkeMfA=
-=jUX9
+iD8DBQFF6jib/ejvha5XGaMRAmQUAKCiUZwuf9HiQ9KugJQx7v/Rs6CAJgCfbzgi
+nnQ+AuTBmR0VkuutkqMZJ6U=
+=Nfud
-----END PGP SIGNATURE-----
+++ /dev/null
-MD5 e81067dc7ed67e68597010599576549f portage-2.1.2-r14.patch.bz2 35100
-RMD160 1bfe20078ccef6a0d7f8c4653c5d9c14d2d1e979 portage-2.1.2-r14.patch.bz2 35100
-SHA256 78c4e15fb49ee1871d3a90b7ab9d2104ec87609a89c2bedd756ce7a7ecc0b48f portage-2.1.2-r14.patch.bz2 35100
-MD5 74c705793edb37ac2fb1d3b2e06c689d portage-2.1.2.tar.bz2 311900
-RMD160 75da869c02e3574babc2f40e07b18686f384cf99 portage-2.1.2.tar.bz2 311900
-SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008 portage-2.1.2.tar.bz2 311900
-MD5 6409f79dd5efe7922dd8fa36340c4912 portage-man-pl-2.1.2.tar.bz2 53893
-RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c portage-man-pl-2.1.2.tar.bz2 53893
-SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f portage-man-pl-2.1.2.tar.bz2 53893
-MD5 aaff8c67df0aadb6e0cb7b1ad12e9f5d portage-2.1.2-r13.patch.bz2 31882
-RMD160 758af8d310a94028b3761301d92e48683e629d14 portage-2.1.2-r13.patch.bz2 31882
-SHA256 d9d934b280680ab84c220844faff7995a341d88ebe8bb02c56bba0b40c01f4d6 portage-2.1.2-r13.patch.bz2 31882
+MD5 3e0503db6688bd75a842fbce7586d292 portage-2.1.2.1.patch.bz2 36104
+RMD160 97d0f19e0a53c9b73bc052bb976be6109492e21c portage-2.1.2.1.patch.bz2 36104
+SHA256 2558751de2b4b054a83149d722a14f6dc6e20f0ce4a3e48bf76de42893297dc7 portage-2.1.2.1.patch.bz2 36104
MD5 74c705793edb37ac2fb1d3b2e06c689d portage-2.1.2.tar.bz2 311900
RMD160 75da869c02e3574babc2f40e07b18686f384cf99 portage-2.1.2.tar.bz2 311900
SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008 portage-2.1.2.tar.bz2 311900
+++ /dev/null
-# Copyright 1999-2007 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-r14.ebuild,v 1.1 2007/03/03 12:28:19 zmedico Exp $
-
-inherit toolchain-funcs eutils flag-o-matic multilib
-
-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 ~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 )
- userland_GNU? ( !selinux? ( >=sys-apps/coreutils-6.4 ) )
- selinux? ( >=dev-python/python-selinux-2.16 )
- doc? ( app-portage/portage-manpages )
- >=dev-python/pycrypto-2.0.1-r5"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-PV_PL="2.1.2"
-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
- einfo "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
- einfo "Generating api docs"
- 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_test() {
- ./tests/runTests || \
- die "test(s) failed"
-}
-
-src_install() {
- local libdir=$(get_libdir)
- local portage_base="/usr/${libdir}/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 ../${libdir}/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 ../${libdir}/portage/bin/${x} /usr/sbin/${x}
- done
-
- dodir /etc/portage
- keepdir /etc/portage
-
- echo PYTHONPATH=\"${portage_base}/pym\" > "${WORKDIR}"/05portage.envd
- doenvd "${WORKDIR}"/05portage.envd
-}
-
-pkg_preinst() {
- local portage_base="/usr/$(get_libdir)/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."
- echo
- elog "See NEWS and RELEASE-NOTES for further changes."
- echo
- portage_docs
-}
# Copyright 1999-2007 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-r13.ebuild,v 1.1 2007/03/02 08:22:42 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2.1.ebuild,v 1.1 2007/03/04 03:10:14 zmedico Exp $
inherit toolchain-funcs eutils flag-o-matic multilib
PV_PL="2.1.2"
PATCHVER_PL=""
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
- ${SRC_ARCHIVES}/${PN}-${PV}.tar.bz2
+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=${PV}
if [ -n "${PATCHVER}" ]; then
- SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2
- ${SRC_ARCHIVES}/${PN}-${PV}${PATCHVER}.patch.bz2"
+ SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
+ ${SRC_ARCHIVES}/${PN}-${PATCHVER}.patch.bz2"
fi
if [ -n "${PATCHVER_PL}" ]; then
${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2 )"
fi
-S="${WORKDIR}"/${PN}-${PV}
+S="${WORKDIR}"/${PN}-${PV%.*}
S_PL="${WORKDIR}"/${PN}-${PV_PL}
portage_docs() {
cd "${S}"
if [ -n "${PATCHVER}" ]; then
cd "${S}"
- epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
- fi
- if [ "${PR}" != "r0" ]; then
- einfo "Setting portage.VERSION to ${PVR} ..."
- sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
- die "Failed to patch portage.VERSION"
- eend 0
+ epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
fi
+ einfo "Setting portage.VERSION to ${PVR} ..."
+ sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
+ die "Failed to patch portage.VERSION"
+ eend 0
if [ -n "${PATCHVER_PL}" ]; then
use linguas_pl && \
epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch"
projects / gentoo.git / commitdiff