# 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.295 2006/11/15 00:20:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.296 2006/11/15 02:40:42 zmedico Exp $
+
+*portage-2.1.2_rc1-r7 (15 Nov 2006)
+
+ 15 Nov 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_rc1-r7.ebuild:
+ 2.1.2_rc1-r7 revbump. This fixes bugs #154897, #154919, #154921, #154986,
+ and #154989.
15 Nov 2006; Jeroen Roovers <jer@gentoo.org> portage-2.1.1-r2.ebuild:
Stable for HPPA (bug #154510).
14 Oct 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre3.ebuild:
2.1.2_pre3 release. This fixes bugs #61732, #151082, #151146 and #151238.
-*portage-2.1.2_pre2-r9 (12 Oct 2006)
-
- 12 Oct 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre2-r9.ebuild:
- 2.1.2_pre2-r9 revbump. This fixes bugs #150121, #150454, #150866, #150876,
- #150883, and #150932.
-
-*portage-2.1.2_pre2-r8 (10 Oct 2006)
-
- 10 Oct 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre2-r8.ebuild,
- repoman_settings.patch:
- 2.1.2_pre2-r8 revbump. This fixes bugs #150370, #150488, and #150754.
-
-*portage-2.1.2_pre2-r7 (09 Oct 2006)
-
- 09 Oct 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre2-r7.ebuild:
- 2.1.2_pre2-r7 revbump. This fixes bugs #140021, #149608, #150251, and
- #150361.
-
-*portage-2.1.2_pre2-r6 (08 Oct 2006)
-
- 08 Oct 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre2-r6.ebuild,
- +files/dep_transform.patch:
- 2.1.2_pre2-r6 revbump. This fixes bugs #149608, #150359, #150377, and
- #150381.
-
-*portage-2.1.2_pre2-r5 (06 Oct 2006)
-
- 06 Oct 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre2-r5.ebuild:
- 2.1.2_pre2-r5 revbump. This fixes bugs #14215, #48195, #150163, and #150178.
-
-*portage-2.1.2_pre2-r4 (05 Oct 2006)
-
- 05 Oct 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre2-r4.ebuild:
- 2.1.2_pre2-r4 revbump. This fixes bugs #4698 and #93469.
-
-*portage-2.1.2_pre2-r3 (04 Oct 2006)
-
- 04 Oct 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre2-r3.ebuild:
- 2.1.2_pre2-r3 revbump. This fixes bugs #144781 and #149881.
-
-*portage-2.1.2_pre2-r2 (03 Oct 2006)
-
- 03 Oct 2006; <zmedico@gentoo.org> +portage-2.1.2_pre2-r2.ebuild:
- 2.1.2_pre2-r2 revbump. This fixes bugs #149781, #149881, and #149900.
-
-*portage-2.1.2_pre2-r1 (01 Oct 2006)
-
- 01 Oct 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre2-r1.ebuild:
- 2.1.2_pre2-r1 revbump. This fixes bugs #149527, #149576, and #149645.
-
-*portage-2.1.2_pre2 (29 Sep 2006)
-
- 29 Sep 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre2.ebuild:
- 2.1.2_pre2 release. This fixes bugs #148870, #149134, #149412, #149491, and
- #149494.
-
-*portage-2.1.2_pre1-r4 (27 Sep 2006)
-
- 27 Sep 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre1-r4.ebuild:
- 2.1.2_pre1-r4 revbump. This fixes bugs #147766 and #149208.
-
26 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org>
portage-2.1.1-r1.ebuild:
ppc stable, bug #149062
2.1.1-r1 revbump. This fixes bugs #80846, #145601, #146879, #147010,
#147428, and #149062.
-*portage-2.1.2_pre1-r3 (26 Sep 2006)
-
- 26 Sep 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre1-r3.ebuild:
- 2.1.2_pre1-r3 revbump. This fixes bugs #149028, #149062, and #149092.
-
-*portage-2.1.2_pre1-r2 (25 Sep 2006)
-
- 25 Sep 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre1-r2.ebuild:
- 2.1.2_pre1-r2 revbump. This fixes bugs #140971 and #148893.
-
-*portage-2.1.2_pre1-r1 (23 Sep 2006)
-
- 23 Sep 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre1-r1.ebuild:
- 2.1.2_pre1-r1 revbump. This fixes bugs #16365, #79606, #145601, #147729,
- #147766, #148115, and #148615.
-
16 Sep 2006; Zac Medico <zmedico@gentoo.org> -portage-2.0.54-r2.ebuild:
Remove an old version.
-*portage-2.1.2_pre1 (16 Sep 2006)
-
- 16 Sep 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre1.ebuild:
- 2.1.2_pre1 release. This fixes bugs #14321, #80846, #146879, #147010,
- #147427, and #147428.
-
13 Sep 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
portage-2.1.1.ebuild:
stable on ppc (Bug # 146881)
--- /dev/null
+# 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
+}
projects / gentoo.git / commitdiff