From 816afdb5739f4fea121c754391a7177a562ac347 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 10 Oct 2006 21:27:44 +0000 Subject: 2.1.2_pre2-r8 revbump. This fixes bugs #150370, #150488, and #150754. (Portage version: 2.1.2_pre2-r8) --- sys-apps/portage/ChangeLog | 8 +- .../portage/files/digest-portage-2.1.2_pre2-r8 | 12 ++ sys-apps/portage/files/repoman_settings.patch | 20 ++ sys-apps/portage/portage-2.1.2_pre2-r8.ebuild | 206 +++++++++++++++++++++ 4 files changed, 245 insertions(+), 1 deletion(-) create mode 100644 sys-apps/portage/files/digest-portage-2.1.2_pre2-r8 create mode 100644 sys-apps/portage/files/repoman_settings.patch create mode 100644 sys-apps/portage/portage-2.1.2_pre2-r8.ebuild (limited to 'sys-apps') diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index e8ce9fe15f44..ec80b5030dab 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,12 @@ # 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.265 2006/10/09 01:54:14 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.266 2006/10/10 21:27:44 zmedico Exp $ + +*portage-2.1.2_pre2-r8 (10 Oct 2006) + + 10 Oct 2006; Zac Medico +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) diff --git a/sys-apps/portage/files/digest-portage-2.1.2_pre2-r8 b/sys-apps/portage/files/digest-portage-2.1.2_pre2-r8 new file mode 100644 index 000000000000..3fcdf6eaa9ab --- /dev/null +++ b/sys-apps/portage/files/digest-portage-2.1.2_pre2-r8 @@ -0,0 +1,12 @@ +MD5 ea6c1b9700d46ef71df2b830ff1b1a18 portage-2.1.2_pre2-r8.patch.bz2 18452 +RMD160 3e7848156f0abe21c0bd384a53441f40b310375f portage-2.1.2_pre2-r8.patch.bz2 18452 +SHA256 7dbbeb3710e42e5ec301542fc2e05a9803566a737d4a84966f6850c7b16b3e22 portage-2.1.2_pre2-r8.patch.bz2 18452 +MD5 5b419eec00e4534c412ac7e9ac92760b portage-2.1.2_pre2.tar.bz2 302712 +RMD160 4bd9d9b3ce76c63d4b86d12c5645403be54903c0 portage-2.1.2_pre2.tar.bz2 302712 +SHA256 caa9828537310067885c365ee49b72d6827cedc781c85825795a46932740e0e3 portage-2.1.2_pre2.tar.bz2 302712 +MD5 674cd0d78d06836736a711066e0fca9f portage-man-pl-2.1.2_pre2-r7.patch.bz2 14420 +RMD160 f6b798efcc39b81541f5a324dc68f832886731db portage-man-pl-2.1.2_pre2-r7.patch.bz2 14420 +SHA256 e621cb572cf8626c0dd9021830b67f1a3cfabbdffe89f3a7f85f4447e0aaa6e5 portage-man-pl-2.1.2_pre2-r7.patch.bz2 14420 +MD5 322f3be926245292fc0c90bc1bf2d8cd portage-man-pl-2.1.2_pre2.tar.bz2 52838 +RMD160 c3d9d59fd68606cb9c1b3f058a1ba2ebb6774101 portage-man-pl-2.1.2_pre2.tar.bz2 52838 +SHA256 cda86d66967304338c73eb391a782aeee0b239c03d3484df04ca8db2a31bfc8c portage-man-pl-2.1.2_pre2.tar.bz2 52838 diff --git a/sys-apps/portage/files/repoman_settings.patch b/sys-apps/portage/files/repoman_settings.patch new file mode 100644 index 000000000000..922bfc334fb4 --- /dev/null +++ b/sys-apps/portage/files/repoman_settings.patch @@ -0,0 +1,20 @@ +Index: bin/repoman +=================================================================== +--- bin/repoman (revision 4649) ++++ bin/repoman (revision 4651) +@@ -395,7 +395,6 @@ + isCvs=False + myreporoot=None + if os.path.isdir("CVS"): +- repoman_settings["PORTDIR_OVERLAY"]="" + if "cvs" not in repoman_settings.features: + print + print +@@ -477,7 +476,6 @@ + # Now that PORTDIR_OVERLAY is properly overridden, create the portdb. + repoman_settings = portage.config(local_config=False, + config_incrementals=portage_const.INCREMENTALS) +-repoman_settings.lock() + trees = portage.create_trees() + trees["/"]["porttree"].settings = repoman_settings + portdb = trees["/"]["porttree"].dbapi diff --git a/sys-apps/portage/portage-2.1.2_pre2-r8.ebuild b/sys-apps/portage/portage-2.1.2_pre2-r8.ebuild new file mode 100644 index 000000000000..4a9b1c75e4ef --- /dev/null +++ b/sys-apps/portage/portage-2.1.2_pre2-r8.ebuild @@ -0,0 +1,206 @@ +# 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_pre2-r8.ebuild,v 1.1 2006/10/10 21:27:44 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.2_pre2" +PATCHVER_PL="-r7" +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 + epatch "${FILESDIR}/repoman_settings.patch" + 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.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 +} -- cgit v1.2.3-65-gdbad