# 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.882 2011/10/10 07:04:52 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.883 2011/10/10 21:49:30 zmedico Exp $
+
+*portage-2.2.0_alpha66 (10 Oct 2011)
+
+ 10 Oct 2011; Zac Medico <zmedico@gentoo.org> +portage-2.2.0_alpha66.ebuild:
+ 2.2.0_alpha66 version bump. This includes all of the fixes in
+ portage-2.1.10.26. Bug #210077 tracks all bugs fixed since portage-2.1.x.
+
+*portage-2.1.10.26 (10 Oct 2011)
+
+ 10 Oct 2011; Zac Medico <zmedico@gentoo.org> +portage-2.1.10.26.ebuild:
+ 2.1.10.26 version bump. This fixes bug #386627 (regression that causes
+ missing line breaks in elog files and mails), and also adds a new emerge
+ --dynamic-deps=<y|n> option which can be used to force emerge to use the
+ dependencies of installed packages (instead of substituting dependencies
+ from unbuilt ebuilds). Bug #381649 tracks all bugs fixed since
+ portage-2.1.10.11.
*portage-2.2.0_alpha65 (10 Oct 2011)
DIST portage-2.1.10.11.tar.bz2 849505 RMD160 ae1fae8df7e42978a988ae7f66c3bb335bfd31b4 SHA1 a0c35facd342cc32a4e713925809e72530b98ec9 SHA256 c9d47d2211fa5feec398bc155cf64ec911fb30eb11a32a9ae7ca38dbeb9b37de
DIST portage-2.1.10.24.tar.bz2 888260 RMD160 57b2292febfadee2aa731b7f6e4312ae0fe0234e SHA1 2611228b5b7a105d05f217616e48e54912c79cb2 SHA256 8314493758e52140f2aecf939762ff7b04d9aa185acdfdd595afd12881fd61b8
DIST portage-2.1.10.25.tar.bz2 890920 RMD160 6d36449017969900621ab3c769602a24c9f7ff5b SHA1 12191289ae8d886753d12956e45dd81ee20f4ee3 SHA256 38105e3c86b44b5858e5c9c7435e335897442ae5455e6afad738d42fcd378e58
+DIST portage-2.1.10.26.tar.bz2 891425 RMD160 018a38669e828da7ec6b9b0c59765bfa83c0cc22 SHA1 fbb564d07d35b6e2a591d0869f2f965a10f33774 SHA256 b9844c7a91424185da2d84d1e9053acbee8531c3932e4732a2799946b0ac0c09
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.2.0_alpha63.tar.bz2 888149 RMD160 c7ae8bdd2f017e042b4ba13c126b8f4355565a23 SHA1 58ffeee1693c6154d172c70bbab72d4628beec27 SHA256 bb146c5a6cfc42d29d86cad070f0934601b269ebe27d92c5d9a426169e799817
DIST portage-2.2.0_alpha64.patch.bz2 1774 RMD160 381d0618d35fecd96f67f9922f19e43433558e28 SHA1 668a146ed02762fec764bdac2e53f8e6192f12ca SHA256 d40720b8535ed8b8f7dc568a861827f9266e251b34f8bd954db79eceabbfb88f
DIST portage-2.2.0_alpha65.tar.bz2 890568 RMD160 324b789b0809d72de42ac79a7dde322e34b1af55 SHA1 f59960ffc1ab057e3383e7f97038c2c90d60c11e SHA256 a7f5f188c85bafc6e44a08e8152f5ffd767703696b6606d428a4a0fa5cf520c2
+DIST portage-2.2.0_alpha66.patch.bz2 3671 RMD160 310d061b4ed37ed2334fb87f5da08a192893e5ab SHA1 088e4cf55dcaf00ca37d526e346da574df65fc0c SHA256 67c9e8dda0e1054647f149f4809c5060a5f23802624f67326a7016b08c5570fc
DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
EBUILD portage-2.1.10.11.ebuild 11660 RMD160 4d52b4ce74bc553ec0f3502bdc03ebfa0d953825 SHA1 7767202cb8ecca952a31c2d5db89734a94561d61 SHA256 14b7bc6fd709f7a1f00de22bc8dfb3288e3cdfde561ff412d56621fc7a8126b5
EBUILD portage-2.1.10.24.ebuild 11641 RMD160 3e4de8973beafbae0719f00b48f891d53ac45f34 SHA1 764ab304c0dc37ac66d19301baed5bd8619322b5 SHA256 1c043f9505d2be535d6c518d572874062891578380592e73a5fd924a820ccb0b
EBUILD portage-2.1.10.25.ebuild 11641 RMD160 1feca3c90976a2aba4080e3dedea22ac119ddac4 SHA1 e154497d4eb01526a4810335bccec338c6e95102 SHA256 db079d8ecce713d72dc81135b2e511827860a1a8cf1fb3ea673fc3ef27d835e0
+EBUILD portage-2.1.10.26.ebuild 11641 RMD160 b2c6597cf2e5b82e7741a7ac07771db4494e64bb SHA1 e7bca4283e0d0fb208af221bb9023c6da8bacbd5 SHA256 72f3a36ffedfc61afbc2882b14a540b47ec845ec93e84d65172e7c32f676f31d
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_alpha64.ebuild 12906 RMD160 3730723ae22ea4ef84b04f4221292e6657c1bba9 SHA1 e241c6f7a3de85d9b5d5cf9ff4d3d2f6da46c68d SHA256 abef90515e8f030800ec7a70f6b04caad00fd3ac99e2dd9a372c620951d87288
EBUILD portage-2.2.0_alpha65.ebuild 12906 RMD160 ef0872a37ebd25a4398ad8cead6c286001c651af SHA1 12b8c3638247a453dbeeca8663a228d1496428f8 SHA256 a1a30f94a9f17ee78e13d0604b7257c1a37ffc14e0abfcb6823031d7483083b4
+EBUILD portage-2.2.0_alpha66.ebuild 12906 RMD160 ca85fa9036372a0c4818aede5257121cc43ddeae SHA1 3651c7f7983b9b4639925f6ef9238d5258e27f8a SHA256 edaef79ca555ede0509ae0f4371388fc2d92cd70e94c6dd93d0e38c9d536b01e
EBUILD portage-9999.ebuild 12214 RMD160 497e432fe756c9fda839cd2268a206e80e0ce1ca SHA1 9e9ef38845fa47767919d117c6f9e3c3b7924537 SHA256 ad0d82b6f9b62379595404695abebd73d0158fe257b2eedf117d9e49725ec8e7
-MISC ChangeLog 55882 RMD160 499e1d0698910bb69e25e9bd71857e630498aa4c SHA1 8cfffb8651554e0a8f61a69c6619c8ed52fc9594 SHA256 d5b8183d8da35b72e99bd2912fed32c10b6862a5c813eae90ec17cc55b74abc6
+MISC ChangeLog 56632 RMD160 80a464f1715e2565f50dfa5171a46df31a6037e4 SHA1 8ccec7b0387b2c8efa117c01dd145031195a8755 SHA256 a1279dbbc5617d85459e795110267cb0fab19d88507bd58d64e1820acf88edc1
MISC metadata.xml 784 RMD160 ed548c07d0a96be62f1854b92abb4ebc0ae2f281 SHA1 338c4eb3cbb626b8830eddb2f0ef23a48b1c9e12 SHA256 3ec8e42f1532859a3697a5870febeb90c635740da85cdf8f913c7529dfc767f2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk6SmRoACgkQ/ejvha5XGaMnQACg7kMYmG5ktxXttU2wSx8MRAPZ
-crEAoOWC23sNQq9OfpDX44UZI0JWrzeu
-=ym0g
+iEYEARECAAYFAk6TaHEACgkQ/ejvha5XGaNKvQCffp5qDgjcLCkupH1Z2mA4+TON
+r1YAoLmE9xJCRjwVilB4l0K24ke0ISlU
+=qQmN
-----END PGP SIGNATURE-----
--- /dev/null
+# 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.26.ebuild,v 1.1 2011/10/10 21:49:30 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 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] <sys-libs/libselinux-2.0.94 ) )
+ !<app-shells/bash-3.2_p17
+ !<app-admin/logrotate-3.8.0"
+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
+# NOTE: FEATURES=install-sources requires debugedit and rsync
+
+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=$PV
+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=
+[[ $TARBALL_PV = $PV ]] || 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() {
+ # 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 '<sys-apps/portage-2.1.10.11' ; then
+ # Initialize permissions for bug #378451 and bug #377177, since older
+ # portage does not create /var/log/portage with the desired default
+ # permissions.
+ einfo "Applying portage group permission to ${ROOT}var/log/portage for bug #378451"
+ chown portage:portage "${ROOT}var/log/portage"
+ chmod g+ws "${ROOT}var/log/portage"
+ 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
+}
--- /dev/null
+# 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_alpha66.ebuild,v 1.1 2011/10/10 21:49:30 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="~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="build doc epydoc +ipc 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 )"
+# 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-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
+ !<app-shells/bash-3.2_p17
+ !<app-admin/logrotate-3.8.0"
+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
+# NOTE: FEATURES=install-sources requires debugedit and rsync
+
+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.0_alpha65
+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=
+[[ $TARBALL_PV = $PV ]] || 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() {
+ # 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
+}
projects / gentoo.git / commitdiff