From 32803d04696ea47fc55f73be57a9d5c0a99e854f Mon Sep 17 00:00:00 2001 From: Jason Stubbs Date: Sat, 31 Dec 2005 07:25:17 +0000 Subject: Bugfix release for 2.1 Package-Manager: portage-2509-svn --- sys-apps/portage/ChangeLog | 8 +- sys-apps/portage/Manifest | 13 +-- sys-apps/portage/files/dep_zapdeps.patch | 34 ------ sys-apps/portage/files/digest-portage-2.1_pre2 | 1 - sys-apps/portage/files/digest-portage-2.1_pre3 | 1 + sys-apps/portage/portage-2.1_pre2.ebuild | 148 ------------------------- sys-apps/portage/portage-2.1_pre3.ebuild | 146 ++++++++++++++++++++++++ 7 files changed, 160 insertions(+), 191 deletions(-) delete mode 100644 sys-apps/portage/files/dep_zapdeps.patch delete mode 100644 sys-apps/portage/files/digest-portage-2.1_pre2 create mode 100644 sys-apps/portage/files/digest-portage-2.1_pre3 delete mode 100644 sys-apps/portage/portage-2.1_pre2.ebuild create mode 100644 sys-apps/portage/portage-2.1_pre3.ebuild (limited to 'sys-apps') diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index df29c7f12d13..e6f7968d80cd 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,10 +1,16 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.59 2005/12/31 03:17:02 jstubbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.60 2005/12/31 07:25:17 jstubbs Exp $ # See the gentoo-src Portage ChangeLog for up-to-date release information: # http://www.gentoo.org/cgi-bin/viewcvs.cgi/portage/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup +*portage-2.1_pre3 (31 Dec 2005) + + 31 Dec 2005; Jason Stubbs + +portage-2.1_pre3.ebuild: + Bug fix release for 2.1. + *portage-2.0.54 (31 Dec 2005) 31 Dec 2005; Jason Stubbs diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index c41b4cd22f1c..7e61114ae7ac 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,24 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 aa190327191798e46b4e2ac3e7c0d5ec ChangeLog 2725 +MD5 d97349b30e0f2dab0838753dcfb4a678 ChangeLog 2863 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34 MD5 bb9cb80f927bcc2b9e0f512d8a200e18 files/2.0.51.22-fixes.patch 10579 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911 -MD5 d1f288b00103bbffaf09651615dc97ca files/dep_zapdeps.patch 1325 MD5 159e3519c10187285ab4b0a536b2a1d3 files/digest-portage-2.0.51.22-r3 70 MD5 ca24230fc57489944e69c7dd6aaa88b3 files/digest-portage-2.0.53 67 MD5 4101f8f17ec33dc7b8c39e4d318cb79d files/digest-portage-2.0.54 67 -MD5 91b9d8bfe9d78f862a501b51754755be files/digest-portage-2.1_pre2 69 +MD5 27384bf8f13f5f4f633f79c735c98dba files/digest-portage-2.1_pre3 69 MD5 e57748276505fab96a2ab4e64de45366 metadata.xml 220 MD5 9ee139d992535438d3e51a4842e7dc13 portage-2.0.51.22-r3.ebuild 5745 MD5 3ecd328547abf187d4880541e16a1f95 portage-2.0.53.ebuild 3653 MD5 cd1e4d4b0b9c94702261818a26aef134 portage-2.0.54.ebuild 3665 -MD5 f778ca91770efc76c4895fd397e0c10a portage-2.1_pre2.ebuild 4397 +MD5 035e818019685712d4034d5e8f278250 portage-2.1_pre3.ebuild 4345 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDtfiFxvWNPsk/ZP4RApbQAKCaqXM/V/wQHB/0pHkT3Tsy4oBtlwCgp08J -nbIYKbhl9WaXb8JRG0DgEVw= -=cqim +iD8DBQFDtjKyxvWNPsk/ZP4RAoE9AJ9D2M+e9uAw/mQMQKv9l2qH00U4agCgmnY5 +2UyGIOddkw1SEc1YTDpczRs= +=hIhS -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/dep_zapdeps.patch b/sys-apps/portage/files/dep_zapdeps.patch deleted file mode 100644 index 8ba0eefa3e21..000000000000 --- a/sys-apps/portage/files/dep_zapdeps.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -uNr portage-2.1_pre2/pym/portage.py portage-2.1_pre2-patched/pym/portage.py ---- portage-2.1_pre2/pym/portage.py 2005-12-25 13:54:35.000000000 +0900 -+++ portage-2.1_pre2-patched/pym/portage.py 2005-12-25 15:55:57.000000000 +0900 -@@ -3159,7 +3159,7 @@ - atoms = dep_zapdeps(dep, satisfied, myroot, use_binaries=use_binaries) - else: - atoms = [dep] -- missing_atoms = [atom for atom in atoms if not db[myroot]["vartree"].dbapi.match(dep_getkey(atom))] -+ missing_atoms = [atom for atom in atoms if not db[myroot]["vartree"].dbapi.match(atom)] - - if not missing_atoms: - if isinstance(dep, list): -@@ -3176,6 +3176,12 @@ - if not missing_atoms: - target = (dep, satisfied) - -+ if not target: -+ if isinstance(deps[0], list): -+ return dep_zapdeps(deps[0], satisfieds[0], myroot, use_binaries=use_binaries) -+ else: -+ return [deps[0]] -+ - if isinstance(target, tuple): # Nothing matching installed - if isinstance(target[0], list): # ... and the first available was a sublist - return dep_zapdeps(target[0], target[1], myroot, use_binaries=use_binaries) -@@ -3196,7 +3202,7 @@ - available_pkgs[pkg] = atom - - if not available_pkgs: -- return [unreduced[0]] # All masked -+ return [relevant_atoms[0]] # All masked - - target_pkg = best(available_pkgs.keys()) - suitable_atom = available_pkgs[target_pkg] diff --git a/sys-apps/portage/files/digest-portage-2.1_pre2 b/sys-apps/portage/files/digest-portage-2.1_pre2 deleted file mode 100644 index 5a3681055ae2..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1_pre2 +++ /dev/null @@ -1 +0,0 @@ -MD5 9db320fc2380402d01ac47f3de41c801 portage-2.1_pre2.tar.bz2 247250 diff --git a/sys-apps/portage/files/digest-portage-2.1_pre3 b/sys-apps/portage/files/digest-portage-2.1_pre3 new file mode 100644 index 000000000000..3ba10b0ec641 --- /dev/null +++ b/sys-apps/portage/files/digest-portage-2.1_pre3 @@ -0,0 +1 @@ +MD5 e64ac58e6e6a71f60eac3fc547379032 portage-2.1_pre3.tar.bz2 248017 diff --git a/sys-apps/portage/portage-2.1_pre2.ebuild b/sys-apps/portage/portage-2.1_pre2.ebuild deleted file mode 100644 index 13f4bacf1bef..000000000000 --- a/sys-apps/portage/portage-2.1_pre2.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre2.ebuild,v 1.2 2005/12/26 15:53:21 jstubbs Exp $ - -inherit toolchain-funcs - -DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo." -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 http://dev.gentoo.org/~jstubbs/releases/${PN}-${PV}.tar.bz2" -LICENSE="GPL-2" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" - -SLOT="0" -IUSE="build selinux" -DEPEND=">=dev-lang/python-2.3" -RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.3 userland_GNU? ( sys-apps/debianutils ) >=app-shells/bash-2.05a ) !userland_Darwin? ( app-misc/pax-utils sys-apps/sandbox ) selinux? ( >=dev-python/python-selinux-2.15 )" -PROVIDE="virtual/portage" - -S=${WORKDIR}/${PN}-${PV} - - -src_unpack() { - unpack ${A} - cd ${S} - patch -p1 < ${FILESDIR}/dep_zapdeps.patch -} - -src_compile() { - python -O -c "import compileall; compileall.compile_dir('${S}/pym')" - - cd "${S}"/src - $(tc-getCC) ${CFLAGS} -o tbz2tool tbz2tool.c - - 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() { - cd "${S}"/cnf - insinto /etc - doins etc-update.conf dispatch-conf.conf make.globals - if [ -f "make.conf.${ARCH}" ]; then - newins make.conf.${ARCH} 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 /usr/lib/portage/bin - exeinto /usr/lib/portage/bin - cd "${S}"/bin - doexe * - doexe "${S}"/src/tbz2tool - dosym newins /usr/lib/portage/bin/donewins - - dodir /usr/lib/portage/pym - insinto /usr/lib/portage/pym - cd "${S}"/pym - doins * - - dodir /usr/lib/portage/pym/cache - insinto /usr/lib/portage/pym/cache - cd "${S}"/pym/cache - doins * - - dodir /usr/lib/portage/pym/elog_modules - insinto /usr/lib/portage/pym/elog_modules - cd "${S}"/pym/elog_modules - doins * - - doman "${S}"/man/*.[0-9] - dodoc "${S}"/ChangeLog - - 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 - for x in archive-conf dispatch-conf emaint emerge-webrsync env-update etc-update fixpackages quickpkg regenworld; do - dosym ../lib/portage/bin/${x} /usr/sbin/${x} - done - - dodir /etc/portage - keepdir /etc/portage - - doenvd ${FILESDIR}/05portage.envd -} - -pkg_preinst() { - if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then - rm -rf ${IMAGE}/usr/lib/portage/pym/* - mv ${IMAGE}/usr/lib/portage/bin/tbz2tool ${T} - rm -rf ${IMAGE}/usr/lib/portage/bin/* - mv ${T}/tbz2tool ${IMAGE}/usr/lib/portage/bin/ - else - rm /usr/lib/portage/pym/*.pyc >& /dev/null - rm /usr/lib/portage/pym/*.pyo >& /dev/null - 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 "This series contains a completely rewritten caching framework." - ewarn "If you are using any cache modules (such as the CDB cache" - ewarn "module) portage will not work until they have been disabled." - ewarn "For reference, they are configured at /etc/portage/modules." - echo - einfo "The default cache format has changed beginning with this" - einfo "version. Before using emerge, run \`emerge --metadata\` to" - einfo "restore portage's local cache." -} diff --git a/sys-apps/portage/portage-2.1_pre3.ebuild b/sys-apps/portage/portage-2.1_pre3.ebuild new file mode 100644 index 000000000000..9713fde074de --- /dev/null +++ b/sys-apps/portage/portage-2.1_pre3.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre3.ebuild,v 1.1 2005/12/31 07:25:17 jstubbs Exp $ + +inherit toolchain-funcs + +DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo." +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 http://dev.gentoo.org/~jstubbs/releases/${PN}-${PV}.tar.bz2" +LICENSE="GPL-2" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" + +SLOT="0" +IUSE="build selinux" +DEPEND=">=dev-lang/python-2.3" +RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.3 userland_GNU? ( sys-apps/debianutils ) >=app-shells/bash-2.05a ) !userland_Darwin? ( app-misc/pax-utils sys-apps/sandbox ) selinux? ( >=dev-python/python-selinux-2.15 )" +PROVIDE="virtual/portage" + +S=${WORKDIR}/${PN}-${PV} + + +src_unpack() { + unpack ${A} +} + +src_compile() { + python -O -c "import compileall; compileall.compile_dir('${S}/pym')" + + cd "${S}"/src + $(tc-getCC) ${CFLAGS} -o tbz2tool tbz2tool.c + + 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() { + cd "${S}"/cnf + insinto /etc + doins etc-update.conf dispatch-conf.conf make.globals + if [ -f "make.conf.${ARCH}" ]; then + newins make.conf.${ARCH} 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 /usr/lib/portage/bin + exeinto /usr/lib/portage/bin + cd "${S}"/bin + doexe * + doexe "${S}"/src/tbz2tool + dosym newins /usr/lib/portage/bin/donewins + + dodir /usr/lib/portage/pym + insinto /usr/lib/portage/pym + cd "${S}"/pym + doins * + + dodir /usr/lib/portage/pym/cache + insinto /usr/lib/portage/pym/cache + cd "${S}"/pym/cache + doins * + + dodir /usr/lib/portage/pym/elog_modules + insinto /usr/lib/portage/pym/elog_modules + cd "${S}"/pym/elog_modules + doins * + + doman "${S}"/man/*.[0-9] + dodoc "${S}"/ChangeLog + + 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 + for x in archive-conf dispatch-conf emaint emerge-webrsync env-update etc-update fixpackages quickpkg regenworld; do + dosym ../lib/portage/bin/${x} /usr/sbin/${x} + done + + dodir /etc/portage + keepdir /etc/portage + + doenvd ${FILESDIR}/05portage.envd +} + +pkg_preinst() { + if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then + rm -rf ${IMAGE}/usr/lib/portage/pym/* + mv ${IMAGE}/usr/lib/portage/bin/tbz2tool ${T} + rm -rf ${IMAGE}/usr/lib/portage/bin/* + mv ${T}/tbz2tool ${IMAGE}/usr/lib/portage/bin/ + else + rm /usr/lib/portage/pym/*.pyc >& /dev/null + rm /usr/lib/portage/pym/*.pyo >& /dev/null + 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 "This series contains a completely rewritten caching framework." + ewarn "If you are using any cache modules (such as the CDB cache" + ewarn "module) portage will not work until they have been disabled." + ewarn "For reference, they are configured at /etc/portage/modules." + echo + einfo "The default cache format has changed beginning with this" + einfo "version. Before using emerge, run \`emerge --metadata\` to" + einfo "restore portage's local cache." +} -- cgit v1.2.3-65-gdbad