From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- app-portage/esearch/Manifest | 5 +- app-portage/esearch/esearch-1.3-r2.ebuild | 52 --------------------- app-portage/esearch/esearch-1.3-r3.ebuild | 53 ++++++++++++++++++++++ app-portage/esearch/esearch-9999.ebuild | 4 +- .../esearch/files/1.3-updatedb-quoting.patch | 39 ++++++++++++++++ 5 files changed, 97 insertions(+), 56 deletions(-) delete mode 100644 app-portage/esearch/esearch-1.3-r2.ebuild create mode 100644 app-portage/esearch/esearch-1.3-r3.ebuild create mode 100644 app-portage/esearch/files/1.3-updatedb-quoting.patch (limited to 'app-portage/esearch') diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest index d584562035e5..24bde302bb38 100644 --- a/app-portage/esearch/Manifest +++ b/app-portage/esearch/Manifest @@ -1,7 +1,8 @@ AUX 1.3-Fix-python-3-compatability.patch 1177 BLAKE2B 1b119e299c6a1ab3a55e6f93190586d9bfc4c84f451605d073372b8db528c6680616c2be3038e8fc58c26d134300862db17088591043eac55aa89eda6cabf20b SHA512 b136b610a87e61e2ca01956fc2ba444b25e26333ed973c0c779279203ddb1ab100ec7ca35c50f4aeaa950829438c7e7729aa95fa43efbd0b5eb3b6f31fce529a AUX 1.3-Fix-setup.py.patch 792 BLAKE2B 1bbaa8f4499d48508c38c48e579849dd8b5cfae587e982b4bae1932d3c8a23d0c4ad43639710576a9b7dcc53a93d47f1965166b271e93c4cee5309be03a05bc9 SHA512 db741e6effca01b8e71810bd455d227c93df2ca86f5b77c69ba227cb1426dfeca548854b626d4d626e311faa6b8bb137c9f22b21322b6fa9f5ac2dec4786a5d2 +AUX 1.3-updatedb-quoting.patch 1409 BLAKE2B 6bd2401216d0394e155cad28386ba2235fd11ae5fd6f5ceb809afb4ca10033c05ee076829b003f40abe89c6d3062d41e13eeab3dc648b3a49ca457dc3a58e318 SHA512 fce5c139969e1f0ab448a985e00a1e9a38b426f28566c506ed63b4c99c69f8240e88179dabd814de687bfed2a3b6ecf5601f4eb9e54a2c37101e92177a3f6aab AUX eupdatedb.cron 659 BLAKE2B c0e820e59ba42f9caf2997f0042836c564283edc1edbcd8fbae4d1a79c9acfe9df344d945dd2ffb1d13d0aeb36f32dada366332517b728e2e5fedfe725788f0a SHA512 4ebaa0f8f73215aa497dc0adb922eae1ca42047b7069d2d0dd279edca8c4d9e782ccbfbc421ccd4cdbbffcc5cd8cffcf0c56ab66747043c5743c217c1e33df92 DIST esearch-1.3.tar.gz 19383 BLAKE2B 308cb075eff0a592135e883913bab3709b64a785602250ae06bfcb50eca6f8dacfb047bb4326b4b9476553bc8bd993b69295373cced7a18786a7834378e860e9 SHA512 7fbc1c362a320a76a40c45ddf83a29223eaafd3cfed1d8a9410a380e2025fb515eea26e38ebf0f304d14230c6c5cfc83ef2116b774b1d50ee4f7f4bb0ac046c4 -EBUILD esearch-1.3-r2.ebuild 1447 BLAKE2B 5ec3becd143f78f6616fb59f01bf0760a1d046f5c60b8cfc8b34cc62baff102b822e02a4aa421e3fe7754b6988f8b49c1bf8ebb2ddc72428339cd97c0b60f3ca SHA512 a8fe9c702ae1689b84448fba4aac7c38e11ea5dfc5c7c82b0e906107b4cb8e00069e0859363b0c3c486658b596849e021f13c9b5b59c0e69c691c680e2b8821a -EBUILD esearch-9999.ebuild 1038 BLAKE2B c27f36a3dc20dfb71cf5a04f041c47b73786235e7f6d69b30c9cec8ab28dc5be05ab4318de570467af15bfde089cc672b057fbeb1c13cbcf36d43167c692efad SHA512 0be5a5a9792dbe714de8b7585f94717a1f57a99c3b8ee8ddebe1df1ba8d0cbd0255d1f23716c1a31e8a1b4d6a5f2f02fda0586f8afd90a954f7349bbf56d29f2 +EBUILD esearch-1.3-r3.ebuild 1490 BLAKE2B 1912266af17afea2f01a23ff2656a752d26f59d037eb7df77b7c688fa247fa22bf9a3734dd3ff827356e9acdceb6a4f3098b1fa91b1a9437ec4e6551fc60050c SHA512 3b0eea2ba8cd52644d72a12d618831099529a5a24e59a9babc35f4febc7eb1dacc1023fc03146f4747c9c872b5af2d6d85a687ff7c2c09f924f91df997d20e99 +EBUILD esearch-9999.ebuild 1037 BLAKE2B 7f601b09809e8098c2bfba583281b5449fce0657e93c591082eba1d373e67cd5e9962d7176b62410e22bfddbbe0e5d6996f9a1fb2dc7f252c3a2c8d55a8a748a SHA512 3ce2fc7fbbcc7dfa41b7d57a4900a52597f5350e73914f21241713f67e62efd5bc9fb918f1f48ef8ca44922fdd8b28c33b8bb57559546e823e3d394c30d86abd MISC metadata.xml 357 BLAKE2B db12b57347ce8c8f1e41c64bf0a94c80509e27964353113c40d4c49aee85d3ab747d3ac2a05b1a1314b141feef9a014a3b475bad5101a077da803f55cc853098 SHA512 a84ae0adf855d68fc14b01d1583b0c264a27852df31397af387ee7d8948f413cd98d2fad937899a91387f23d70738a540522b393e2fdab21dc0f55014cf6557f diff --git a/app-portage/esearch/esearch-1.3-r2.ebuild b/app-portage/esearch/esearch-1.3-r2.ebuild deleted file mode 100644 index 39ad2fc4e7f2..000000000000 --- a/app-portage/esearch/esearch-1.3-r2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=(python{3_6,3_7}) -PYTHON_REQ_USE="readline(+)" - -inherit distutils-r1 - -DESCRIPTION="Replacement for 'emerge --search' with search-index" -HOMEPAGE="https://github.com/fuzzyray/esearch" -SRC_URI="https://github.com/downloads/fuzzyray/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="l10n_fr l10n_it" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" - -DEPEND="sys-apps/portage" -RDEPEND="${DEPEND}" - -# Populate the patches array for any patches for -rX releases -# It is an array of patch file names of the form: -# "${FILESDIR}"/${PV}-fix-EPREFIX-capability.patch -PATCHES=( - "${FILESDIR}"/${PV}-Fix-setup.py.patch - "${FILESDIR}"/${PV}-Fix-python-3-compatability.patch -) - -python_configure_all() { - echo VERSION="${PVR}" "${EPYTHON}" setup.py set_version - VERSION="${PVR}" "${EPYTHON}" setup.py set_version \ - || die "setup.py set_version failed" -} - -python_install_all() { - distutils-r1_python_install_all - dodoc eupdatedb.cron - - # Remove unused man pages according to the l10n flags - if ! use l10n_fr ; then - rm -rf "${ED}"/usr/share/man/fr \ - || die "rm failed to remove ${ED}/usr/share/man/fr" - fi - - if ! use l10n_it ; then - rm -rf "${ED}"/usr/share/man/it \ - || die "rm failed to remove ${ED}/usr/share/man/it" - fi -} diff --git a/app-portage/esearch/esearch-1.3-r3.ebuild b/app-portage/esearch/esearch-1.3-r3.ebuild new file mode 100644 index 000000000000..026f4017bec1 --- /dev/null +++ b/app-portage/esearch/esearch-1.3-r3.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=(python3_{6..9}) +PYTHON_REQ_USE="readline(+)" + +inherit distutils-r1 + +DESCRIPTION="Replacement for 'emerge --search' with search-index" +HOMEPAGE="https://github.com/fuzzyray/esearch" +SRC_URI="https://github.com/downloads/fuzzyray/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +IUSE="l10n_fr l10n_it" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" + +DEPEND="sys-apps/portage" +RDEPEND="${DEPEND}" + +# Populate the patches array for any patches for -rX releases +# It is an array of patch file names of the form: +# "${FILESDIR}"/${PV}-fix-EPREFIX-capability.patch +PATCHES=( + "${FILESDIR}"/${PV}-Fix-setup.py.patch + "${FILESDIR}"/${PV}-Fix-python-3-compatability.patch + "${FILESDIR}"/${PV}-updatedb-quoting.patch +) + +python_configure_all() { + echo VERSION="${PVR}" "${EPYTHON}" setup.py set_version + VERSION="${PVR}" "${EPYTHON}" setup.py set_version \ + || die "setup.py set_version failed" +} + +python_install_all() { + distutils-r1_python_install_all + dodoc eupdatedb.cron + + # Remove unused man pages according to the l10n flags + if ! use l10n_fr ; then + rm -rf "${ED}"/usr/share/man/fr \ + || die "rm failed to remove ${ED}/usr/share/man/fr" + fi + + if ! use l10n_it ; then + rm -rf "${ED}"/usr/share/man/it \ + || die "rm failed to remove ${ED}/usr/share/man/it" + fi +} diff --git a/app-portage/esearch/esearch-9999.ebuild b/app-portage/esearch/esearch-9999.ebuild index f880bb7a1ad9..cb46da61322f 100644 --- a/app-portage/esearch/esearch-9999.ebuild +++ b/app-portage/esearch/esearch-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -PYTHON_COMPAT=(python{3_6,3_7}) +PYTHON_COMPAT=(python3_{6..9}) PYTHON_REQ_USE="readline(+)" inherit distutils-r1 git-r3 diff --git a/app-portage/esearch/files/1.3-updatedb-quoting.patch b/app-portage/esearch/files/1.3-updatedb-quoting.patch new file mode 100644 index 000000000000..4f20634e6750 --- /dev/null +++ b/app-portage/esearch/files/1.3-updatedb-quoting.patch @@ -0,0 +1,39 @@ +From 8cbf59309a48327b74969bf402b415e389d79f73 Mon Sep 17 00:00:00 2001 +From: Zac Medico +Date: Sun, 16 Aug 2020 13:37:27 -0700 +Subject: [PATCH] updatedb: use repr for correct quoting (bug 670224) + +Bug: https://bugs.gentoo.org/670224 +Signed-off-by: Zac Medico +--- + esearch/update.py | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +diff --git a/esearch/update.py b/esearch/update.py +index f05d08f..b18070c 100755 +--- a/esearch/update.py ++++ b/esearch/update.py +@@ -210,18 +210,10 @@ def updatedb(config=None): + lastcat = curcat + + installed = pkg_version(VARTREE.dep_bestmatch(pkg)) +- if installed: +- installed = "\'%s\'" % installed +- else: +- installed = str(installed) + + dbfile.write( +- _unicode( +- "(\'%s\', \'%s\', %s" %(pkgname, pkg, str(masked)) + +- ", \'%s\', %s" % (pkg_version(pkgv), installed) + +- ", \'%s\', \'%s\', \'%s\', \'%s\'" +- % (filesize, homepage, description.replace("'", "\\'"), +- _license) + "),\n")) ++ repr((pkgname, pkg, masked, pkg_version(pkgv), installed, ++ filesize, homepage, description, _license)) + ",\n") + + except KeyboardInterrupt: + dbfile.close() +-- +2.25.3 + -- cgit v1.2.3