From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- app-portage/repoman/Manifest | 10 +++ .../repoman/files/repoman-2.3.0-bug-586864.patch | 32 ++++++++ app-portage/repoman/metadata.xml | 12 +++ app-portage/repoman/repoman-2.3.0-r1.ebuild | 94 ++++++++++++++++++++++ app-portage/repoman/repoman-2.3.6.ebuild | 60 ++++++++++++++ app-portage/repoman/repoman-2.3.9.ebuild | 67 +++++++++++++++ app-portage/repoman/repoman-9999.ebuild | 61 ++++++++++++++ 7 files changed, 336 insertions(+) create mode 100644 app-portage/repoman/Manifest create mode 100644 app-portage/repoman/files/repoman-2.3.0-bug-586864.patch create mode 100644 app-portage/repoman/metadata.xml create mode 100644 app-portage/repoman/repoman-2.3.0-r1.ebuild create mode 100644 app-portage/repoman/repoman-2.3.6.ebuild create mode 100644 app-portage/repoman/repoman-2.3.9.ebuild create mode 100644 app-portage/repoman/repoman-9999.ebuild (limited to 'app-portage/repoman') diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest new file mode 100644 index 000000000000..efc0141119fc --- /dev/null +++ b/app-portage/repoman/Manifest @@ -0,0 +1,10 @@ +AUX repoman-2.3.0-bug-586864.patch 1034 BLAKE2B a2641d1c47907ec6069c490de30aabdcb654fefbff36665899463f2bd4fab343f254ab54038b5756c32b8df9058f270e9ef17c743898bdfec6b65847dae2f443 SHA512 463bd5f0255165faf0c60faa327c29d9eb1a6f9ccdf41369879485f234e1bf9d2713332c115b36088ac9227a56ca154786b3955b2d6e8ffdf7bdc3f10a5a762e +DIST repoman-2.3.0-bug-586864.patch 1074 BLAKE2B f29ed4b9b66540bf765cd9bdf46ed10d99845ca141df4ad9701d94d8283343bb2e9101cf44e10ed2dc2dd11d02c5dea68e113f624db82d420dac5e846dd44c59 SHA512 b48112a623a4844e5783f229ee0208f729b99ab46128d19735a76633efee17deb81342b5dc8fa67f4f4f5a851509c04c8d2f2ba2cbd992a9d26e61da4ed5f7e8 +DIST repoman-2.3.0.tar.bz2 75285 BLAKE2B 980fadf2247869358f76f6708117b8a9591763e9cae8fdeed8fe4cbc6915d0fd4473381a0eed99c16fc67394fda996c12b9784b7511ebe07267496e39d683258 SHA512 960c63caed12f7c89d374ecceb39677b62d588bf75cc8da1857641c60310061188f4c2fd7177c93a4e8f20cf00a423426f2a70666320f263158531a618a7ff9c +DIST repoman-2.3.6.tar.bz2 78961 BLAKE2B c11953ced4d6bcd5e6e6a5b2dacb8802446f3acfd1842854b33fa8c0a64fa636a0b278b4fd3010b7070a7e2f00ae841ea331925ca20175e7c7e571082195d3d1 SHA512 490078d4621073e448d037373617911093bc4c3262961c4da00f201f880069c0b70c019abd86c15954ff0c547b0ea49434ee97cd972c2baff82f7cfed1a987b3 +DIST repoman-2.3.9.tar.bz2 86432 BLAKE2B 8b60e9ee2705e8fe5d6ab569120f96ca452327c70b95a3b2fff291d4e5c6e446a5bbfa9256b5b0ed18a4e54662bb1b60f4a1e80a8a0c07d276a42fe756ec30e2 SHA512 7b492db9b46f8ebb681ec7dec6dee4a40ce5f95809d505e8b74058c391d16dacdb0171befad64f0281c0168316fcc9d7ec09c7b37742b87b890593ac610329a7 +EBUILD repoman-2.3.0-r1.ebuild 2512 BLAKE2B b46e14ed46d556e731a348c8dc212ca42d20b0703edfe6322bb9475c1e46cd69ced238b9a567f9b441433a2a2a3ad9c04dddce646427f5ea71d80dcbb8865c1c SHA512 a80325ec9455f6210eaf2af3fee60035dc2dfab7f153fc345e1c034b67238b6de94754493768336ed0b9126ad32dec7ca711ca1200f879dad726e64aa9237da0 +EBUILD repoman-2.3.6.ebuild 1852 BLAKE2B 778490890dd38fa7ff51d7de8e3ab122a9e58a02515bea423a097d883706bfdbd3bef081c6091e6a671d7e0a26f2ee8cd9b4f2a0f226329cc164fb02f7bb5f96 SHA512 e4df9e66171dcc2ab07a9f3cecaa26a8d8185e0ff4e2291bd134ae83a797c66698804b7c0f1a3557571835b540b2c174133efa12bc2cfc4451130ac29b3dd617 +EBUILD repoman-2.3.9.ebuild 2113 BLAKE2B 477165a48ea4c5df4553b1d4e582ddf0b6dfbd283ac17ea8042034f6af05e677d3ba105a2191b8faf3665be8a70fdb0c67f49c1dacc93ad9b396b7efa8c8cfee SHA512 2cddc8d1d4a9fccfdc5a67f1507979611a5559d612de8dd2a6b13e0064b7e2f8860feedcd866a1877bbf5ccfcc407988710631360e42b865ba184c7aee891152 +EBUILD repoman-9999.ebuild 1936 BLAKE2B ff54893cab6ea28fb8f394d75ca95a4662cfb83efe3b8d9596b039a0cbd433f24d53df89475959d6ede55f091e73f82768daa8de03473820bc386d997d4793f0 SHA512 9de9e9c7541e6b9f97ff58b90165f77211b82df8b4bc5d477e0337d4996573b0a839c3af867e5524b885739d5e9f9635a886436d1cac201fe59fd14550b2a321 +MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0 diff --git a/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch b/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch new file mode 100644 index 000000000000..adba72fdcc57 --- /dev/null +++ b/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch @@ -0,0 +1,32 @@ +From ef33db45a0c1d462411d4ced1857a322c0ab28f6 Mon Sep 17 00:00:00 2001 +From: Zac Medico +Date: Thu, 23 Jun 2016 23:22:41 -0700 +Subject: repoman: skip QA checks in manifest mode (bug 586864) + +The relevent Scanner loop control logic broke in commit 4062c69dc27a +because it was relying on the return value from the Manifest module's +"check" method. + +Fixes: 4062c69dc27a ("repoman: Move manifest generation to modules/commit/manifest.py") +X-Gentoo-Bug: 586864 +X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=586864 +--- + pym/repoman/scanner.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py +index d7cd81f..8999751 100644 +--- a/pym/repoman/scanner.py ++++ b/pym/repoman/scanner.py +@@ -294,6 +294,8 @@ class Scanner(object): + + if self.generate_manifest: + manifest.Manifest(**self.kwargs).update_manifest(checkdir) ++ if self.options.mode == 'manifest': ++ continue + checkdirlist = os.listdir(checkdir) + + dynamic_data = { +-- +cgit v0.12 + diff --git a/app-portage/repoman/metadata.xml b/app-portage/repoman/metadata.xml new file mode 100644 index 000000000000..c15cfac45369 --- /dev/null +++ b/app-portage/repoman/metadata.xml @@ -0,0 +1,12 @@ + + + + + mailto:dev-portage@gentoo.org + https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES + https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage + + + dev-portage@gentoo.org + + diff --git a/app-portage/repoman/repoman-2.3.0-r1.ebuild b/app-portage/repoman/repoman-2.3.0-r1.ebuild new file mode 100644 index 000000000000..b2fb3350b5f8 --- /dev/null +++ b/app-portage/repoman/repoman-2.3.0-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( + pypy + python3_3 python3_4 python3_5 python3_6 + python2_7 +) +PYTHON_REQ_USE='bzip2(+)' + +inherit distutils-r1 eutils multilib + +DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds" +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 ~x86-fbsd" +SLOT="0" +IUSE="" + +DEPEND="dev-lang/python-exec:2" + +RDEPEND=" + dev-lang/python-exec:2 + !=dev-python/lxml-3.6.0 + " + +SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/repoman" + +prefix_src_archives() { + local x y + for x in ${@}; do + for y in ${SRC_ARCHIVES}; do + echo ${y}/${x} + done + done +} + +TARBALL_PV=${PV} +SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 + $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2) + https://gitweb.gentoo.org/proj/portage.git/patch/?id=ef33db45a0c1d462411d4ced1857a322c0ab28f6 -> repoman-2.3.0-bug-586864.patch" + +python_prepare_all() { + epatch "${DISTDIR}/repoman-2.3.0-bug-586864.patch" + distutils-r1_python_prepare_all + + if [[ -n ${EPREFIX} ]] ; then + 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) + 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" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all +} + +pkg_postinst() { + einfo "" + einfo "This release of repoman is from the new portage/repoman split" + einfo "release code base." + einfo "This new repoman code base is still being developed. So its API's" + einfo "are not to be considered stable and are subject to change." + einfo "The code released has been tested and considered ready for use." + einfo "This however does not guarantee it to be completely bug free." + einfo "Please report any bugs you may encounter." + einfo "" +} diff --git a/app-portage/repoman/repoman-2.3.6.ebuild b/app-portage/repoman/repoman-2.3.6.ebuild new file mode 100644 index 000000000000..8c7504b338c7 --- /dev/null +++ b/app-portage/repoman/repoman-2.3.6.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +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 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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-2.3.14[${PYTHON_USEDEP}] + >=dev-python/lxml-3.6.0[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" + +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" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +pkg_postinst() { + einfo "" + einfo "This release of repoman is from the new portage/repoman split" + einfo "release code base." + einfo "This new repoman code base is still being developed. So its API's" + einfo "are not to be considered stable and are subject to change." + einfo "The code released has been tested and considered ready for use." + einfo "This however does not guarantee it to be completely bug free." + einfo "Please report any bugs you may encounter." + einfo "" +} diff --git a/app-portage/repoman/repoman-2.3.9.ebuild b/app-portage/repoman/repoman-2.3.9.ebuild new file mode 100644 index 000000000000..cd3bc0292adb --- /dev/null +++ b/app-portage/repoman/repoman-2.3.9.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +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 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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-2.3.27[${PYTHON_USEDEP}] + >=dev-python/lxml-3.6.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" + +src_prepare() { + sed 's:FileNotFoundError:EnvironmentError:' -i pym/repoman/config.py || die + sed 's:file\.size\.fatal:file.size-fatal:' -i pym/repoman/modules/scan/fetch/fetches.py || die + distutils-r1_src_prepare +} + +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" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +pkg_postinst() { + einfo "" + einfo "This release of repoman is from the new portage/repoman split" + einfo "release code base." + einfo "This new repoman code base is still being developed. So its API's" + einfo "are not to be considered stable and are subject to change." + einfo "The code released has been tested and considered ready for use." + einfo "This however does not guarantee it to be completely bug free." + einfo "Please report any bugs you may encounter." + einfo "" +} diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild new file mode 100644 index 000000000000..9d1ee5500780 --- /dev/null +++ b/app-portage/repoman/repoman-9999.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +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/~dolsen/releases/${PN}/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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-2.3.0_rc[${PYTHON_USEDEP}] + >=dev-python/lxml-3.6.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" + +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" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +pkg_postinst() { + einfo "" + einfo "This release of repoman is from the new portage/repoman split" + einfo "release code base." + einfo "This new repoman code base is still being developed. So its API's" + einfo "are not to be considered stable and are subject to change." + einfo "The code released has been tested and considered ready for use." + einfo "This however does not guarantee it to be completely bug free." + einfo "Please report any bugs you may encounter." + einfo "" +} -- cgit v1.2.3