2.1.2_rc4-r1 revbump with just some minor fixes.
authorZac Medico <zmedico@gentoo.org>
Mon, 25 Dec 2006 01:25:06 +0000 (01:25 +0000)
committerZac Medico <zmedico@gentoo.org>
Mon, 25 Dec 2006 01:25:06 +0000 (01:25 +0000)
Package-Manager: portage-2.1.2_rc4-r1

sys-apps/portage/ChangeLog
sys-apps/portage/files/digest-portage-2.1.2_rc4-r1 [new file with mode: 0644]
sys-apps/portage/portage-2.1.2_rc4-r1.ebuild [new file with mode: 0644]

index aca533ee2bf78459dc4947288595ec709e3450ec..6325e5f43aceb64b669e75152913b33942cca032 100644 (file)
@@ -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.321 2006/12/23 02:16:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.322 2006/12/25 01:25:05 zmedico Exp $
+
+*portage-2.1.2_rc4-r1 (25 Dec 2006)
+
+  25 Dec 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_rc4-r1.ebuild:
+  2.1.2_rc4-r1 revbump with just some minor fixes.
 
 *portage-2.1.2_rc4 (23 Dec 2006)
 
   15 Nov 2006; Markus Rothe <corsair@gentoo.org> portage-2.1.1-r2.ebuild:
   Stable on ppc64; bug #154510
 
-*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).
 
-*portage-2.1.2_rc1-r6 (12 Nov 2006)
-
-  12 Nov 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_rc1-r6.ebuild:
-  2.1.2_rc1-r6 revbump.  This fixes bugs #100478 and #154554.
-
   11 Nov 2006; nixnut <nixnut@gentoo.org> portage-2.1.1-r2.ebuild:
   Stable on ppc wrt bug 154510
 
   in <portage-2.0.52.  Please refer to bug #153591 and the postinst ewarn
   message for more information.
 
-*portage-2.1.2_rc1-r5 (07 Nov 2006)
-
-  07 Nov 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_rc1-r5.ebuild:
-  2.1.2_rc1-r5 revbump.  This fixes bugs #149608, #154207, #154220, #154223.
-
-*portage-2.1.2_rc1-r4 (06 Nov 2006)
-
-  06 Nov 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_rc1-r4.ebuild:
-  2.1.2_rc1-r4 revbump.  This fixes bugs #153951 and #153980.
-
-  03 Nov 2006; Zac Medico <zmedico@gentoo.org> portage-2.1.2_rc1-r3.ebuild:
-  Add /usr/lib/portage/bin to the list of directories to clean *.pyo files
-  from during the preinst phase. This fixes bug #153905.
-
-  02 Nov 2006; Zac Medico <zmedico@gentoo.org> portage-2.0.51.22-r3.ebuild,
-  portage-2.1-r2.ebuild, portage-2.1.1.ebuild, portage-2.1.1-r1.ebuild,
-  portage-2.1.2_rc1-r1.ebuild, portage-2.1.2_rc1-r2.ebuild,
-  portage-2.1.2_rc1-r3.ebuild:
-  s:sys-apps/sandbox:>=sys-apps/sandbox-1.2.17:g for bug #153788
-
-*portage-2.1.2_rc1-r3 (02 Nov 2006)
-
-  02 Nov 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_rc1-r3.ebuild:
-  2.1.2_rc1-r3 revbump.  This fixes bugs #42115, #116616, #129670, and #153764.
-
-*portage-2.1.2_rc1-r2 (01 Nov 2006)
-
-  01 Nov 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_rc1-r2.ebuild:
-  2.1.2_rc1-r2 revbump.  This fixes bugs #151685, #153282, and #153295.
-
   30 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   portage-2.1.1-r1.ebuild:
   Stable on sparc
   29 Oct 2006; Andrej Kacian <ticho@gentoo.org> portage-2.1.1-r1.ebuild:
   Stable on x86, bug #152935.
 
