From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A5A61138335 for ; Sun, 7 Apr 2019 07:27:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F4CAE089A; Sun, 7 Apr 2019 07:27:23 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2D456E089A for ; Sun, 7 Apr 2019 07:27:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E01DB335CC0 for ; Sun, 7 Apr 2019 07:27:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DBE1359F for ; Sun, 7 Apr 2019 07:27:18 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1554622026.adddcee4d436824761593ae17f23e1da1d88fb41.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage-mgorny/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/portage-mgorny/Manifest sys-apps/portage-mgorny/portage-mgorny-2.3.49.1.ebuild X-VCS-Directories: sys-apps/portage-mgorny/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: adddcee4d436824761593ae17f23e1da1d88fb41 X-VCS-Branch: master Date: Sun, 7 Apr 2019 07:27:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 76d8d9ad-1ffa-4a09-8f5c-24351c09061e X-Archives-Hash: e689ed8bb4f2d348e32fe132723b8cef commit: adddcee4d436824761593ae17f23e1da1d88fb41 Author: Michał Górny gentoo org> AuthorDate: Sun Apr 7 07:12:52 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Apr 7 07:27:06 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adddcee4 sys-apps/portage-mgorny: Drop old Signed-off-by: Michał Górny gentoo.org> sys-apps/portage-mgorny/Manifest | 1 - .../portage-mgorny/portage-mgorny-2.3.49.1.ebuild | 198 --------------------- 2 files changed, 199 deletions(-) diff --git a/sys-apps/portage-mgorny/Manifest b/sys-apps/portage-mgorny/Manifest index dca4eeb0c1c..ff04afe9e6e 100644 --- a/sys-apps/portage-mgorny/Manifest +++ b/sys-apps/portage-mgorny/Manifest @@ -1,2 +1 @@ -DIST portage-mgorny-2.3.49.1.tar.gz 1255740 BLAKE2B a64b3d1a96d7ec808168830fee03e40dd4070745f8670ec50e3d286173178bd3af8e6f823e2f732f374b59f3b88b4f44033eb6dcc21633edd25a9c8d563d04d7 SHA512 bfdf4aad186635770b05178e3c552fdca42a20790d4db17c7a204af27117b540545ba19f253924ac6ce18dd5036fe9a0503630a522303739f536b6e3b5178319 DIST portage-mgorny-2.3.51.1.tar.gz 1257484 BLAKE2B 85761b1fb5b44e4457173f8820166643fb3afb3115e9eab1436f16ee3a10f4fe1c8ab62b3e70239b4f2b00977d8421bc24a441d4a60d122c450185ff56e1e531 SHA512 8d2bd540a82f0d4aa5b089032d41c72a3d33b88041240e480ffa7d924eea0197e674b29241eb30ef13f154052514419e038d98aa72e89a5e1977dfcb6a86fa83 diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.49.1.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.49.1.ebuild deleted file mode 100644 index 36bbee3032b..00000000000 --- a/sys-apps/portage-mgorny/portage-mgorny-2.3.49.1.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy ) -PYTHON_REQ_USE='bzip2(+),threads(+)' - -inherit distutils-r1 - -DESCRIPTION="Fork of Portage focused on cleaning up and useful features" -HOMEPAGE="https://github.com/mgorny/portage-mgorny" -SRC_URI="https://github.com/mgorny/portage-mgorny/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" -SLOT="0" -IUSE="build +ipc +native-extensions selinux xattr kernel_linux" - -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) - >=app-arch/tar-1.27 - >=sys-apps/sed-4.0.5 - sys-devel/patch" -RDEPEND=" - >=app-arch/tar-1.27 - !build? ( - >=app-admin/eselect-1.2 - app-crypt/openpgp-keys-gentoo-release - >=app-crypt/gnupg-2.2.4-r2[ssl(-)] - >=app-portage/gemato-10[${PYTHON_USEDEP}] - app-shells/bash:0[readline] - $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ - python{2_7,3_4,3_5} pypy) - >=dev-python/lxml-3.6.0[${PYTHON_USEDEP}] - >=sys-apps/sed-4.0.5 - ) - 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-portage/repoman - !sys-apps/portage" -PDEPEND=" - !build? ( - >=net-misc/rsync-2.6.4 - )" -# NOTE: FEATURES=installsources requires debugedit and rsync - -pkg_pretend() { - if [[ -f ${EROOT%/}/etc/make.conf ]]; then - eerror "You seem to be using /etc/make.conf. Please migrate to the new" - eerror "/etc/portage/make.conf location before upgrading." - if [[ ! -f ${EROOT%/}/etc/portage/make.conf ]]; then - eerror - eerror " mv ${EROOT%/}/etc/make.conf ${EROOT%/}/etc/portage/make.conf" - else - ewarn - ewarn "WARNING: You seem to have make.conf in both locations. Please take" - ewarn "care not to accientally overwrite one with the other." - fi - die "${EROOT%/}/etc/make.conf present" - fi - - if [[ -f ${EROOT%/}/etc/portage/package.keywords ]]; then - eerror "You seem to be using /etc/portage/package.keywords. Please migrate" - eerror "to the new /etc/portage/package.accept_keywords location before" - eerror "upgrading." - eerror - if [[ -d ${EROOT%/}/etc/portage/package.accept_keywords ]]; then - eerror " mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords/99old" - else - if [[ -f ${EROOT%/}/etc/portage/package.accept_keywords ]]; then - eerror " cat ${EROOT%/}/etc/portage/package.accept_keywords >> ${EROOT%/}/etc/portage/package.keywords" - fi - eerror " mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords" - fi - die "${EROOT%/}/etc/portage/package.keywords present" - fi - - if has_version sys-apps/portage; then - ewarn "If you are migrating from sys-apps/portage to sys-apps/portage-mgorny," - ewarn "please note that Portage will abort upon having to unmerge itself." - ewarn "However, sys-apps/portage-mgorny will already be installed at this" - ewarn "point, so you simply have to restart emerge and it will successfully" - ewarn "clean the old package afterwards." - ewarn - ewarn "If you did not use '--dynamic-deps n' in Portage, your VDB dependency" - ewarn "graph is probably broken. You may need to use '--changed-deps y'" - ewarn "for your first @world upgrade to resolve the conflicts. Afterwards," - ewarn "--changed-deps should no longer be necessary and any conflicts" - ewarn "introduced afterwards should be reported to bugs.gentoo.org." - fi -} - -python_prepare_all() { - distutils-r1_python_prepare_all - - if ! use ipc ; then - einfo "Disabling ipc..." - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ - -i lib/_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 lib/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|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \ - -i cnf/repos.conf || die "sed failed" - if prefix-guest ; then - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || die "sed failed" - fi - - 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_configure_all() { - cat >> setup.cfg <<-EOF || die - [build_ext] - portage-ext-modules=$(usex native-extensions true false) - EOF -} - -python_test() { - esetup.py test -} - -python_install() { - distutils-r1_python_install \ - --system-prefix="${EPREFIX}/usr" \ - --bindir="$(python_get_scriptdir)" \ - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ - --sysconfdir="${EPREFIX}/etc" \ - "${@}" - - keepdir /var/log/portage/elog -} - -pkg_preinst() { - # 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 -}