diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-01-09 06:48:07 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-01-09 06:48:07 +0000 |
commit | 4c39f46667baeb4674cfc396cc0e6b66dc88a8fd (patch) | |
tree | 3f825063f4eed178fc199a6a1ab17f059f9a187a | |
parent | 2024-01-09 06:33:10 UTC (diff) | |
parent | sys-kernel/installkernel-gentoo: drop 10 (diff) | |
download | gentoo-4c39f46667baeb4674cfc396cc0e6b66dc88a8fd.tar.gz gentoo-4c39f46667baeb4674cfc396cc0e6b66dc88a8fd.tar.bz2 gentoo-4c39f46667baeb4674cfc396cc0e6b66dc88a8fd.zip |
Merge updates from master
-rw-r--r-- | app-text/qpdf/Manifest | 3 | ||||
-rw-r--r-- | app-text/qpdf/qpdf-11.8.0.ebuild | 99 | ||||
-rw-r--r-- | dev-python/environs/Manifest | 1 | ||||
-rw-r--r-- | dev-python/environs/environs-10.1.0.ebuild | 39 | ||||
-rw-r--r-- | dev-python/sqlglot/Manifest | 1 | ||||
-rw-r--r-- | dev-python/sqlglot/sqlglot-20.8.0.ebuild | 121 | ||||
-rw-r--r-- | eclass/cargo.eclass | 3 | ||||
-rw-r--r-- | sys-kernel/installkernel-gentoo/Manifest | 2 | ||||
-rw-r--r-- | sys-kernel/installkernel-gentoo/installkernel-gentoo-11.ebuild (renamed from sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild) | 0 |
9 files changed, 265 insertions, 4 deletions
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest index 72f284dc3d2b..346ddec3bf71 100644 --- a/app-text/qpdf/Manifest +++ b/app-text/qpdf/Manifest @@ -8,3 +8,6 @@ DIST qpdf-11.6.4.tar.gz.asc 833 BLAKE2B 423552746f54f52dc7149bc1ba6854dfc4df8e4b DIST qpdf-11.7.0-doc.zip 6874893 BLAKE2B b14b0f68f4599bd4f396cccbc35b13b0f52b72856de1afd3fdb0c70b33e1702c4afd7c954011df72905c06ff262b08dc9519e44dcef9b7633423d38208542795 SHA512 7ceeff62788defe3649a8d242220c7c8208ebe92dbd9d67b4b53d5036afb1cdbcfe46b4140b064b0542cba2d8eaaad6eedec1ed7b7bd0ccafe2dd7aa20efaa69 DIST qpdf-11.7.0.tar.gz 18124824 BLAKE2B aa10e154899a7fd53d696b9521cc8a44d4a336094711ddc2a506dac8841ae12ce5bcd604555725d2b6bae3c63a6a3f6ef0e9ab6baf38dd3d7fa71507234378a3 SHA512 6ee302671fd4513c5b22f101feb773b4101de6cc5ff6b0e25d1daa03df82420f87ce7db49a6c47758d7e8bbc3beeb997d4671d52e4cf0ac0d4f817f10677d1f9 DIST qpdf-11.7.0.tar.gz.asc 833 BLAKE2B e0b15e6ed6b67fc222f7b4d9f863e8630af814bede3605ca56b83b287d7e02c700092e59f3805565884b55af96c4ddd407331cae26273287b546c32a7975c331 SHA512 ef5aa1661944fd56c3f929ee1ffc78229667ed1d1c639aab82a0ff3a3891455e4dcf3dffbb17e9d22862d6426a263182360b19dd58435a2413c19761abc9b966 +DIST qpdf-11.8.0-doc.zip 6886718 BLAKE2B de4e706cc27a73dffa40561fc1b0342a6c6d5e2b3bced0dbf6dbe43c969911b61f6e74fd3fd871833078ed70c50fca28dd316ad8d6ff0344d668a958a9d1840b SHA512 5b2748d4b0b0367d4fd2773e697f6e125d92c397b62ee63388bce85c74a051e1b17d487941128927e3493669bd00196caa842eee76db0f05827a650a067b6939 +DIST qpdf-11.8.0.tar.gz 18150965 BLAKE2B 6843a268d472c83169d33ef5f216da9428ec84a73a93cd81fde8f122c088ad1401df47c209d7aa4f3a5b950ddef0d8926908b0a9efefad13757eb0ea7dc1db86 SHA512 e558cd4f0066ace73670ead7a49b0343862cdd275bd013eb10cbef6e161a13955101e6d78de8e87bb05a68498c3018152e9d20d61c01dce55d3810e7f5768aa9 +DIST qpdf-11.8.0.tar.gz.asc 833 BLAKE2B 02c0cfec3bab48a3d49783cb68bd6b6c6382536f5d15a54357b54e02b7ef2b5a3517c7448cebf255eebac60feeef2cfe6b42ffe5bfeec5db07db24059f97df69 SHA512 4dce7d90fef819edbb5bb5a46983c9cd6d181f1e58e36b439a0e9e38aca9cb9954fb5f6886cd2284f9852e205a3a4035827f4baa693a96c293ea604dcddb430e diff --git a/app-text/qpdf/qpdf-11.8.0.ebuild b/app-text/qpdf/qpdf-11.8.0.ebuild new file mode 100644 index 000000000000..055841cf1036 --- /dev/null +++ b/app-text/qpdf/qpdf-11.8.0.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 cmake verify-sig + +DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files" +HOMEPAGE=" + https://qpdf.sourceforge.io/ + https://github.com/qpdf/qpdf/ +" +SRC_URI=" + https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz + doc? ( + https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip + ) + verify-sig? ( + https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz.asc + ) +" + +LICENSE="|| ( Apache-2.0 Artistic-2 )" +# Subslot for libqpdf soname version (just represent via major version) +SLOT="0/$(ver_cut 1)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples gnutls test" +RESTRICT="!test? ( test )" + +RDEPEND=" + media-libs/libjpeg-turbo:= + sys-libs/zlib + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( dev-libs/openssl:= ) +" +DEPEND=" + ${RDEPEND} + test? ( + app-text/ghostscript-gpl[tiff(+)] + media-libs/tiff + sys-apps/diffutils + ) +" +BDEPEND=" + dev-lang/perl + doc? ( app-arch/unzip ) + verify-sig? ( sec-keys/openpgp-keys-jberkenbilt ) +" + +QA_CONFIG_IMPL_DECL_SKIP=( + # glibc only (bug #899052) + malloc_info +) + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jberkenbilt.asc + +src_unpack() { + if use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + +src_configure() { + local crypto_provider=$(usex gnutls GNUTLS OPENSSL) + local crypto_provider_lowercase=${crypto_provider,,} + + # Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html. + local mycmakeargs=( + -DINSTALL_EXAMPLES=$(usex examples) + + # Avoid automagic crypto deps + -DUSE_IMPLICIT_CRYPTO=OFF + -DALLOW_CRYPTO_NATIVE=ON + + # Breaks install with USE=-doc in 11.0.0? + #-DINSTALL_MANUAL=ON + + -DDEFAULT_CRYPTO=${crypto_provider_lowercase} + -DREQUIRE_CRYPTO_${crypto_provider}=ON + ) + + cmake_src_configure +} + +src_install() { + if use doc ; then + mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die + fi + + cmake_src_install + + # Completions + dobashcomp completions/bash/qpdf + + insinto /usr/share/zsh/site-functions + doins completions/zsh/_qpdf +} diff --git a/dev-python/environs/Manifest b/dev-python/environs/Manifest index cbad02a55109..db277cc6db18 100644 --- a/dev-python/environs/Manifest +++ b/dev-python/environs/Manifest @@ -1 +1,2 @@ DIST environs-10.0.0.gh.tar.gz 23500 BLAKE2B c99a5972416a7959d06bb4541f6b319a948727386e621252e86389e3f271130917f6a056abe1363bd3bc4f10eb9d79107d9a6859fb4a745436fc35dd7a45e4d0 SHA512 4f2a485eb6a42687bd641f1468e70578eadaf01bd16fc121a9ba89725f560da1f1a4f0ba4476fbca561ffc6f4538c9a742b9335b89398d0abe09434e5e135957 +DIST environs-10.1.0.gh.tar.gz 23613 BLAKE2B 6a0e47ba5397f21d4aa4026e8046a49f1a0f19f495725e9980786fe31b03ce492ce9233d279cb960c13a7d0b592034b643e3d719732d53fe0fb28ec15fc7c815 SHA512 5faf0e3e8fb67b01e4b809c817c5547914a499642324c0a9a2e2158e686ce80416656f29865cfee60e28e72360b6a65ec8045ef682a3a02ab49639f10e180bf5 diff --git a/dev-python/environs/environs-10.1.0.ebuild b/dev-python/environs/environs-10.1.0.ebuild new file mode 100644 index 000000000000..eb57773697a8 --- /dev/null +++ b/dev-python/environs/environs-10.1.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 + +DESCRIPTION="Python library for simplified environment variable parsing" +HOMEPAGE=" + https://github.com/sloria/environs/ + https://pypi.org/project/environs/ +" +SRC_URI=" + https://github.com/sloria/environs/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +RDEPEND=" + dev-python/python-dotenv[${PYTHON_USEDEP}] + dev-python/marshmallow[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/django-cache-url[${PYTHON_USEDEP}] + dev-python/dj-database-url[${PYTHON_USEDEP}] + dev-python/dj-email-url[${PYTHON_USEDEP}] + ) +" + +DOCS=( CHANGELOG.md CONTRIBUTING.md README.md ) + +distutils_enable_tests pytest diff --git a/dev-python/sqlglot/Manifest b/dev-python/sqlglot/Manifest index d4052e38854b..4afb2ed00d44 100644 --- a/dev-python/sqlglot/Manifest +++ b/dev-python/sqlglot/Manifest @@ -21,6 +21,7 @@ DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb9 DIST smallvec-1.11.2.crate 34801 BLAKE2B 58645e99db8f02db64d02c75860c7ea41836c427c03ee3b0b23365e73a406e4fd6ac312bf13fc5faef8bb6111c10fcfd5f839d5b3686e9b34d1626f8469fc327 SHA512 5cfb427c3b99b0dbd71f6154ed899abcde9d7d2992977ac7b2ef3a4c3ff51e4efafd133071a69609b4ed6cb269bdc26b79eb72e1988f10dfcaef8185d950cd1d DIST sqlglot-20.5.0.tar.gz 9066011 BLAKE2B a2062e4bbb74abe84d14fa1bdde57374185a7487c42c90b13d4fdee5d0793f0cbe54c8da21d33ec0aef398fd4e2015547bc34dd0d444391079c33aa90d612f77 SHA512 4ccc3bf40fe778e8911008a6a51ef84a2c46e430ad15b7ac93e64d68c13705d9811f72691e96f35ab7ce2c45835776afb50815807ab585b52489b1971bb7ddaa DIST sqlglot-20.7.1.tar.gz 9293277 BLAKE2B 8a7d894033122a5541f1e6bf3bc9066805fc8a43e700186dde49c007e042baecfb59742918607b8779f11d0215f0f107cd45ed793683256fdcd2e1b11a4ab058 SHA512 ffc4d539752e9357cb93669ab936666b7c11d37ccca1358059ce19322a9ba65b05b8492ecc3c39b5905564b3aae2fe13d4ae87c80b51b5cf5a43bbb074cc2c88 +DIST sqlglot-20.8.0.tar.gz 9300786 BLAKE2B 843043c4b389145a9da5f0045d8861d054f046b3f79d9f9e7025b1a4ffc10564a83b3b413766190d64c7477795252738e8c5f35dde81d07f1b5d4a6e3a3a12ee SHA512 d88bef209ff27ae2b8187c58746e6388252e693282f0dfe736eff5f1ed2a2b6322632921f3a759f2d6f304b8339abee76be638ff899d23ad13eec72d1322c062 DIST syn-2.0.41.crate 246016 BLAKE2B 9d389f2e2a0acb4c84c309456e8ffcc88c5d4d541535ed136832d7a6054dde45a598bb68e8a6f3062ca2a96e1ceae947d54b3aec9bad65b0c51d6733aa6c80db SHA512 6bbaf69ca783025dfb81ac3612ac60bfbed31b2d87792909b35c12892dadebdaff2ddf9463105e536b671dce5870610ab90fe29471284bbd3014dca8d6993f1a DIST target-lexicon-0.12.12.crate 25156 BLAKE2B f3803596c75f6c89438592a1176c3748fc2c0524d7d50a20056de1cd26d40c572b05bafcdf6dd702752864bea37c8b4f28f96dadc12a5b3bb1d279b25e489f85 SHA512 6147295c43ba1b7b087a3c5ab51534b2985e4e77e5e15687978cfb9d07e21c4fd9bc7191576d6cabd268d08a44dc733c4a957e59dba8b948c2055d8bb433aeca DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 diff --git a/dev-python/sqlglot/sqlglot-20.8.0.ebuild b/dev-python/sqlglot/sqlglot-20.8.0.ebuild new file mode 100644 index 000000000000..058fa81df816 --- /dev/null +++ b/dev-python/sqlglot/sqlglot-20.8.0.ebuild @@ -0,0 +1,121 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +CARGO_OPTIONAL=1 +CRATES=" + autocfg@1.1.0 + bitflags@1.3.2 + cfg-if@1.0.0 + heck@0.4.1 + indoc@2.0.4 + libc@0.2.150 + lock_api@0.4.11 + memoffset@0.9.0 + once_cell@1.19.0 + parking_lot@0.12.1 + parking_lot_core@0.9.9 + proc-macro2@1.0.70 + pyo3-build-config@0.20.0 + pyo3-ffi@0.20.0 + pyo3-macros-backend@0.20.0 + pyo3-macros@0.20.0 + pyo3@0.20.0 + quote@1.0.33 + redox_syscall@0.4.1 + scopeguard@1.2.0 + smallvec@1.11.2 + syn@2.0.41 + target-lexicon@0.12.12 + unicode-ident@1.0.12 + unindent@0.2.3 + windows-targets@0.48.5 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.48.5 +" + +inherit cargo distutils-r1 pypi optfeature + +DESCRIPTION="An easily customizable SQL parser and transpiler" +HOMEPAGE=" + https://sqlglot.com/ + https://github.com/tobymao/sqlglot/ + https://pypi.org/project/sqlglot/ +" +SRC_URI+=" + native-extensions? ( + ${CARGO_CRATE_URIS} + ) +" + +LICENSE="MIT" +LICENSE+=" native-extensions? (" +# Dependent crate licenses +LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016" +LICENSE+=" )" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="+native-extensions" + +BDEPEND=" + native-extensions? ( + ${RUST_DEPEND} + dev-util/maturin[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so" + +src_unpack() { + cargo_src_unpack +} + +src_prepare() { + # remove fragile timing check + sed -i -e '/assertLessEqual(time\.time/d' tests/test_parser.py || die + distutils-r1_src_prepare +} + +python_compile() { + distutils-r1_python_compile + + if use native-extensions; then + local DISTUTILS_USE_PEP517=maturin + cd sqlglotrs || die + distutils-r1_python_compile + cd - >/dev/null || die + fi +} + +python_test() { + local EPYTEST_IGNORE=( + # Tests require pyspark or duckdb which aren't in the tree. + # Pandas would be a requirement normally, but it gets ignored by proxy. + "tests/dataframe/integration/test_dataframe.py" + "tests/dataframe/integration/test_grouped_data.py" + "tests/dataframe/integration/test_session.py" + "tests/test_executor.py" + "tests/test_optimizer.py" + ) + + # make sure not to use an earlier installed version + local -x SQLGLOTRS_TOKENIZER=$(usex native-extensions 1 0) + rm -rf sqlglotrs || die + epytest +} + +pkg_postinst() { + optfeature "simplifying timedelta expressions" dev-python/python-dateutil +} diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass index 7bdd548b0df8..3bdbb5e3ec64 100644 --- a/eclass/cargo.eclass +++ b/eclass/cargo.eclass @@ -175,9 +175,6 @@ ECARGO_VENDOR="${ECARGO_HOME}/gentoo" # If no arguments are provided, it uses the CRATES variable. # The value is set as CARGO_CRATE_URIS. _cargo_set_crate_uris() { - # when called by pkgbump, do not fetch crates - [[ ${PKGBUMPING} == ${PVR} ]] && return - local -r regex='^([a-zA-Z0-9_\-]+)-([0-9]+\.[0-9]+\.[0-9]+.*)$' local crates=${1} local crate diff --git a/sys-kernel/installkernel-gentoo/Manifest b/sys-kernel/installkernel-gentoo/Manifest index 306d1e35a9c7..1b9400f85f38 100644 --- a/sys-kernel/installkernel-gentoo/Manifest +++ b/sys-kernel/installkernel-gentoo/Manifest @@ -1 +1 @@ -DIST installkernel-gentoo-10.tar.gz 4379 BLAKE2B 482309090305cf02fe38fb462b7f85a1cbe51b303b1828313210bd37f4f062380bf797bd786274eba53c36eb22e2b5204b1717ec0a50534eca0bc210957b25d0 SHA512 ca4bf98ddca82fdd17b933cbbd1c5604b70450e9c4eb2df288b1bdf31209b1cd6f1f83f6bfadee619a09e5ef01a14472321323cbe8a7b696656cbabfad82bc3a +DIST installkernel-gentoo-11.tar.gz 4427 BLAKE2B ef71c5e4bb928c60975812a905e2a05f4df98ae6ad8f8e515aee9528e2418a2cb0481828b8e68721f9d691192a25ab802488ee1cd4e796133442431bac1a3c0b SHA512 d39d3d9222507bafde288ccab49cc11310dfe5a480ca17b5580514ac6268d3cd4c1b6c0fbe61b7dcd9712876e50736d832c4991d64e1920a4f4df30ccbbfc9d6 diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild b/sys-kernel/installkernel-gentoo/installkernel-gentoo-11.ebuild index b3fc7f5fa826..b3fc7f5fa826 100644 --- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild +++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-11.ebuild |