-*portage-2.1.2_rc1-r1 (28 Oct 2006)
-
-  28 Oct 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_rc1-r1.ebuild:
-  2.1.2_rc1-r1 revbump.  This fixes bugs #153109 and #153181.
-
-*portage-2.1.2_rc1 (27 Oct 2006)
-
-  27 Oct 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_rc1.ebuild:
-  2.1.2_rc1 release candidate.
-
-*portage-2.1.2_pre3-r9 (25 Oct 2006)
-
-  25 Oct 2006; Zac Medico <zmedico@gentoo.org>
-  -portage-2.1.2_pre3-r8.ebuild, +portage-2.1.2_pre3-r9.ebuild:
-  2.1.2_pre3-r9 revbump. This fixes bug #152726 and an cache compatibility
-  issue.
-
-*portage-2.1.2_pre3-r8 (24 Oct 2006)
-
-  24 Oct 2006; Zac Medico <zmedico@gentoo.org>
-  -portage-2.1.2_pre3-r7.ebuild, +portage-2.1.2_pre3-r8.ebuild:
-  2.1.2_pre3-r8 revbump. This release disables ACCEPT_LICENSE support since the
-  details of license groups still need to be decided and implemented.  See bugs
-  #17367 and #152593 for more information.
-
-*portage-2.1.2_pre3-r7 (22 Oct 2006)
-
-  22 Oct 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre3-r7.ebuild:
-  2.1.2_pre3-r7 revbump.  This fixes bugs #17367, #137786, #152157, and
-  #152175.
-
-*portage-2.1.2_pre3-r6 (20 Oct 2006)
-
-  20 Oct 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre3-r6.ebuild:
-  2.1.2_pre3-r6 revbump.  This fixes bugs #137610, #152017, and #152030.
-
-*portage-2.1.2_pre3-r5 (18 Oct 2006)
-
-  18 Oct 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre3-r5.ebuild:
-  2.1.2_pre3-r5 revbump.  This fixes bug #151822 among other things.
-
-*portage-2.1.2_pre3-r4 (17 Oct 2006)
-
-  17 Oct 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre3-r4.ebuild:
-  2.1.2_pre3-r4 revbump.  This fixes bugs #151502, #151586, and #151694.
-
   17 Oct 2006; Aron Griffis <agriffis@gentoo.org> portage-2.1.1-r1.ebuild:
   Mark 2.1.1-r1 stable on alpha
 
   portage-2.1.2_pre3-r3.ebuild:
   Added ~sparc-fbsd keyword.
 
-*portage-2.1.2_pre3-r3 (17 Oct 2006)
-
-  17 Oct 2006; <zmedico@gentoo.org> +portage-2.1.2_pre3-r3.ebuild:
-  2.1.2_pre3-r3 revbump.  This fixes bugs #133908, #150442, and #151331.
-
-*portage-2.1.2_pre3-r2 (15 Oct 2006)
-
-  15 Oct 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre3-r2.ebuild:
-  2.1.2_pre3-r2 revbump for bugs #150879 and #151331.
-
-*portage-2.1.2_pre3-r1 (14 Oct 2006)
-
-  14 Oct 2006; Zac Medico <zmedico@gentoo.org> +files/blockers_151331.patch,
-  -portage-2.1.2_pre3.ebuild, +portage-2.1.2_pre3-r1.ebuild:
-  2.1.2_pre3-r1 regression fix revbump for bug #151331.
-
-*portage-2.1.2_pre3 (14 Oct 2006)
-
-  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.
-
   26 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   portage-2.1.1-r1.ebuild:
   ppc stable, bug #149062
diff --git a/sys-apps/portage/files/digest-portage-2.1.2_rc4-r1 b/sys-apps/portage/files/digest-portage-2.1.2_rc4-r1
new file mode 100644 (file)
index 0000000..6171aa0
--- /dev/null
@@ -0,0 +1,9 @@
+MD5 bce3ce0f8b2376c61705bda7e368bdc8 portage-2.1.2_rc4-r1.patch.bz2 8029
+RMD160 fd81ced63ff0687b2d0875cbf167ec0c9719c2b7 portage-2.1.2_rc4-r1.patch.bz2 8029
+SHA256 4df6679376c77b7392f0d321d6d5d5dcd5958892e9e05e8c940eb105bda063d0 portage-2.1.2_rc4-r1.patch.bz2 8029
+MD5 efe9c50862533049db266ac46c903f82 portage-2.1.2_rc4.tar.bz2 342408
+RMD160 a5ff27e1db02929940aa90108cb8d9219c7f1a48 portage-2.1.2_rc4.tar.bz2 342408
+SHA256 15d33e3845850b7e6866cf1973256ad98f018e4cb097a1146161c58e7c7a601d portage-2.1.2_rc4.tar.bz2 342408
+MD5 624d18249325e364c13dc7ef7647f986 portage-man-pl-2.1.2_rc1.tar.bz2 53030
+RMD160 9ed9037256f3eba59600028f2d8f78792a33383a portage-man-pl-2.1.2_rc1.tar.bz2 53030
+SHA256 1d03dbfab182397a9fd739604ab526b644e07b9de397f029ea3e7f6969ed1e5a portage-man-pl-2.1.2_rc1.tar.bz2 53030
diff --git a/sys-apps/portage/portage-2.1.2_rc4-r1.ebuild b/sys-apps/portage/portage-2.1.2_rc4-r1.ebuild
new file mode 100644 (file)
index 0000000..e20c094
--- /dev/null
@@ -0,0 +1,226 @@
+# 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_rc4-r1.ebuild,v 1.1 2006/12/25 01:25:05 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_test() {
+       local test_runner="./tests/runTests"
+       chmod +x ${test_runner}
+       PYTHONPATH="${S}:${S}/pym:${PYTHONPATH}" ${test_runner} || \
+               die "test(s) failed"
+}
+
+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."
+       echo
+       elog "See NEWS and RELEASE-NOTES for further changes."
+       echo
+       portage_docs
+}