From: Zac Medico Date: Mon, 19 Sep 2011 04:39:17 +0000 (+0000) Subject: *portage-2.2.0_alpha59 (19 Sep 2011) X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0950612ccf062c3db7d57072e8e8ded15a3479d5;p=gentoo.git *portage-2.2.0_alpha59 (19 Sep 2011) 19 Sep 2011; Zac Medico +portage-2.2.0_alpha59.ebuild: 2.2.0_alpha59 version bump. This includes all of the fixes in portage-2.1.10.19. Bug #210077 tracks all bugs fixed since portage-2.1.x. *portage-2.1.10.19 (19 Sep 2011) 19 Sep 2011; Zac Medico +portage-2.1.10.19.ebuild: 2.1.10.19 version bump. This fixes bug #374233 (change "poor programming practices" QA message to say "severe warnings" instead), bug #375265 (show relevant parent in autounmask dependency chain), bug #383269 (fix quote handling for PORTDIR_OVERLAY), and bug #383375 (fix emerge-webrsync to bail out if gpg is missing). Bug #381649 tracks all bugs fixed since portage-2.1.10.11. 19 Sep 2011; Zac Medico -portage-2.1.10.15.ebuild, -portage-2.1.10.17.ebuild, -portage-2.2.0_alpha55.ebuild, -portage-2.2.0_alpha57.ebuild: Remove old versions. Package-Manager: portage-2.2.0_alpha59/cvs/Linux i686 --- diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index d388b28267b3..5d18995d2dce 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,27 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.873 2011/09/15 06:17:57 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.874 2011/09/19 04:39:17 zmedico Exp $ + +*portage-2.2.0_alpha59 (19 Sep 2011) + + 19 Sep 2011; Zac Medico +portage-2.2.0_alpha59.ebuild: + 2.2.0_alpha59 version bump. This includes all of the fixes in + portage-2.1.10.19. Bug #210077 tracks all bugs fixed since portage-2.1.x. + +*portage-2.1.10.19 (19 Sep 2011) + + 19 Sep 2011; Zac Medico +portage-2.1.10.19.ebuild: + 2.1.10.19 version bump. This fixes bug #374233 (change "poor programming + practices" QA message to say "severe warnings" instead), bug #375265 + (show relevant parent in autounmask dependency chain), bug #383269 + (fix quote handling for PORTDIR_OVERLAY), and bug #383375 (fix + emerge-webrsync to bail out if gpg is missing). Bug #381649 tracks all + bugs fixed since portage-2.1.10.11. + + 19 Sep 2011; Zac Medico -portage-2.1.10.15.ebuild, + -portage-2.1.10.17.ebuild, -portage-2.2.0_alpha55.ebuild, + -portage-2.2.0_alpha57.ebuild: + Remove old versions. *portage-2.2.0_alpha58 (15 Sep 2011) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 78de0c46f160..37baf663dcd5 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -3,38 +3,34 @@ Hash: SHA1 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 DIST portage-2.1.10.11.tar.bz2 849505 RMD160 ae1fae8df7e42978a988ae7f66c3bb335bfd31b4 SHA1 a0c35facd342cc32a4e713925809e72530b98ec9 SHA256 c9d47d2211fa5feec398bc155cf64ec911fb30eb11a32a9ae7ca38dbeb9b37de -DIST portage-2.1.10.15.tar.bz2 862353 RMD160 2597c5a5a7b1e6139a3bdaf2b8e4e5ebed4c9a5b SHA1 14ef0cda20f6365886b844cfbab84c807157eb5e SHA256 9ef0646cacb085ea1f62ae3b04ef35d5d77c0b6ca4db631739f929b65f9a4cba -DIST portage-2.1.10.17.tar.bz2 867814 RMD160 e8651040023bc526e04074b4dcccc5afe2c601f7 SHA1 59fe2a8c9217ed31930c098622278a450c790552 SHA256 2af390ba12f40140a71408d565a8e1142011f189a32bb240cace81c8c4aa6d18 DIST portage-2.1.10.18.tar.bz2 868614 RMD160 874addad0a417f371bf38a6d01894f450a1bb8b8 SHA1 5dc59bc4fcd45e060440af9b595331ca9b5ebe73 SHA256 1398077b99167acaf4d167ac4ea7c9b1d1866a5b41743087cd8ec453ad5e6f7d +DIST portage-2.1.10.19.tar.bz2 870736 RMD160 2ec72654263ac09f8d08afa475914e58f5b7b9da SHA1 19dbea89b550a3d5fa8d0ce32d6960f639377ea0 SHA256 9b9fe4cb647cc952f051611e298cd4b817440b8f1d672bec3973b6c555daa3df DIST portage-2.1.10.3.tar.bz2 833210 RMD160 76a2387b32fa2d879a19cfbdf60f906193fa5066 SHA1 0edb5bfc9005c9a9b39475c84c9f13a25a814987 SHA256 713a15b43c44ebe5a0ec1a880708ceb05773aad206383b39139b21bf36e1ded3 DIST portage-2.1.6.13.patch.bz2 177383 RMD160 ef6388ca4a55a7defb319d54c9d80625cb8e12dc SHA1 5298feb6f881c25abdbde4a353d341fd36fdee51 SHA256 2cc897b6fa43b3329ef51f6304c064237be6bc326f1f0c221a19c0f96b69cd9c DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0efb489 SHA1 02021be38b0f829d45b342483834652a1985a952 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0 DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c63 SHA1 a28b191904296b551b22a7af83dacd1c336340a5 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647 DIST portage-2.1.9.42.tar.bz2 764537 RMD160 7bfef7fb167c986e36532416a0ed4b914f0a9809 SHA1 d5593b09781dae537198197adc3c1d7f7fb466f7 SHA256 1bd238065eca36aaae11607482ae43b20c64f338db7401a46c11ab56d6ff72ba DIST portage-2.2.0_alpha51.tar.bz2 848918 RMD160 84c771624d4f89d7017fd90d522a008e47b68345 SHA1 b8f09497e49af0e669014332511179c305fb4782 SHA256 3b695242c4a7f69d1b0863a82220ccd17512e018e404f279e2ddba7b7d29deb5 -DIST portage-2.2.0_alpha55.tar.bz2 862437 RMD160 9d9861e438a95c2c5948ffe9c5e35b65aa15178a SHA1 f66cf68af551903b40b9e8b99b603e0d429f4af3 SHA256 cb0ce89aa18f299e187c427676397882995c4f3502b0ff1b015dca5c28502814 -DIST portage-2.2.0_alpha57.patch.bz2 40364 RMD160 668fc0e59a4e051c23830e1af707c5601b5e35ff SHA1 02724ae3cd5266b4cfce9d1ee2175a1c1f2f70a6 SHA256 30117c944722158b060dab4f12b93dd173aa69bd62b4a19c3751acbb54aa3f40 DIST portage-2.2.0_alpha58.tar.bz2 868950 RMD160 e9a2de39d2c7abbddcd1686e76037c83777e308f SHA1 dbaeb9752df5e096c7c1bdd865929de0b12a4987 SHA256 2bf005a36a13f3c45efe29753be797a9f21c2005db753729aeec9e4088247155 +DIST portage-2.2.0_alpha59.patch.bz2 8463 RMD160 e8b638300a127e10ca640567f647bf2d2131e4ed SHA1 51d49b2ea8277cb43418083b9a20ce406d7a9d79 SHA256 a3fbcc1f6210979dc470043061aaa5dd033ebedb15d732b7768a1a0bad457e68 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f EBUILD portage-2.1.10.11.ebuild 11659 RMD160 5bea6dccc7e76edd17fdcfb6892d972be28190b5 SHA1 d383d3b935d9f14d1c68c161b1a85cd7ab0f92b2 SHA256 6ecad97b28a2ea0fe7899e81308d071db92fa6e42a45f9cdf0aefa5c3d0edb09 -EBUILD portage-2.1.10.15.ebuild 11673 RMD160 925c30f319184a61fb10ab006284f149fe5bf9dc SHA1 63a0881705a4b795faff444dcdd55a2d97fc0364 SHA256 65b03a8643228d2eb1c9ca5e9db354b8f76fb92a7ee160ffd5c6bb0bb87e5a6c -EBUILD portage-2.1.10.17.ebuild 11673 RMD160 720b61b832708da752d702158bf0d1bb1978c6c4 SHA1 f6f0c603a4981581a69058954cc205808e768fd2 SHA256 5e93ecf742dce09ee2bdb7338e09d18b663680e884bd63abaf91c6350f2b5ddb EBUILD portage-2.1.10.18.ebuild 11673 RMD160 09c4a0d3bb2b5894ac501b8a3e1879a402c6b1cc SHA1 fd3a8a072d3ad9a70296a24642da8f43d8816472 SHA256 7247e70c3f749837193ab22360b39b3a624970b4fc4f57ff3bd58d8df7de3c79 +EBUILD portage-2.1.10.19.ebuild 11673 RMD160 3215b33c6b9a3fdfde369a06086f9b00f175c690 SHA1 42dd8daf0972b3197f7cdfa3c7e56b400b5bda5c SHA256 8953d802b8b7231de473cd9abdfd893aea3c55949eb10176dfacdba3651557c4 EBUILD portage-2.1.10.3.ebuild 10221 RMD160 97396fdbcb6aff7705c2636f0fc829a83c1aa074 SHA1 eca88bafd3733c621473f03426558cf5a09ec176 SHA256 0a258d57a64921dbf2c9e21965a45212738d1758adf670b23670416d41f55888 EBUILD portage-2.1.6.13.ebuild 10038 RMD160 a40e576c31f07f89387bda834607e62708b47e79 SHA1 ecbd0bae4ca5f340627f1dca792d137870be4d5e SHA256 c507d206aa08c39b387f464f1fe973d15b1b39baadd2a8feafc4867f8856e1a9 EBUILD portage-2.1.6.7.ebuild 8689 RMD160 a04a6f87a6ded5b3c20413c79cc5d854f4083574 SHA1 1782ad24f77a56d2c8cbd88828d50451a1254f7e SHA256 a3f0e6639db74003108c933fcd4557bd4dccbfd913fc6fde7546dbec3987797a EBUILD portage-2.1.9.42.ebuild 10283 RMD160 60ac7fd535e83626095d2ef11466da8e8aa9b209 SHA1 b204bf62ad13b3c3d116fff53bc7a482eb89b7d8 SHA256 1b7968c34b0fc83aa1b388540a155340fdeb93df19de4515826af205fbcb9a3e EBUILD portage-2.2.0_alpha51.ebuild 12928 RMD160 72acaaa06c2d1c170b17ae9449ed9f9bceeb0735 SHA1 195fc5ef71c91f86ec3329833e56543d482c7b7d SHA256 486a6a78bae63337695a134af3f6ff6462a01613b1f1848663cd2ca79cd59292 -EBUILD portage-2.2.0_alpha55.ebuild 12938 RMD160 6716ba0c55230ddef8394ee45db24f446bfe8c03 SHA1 1e9afd5fea01a1c443fdfce6b7d8028edbde61ee SHA256 0fee47c54b2a7e7ddc0eb10f5088e8b17ea04a2455ec41526a36d2ec4c9bea0d -EBUILD portage-2.2.0_alpha57.ebuild 12938 RMD160 34338b15d9755926a54adfee419a13f2823241ba SHA1 896dc3a23cd2842c145d1fc6b112182bb14f65fe SHA256 c348cd534d745435936cb5d43544d8f9268f0910fbc474d7fdcae795c6c21274 EBUILD portage-2.2.0_alpha58.ebuild 12938 RMD160 c6112ec63c32d19f4b12c311a473c601d76da33e SHA1 ae399a9062de3112cf074c70e3582d3a018f3669 SHA256 6c195518fd5dfa652dbae96d46f69ebf7476b952d560335ff486f8e9342a468b +EBUILD portage-2.2.0_alpha59.ebuild 12938 RMD160 8d87427add7721bf9c7ffd3d0b12b37dc10c67d8 SHA1 b60721f7d4a92ae4b7d47430ab19106de871192a SHA256 e5422c5f3fcca58dde79447b4464f2ba6f575d0146f55fc34faf34a8f552544e EBUILD portage-9999.ebuild 12214 RMD160 497e432fe756c9fda839cd2268a206e80e0ce1ca SHA1 9e9ef38845fa47767919d117c6f9e3c3b7924537 SHA256 ad0d82b6f9b62379595404695abebd73d0158fe257b2eedf117d9e49725ec8e7 -MISC ChangeLog 49476 RMD160 a8ab5ac92f6ed66ee9289303e85510280d7efc4b SHA1 23531a7163551792898c84cc40cd0c7ed3edd429 SHA256 cdebfb45fcf6e896c91ba678151df03866023325a356ac94653ed75d4a557b0e +MISC ChangeLog 50425 RMD160 917ecda57c0adee419769f377f061485ab80521b SHA1 a612ca235daf9d5780270645d96fb0a79a9c1a1f SHA256 d7d1553ca70fd8044c942dfb1f0080add3e74c2718ff81f7e3e1f42dae769225 MISC metadata.xml 806 RMD160 511095d817e35ffce10ea738cc401176c9346caa SHA1 d25de76c2eaaab4a4b84191e7f33893bee81370d SHA256 cc5f451325114cd24263899ca84010c02700de03e21fe413661178a9431962d9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk5xmJwACgkQ/ejvha5XGaPtpgCgyTYSvhjTEhdIJt2PxGK/FYWk -ar0AoLWwIdmiia7OtGXHuM0zv1gHZ42/ -=VC+C +iEYEARECAAYFAk52x3wACgkQ/ejvha5XGaNvwQCfZMnCEAZ9fueJneGg76DRtRem +P8UAn1KZyvncuR2PnPnLfB4n4+aUtKY4 +=rv4B -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.1.10.17.ebuild b/sys-apps/portage/portage-2.1.10.17.ebuild deleted file mode 100644 index 20e4284b747d..000000000000 --- a/sys-apps/portage/portage-2.1.10.17.ebuild +++ /dev/null @@ -1,360 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.17.ebuild,v 1.1 2011/09/14 19:52:42 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 ~x86 ~sparc-fbsd ~x86-fbsd" -SLOT="0" -IUSE="build doc epydoc +ipc +less linguas_pl python2 python3 selinux" - -# Import of the io module in python-2.6 raises ImportError for the -# thread module if threading is disabled. -python_dep="python3? ( =dev-lang/python-3* ) - !python2? ( !python3? ( - build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) - !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) ) - ) ) - python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )" - -# 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-2.0.94[python] = 0x2060000 and "good" or "bad")') = good ]] -} - -pkg_setup() { - # Bug #359731 - Die early if get_libdir fails. - [[ -z $(get_libdir) ]] && \ - die "get_libdir returned an empty string" - - if use python2 && use python3 ; then - ewarn "Both python2 and python3 USE flags are enabled, but only one" - ewarn "can be in the shebangs. Using python3." - fi - if ! use python2 && ! 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 - elif use python2; then - python_set_active_version 2 - 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 . - elif use python2; then - einfo "Converting shebangs for python2..." - python_convert_shebangs -r 2 . - 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 - ./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 files - - 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" - files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l) - if [ -n "$files" ] ; then - doexe $files || die "doexe failed" - fi - symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) - if [ -n "$symlinks" ] ; then - cp -P $symlinks "$D$portage_base/$x" || die "cp failed" - fi - done - - cd "$S" || die "cd failed" - for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; 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 - - # We install some minimal tests for use as a preinst sanity check. - # These tests must be able to run without a full source tree and - # without relying on a previous portage instance being installed. - cd "$S" || die "cd failed" - exeinto $portage_base/pym/portage/tests || die - doexe pym/portage/tests/runTests || die - insinto $portage_base/pym/portage/tests || die - doins pym/portage/tests/*.py || die - insinto $portage_base/pym/portage/tests/lint || die - doins pym/portage/tests/lint/*.py || die - doins pym/portage/tests/lint/__test__ || die - - # 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 - - 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 [[ $ROOT == / ]] ; then - # Run some minimal tests as a sanity check. - local test_runner=$(find "$D" -name runTests) - if [[ -n $test_runner && -x $test_runner ]] ; then - einfo "Running preinst sanity tests..." - "$test_runner" || die "preinst sanity tests failed" - fi - fi - - 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 - - if [[ -d ${ROOT}var/log/portage && \ - $(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \ - has_version '= 0x2060000 and "good" or "bad")') = good ]] -} - -pkg_setup() { - # Bug #359731 - Die early if get_libdir fails. - [[ -z $(get_libdir) ]] && \ - die "get_libdir returned an empty string" - - if use python2 && use python3 ; then - ewarn "Both python2 and python3 USE flags are enabled, but only one" - ewarn "can be in the shebangs. Using python3." - fi - if ! use python2 && ! 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 - elif use python2; then - python_set_active_version 2 - 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 . - elif use python2; then - einfo "Converting shebangs for python2..." - python_convert_shebangs -r 2 . - 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 - ./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 files - - 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" - files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l) - if [ -n "$files" ] ; then - doexe $files || die "doexe failed" - fi - symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) - if [ -n "$symlinks" ] ; then - cp -P $symlinks "$D$portage_base/$x" || die "cp failed" - fi - done - - cd "$S" || die "cd failed" - for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; 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 - - # We install some minimal tests for use as a preinst sanity check. - # These tests must be able to run without a full source tree and - # without relying on a previous portage instance being installed. - cd "$S" || die "cd failed" - exeinto $portage_base/pym/portage/tests || die - doexe pym/portage/tests/runTests || die - insinto $portage_base/pym/portage/tests || die - doins pym/portage/tests/*.py || die - insinto $portage_base/pym/portage/tests/lint || die - doins pym/portage/tests/lint/*.py || die - doins pym/portage/tests/lint/__test__ || die - - # 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 - - 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 [[ $ROOT == / ]] ; then - # Run some minimal tests as a sanity check. - local test_runner=$(find "$D" -name runTests) - if [[ -n $test_runner && -x $test_runner ]] ; then - einfo "Running preinst sanity tests..." - "$test_runner" || die "preinst sanity tests failed" - fi - fi - - 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/*_alpha*}" ]; 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 -} diff --git a/sys-apps/portage/portage-2.2.0_alpha55.ebuild b/sys-apps/portage/portage-2.2.0_alpha59.ebuild similarity index 99% rename from sys-apps/portage/portage-2.2.0_alpha55.ebuild rename to sys-apps/portage/portage-2.2.0_alpha59.ebuild index 482f2c87cbaa..b9de44f53484 100644 --- a/sys-apps/portage/portage-2.2.0_alpha55.ebuild +++ b/sys-apps/portage/portage-2.2.0_alpha59.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha55.ebuild,v 1.1 2011/09/09 22:30:57 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha59.ebuild,v 1.1 2011/09/19 04:39:17 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -62,7 +62,7 @@ prefix_src_archives() { PV_PL="2.1.2" PATCHVER_PL="" -TARBALL_PV=2.2.0_alpha55 +TARBALL_PV=2.2.0_alpha58 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