diff options
| -rw-r--r-- | sys-apps/portage/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/portage/files/digest-portage-2.1_rc3-r5 | 6 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.1_rc3-r5.ebuild | 220 |
3 files changed, 232 insertions, 1 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 40254c40967c..ab9c08091e55 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.163 2006/06/01 10:40:15 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.164 2006/06/02 02:44:36 zmedico Exp $ + +*portage-2.1_rc3-r5 (02 Jun 2006) + + 02 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc3-r5.ebuild: + Revbump to fix bugs #135132 and #135134. *portage-2.1_rc3-r4 (01 Jun 2006) diff --git a/sys-apps/portage/files/digest-portage-2.1_rc3-r5 b/sys-apps/portage/files/digest-portage-2.1_rc3-r5 new file mode 100644 index 000000000000..de75b4bd7db7 --- /dev/null +++ b/sys-apps/portage/files/digest-portage-2.1_rc3-r5 @@ -0,0 +1,6 @@ +MD5 df8351e6b283ba037678859efdffecf2 portage-2.1_rc3-r5.patch.bz2 4687 +RMD160 1f9a272b308ac827ce0d87654fd205b7c462550f portage-2.1_rc3-r5.patch.bz2 4687 +MD5 e80970e8e94d84e17a200de30e15b0d2 portage-2.1_rc3.tar.bz2 273951 +RMD160 76992ceb971bb6da755f64a2d85d8af654f3d920 portage-2.1_rc3.tar.bz2 273951 +MD5 4e188ec08ee0c959f46b6a8704811c84 portage-pl-2.1_rc2.tar.bz2 35551 +RMD160 4d31b2a617abc83e841be3899b2a018aede8556a portage-pl-2.1_rc2.tar.bz2 35551 diff --git a/sys-apps/portage/portage-2.1_rc3-r5.ebuild b/sys-apps/portage/portage-2.1_rc3-r5.ebuild new file mode 100644 index 000000000000..8f147351ac77 --- /dev/null +++ b/sys-apps/portage/portage-2.1_rc3-r5.ebuild @@ -0,0 +1,220 @@ +# 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_rc3-r5.ebuild,v 1.1 2006/06/02 02:44:36 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 ) + userland_Darwin? ( >=app-shells/bash-2.05a ) ) + elibc_glibc? ( sys-apps/sandbox ) + elibc_uclibc? ( sys-apps/sandbox ) + !userland_Darwin? ( >=app-misc/pax-utils-0.1.10 ) + selinux? ( >=dev-python/python-selinux-2.15 ) + 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_rc2" +SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 + ${SRC_ARCHIVES}/${PN}-${PV}.tar.bz2 + linguas_pl? ( mirror://gentoo/${PN}-pl-${PV_PL}.tar.bz2 + ${SRC_ARCHIVES}/${PN}-pl-${PV_PL}.tar.bz2 )" + +if [ "${PR}" != "r0" ]; then + PATCHVER="-${PR}" + SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2" +fi + +S="${WORKDIR}"/${PN}-${PV} +S_PL="${WORKDIR}"/${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" + einfo "Setting portage.VERSION to ${PVR} ..." + sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \ + die "Failed to patch portage.VERSION" + fi +} + +src_compile() { + python -O -c "import compileall; compileall.compile_dir('${S}/pym')" + + cd "${S}"/src + $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \ + die "Failed to build tbz2tool" + + if ! use userland_Darwin; then + cd "${S}"/src/python-missingos + chmod +x setup.py + ./setup.py build || die "Failed to build missingos module" + fi + + 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 userland_Darwin; then + cd "${S}"/src/python-missingos + ./setup.py install --root "${D}" || \ + die "Failed to install missingos module" + 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 + 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 *.pyo + done + + doman "${S}"/man/*.[0-9] + use linguas_pl && doman -i18n=pl "${S_PL}"/pl/*.[0-9] + 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" + 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 "Portage 2.1 contains a completely rewritten caching framework." + ewarn "If you are using any cache modules from portage-2.0.x (such as" + ewarn "the CDB cache module), portage will not work until they have" + ewarn "been disabled via /etc/portage/modules." + echo + einfo "The default cache format has changed between 2.0.x and 2.1" + einfo "versions. If you have upgraded from 2.0.x, before using" + einfo "emerge, run \`emerge --metadata\` to restore portage's local" + einfo "cache." + echo + einfo "With the new metadata_overlay cache module, it is possible to" + einfo "disable FEATURES=\"metadata-transfer\" (see make.conf.5)." + einfo "When this module is used, eclasses in \${PORTDIR} must never" + einfo "be modified by the user because portage will not be able to" + einfo "detect that cache regeneration is necessary." + einfo "When metadata_overlay is initially enabled by setting" + einfo "portdbapi.auxdbmodule = cache.metadata_overlay.database" + einfo "in /etc/portage/modules, the user must completely remove" + einfo "/var/cache/edb/dep/\${PORTDIR} in order to avoid unecessary" + einfo "cache regeneration." + echo + einfo "Flag ordering has changed for \`emerge --pretend --verbose\`." + einfo "Add EMERGE_DEFAULT_OPTS=\"--alphabetical\" to /etc/make.conf" + einfo "to restore the previous ordering." + echo + einfo "See NEWS and RELEASE-NOTES for further changes." + + portage_docs +} |