From 4010be9f65b764d3da397e7745d7b4566e8ae579 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 9 Jul 2022 07:02:13 +0100 Subject: app-portage/repoman: add pre-emptive Portage version limit Support is gone in the upcoming 3.0.31 release of Portage. repoman is deprecated. Migrate to pkgcheck instead. Signed-off-by: Sam James --- app-portage/repoman/repoman-3.0.3-r1.ebuild | 79 ---------------------------- app-portage/repoman/repoman-3.0.3-r2.ebuild | 80 +++++++++++++++++++++++++++++ app-portage/repoman/repoman-9999.ebuild | 65 ----------------------- 3 files changed, 80 insertions(+), 144 deletions(-) delete mode 100644 app-portage/repoman/repoman-3.0.3-r1.ebuild create mode 100644 app-portage/repoman/repoman-3.0.3-r2.ebuild delete mode 100644 app-portage/repoman/repoman-9999.ebuild (limited to 'app-portage') diff --git a/app-portage/repoman/repoman-3.0.3-r1.ebuild b/app-portage/repoman/repoman-3.0.3-r1.ebuild deleted file mode 100644 index 1a721bcc7e8a..000000000000 --- a/app-portage/repoman/repoman-3.0.3-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{8..10} pypy3 ) -PYTHON_REQ_USE='bzip2(+)' - -inherit distutils-r1 - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git" - S="${WORKDIR}/${P}/repoman" -else - SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2 - https://github.com/gentoo/portage/compare/285d3ae987a079f32b909c6e6eddde9bc45a4a25...b09b4071151d8e3a81f3576843d00f88eb407799.patch -> ${P}-unit-test-bug-779055.patch - https://github.com/gentoo/portage/commit/e29177fcd2950199afa4f83673c0771afb261123.patch -> ${P}-version-bug-779508.patch - https://github.com/gentoo/portage/commit/2eb3ca092a528e0722e0ca32f616836ed8039936.patch -> ${P}-unit-test-bug-779967.patch" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -RDEPEND=" - >=sys-apps/portage-3.0.18[${PYTHON_USEDEP}] - >=dev-python/lxml-3.6.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -python_prepare_all() { - local patches=( - "${DISTDIR}/${P}-unit-test-bug-779055.patch" - "${DISTDIR}/${P}-version-bug-779508.patch" - "${DISTDIR}/${P}-unit-test-bug-779967.patch" - ) - eapply -p2 "${patches[@]}" - - distutils-r1_python_prepare_all -} - -python_test() { - unset REPOMAN_DEFAULT_OPTS - 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" \ - --sbindir="$(python_get_scriptdir)" \ - --sysconfdir="${EPREFIX}/etc" \ - "${@}" -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "" - elog "This release of repoman is from the new portage/repoman split" - elog "release code base." - elog "This new repoman code base is still being developed. So its API's" - elog "are not to be considered stable and are subject to change." - elog "The code released has been tested and considered ready for use." - elog "This however does not guarantee it to be completely bug free." - elog "Please report any bugs you may encounter." - elog "" - fi -} diff --git a/app-portage/repoman/repoman-3.0.3-r2.ebuild b/app-portage/repoman/repoman-3.0.3-r2.ebuild new file mode 100644 index 000000000000..13f7e3218bff --- /dev/null +++ b/app-portage/repoman/repoman-3.0.3-r2.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +PYTHON_REQ_USE='bzip2(+)' + +inherit distutils-r1 + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git" + S="${WORKDIR}/${P}/repoman" +else + SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2 + https://github.com/gentoo/portage/compare/285d3ae987a079f32b909c6e6eddde9bc45a4a25...b09b4071151d8e3a81f3576843d00f88eb407799.patch -> ${P}-unit-test-bug-779055.patch + https://github.com/gentoo/portage/commit/e29177fcd2950199afa4f83673c0771afb261123.patch -> ${P}-version-bug-779508.patch + https://github.com/gentoo/portage/commit/2eb3ca092a528e0722e0ca32f616836ed8039936.patch -> ${P}-unit-test-bug-779967.patch" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +RDEPEND=" + >=sys-apps/portage-3.0.18[${PYTHON_USEDEP}] + =dev-python/lxml-3.6.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" + +python_prepare_all() { + local patches=( + "${DISTDIR}/${P}-unit-test-bug-779055.patch" + "${DISTDIR}/${P}-version-bug-779508.patch" + "${DISTDIR}/${P}-unit-test-bug-779967.patch" + ) + eapply -p2 "${patches[@]}" + + distutils-r1_python_prepare_all +} + +python_test() { + unset REPOMAN_DEFAULT_OPTS + 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" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "" + elog "This release of repoman is from the new portage/repoman split" + elog "release code base." + elog "This new repoman code base is still being developed. So its API's" + elog "are not to be considered stable and are subject to change." + elog "The code released has been tested and considered ready for use." + elog "This however does not guarantee it to be completely bug free." + elog "Please report any bugs you may encounter." + elog "" + fi +} diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild deleted file mode 100644 index 0ba9ff39dfda..000000000000 --- a/app-portage/repoman/repoman-9999.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=bdepend -PYTHON_COMPAT=( python3_{8..10} pypy3 ) -PYTHON_REQ_USE='bzip2(+)' - -inherit distutils-r1 - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git" - S="${WORKDIR}/${P}/repoman" -else - SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -RDEPEND=" - >=sys-apps/portage-3.0.18[${PYTHON_USEDEP}] - >=dev-python/lxml-3.6.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -python_test() { - unset REPOMAN_DEFAULT_OPTS - 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" \ - --sbindir="$(python_get_scriptdir)" \ - --sysconfdir="${EPREFIX}/etc" \ - "${@}" -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "" - elog "This release of repoman is from the new portage/repoman split" - elog "release code base." - elog "This new repoman code base is still being developed. So its API's" - elog "are not to be considered stable and are subject to change." - elog "The code released has been tested and considered ready for use." - elog "This however does not guarantee it to be completely bug free." - elog "Please report any bugs you may encounter." - elog "" - fi -} -- cgit v1.2.3-65-gdbad