2.1.2-r1 revbump. Bug #162453 tracks fixes since 2.1.2.
authorZac Medico <zmedico@gentoo.org>
Fri, 19 Jan 2007 04:09:25 +0000 (04:09 +0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 19 Jan 2007 04:09:25 +0000 (04:09 +0000)
Package-Manager: portage-2.1.2-r1

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

index 2a37e210c34e8e4c173ebd1e71fffd8bde5fa55d..fbf58786195fc9974465ca128cb13497e84eee2e 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.332 2007/01/15 08:44:05 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.333 2007/01/19 04:09:25 zmedico Exp $
+
+*portage-2.1.2-r1 (19 Jan 2007)
+
+  19 Jan 2007; Zac Medico <zmedico@gentoo.org> +portage-2.1.2-r1.ebuild:
+  2.1.2-r1 revbump.  Bug #162453 tracks fixes since 2.1.2.
 
 *portage-2.1.2 (15 Jan 2007)
 
index 0afbdedd010ed2f52f2b0b733c1dcbd349987900..f15a4f59e1ae4469c7b730e6131bc8f5e62d8d7f 100644 (file)
@@ -18,6 +18,7 @@ DIST portage-2.1-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d
 DIST portage-2.1.1-r1.patch.bz2 4200 RMD160 e8c003983b1711e296774025f12f01463ed5e4d9 SHA1 9471d5412ef205e452dac985da3871346800c1cc SHA256 eee5bcc98558ca5300fa1f8dc37135c6ff73f4cd52b985218a30846176ad53f1
 DIST portage-2.1.1-r2.patch.bz2 5263 RMD160 6b749c6700784ea1ecc615b7b3ed39eade28e489 SHA1 4eaedfedf867346d67744d95d5cb3ad5b0da4417 SHA256 4d2bc33b66c6354f008d798507137a347e35ef7448a10ef17e5108160acb0414
 DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 SHA1 6fdcb9897cef7f48d98829ab96caf37e31bd14a2 SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389
+DIST portage-2.1.2-r1.patch.bz2 7540 RMD160 5a03c9ad9e2a1787ffb23e128df81f6617222ca3 SHA1 e794535572dd9ed28286edb9d9ff6e23844cb7cc SHA256 81a6e079375bc4f3d6bbaf1f0c5d5fae240f9be11fdfecd2f1d8fd3189aff534
 DIST portage-2.1.2.tar.bz2 311900 RMD160 75da869c02e3574babc2f40e07b18686f384cf99 SHA1 72980508e881d837e78b9309d53dba62ef76c247 SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
@@ -38,14 +39,18 @@ EBUILD portage-2.1.1-r2.ebuild 7234 RMD160 7516a62adb99ae3e88d6db389cccee1efca3b
 MD5 c583bfb1e33476953f90a66ab2557c53 portage-2.1.1-r2.ebuild 7234
 RMD160 7516a62adb99ae3e88d6db389cccee1efca3b532 portage-2.1.1-r2.ebuild 7234
 SHA256 2e517ceee2ec5a426effa4716c2e95b22db3acc62faab3fd637b78498634ef61 portage-2.1.1-r2.ebuild 7234
+EBUILD portage-2.1.2-r1.ebuild 6764 RMD160 12cd6b62ca445f9e57fdd81357773cfd8585a7f9 SHA1 39e78be72be2a49a7484bd382fc156624079c8cd SHA256 c77d1186ba1fb978800bc5b2d9d7fd1bbd5abf8990cc9f180480b320e33164ee
+MD5 0b37aafc48b97841a1641da70a212858 portage-2.1.2-r1.ebuild 6764
+RMD160 12cd6b62ca445f9e57fdd81357773cfd8585a7f9 portage-2.1.2-r1.ebuild 6764
+SHA256 c77d1186ba1fb978800bc5b2d9d7fd1bbd5abf8990cc9f180480b320e33164ee portage-2.1.2-r1.ebuild 6764
 EBUILD portage-2.1.2.ebuild 6761 RMD160 25eb45c5b220d4405acac07a75929326c0676d98 SHA1 6486064a4181d4aebe4029dff53744b981239c2e SHA256 a817f48a51773d50dc669ffb7c7ec8f1d8c03305d52a4ec0cf486ca6a01d92b2
 MD5 b9ee3228e04c4d1506903baadede39cb portage-2.1.2.ebuild 6761
 RMD160 25eb45c5b220d4405acac07a75929326c0676d98 portage-2.1.2.ebuild 6761
 SHA256 a817f48a51773d50dc669ffb7c7ec8f1d8c03305d52a4ec0cf486ca6a01d92b2 portage-2.1.2.ebuild 6761
-MISC ChangeLog 17561 RMD160 94ec44d767f5394ea7a08931275fc30efdfef0db SHA1 0fba130ace579841812aa67da2885033bcd62592 SHA256 8ce52cec4ec8c75fcfda854f0efd9f1c72e2eabcc9bd7f5b01f139d27f880cf2
-MD5 84b38b40189417c425c36efa3e93ddc1 ChangeLog 17561
-RMD160 94ec44d767f5394ea7a08931275fc30efdfef0db ChangeLog 17561
-SHA256 8ce52cec4ec8c75fcfda854f0efd9f1c72e2eabcc9bd7f5b01f139d27f880cf2 ChangeLog 17561
+MISC ChangeLog 17727 RMD160 3f0f4fe6427669848b7226c329332b6ebfd6adb9 SHA1 bfec0ae3cc13bac32c046ddb2651338c85122ef9 SHA256 43ea37557c24610608ba543d9a1064cded9ca46d7ffe89ac558e20c6b251aee5
+MD5 b2c3dbc9dbe049830ddc495287e73950 ChangeLog 17727
+RMD160 3f0f4fe6427669848b7226c329332b6ebfd6adb9 ChangeLog 17727
+SHA256 43ea37557c24610608ba543d9a1064cded9ca46d7ffe89ac558e20c6b251aee5 ChangeLog 17727
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -65,10 +70,13 @@ SHA256 1dbfd88dcf8f81cff40287b480099fe80fd5e0a9f0b153e23d7706446c01be22 files/di
 MD5 a3ec37cbbeda8e2eefc7a8c764480e43 files/digest-portage-2.1.2 506
 RMD160 c4c86174976569633db6c020ac6c2562916badfa files/digest-portage-2.1.2 506
 SHA256 835cbb1b47d8c2bb81a3278b50ee9624d62b655f49446b8bf5b885651af6ed2b files/digest-portage-2.1.2 506
+MD5 649baa980ba7c5f2e08b34034e71e079 files/digest-portage-2.1.2-r1 759
+RMD160 c313594834aa9e409d767d49100f60a0480c36e8 files/digest-portage-2.1.2-r1 759
+SHA256 e6443a2340b8426eb45ef5e77751fdf510599bd8e08ae452f09475497c33bbf9 files/digest-portage-2.1.2-r1 759
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFqz7b/ejvha5XGaMRAlh6AJ4vSK7YeBHLdhvMPWPgjH2AZHbpqgCgxYK+
-6eucr5CV+tO/0WpLW42qkAE=
-=7hOF
+iD8DBQFFsER5/ejvha5XGaMRAp84AJ9GNvL1cu3D1k/jmoumHvfUiWgTtQCgi5oH
+w5qClTVNNcfUwe1jO5o+vv0=
+=Oe2j
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2-r1 b/sys-apps/portage/files/digest-portage-2.1.2-r1
new file mode 100644 (file)
index 0000000..3f85753
--- /dev/null
@@ -0,0 +1,9 @@
+MD5 e1af7e310a5d32e4ec11c57e0b1a2148 portage-2.1.2-r1.patch.bz2 7540
+RMD160 5a03c9ad9e2a1787ffb23e128df81f6617222ca3 portage-2.1.2-r1.patch.bz2 7540
+SHA256 81a6e079375bc4f3d6bbaf1f0c5d5fae240f9be11fdfecd2f1d8fd3189aff534 portage-2.1.2-r1.patch.bz2 7540
+MD5 74c705793edb37ac2fb1d3b2e06c689d portage-2.1.2.tar.bz2 311900
+RMD160 75da869c02e3574babc2f40e07b18686f384cf99 portage-2.1.2.tar.bz2 311900
+SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008 portage-2.1.2.tar.bz2 311900
+MD5 6409f79dd5efe7922dd8fa36340c4912 portage-man-pl-2.1.2.tar.bz2 53893
+RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c portage-man-pl-2.1.2.tar.bz2 53893
+SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f portage-man-pl-2.1.2.tar.bz2 53893
diff --git a/sys-apps/portage/portage-2.1.2-r1.ebuild b/sys-apps/portage/portage-2.1.2-r1.ebuild
new file mode 100644 (file)
index 0000000..938e5fd
--- /dev/null
@@ -0,0 +1,224 @@
+# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/01/19 04:09:25 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"
+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() {
+       ./tests/runTests || \
+               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
+}