From 5b823f0dcd726c0af84548660e84e4eaff95a87b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 24 May 2012 20:51:16 +0000 Subject: 2.2.0_alpha108 version bump. This includes all of the fixes in 2.1.10.63. Bug #210077 tracks all bugs fixed since portage-2.1.x. Package-Manager: portage-2.2.0_alpha108/cvs/Linux i686 --- sys-apps/portage/ChangeLog | 8 +- sys-apps/portage/Manifest | 10 +- sys-apps/portage/portage-2.2.0_alpha108.ebuild | 361 +++++++++++++++++++++++++ 3 files changed, 374 insertions(+), 5 deletions(-) create mode 100644 sys-apps/portage/portage-2.2.0_alpha108.ebuild (limited to 'sys-apps') diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index dddd5b5b6b8f..a68cd037406b 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1023 2012/05/24 20:50:03 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1024 2012/05/24 20:51:16 zmedico Exp $ + +*portage-2.2.0_alpha108 (24 May 2012) + + 24 May 2012; Zac Medico +portage-2.2.0_alpha108.ebuild: + 2.2.0_alpha108 version bump. This includes all of the fixes in 2.1.10.63. Bug + #210077 tracks all bugs fixed since portage-2.1.x. *portage-2.1.10.63 (24 May 2012) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 1b33afe93a32..2b42983788b7 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -9,6 +9,7 @@ DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0ef DIST portage-2.1.6.7_p1.patch.bz2 4741 RMD160 ae3607d5c04f24d0ccd36931c91f45a77d44a81a SHA1 e49768be303baff919da458c0dea066c32a45a04 SHA256 ddaae2ad8c01e6477bfe22e23a4da57eb9d079a27a17a08385d56fe2c49eec30 DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c63 SHA1 a28b191904296b551b22a7af83dacd1c336340a5 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647 DIST portage-2.2.0_alpha107.patch.bz2 76816 RMD160 a2d19376e9a41e38021d96a751fe584f22803ee2 SHA1 4b2367a152f448e25ce96775ddd16c3131eac3b9 SHA256 c4dda3a14a4bbb9bfa824fe1eef093269b51bf422a68fda5fa4773ab3e2ce5c7 +DIST portage-2.2.0_alpha108.tar.bz2 821498 RMD160 9a5beedfc71db0b88f0929d43a894ee43401e751 SHA1 da4cf6d0ce5ab5d31f344c0e378ecade9452acb2 SHA256 c5ffc4abe03696319bfd89082b5a5bbb8f427acc92a8557f29a585fc8f2b6f9a DIST portage-2.2.0_alpha88.tar.bz2 803852 RMD160 9c6a87c2a8de996286e74245faeaacf89fab0aea SHA1 d2f698470f0df250f51f937d78ea484d27ad0068 SHA256 75b74a87c4f4b1a13857f62aeb42522b491b06b66fe686ef4036993f55125130 DIST portage-2.2.0_alpha89.patch.bz2 4205 RMD160 ff17958771ee571ccc45604682882356d2d54e5e SHA1 bf5ed24e13f89bcad128e8773f40ceea8bbd8ed2 SHA256 677bc5cce25723cefbdb8f147ac6fc7162d541eb0a149fbd1b96d79f4b2a07d1 DIST portage-2.2.0_alpha94.tar.bz2 813945 RMD160 1abe94ff71b33255f260458d1b57a00755ba375b SHA1 5a7affd3e97bf8692a6b33ef55268b2d708bd1b8 SHA256 2b559d5596ad748be4587802012d1dfd817a1b7b40242be1f0145bb0e39a6b35 @@ -18,14 +19,15 @@ EBUILD portage-2.1.10.62.ebuild 10003 RMD160 d1e026a077e046bc946d5dc1e3f81bbbc00 EBUILD portage-2.1.10.63.ebuild 10003 RMD160 d43d84d27cfd1773b76c7b0ad922cd1c90c07694 SHA1 9c799b8f8af1830db3310285ef64bcbf25481710 SHA256 e1300081737012b7a2b2cfa123c897e3a5de6105cc8379c9ca2f1c88e195ed56 EBUILD portage-2.1.6.7_p1.ebuild 8388 RMD160 00b93174fd0cb9fd6794a4b7958a93dfa4433389 SHA1 d793aab40e9a6a31eb1b5392170bc305fecdbf68 SHA256 9213666cb89e2439a01317dd8fbdc5576687f777576b822cb4625d7ca8d09ac3 EBUILD portage-2.2.0_alpha107.ebuild 12447 RMD160 8490f84b3c1ad1ce1abbf120d60c3d3bdac9375c SHA1 be8f4e9ca02a8b4a77d30144541148d82990165a SHA256 417145b3334da269450948f8382aa7c1141c49ced904491e51165c12507bae5c +EBUILD portage-2.2.0_alpha108.ebuild 12448 RMD160 f3990dd802905424c58e1bf2fda184fbb9f1d91c SHA1 36a301c52c73f20f865093f4f24ac120a8ee780e SHA256 6e7cf9f6cf08076a6a354f77a4ea9b2c779a6de615bb421cd14c06a849ce4586 EBUILD portage-2.2.0_alpha89.ebuild 15703 RMD160 f6549541c7b98ce687f63c0f35d5df3e6aedbe6b SHA1 b18d66d52cddd626991804d749a4ec1328bb3969 SHA256 dbccab460eb714b709fe77873f702d39de33c3f861d2f3f8dd8e8f5e7b6c4169 EBUILD portage-9999.ebuild 11696 RMD160 10990256aa32009717c766ce070f51c09243c78a SHA1 4cb6bf17d6ba77f03cacebfec3eaa4144537fd85 SHA256 183f3f0ceef25196aac7853cb565bef689b240a890fcf723c64b44c36840636d -MISC ChangeLog 95875 RMD160 bc665ff88943f23388dd8e9b194e4a85a62b66e7 SHA1 7e0f851b64c8f58d70319de31e08e3bc7a0c7783 SHA256 630c98bd201911124e8ce5a24f23e870cf3128f2251b6c9d02fee8efe5afb83b +MISC ChangeLog 96127 RMD160 6801b48336acd4a74b939821f8ededdd9311e544 SHA1 18768deb1bc26a871877d6e7e2d5b852febe3a0d SHA256 7b8fd447970d3743cf20a77227cc441b25888fba093db5c0052994ff2e78dbf0 MISC metadata.xml 926 RMD160 9fd2d499d8102a870e45e63ec68400d71de950c6 SHA1 83f8455f45d0baaedcbbd3fc0186cccad54af7b9 SHA256 2609962ab6a20df40f95053513e6aca76b24caee81e7b3f45de7e3c7e33eec25 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEARECAAYFAk++nwAACgkQ/ejvha5XGaOj1ACg5BAv8JC945tjB0unkHxAHGC0 -aGAAn3fER76wedkFUUg/APIKikPWAQnO -=kMZg +iEYEARECAAYFAk++n0kACgkQ/ejvha5XGaNf0QCfbaEiOIoI1oAAqMhTMaG12Pld +FuMAoPMEK3EYduEHTvc8tGgf+15S44CK +=Mm6i -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.2.0_alpha108.ebuild b/sys-apps/portage/portage-2.2.0_alpha108.ebuild new file mode 100644 index 000000000000..ff497fddf8c9 --- /dev/null +++ b/sys-apps/portage/portage-2.2.0_alpha108.ebuild @@ -0,0 +1,361 @@ +# Copyright 1999-2012 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_alpha108.ebuild,v 1.1 2012/05/24 20:51:16 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=3 +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="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +SLOT="0" +IUSE="build doc epydoc +ipc linguas_pl pypy1_8 python2 python3 selinux xattr" + +# 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* ) + !pypy1_8? ( !python2? ( !python3? ( + || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) + ) ) ) + pypy1_8? ( !python2? ( !python3? ( dev-python/pypy:1.8[bzip2] ) ) ) + 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 )" +# Require sandbox-2.2 for bug #288863. +# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's +# quite slow, so it's not considered in the dependencies as an alternative to +# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so +# for now, don't pull in xattr deps for other kernels. +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 + xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) + selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] = 0x2060000 and "good" or "bad")') = good ]] +} + +current_python_has_xattr() { + [[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \ + "${EPREFIX}/usr/bin/python" -c 'import xattr' 2>/dev/null +} + +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 pypy1_8 && use python3 ; then + ewarn "Both pypy1_8 and python3 USE flags are enabled, but only one" + ewarn "can be in the shebangs. Using python3." + fi + if use pypy1_8 && use python2 ; then + ewarn "Both pypy1_8 and python2 USE flags are enabled, but only one" + ewarn "can be in the shebangs. Using python2" + fi + if ! use pypy1_8 && ! 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 + elif use pypy1_8; then + python_set_active_version 2.7-pypy-1.8 + 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 xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + 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 . + elif use pypy1_8; then + einfo "Converting shebangs for pypy-c1.8..." + python_convert_shebangs -r 2.7-pypy-1.8 . + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ + -i pym/portage/const.py || \ + die "Failed to patch portage.const.EPREFIX" + + einfo "Prefixing shebangs ..." + find . -type f -print0 | \ + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ + die "sed failed" + fi + done + + einfo "Adjusting make.globals ..." + sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \ + -e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \ + -e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \ + -i cnf/make.globals || die "sed failed" + + einfo "Adding FEATURES=force-prefix to make.globals ..." + echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + cd "${S}/cnf" || die + if [ -f "make.conf.${ARCH}".diff ]; then + patch make.conf "make.conf.${ARCH}".diff || \ + die "Failed to patch 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 "" + fi + + # BSD and OSX need a sed wrapper so that find/xargs work properly + if use userland_GNU; then + rm -f "${S}"/bin/ebuild-helpers/sed || \ + die "Failed to remove sed wrapper" + fi +} + +src_compile() { + if use doc; then + emake docbook || die + fi + + if use epydoc; then + einfo "Generating api docs" + emake epydoc || die + fi +} + +src_test() { + # make files executable, in case they were created by patch + find bin -type f | xargs chmod +x + emake test || die +} + +src_install() { + emake DESTDIR="${D}" \ + sysconfdir="${EPREFIX}/etc" \ + prefix="${EPREFIX}/usr" \ + libdir="${EPREFIX}/usr/$(get_libdir)" \ + install || die + + # Use dodoc for compression, since the Makefile doesn't do that. + dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die + + if use linguas_pl; then + doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die + doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die + fi +} + +pkg_preinst() { + if [[ $ROOT == / ]] ; then + # Run some minimal tests as a sanity check. + local test_runner=$(find "$ED" -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 xattr && ! current_python_has_xattr ; then + ewarn "For optimal performance in xattr handling, install" + ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and" + ewarn "enable USE=python3 for $CATEGORY/$PN." + 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 "${EROOT}/etc/make.globals" ]; then + rm "${EROOT}/etc/make.globals" + fi + + has_version "<${CATEGORY}/${PN}-2.2_alpha" \ + && MINOR_UPGRADE=true || MINOR_UPGRADE=false + + has_version "<=${CATEGORY}/${PN}-2.2_pre5" \ + && WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false + + # 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 "${EROOT}"var/lib/portage/preserved_libs_registry ] && \ + has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \ + && NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false + + [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" \ + && REPO_LAYOUT_CONF_WARN=true || REPO_LAYOUT_CONF_WARN=false +} + +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 ; then + einfo "moving set references from the worldfile into world_sets" + cd "${EROOT}/var/lib/portage/" + grep "^@" world >> world_sets + sed -i -e '/^@/d' world + fi + + if $NEEDED_REBUILD_UPGRADE ; then + einfo "rebuilding NEEDED.ELF.2 files" + for cpv in "${EROOT}/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 ; 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 + + if $MINOR_UPGRADE ; 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 +} + +pkg_postrm() { + python_mod_cleanup /usr/$(get_libdir)/portage/pym +} -- cgit v1.2.3-65-gdbad