diff options
| -rw-r--r-- | sys-apps/portage/Manifest | 16 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.3.28.ebuild | 2 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.3.38.ebuild (renamed from sys-apps/portage/portage-2.3.24.ebuild) | 10 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.3.6-r1.ebuild | 275 |
4 files changed, 19 insertions, 284 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index f387c6834..a6d67341b 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,6 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c -EBUILD portage-2.3.24.ebuild 9445 BLAKE2B a81f62ec06cd28837b8ec92bbbb2009eb01cc524b291d75ed144d279eef308cfc1abdd84c25e9cf01fb271f8212ce68693114a0d67e395b52b6cb3ac5d4ce490 SHA512 8d483d6eeff3cd77b3f0e64e32883321522e3ab09de0c1afbe9ef66df39b93d4ebc74738da30f6083b8b389db89661c3b0257561d84f4240ed73c45097b63836 -EBUILD portage-2.3.28.ebuild 9484 BLAKE2B 705df8b4545d81239364258a33ce5b79afe7274ebd4fe06dd6e2354015e18626c2b5cc152c096a8ddb5a4ea56c889f49298ee659f1e1076bd454b2f9dae5921e SHA512 9ca0e65ea17e13c96aef27bcdb5bcb0953935d9f328cc79416329b486555ce2a66b40fff6a728bc95cb10cfa5e0352a27318efd52501b24733966d2e2e1c9daf -EBUILD portage-2.3.6-r1.ebuild 8865 BLAKE2B 1b23e2d79aa89d8b30faf5eee38d95e75df43086b61a64606675d920cc477200151e7bb3d3a920b70457761f391072f3e746283c005adc1ed6eaccef997f3afa SHA512 50991bc94f2934454f5254dce47460a57d4e933a78e26cb2db9374856efff135c7d0564a52297f0416d922a22bb011ef6cc0623d17fa8b1ad9a880395c8e2f6c +EBUILD portage-2.3.28.ebuild 9472 BLAKE2B 1aff941173e46a1773970efc55a475241b9a4e7f48a265cd1b6e5227909d317b4ef02b7ff4284e3170923ce896ec3b0cfc42fa5e282b0a776d3527dc28069e64 SHA512 e227ac35eb4c57f6c7ad5c79f1d7b0cd7c39348c27dedecc9e81d28ad8e84ef774c1124b4ecac3b838540346dbfc34715ac2d9b3556702f537d0919549493dc5 +EBUILD portage-2.3.38.ebuild 9488 BLAKE2B 1d92f0d50c4c918ccbfee33ef76d532509a3e392b9fb41d48217167b03eec3e961dd94affa10886a1d6bf4862dc96c135ca62dd726f4018b530f48e0a38dc794 SHA512 fb977e96f2033df5e39aa17168aec68a4679b3840e06f8794dc17696389b7fc3588625885f9b286b961627f9b92ca3f32cd23a5fca41e6903f6a84d715e9636e MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59 +-----BEGIN PGP SIGNATURE----- + +iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCWwVfgAAKCRAbuSpxNYmQ +ZwR6A/4ztf1hEl4Biu//4460EHCF7676AhDjDZUCaD0yFa2EQTDdcp3fG1Y4n70x +nHCQqF6BDVsnlqzyLuHOgx/SjCSmXc/WoPK0RQC4gELt/zT3KaFsUWncx1OiXuLc +roCj7g7WadZX2Pe+dwiAb2YwUGgql7Fw+iebsQMmlcYPMD0gwg== +=gyTY +-----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.3.28.ebuild b/sys-apps/portage/portage-2.3.28.ebuild index f6238e782..69cb0e980 100644 --- a/sys-apps/portage/portage-2.3.28.ebuild +++ b/sys-apps/portage/portage-2.3.28.ebuild @@ -19,7 +19,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" SLOT="0" IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" diff --git a/sys-apps/portage/portage-2.3.24.ebuild b/sys-apps/portage/portage-2.3.38.ebuild index 7c532f6bd..172a4f3b9 100644 --- a/sys-apps/portage/portage-2.3.24.ebuild +++ b/sys-apps/portage/portage-2.3.38.ebuild @@ -14,12 +14,12 @@ inherit distutils-r1 git-2 multilib systemd EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git" EGIT_BRANCH="multilib" -EGIT_COMMIT="3228956aed7ba7caaaad7a07e48ed6013f73e523" +EGIT_COMMIT="b74e878839a2b1e8d6148776d5a44019d8fffbc1" DESCRIPTION="Portage is the package management and distribution system for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" SLOT="0" IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" @@ -49,9 +49,9 @@ RDEPEND=" $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ python{2_7,3_4,3_5} pypy) rsync-verify? ( - >=app-portage/gemato-10 - app-crypt/gentoo-keys - app-crypt/gnupg[ssl(-)] + >=app-portage/gemato-12.1 + app-crypt/openpgp-keys-gentoo-release + >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) diff --git a/sys-apps/portage/portage-2.3.6-r1.ebuild b/sys-apps/portage/portage-2.3.6-r1.ebuild deleted file mode 100644 index 97dcf36b0..000000000 --- a/sys-apps/portage/portage-2.3.6-r1.ebuild +++ /dev/null @@ -1,275 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( - pypy - python3_4 python3_5 python3_6 - python2_7 -) -PYTHON_REQ_USE='bzip2(+),threads(+)' - -inherit distutils-r1 git-2 multilib - -EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git" -EGIT_BRANCH="multilib" -EGIT_COMMIT="c7938eca955a49b2fc7c7ce714bf0ab6d1a53c7b" -DESCRIPTION="Portage is the package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -SLOT="0" -IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr" - -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] ) - >=sys-apps/abi-wrapper-1.0-r6" -# 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. -# For whirlpool hash, require python[ssl] (bug #425046). -# For compgen, require bash[readline] (bug #445576). -RDEPEND=" - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - !build? ( - >=sys-apps/sed-4.0.5 - app-shells/bash:0[readline] - >=app-admin/eselect-1.2 - ) - elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_musl? ( >=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,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ - python2_7 pypy) - ) ) - !<app-admin/logrotate-3.8.0 - >=sys-apps/abi-wrapper-1.0-r6" -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=installsources requires debugedit and rsync - -REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" - -pkg_setup() { - use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) -} - -python_prepare_all() { - distutils-r1_python_prepare_all - - if use native-extensions; then - printf "[build_ext]\nportage-ext-modules=true\n" >> \ - setup.cfg || die - fi - - 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 [[ -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 ..." - 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 < <(find . -type f -print0) - - einfo "Adjusting make.globals ..." - sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ - -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ - -i cnf/make.globals || die "sed failed" - - einfo "Adjusting repos.conf ..." - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || 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.example.${ARCH}".diff ]; then - patch make.conf.example "make.conf.example.${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 -} - -python_compile_all() { - local targets=() - use doc && targets+=( docbook ) - use epydoc && targets+=( epydoc ) - - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi -} - -python_test() { - esetup.py test -} - -python_install() { - # Install sbin scripts to bindir for python-exec linking - # they will be relocated in pkg_preinst() - distutils-r1_python_install \ - --system-prefix="${EPREFIX}/usr" \ - --bindir="$(python_get_scriptdir)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ - --sbindir="$(python_get_scriptdir)" \ - --sysconfdir="${EPREFIX}/etc" \ - "${@}" -} - -python_install_all() { - distutils-r1_python_install_all - - local targets=() - use doc && targets+=( install_docbook ) - use epydoc && targets+=( install_epydoc ) - - # install docs - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi - - # Due to distutils/python-exec limitations - # these must be installed to /usr/bin. - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' - einfo "Moving admin scripts to the correct directory" - dodir /usr/sbin - for target in ${sbin_relocations}; do - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" - mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" - done -} - -pkg_preinst() { - # comment out sanity test until it is fixed to work - # with the new PORTAGE_PYM_PATH - #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 - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} - fi - - if has_version ">=${CATEGORY}/${PN}-2.3.1" && \ - has_version "<${CATEGORY}/${PN}-2.3.3"; then - SYNC_DEPTH_UPGRADE=true - else - SYNC_DEPTH_UPGRADE=false - fi -} - -get_ownership() { - case ${USERLAND} in - BSD) - stat -f '%Su:%Sg' "${1}" - ;; - *) - stat -c '%U:%G' "${1}" - ;; - esac -} - -new_config_protect() { - # Generate a ._cfg file even if the target file - # does not exist, ensuring that the user will - # notice the config change. - local basename=${1##*/} - local dirname=${1%/*} - local i=0 - while true ; do - local filename=$( - echo -n "${dirname}/._cfg" - printf "%04d" ${i} - echo -n "_${basename}" - ) - [[ -e ${filename} ]] || break - (( i++ )) - done - echo "${filename}" -} - -pkg_postinst() { - if ${SYNC_DEPTH_UPGRADE}; then - ewarn "Please note that this release no longer respects sync-depth for" - ewarn "git repositories. There have been too many problems and" - ewarn "performance issues. See bugs 552814, 559008" - fi - - einfo - elog "For setup instructions after switching to portage-multilib" - elog "read doc/portage-multilib-instructions inside the multilib overlay" - einfo - elog "The bin/ dir of the overlay has some scripts to switch from lib32" - elog "to MULTILIB_ABI or to add the default MULTILIB_ABI flags" - - einfo "" - einfo "This release of portage NO LONGER contains the repoman code base." - einfo "Repoman has its own ebuild and release package." - einfo "For repoman functionality please emerge app-portage/repoman" - einfo "Please report any bugs you may encounter." - einfo "" -} |