diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-10-18 11:54:33 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-10-18 11:54:33 +0000 |
commit | 6f71b9b6768112f201c17517528f5ebe0eb434c5 (patch) | |
tree | 9563c8a0f7cef522acf397b16478f8010b94f621 /sys-apps | |
parent | Automated update of use.local.desc (diff) | |
download | historical-6f71b9b6768112f201c17517528f5ebe0eb434c5.tar.gz historical-6f71b9b6768112f201c17517528f5ebe0eb434c5.tar.bz2 historical-6f71b9b6768112f201c17517528f5ebe0eb434c5.zip |
*portage-2.2_rc98 (18 Oct 2010)
18 Oct 2010; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc98.ebuild:
2.2_rc98 version bump. This includes all of the fixes in portage-2.1.9.20,
and also fixes bug #341299 (erroneous messages about missing repo_name).
Bug #210077 tracks all bugs fixed since 2.1.x.
*portage-2.1.9.20 (18 Oct 2010)
18 Oct 2010; Zac Medico <zmedico@gentoo.org> +portage-2.1.9.20.ebuild:
2.1.9.20 version bump. This fixes a NameError for 'basestring' with
python3 during SLOT conflict display. Bug #335925 tracks all bugs fixed
since 2.1.8.x.
Package-Manager: portage-2.2_rc98/cvs/Linux i686
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/portage/ChangeLog | 16 | ||||
-rw-r--r-- | sys-apps/portage/Manifest | 12 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.1.9.20.ebuild | 315 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.2_rc98.ebuild | 370 |
4 files changed, 708 insertions, 5 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 3d95e71176cd..d444ebdedc2b 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.755 2010/10/16 03:30:49 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.756 2010/10/18 11:54:33 zmedico Exp $ + +*portage-2.2_rc98 (18 Oct 2010) + + 18 Oct 2010; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc98.ebuild: + 2.2_rc98 version bump. This includes all of the fixes in portage-2.1.9.20, + and also fixes bug #341299 (erroneous messages about missing repo_name). + Bug #210077 tracks all bugs fixed since 2.1.x. + +*portage-2.1.9.20 (18 Oct 2010) + + 18 Oct 2010; Zac Medico <zmedico@gentoo.org> +portage-2.1.9.20.ebuild: + 2.1.9.20 version bump. This fixes a NameError for 'basestring' with + python3 during SLOT conflict display. Bug #335925 tracks all bugs fixed + since 2.1.8.x. *portage-2.2_rc97 (16 Oct 2010) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index d856d05290a5..493b9ddd36c4 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -11,12 +11,14 @@ DIST portage-2.1.8.3.patch.bz2 11222 RMD160 43f99de135eccd78731dfa6105edca68497b DIST portage-2.1.8.tar.bz2 522621 RMD160 12a079f48552b78162a857b732ab8bfe76bd7b6e SHA1 390c97f3783af2d9e52482747ead3681655ea9c3 SHA256 9440bea218a059fc52c5639945c91c8ad6fdcd8d1d4a9dc7672d0da783345303 DIST portage-2.1.9.18.patch.bz2 133487 RMD160 47b4eb47d0255c2f12b28226b5ae5fe44abdedfd SHA1 cea7a4d7064d44748e11b9ed45a62ddcff909f96 SHA256 0c3a728de32a19b568a0bd1b78df6cbf600b97d17e741bd025bdfc3f9d65ede0 DIST portage-2.1.9.19.patch.bz2 137639 RMD160 0a9d19b1afad63e4a4c56be21f3b5e70bec93391 SHA1 835d7bcee1a64c84bf04ead402a5c6dcd73c70d3 SHA256 bad1dca4ed48f1e944197b0d8258e400fb1e980e8c08644055cf672e4bc1bca4 +DIST portage-2.1.9.20.patch.bz2 137930 RMD160 2d2d3c78f122f174a85d811674614d0613e1619a SHA1 454841a5f1500acf6e10826d04b7f6b39cd8c006 SHA256 d6eb6d98531e7d4d8867ae27cbf52819a6b1734d90fd1e1599bcfde343f133ae DIST portage-2.1.9.tar.bz2 681155 RMD160 ad16d592223b1d5bb7e9732b5ceb0479eee901bb SHA1 04f44bdb27af36964d83dd7fd8c580bbff1c4b17 SHA256 af98428220d0037fd908815a6e42d7ab390fe43e858d43e247556f6a2b65be25 DIST portage-2.2_rc64.tar.bz2 544483 RMD160 63ca64a564b3075542cd64410f2b2227de82bdb2 SHA1 93a104b5b03235af71db1f2fb924f37832a6dbba SHA256 409f424ab6e947c9005609807cd42233609d5845ed0461b55bae8b95b4135e8e DIST portage-2.2_rc67.patch.bz2 11199 RMD160 aacf56c1b54e0debe7cbf10b7a05fef073ac7eec SHA1 da2068ac61ba7c3ae5b1ecef298775a7a30841e0 SHA256 64dad166d418a313e4d001c1c9242c40b4e969c654df86c15d5d3ddcc166b899 DIST portage-2.2_rc68.tar.bz2 649525 RMD160 97112e4d84e00c6064089dee72acf52cdc5f04a4 SHA1 6a6953192fb5c3761003f4719f5e55b84008673c SHA256 c85c64f39b651bc82c6c8a4a38f671a09741fe196905d8a0e2655afafe79f134 DIST portage-2.2_rc96.patch.bz2 257674 RMD160 28a3e1900eef0af36b1b6797a8bd065b32b38c6e SHA1 3365481491019722844634700fbfd44181655e96 SHA256 aeb80a8a5cf64d53fefbb17458c38155e5497f5346c83cde8bb77d97f2f81f22 DIST portage-2.2_rc97.patch.bz2 261215 RMD160 dc426672e9dc54e4ac588d73a179a69d9e57b017 SHA1 9de852055d67045a889f886242bb072cb3362fda SHA256 543b0f5df89ea97fef24438adf13ee35ea2b96f6b1ac186242d67ae13ff79ff3 +DIST portage-2.2_rc98.patch.bz2 261638 RMD160 330fb48de0824c86e79a8a544d36130b8e08937a SHA1 4aee897c0c21278c7138ea5dc9ff8f6199190d27 SHA256 e8b9859b1e01898802c8b79238928332750e906304b76286dc443deee7267c32 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f EBUILD portage-2.1.6.13.ebuild 9886 RMD160 830a84ad6f5c8640f55351d67edeb1a1bf75e70a SHA1 29aa8a43789805fca31b5a32d98c082fe9f510a4 SHA256 e0ad29eeb0bda0c9c137bdc933e2b286990264364672498b56cc5e057ae7ba4a EBUILD portage-2.1.6.7.ebuild 8538 RMD160 af018f60721b1d1e581d48e4ecadea2e6fe2a4e7 SHA1 7b9a758aba1f35784f55f2a14ad59584456e5ee6 SHA256 d29ccc18665540c61e5f65f09bd66b71c60c7d6e3e69613cdb47ccc3a4758745 @@ -24,16 +26,18 @@ EBUILD portage-2.1.7.17.ebuild 10211 RMD160 8ab7618313d82254e1ec0a096c6246c78249 EBUILD portage-2.1.8.3.ebuild 9288 RMD160 8a26eed38f21c7d9ba7cdc7b698bc3bb3e2082cc SHA1 f700cc590175eb370799fb233cb7c60131f5d063 SHA256 5e5f7d51fc0881a4e2a836ea27f2ef51378acf217bc8ec5302e82f780fe4c2c8 EBUILD portage-2.1.9.18.ebuild 9760 RMD160 6eda6379f257a6d773b8a5a33059e503c6654bda SHA1 84b8658a28a4d7ad46482d10dcfe490c8ea3601e SHA256 af591f52343e71e5b0d4c641f3571eb8f564516fb8eb16f7ab7da3a5c868605a EBUILD portage-2.1.9.19.ebuild 9760 RMD160 9498893f449d900c513370c6cf7eb857248c4fcd SHA1 b7a754a46bc649aa6b066e20b0abdfe291d445b9 SHA256 1fac10ced2b42f87d2153ab606c87845d38d96818731bb34253fe0c5d35e06a6 +EBUILD portage-2.1.9.20.ebuild 9760 RMD160 12a69f91f38e472ed4e9b0ed5963c01646e8c617 SHA1 47269f2f305ad5fd68af3355e534ebdb3a7f001f SHA256 602836a1cf16867f7693967da746bb20b56717f47cd878f111c976d3e1bb20b9 EBUILD portage-2.2_rc67.ebuild 10701 RMD160 09eeaf053c359828bb5597b68f32efc96e181116 SHA1 403132c4dc71450809a9f2f4b3c49ba0125a3223 SHA256 f4cc6bfaef1c0bdcf4afa533b82ab67fc3132f6e5f1916ed70a522a4c03310d3 EBUILD portage-2.2_rc96.ebuild 11584 RMD160 2d2f359e063a3d8cd4be25a2055b34fc6f1bb2a4 SHA1 0c9bffbb10525a332fe86d85994ac82bb1181f1a SHA256 7700206a8a0cf0dcd9f734df072f0b3e3608ebab4fe4c50d96f3246dca25685b EBUILD portage-2.2_rc97.ebuild 11584 RMD160 de3e20ca2c63bd077b66c2e6a046b58e7f378665 SHA1 c6f86d2001e63e1a749104ba3e3246755d186364 SHA256 4fdddcadab06619410c2bfb442aacc6e368740216b85402b2fee8ee81759b5f3 +EBUILD portage-2.2_rc98.ebuild 11584 RMD160 a24faf41749a8e662c7c8becf6040ba85ec4a19f SHA1 8f4e96f6022840d99263359e5d465312a18691e5 SHA256 8e300096193bbf6894d73ca405e91f85484afc2e15230bf0242c309fec079a1f EBUILD portage-9999.ebuild 10641 RMD160 88a29c154394f1a3b5aa1313dcb9533b99cd11c9 SHA1 a2b3f474ca80a6628847a2cea2919b4f95f16aef SHA256 accd165113a7f06f0485e485e926c542a42fd0b216e10b7a9220311b87d9f4ba -MISC ChangeLog 38714 RMD160 d64f2ca335989078cc03d2fa83f918af67eb2eb8 SHA1 004805fa0f7a457e747d660f1047b39688acfba7 SHA256 da83ab23119d0a32681ea2618bc77a72331501ef4dacdfd1cc4618e520dc48be +MISC ChangeLog 39290 RMD160 7bed107510ffb4f8cfdef8ca244baec459740b49 SHA1 bb2e30bdce253d71a2eb34854da32b32604f8959 SHA256 d9b20cad46f170061e1d2acf40bce4e84a09813a02a9bf780868946c2b9a9e04 MISC metadata.xml 659 RMD160 7ee0e47eb8f485c2a0d45164b90e0aa4f91bd738 SHA1 afeb226c303b15eb2157cf9f97293c77f92a2919 SHA256 e141c1ecbca4c7c97009ecf16a70628c0470f291683c788dfed5d06efcd6ae2e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAky5HHMACgkQ/ejvha5XGaOALACg7bVKU9N0y6dRAOXFT/7ue8Gp -U3AAn0ejKyI+ZDNRD/gF7c+7osRYl4nI -=Riak +iEYEARECAAYFAky8NYgACgkQ/ejvha5XGaPcqgCffuafr/u4V+c9xOv7RQRfQfwK +vQ8An0W3k4i5tYtuEg7ViLWT9lqFnfnx +=+xGm -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.1.9.20.ebuild b/sys-apps/portage/portage-2.1.9.20.ebuild new file mode 100644 index 000000000000..053d2ce39753 --- /dev/null +++ b/sys-apps/portage/portage-2.1.9.20.ebuild @@ -0,0 +1,315 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.9.20.ebuild,v 1.1 2010/10/18 11:54:33 zmedico Exp $ + +# Require EAPI 2 since we now require at least python-2.6 (for python 3 +# syntax support) which also requires EAPI 2. +EAPI=2 +inherit eutils multilib python + +DESCRIPTION="Portage is the 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 ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +PROVIDE="virtual/portage" +SLOT="0" +IUSE="build doc epydoc +ipc linguas_pl python3 selinux" + +python_dep="python3? ( =dev-lang/python-3* ) + !python3? ( + build? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 ) ) + !build? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) ) + )" + +# The pysqlite blocker is for bug #282760. +DEPEND="${python_dep} + !build? ( >=sys-apps/sed-4.0.5 ) + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )" + +RDEPEND="${python_dep} + !build? ( >=sys-apps/sed-4.0.5 + >=app-shells/bash-3.2_p17 + >=app-admin/eselect-1.2 ) + elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) + elibc_glibc? ( >=sys-apps/sandbox-1.6 ) + elibc_uclibc? ( >=sys-apps/sandbox-1.6 ) + >=app-misc/pax-utils-0.1.17 + selinux? ( sys-libs/libselinux ) + !<app-shells/bash-3.2_p17" +PDEPEND=" + !build? ( + >=net-misc/rsync-2.6.4 + userland_GNU? ( >=sys-apps/coreutils-6.4 ) + )" +# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 +# rsync-2.6.4 rdep is for the --filter option #167668 + +SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives" + +prefix_src_archives() { + local x y + for x in ${@}; do + for y in ${SRC_ARCHIVES}; do + echo ${y}/${x} + done + done +} + +PV_PL="2.1.2" +PATCHVER_PL="" +TARBALL_PV=2.1.9 +SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 + $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2) + linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2 + $(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )" + +PATCHVER=$PV +if [ -n "${PATCHVER}" ]; then + SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 + $(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)" +fi + +S="${WORKDIR}"/${PN}-${TARBALL_PV} +S_PL="${WORKDIR}"/${PN}-${PV_PL} + +compatible_python_is_selected() { + [[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]] +} + +pkg_setup() { + if ! use python3 && ! compatible_python_is_selected ; then + ewarn "Attempting to select a compatible default python interpreter" + local x success=0 + for x in /usr/bin/python2.* ; do + x=${x#/usr/bin/python2.} + if [[ $x -ge 6 ]] 2>/dev/null ; then + eselect python set python2.$x + if compatible_python_is_selected ; then + elog "Default python interpreter is now set to python-2.$x" + success=1 + break + fi + fi + done + if [ $success != 1 ] ; then + eerror "Unable to select a compatible default python interpreter!" + die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)." + fi + fi + + if use python3; then + python_set_active_version 3 + fi +} + +src_prepare() { + if [ -n "${PATCHVER}" ] ; then + if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then + rm "$S/bin/ebuild-helpers/portageq" \ + || die "failed to remove portageq helper symlink" + fi + epatch "${WORKDIR}/${PN}-${PATCHVER}.patch" + fi + einfo "Setting portage.VERSION to ${PVR} ..." + sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \ + die "Failed to patch portage.VERSION" + sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \ + die "Failed to patch VERSION in doc/fragment/version" + sed -e "1s/VERSION/${PVR}/" -i man/* || \ + die "Failed to patch VERSION in man page headers" + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i pym/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use python3; then + einfo "Converting shebangs for python3..." + python_convert_shebangs -r 3 . + fi +} + +src_compile() { + if use doc; then + cd "${S}"/doc + touch fragment/date + make xhtml xhtml-nochunks || die "failed to make docs" + fi + + if use epydoc; then + einfo "Generating api docs" + mkdir "${WORKDIR}"/api + local my_modules epydoc_opts="" + my_modules="$(find "${S}/pym" -name "*.py" \ + | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ + -e 's:/:.:g' | sort)" || die "error listing modules" + # workaround for bug 282760 + > "$S/pym/pysqlite2.py" + PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \ + epydoc -o "${WORKDIR}"/api \ + -qqqqq --no-frames --show-imports $epydoc_opts \ + --name "${PN}" --url "${HOMEPAGE}" \ + ${my_modules} || die "epydoc failed" + rm "$S/pym/pysqlite2.py" + fi +} + +src_test() { + # make files executable, in case they were created by patch + find bin -type f | xargs chmod +x + PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \ + ./pym/portage/tests/runTests || die "test(s) failed" +} + +src_install() { + local libdir=$(get_libdir) + local portage_base="/usr/${libdir}/portage" + local portage_share_config=/usr/share/portage/config + + cd "${S}"/cnf + insinto /etc + doins etc-update.conf dispatch-conf.conf || die + + insinto "$portage_share_config" + doins "$S/cnf/make.globals" || die + 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 || die + 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 || die + fi + + dosym ..${portage_share_config}/make.globals /etc/make.globals + + insinto /etc/logrotate.d + doins "${S}"/cnf/logrotate.d/elog-save-summary || die + + # BSD and OSX need a sed wrapper so that find/xargs work properly + if use userland_GNU; then + rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper" + fi + + local x symlinks + + cd "$S" || die "cd failed" + for x in $(find bin -type d) ; do + exeinto $portage_base/$x || die "exeinto failed" + cd "$S"/$x || die "cd failed" + doexe $(find . -mindepth 1 -maxdepth 1 -type f ! -type l) || \ + die "doexe failed" + symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) + if [ -n "$symlinks" ] ; then + cp -P $symlinks "$D$portage_base/$x" || die "cp failed" + fi + done + + # create this manually until it's in a release tarball + dosym ../../banned-helper $portage_base/bin/ebuild-helpers/4/prepalldocs + + cd "$S" || die "cd failed" + for x in $(find pym/* -type d) ; do + insinto $portage_base/$x || die "insinto failed" + cd "$S"/$x || die "cd failed" + # __pycache__ directories contain no py files + [[ "*.py" != $(echo *.py) ]] || continue + doins *.py || die "doins failed" + symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) + if [ -n "$symlinks" ] ; then + cp -P $symlinks "$D$portage_base/$x" || die "cp failed" + fi + done + + # Symlinks to directories cause up/downgrade issues and the use of these + # modules outside of portage is probably negligible. + for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do + [ ! -L "${x}" ] && continue + die "symlink to directory will cause upgrade/downgrade issues: '${x}'" + done + + exeinto ${portage_base}/pym/portage/tests + doexe "${S}"/pym/portage/tests/runTests + + 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,NEWS,RELEASE-NOTES} + use doc && dohtml -r "${S}"/doc/* + use epydoc && dohtml -r "${WORKDIR}"/api + + dodir /usr/bin + for x in ebuild egencache emerge portageq quickpkg repoman ; 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 + regenworld" + local x + for x in ${my_syms}; do + dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x} + done + dosym env-update /usr/sbin/update-env + dosym etc-update /usr/sbin/update-etc + + dodir /etc/portage + keepdir /etc/portage +} + +pkg_preinst() { + if ! use build && ! has_version dev-python/pycrypto && \ + ! has_version '>=dev-lang/python-2.6[ssl]' ; then + ewarn "If you are an ebuild developer and you plan to commit ebuilds" + ewarn "with this system then please install dev-python/pycrypto or" + ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order" + ewarn "to enable RMD160 hash support." + ewarn "See bug #198398 for more information." + fi + if [ -f "${ROOT}/etc/make.globals" ]; then + rm "${ROOT}/etc/make.globals" + fi + + [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" + REPO_LAYOUT_CONF_WARN=$? +} + +pkg_postinst() { + # Compile all source files recursively. Any orphans + # will be identified and removed in postrm. + python_mod_optimize /usr/$(get_libdir)/portage/pym + + if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then + ewarn + echo "If you want overlay eclasses to override eclasses from" \ + "other repos then see the portage(5) man page" \ + "for information about the new layout.conf and repos.conf" \ + "configuration files." \ + | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done + ewarn + fi + + einfo + einfo "For help with using portage please consult the Gentoo Handbook" + einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3" + einfo +} + +pkg_postrm() { + python_mod_cleanup /usr/$(get_libdir)/portage/pym +} diff --git a/sys-apps/portage/portage-2.2_rc98.ebuild b/sys-apps/portage/portage-2.2_rc98.ebuild new file mode 100644 index 000000000000..e11bea427de4 --- /dev/null +++ b/sys-apps/portage/portage-2.2_rc98.ebuild @@ -0,0 +1,370 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc98.ebuild,v 1.1 2010/10/18 11:54:33 zmedico Exp $ + +# Require EAPI 2 since we now require at least python-2.6 (for python 3 +# syntax support) which also requires EAPI 2. +EAPI=2 +inherit eutils multilib python + +DESCRIPTION="Portage is the 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 ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +PROVIDE="virtual/portage" +SLOT="0" +IUSE="build doc epydoc +ipc linguas_pl python3 selinux" + +python_dep="python3? ( =dev-lang/python-3* ) + !python3? ( + build? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 ) ) + !build? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) ) + )" + +# The pysqlite blocker is for bug #282760. +DEPEND="${python_dep} + !build? ( >=sys-apps/sed-4.0.5 ) + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )" +# Require sandbox-2.2 for bug #288863. +RDEPEND="${python_dep} + !build? ( >=sys-apps/sed-4.0.5 + >=app-shells/bash-3.2_p17 + >=app-admin/eselect-1.2 ) + elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) + >=app-misc/pax-utils-0.1.17 + selinux? ( sys-libs/libselinux ) + !<app-shells/bash-3.2_p17" +PDEPEND=" + !build? ( + >=net-misc/rsync-2.6.4 + userland_GNU? ( >=sys-apps/coreutils-6.4 ) + )" +# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 +# rsync-2.6.4 rdep is for the --filter option #167668 + +SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives" + +prefix_src_archives() { + local x y + for x in ${@}; do + for y in ${SRC_ARCHIVES}; do + echo ${y}/${x} + done + done +} + +PV_PL="2.1.2" +PATCHVER_PL="" +TARBALL_PV=2.2_rc68 +SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 + $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2) + linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2 + $(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )" + +PATCHVER=$PV +if [ -n "${PATCHVER}" ]; then + SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 + $(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)" +fi + +S="${WORKDIR}"/${PN}-${TARBALL_PV} +S_PL="${WORKDIR}"/${PN}-${PV_PL} + +compatible_python_is_selected() { + [[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]] +} + +pkg_setup() { + if ! use python3 && ! compatible_python_is_selected ; then + ewarn "Attempting to select a compatible default python interpreter" + local x success=0 + for x in /usr/bin/python2.* ; do + x=${x#/usr/bin/python2.} + if [[ $x -ge 6 ]] 2>/dev/null ; then + eselect python set python2.$x + if compatible_python_is_selected ; then + elog "Default python interpreter is now set to python-2.$x" + success=1 + break + fi + fi + done + if [ $success != 1 ] ; then + eerror "Unable to select a compatible default python interpreter!" + die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)." + fi + fi + + if use python3; then + python_set_active_version 3 + fi +} + +src_prepare() { + if [ -n "${PATCHVER}" ] ; then + if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then + rm "$S/bin/ebuild-helpers/portageq" \ + || die "failed to remove portageq helper symlink" + fi + epatch "${WORKDIR}/${PN}-${PATCHVER}.patch" + fi + einfo "Setting portage.VERSION to ${PVR} ..." + sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \ + die "Failed to patch portage.VERSION" + sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \ + die "Failed to patch VERSION in doc/fragment/version" + sed -e "1s/VERSION/${PVR}/" -i man/* || \ + die "Failed to patch VERSION in man page headers" + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i pym/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use python3; then + einfo "Converting shebangs for python3..." + python_convert_shebangs -r 3 . + fi +} + +src_compile() { + if use doc; then + cd "${S}"/doc + touch fragment/date + make xhtml xhtml-nochunks || die "failed to make docs" + fi + + if use epydoc; then + einfo "Generating api docs" + mkdir "${WORKDIR}"/api + local my_modules epydoc_opts="" + my_modules="$(find "${S}/pym" -name "*.py" \ + | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ + -e 's:/:.:g' | sort)" || die "error listing modules" + # workaround for bug 282760 + > "$S/pym/pysqlite2.py" + PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \ + epydoc -o "${WORKDIR}"/api \ + -qqqqq --no-frames --show-imports $epydoc_opts \ + --name "${PN}" --url "${HOMEPAGE}" \ + ${my_modules} || die "epydoc failed" + rm "$S/pym/pysqlite2.py" + fi +} + +src_test() { + # make files executable, in case they were created by patch + find bin -type f | xargs chmod +x + PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \ + ./pym/portage/tests/runTests || die "test(s) failed" +} + +src_install() { + local libdir=$(get_libdir) + local portage_base="/usr/${libdir}/portage" + local portage_share_config=/usr/share/portage/config + + cd "${S}"/cnf + insinto /etc + doins etc-update.conf dispatch-conf.conf || die + + insinto "$portage_share_config/sets" + doins "$S"/cnf/sets/*.conf || die + insinto "$portage_share_config" + doins "$S/cnf/make.globals" || die + 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 || die + 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 || die + fi + + dosym ..${portage_share_config}/make.globals /etc/make.globals + + insinto /etc/logrotate.d + doins "${S}"/cnf/logrotate.d/elog-save-summary || die + + # BSD and OSX need a sed wrapper so that find/xargs work properly + if use userland_GNU; then + rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper" + fi + + local x symlinks + + cd "$S" || die "cd failed" + for x in $(find bin -type d) ; do + exeinto $portage_base/$x || die "exeinto failed" + cd "$S"/$x || die "cd failed" + doexe $(find . -mindepth 1 -maxdepth 1 -type f ! -type l) || \ + die "doexe failed" + symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) + if [ -n "$symlinks" ] ; then + cp -P $symlinks "$D$portage_base/$x" || die "cp failed" + fi + done + + # create this manually until it's in a release tarball + dosym ../../banned-helper $portage_base/bin/ebuild-helpers/4/prepalldocs + + cd "$S" || die "cd failed" + for x in $(find pym/* -type d) ; do + insinto $portage_base/$x || die "insinto failed" + cd "$S"/$x || die "cd failed" + # __pycache__ directories contain no py files + [[ "*.py" != $(echo *.py) ]] || continue + doins *.py || die "doins failed" + symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) + if [ -n "$symlinks" ] ; then + cp -P $symlinks "$D$portage_base/$x" || die "cp failed" + fi + done + + # Symlinks to directories cause up/downgrade issues and the use of these + # modules outside of portage is probably negligible. + for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do + [ ! -L "${x}" ] && continue + die "symlink to directory will cause upgrade/downgrade issues: '${x}'" + done + + exeinto ${portage_base}/pym/portage/tests + doexe "${S}"/pym/portage/tests/runTests + + 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,NEWS,RELEASE-NOTES} + use doc && dohtml -r "${S}"/doc/* + use epydoc && dohtml -r "${WORKDIR}"/api + + dodir /usr/bin + for x in ebuild egencache emerge portageq quickpkg repoman ; 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 + regenworld" + local x + for x in ${my_syms}; do + dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x} + done + dosym env-update /usr/sbin/update-env + dosym etc-update /usr/sbin/update-etc + + dodir /etc/portage + keepdir /etc/portage +} + +pkg_preinst() { + if ! use build && ! has_version dev-python/pycrypto && \ + ! has_version '>=dev-lang/python-2.6[ssl]' ; then + ewarn "If you are an ebuild developer and you plan to commit ebuilds" + ewarn "with this system then please install dev-python/pycrypto or" + ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order" + ewarn "to enable RMD160 hash support." + ewarn "See bug #198398 for more information." + fi + if [ -f "${ROOT}/etc/make.globals" ]; then + rm "${ROOT}/etc/make.globals" + fi + + has_version "<${CATEGORY}/${PN}-2.2_alpha" + MINOR_UPGRADE=$? + + has_version "<=${CATEGORY}/${PN}-2.2_pre5" + WORLD_MIGRATION_UPGRADE=$? + + # If portage-2.1.6 is installed and the preserved_libs_registry exists, + # assume that the NEEDED.ELF.2 files have already been generated. + has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \ + ! ( [ -e "$ROOT"var/lib/portage/preserved_libs_registry ] && \ + has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) + NEEDED_REBUILD_UPGRADE=$? + + [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" + REPO_LAYOUT_CONF_WARN=$? +} + +pkg_postinst() { + # Compile all source files recursively. Any orphans + # will be identified and removed in postrm. + python_mod_optimize /usr/$(get_libdir)/portage/pym + + if [ $WORLD_MIGRATION_UPGRADE = 0 ] ; then + einfo "moving set references from the worldfile into world_sets" + cd "${ROOT}/var/lib/portage/" + grep "^@" world >> world_sets + sed -i -e '/^@/d' world + fi + + if [ $NEEDED_REBUILD_UPGRADE = 0 ] ; then + einfo "rebuilding NEEDED.ELF.2 files" + for cpv in "${ROOT}/var/db/pkg"/*/*; do + if [ -f "${cpv}/NEEDED" ]; then + rm -f "${cpv}/NEEDED.ELF.2" + while read line; do + filename=${line% *} + needed=${line#* } + needed=${needed//+/++} + needed=${needed//#/##} + needed=${needed//%/%%} + newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename) + newline=${newline// - } + echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2" + done < "${cpv}/NEEDED" + fi + done + fi + + if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then + ewarn + echo "If you want overlay eclasses to override eclasses from" \ + "other repos then see the portage(5) man page" \ + "for information about the new layout.conf and repos.conf" \ + "configuration files." \ + | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done + ewarn + fi + + einfo + einfo "For help with using portage please consult the Gentoo Handbook" + einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3" + einfo + + if [ $MINOR_UPGRADE = 0 ] ; then + elog "If you're upgrading from a pre-2.2 version of portage you might" + elog "want to remerge world (emerge -e world) to take full advantage" + elog "of some of the new features in 2.2." + elog "This is not required however for portage to function properly." + elog + fi + + if [ -z "${PV/*_rc*}" ]; then + elog "If you always want to use the latest development version of portage" + elog "please read http://www.gentoo.org/proj/en/portage/doc/testing.xml" + elog + fi +} + +pkg_postrm() { + python_mod_cleanup /usr/$(get_libdir)/portage/pym +} |