2.1.2-r11 revbump.
authorZac Medico <zmedico@gentoo.org>
Sat, 24 Feb 2007 04:09:02 +0000 (04:09 +0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 24 Feb 2007 04:09:02 +0000 (04:09 +0000)
Package-Manager: portage-2.1.2-r11

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

index e2ded004646e629f80f99b8b643b18074c0ed5c0..87db88b8a71a34b7c937eb0b4c2648febc6ee89f 100644 (file)
@@ -1,6 +1,14 @@
 # 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.355 2007/02/19 22:01:30 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.356 2007/02/24 04:09:02 zmedico Exp $
+
+*portage-2.1.2-r11 (23 Feb 2007)
+
+  23 Feb 2007; Zac Medico <zmedico@gentoo.org> +portage-2.1.2-r11.ebuild:
+  2.1.2-r11 revbump. This fixes bugs #165342, #167667, #167668, #167795,
+  and #168169. Bug #167107 tracks fixes since 2.1.2-r9.  The default
+  PORTAGE_RSYNC_OPTS now excludes Manifest1 digest files.  See bugs
+  #167667 and #167668 for more information about this change.
 
 *portage-2.1.2-r10 (19 Feb 2007)
 
index 1ee4223fa5288c6be85e3ea16b1e624af1d5b3be..5a142bbe21b8c763c1107632f6f6618082cddd1b 100644 (file)
@@ -17,6 +17,7 @@ DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c4
 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-r10.patch.bz2 25049 RMD160 1e65345b4214273ba7866f038e10a7e32f15a761 SHA1 51345ff27c15e67bd0b01e5af66c693a7fa5835a SHA256 3a5a3edd23bce0d5a339943b86db818e6bcd89aaf87eaace898d36b910e8d85e
+DIST portage-2.1.2-r11.patch.bz2 29597 RMD160 32131a54b7d673956107c4beca9fe5dc7d346ff5 SHA1 0eede52dac9c3160c31c9d28dd6ca44609f8889e SHA256 f442b6953714945a6bf4be3823af9a92a6eaa7237acc9f65701635f0193e6404
 DIST portage-2.1.2-r9.patch.bz2 20357 RMD160 bae73f052e413a71328865083ce46923de46d9fd SHA1 d5a07fc92791c2d69c8614de5413659803aa9e5d SHA256 73080e708293a1df5419567c1d9cd143922ca7806070e54b3adce29fe14937e3
 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
@@ -34,14 +35,18 @@ EBUILD portage-2.1.2-r10.ebuild 7056 RMD160 aff0fbe508010afd9449cbf246b30ae9e74f
 MD5 bf6cf80776593bd4fa72701be3c042c3 portage-2.1.2-r10.ebuild 7056
 RMD160 aff0fbe508010afd9449cbf246b30ae9e74f562c portage-2.1.2-r10.ebuild 7056
 SHA256 becda2891cc2759dbbe9021e24a3006ebeca6f56d518f3e3f98bc412bb7794bb portage-2.1.2-r10.ebuild 7056
+EBUILD portage-2.1.2-r11.ebuild 7056 RMD160 4e460587b34db29151a1e778042a974e96f693e5 SHA1 0d78a49aac089c3bffdc025cdbb9542885154b99 SHA256 6a428a067b53c0d74710bed866f974afe5f3c4e1c671cf07318c241ad76e2a32
+MD5 455eee99cb236eafbfe40366599afe87 portage-2.1.2-r11.ebuild 7056
+RMD160 4e460587b34db29151a1e778042a974e96f693e5 portage-2.1.2-r11.ebuild 7056
+SHA256 6a428a067b53c0d74710bed866f974afe5f3c4e1c671cf07318c241ad76e2a32 portage-2.1.2-r11.ebuild 7056
 EBUILD portage-2.1.2-r9.ebuild 6909 RMD160 02e7f2d92637522108481d30259d3309284638ec SHA1 52071f0f53a7e894295fad59d7c4df99cd094434 SHA256 8a6d02501744de2a2ac46ec500ef9501d53691eabb44084b12053c5d9ae582c1
 MD5 fe249fc436d2065ed44388e90c0e82ac portage-2.1.2-r9.ebuild 6909
 RMD160 02e7f2d92637522108481d30259d3309284638ec portage-2.1.2-r9.ebuild 6909
 SHA256 8a6d02501744de2a2ac46ec500ef9501d53691eabb44084b12053c5d9ae582c1 portage-2.1.2-r9.ebuild 6909
-MISC ChangeLog 17501 RMD160 262125a6cf0f5f5f8e6ec8efb186f7b56adb9ee1 SHA1 ccfafbfd4959ae1f7f1441154e22940840959401 SHA256 67fe5f66a8885e3c0324b83a6a0313c511d338b25e225ba3975bf6c816609d6e
-MD5 1bcf8f7d0196ea95cc4b12822863873e ChangeLog 17501
-RMD160 262125a6cf0f5f5f8e6ec8efb186f7b56adb9ee1 ChangeLog 17501
-SHA256 67fe5f66a8885e3c0324b83a6a0313c511d338b25e225ba3975bf6c816609d6e ChangeLog 17501
+MISC ChangeLog 17882 RMD160 4523eb7bfa500093b02f7d3e9d548d03b2e27cc4 SHA1 1617d628adb1163302342340ea96c98a7c229964 SHA256 795ce6eeaf0b9104c2cbda80b8e13b904c7adae2425c86a52cdc84b40dd9506b
+MD5 4beb7f5cea530111a957bd31ae342a60 ChangeLog 17882
+RMD160 4523eb7bfa500093b02f7d3e9d548d03b2e27cc4 ChangeLog 17882
+SHA256 795ce6eeaf0b9104c2cbda80b8e13b904c7adae2425c86a52cdc84b40dd9506b ChangeLog 17882
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -55,13 +60,16 @@ SHA256 1dbfd88dcf8f81cff40287b480099fe80fd5e0a9f0b153e23d7706446c01be22 files/di
 MD5 47ce487271a6fe9c0626752869e2d67d files/digest-portage-2.1.2-r10 765
 RMD160 e76450f4dc25df4df573d3cd491e8390bee4e203 files/digest-portage-2.1.2-r10 765
 SHA256 4116fc6996f365e561a7587e111da13b84514fad38faee49e34c4f22787d9a01 files/digest-portage-2.1.2-r10 765
+MD5 fb1d59dd5ce817487fa3c3b6d24fb1bc files/digest-portage-2.1.2-r11 765
+RMD160 dbf8dd2c85379f5c550d9877b6b9a0eef224894b files/digest-portage-2.1.2-r11 765
+SHA256 14b725f25ee62390c2df6c85df90c95d59d72e10063980f8dc7b0ea944079920 files/digest-portage-2.1.2-r11 765
 MD5 c8470f45ecc797cf3d11955e8f289f27 files/digest-portage-2.1.2-r9 762
 RMD160 a8ddfbbe84d19146aeca5f44c6996c9d5b6fe476 files/digest-portage-2.1.2-r9 762
 SHA256 c5dca1f067e2d2e51ede6a1a1fea63510256018bc286401be1f55f9d2307bfa0 files/digest-portage-2.1.2-r9 762
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF2h5B/ejvha5XGaMRAnQvAJ9rU4DxWbwT8yGl2MHqlc+aJnKaIQCdF7jl
-uSpqMZ9h2m0IdTJ3RJrATTQ=
-=SXzN
+iD8DBQFF37pk/ejvha5XGaMRAn0ZAKDSMpPMmbfMuoA51qy5Mu6paighSQCgxm+v
+PEFF7oU6P0XhY6MrqCk7nh0=
+=UKaS
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2-r11 b/sys-apps/portage/files/digest-portage-2.1.2-r11
new file mode 100644 (file)
index 0000000..18b1674
--- /dev/null
@@ -0,0 +1,9 @@
+MD5 8445c1c095ab0749901dfba33b937b75 portage-2.1.2-r11.patch.bz2 29597
+RMD160 32131a54b7d673956107c4beca9fe5dc7d346ff5 portage-2.1.2-r11.patch.bz2 29597
+SHA256 f442b6953714945a6bf4be3823af9a92a6eaa7237acc9f65701635f0193e6404 portage-2.1.2-r11.patch.bz2 29597
+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-r11.ebuild b/sys-apps/portage/portage-2.1.2-r11.ebuild
new file mode 100644 (file)
index 0000000..1d6bb49
--- /dev/null
@@ -0,0 +1,229 @@
+# 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-r11.ebuild,v 1.1 2007/02/24 04:09:02 zmedico Exp $
+
+inherit toolchain-funcs eutils flag-o-matic multilib
+
+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 )
+       userland_GNU? ( !selinux? ( >=sys-apps/coreutils-6.4 ) )
+       selinux? ( >=dev-python/python-selinux-2.16 )
+       doc? ( app-portage/portage-manpages )
+       >=dev-python/pycrypto-2.0.1-r5"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+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
+               einfo "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
+               einfo "Generating api docs"
+               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 libdir=$(get_libdir)
+       local portage_base="/usr/${libdir}/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 ../${libdir}/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 ../${libdir}/portage/bin/${x} /usr/sbin/${x}
+       done
+
+       dodir /etc/portage
+       keepdir /etc/portage
+
+       echo PYTHONPATH=\"${portage_base}/pym\" > "${WORKDIR}"/05portage.envd
+       doenvd "${WORKDIR}"/05portage.envd
+}
+
+pkg_preinst() {
+       local portage_base="/usr/$(get_libdir)/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
+}