[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: 40703c4f8379c52c7c5f19d340d2ae76fd522ff5 Author: Sam James gentoo org> AuthorDate: Tue Apr 12 04:34:00 2022 + Commit: Sam James gentoo org> CommitDate: Tue Apr 12 05:58:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40703c4f autotools.eclass: don't use reserved variable (__) Closes: https://bugs.gentoo.org/806368 Signed-off-by: Sam James gentoo.org> eclass/autotools.eclass | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 8a44aae417db..30bc0e18fd3a 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -13,13 +13,13 @@ # Note: We require GNU m4, as does autoconf. So feel free to use any features # from the GNU version of m4 without worrying about other variants (i.e. BSD). -if [[ ${__AUTOTOOLS_AUTO_DEPEND+set} == "set" ]] ; then +if [[ ${_AUTOTOOLS_AUTO_DEPEND+set} == "set" ]] ; then # See if we were included already, but someone changed the value # of AUTOTOOLS_AUTO_DEPEND on us. We could reload the entire # eclass at that point, but that adds overhead, and it's trivial # to re-order inherit in eclasses/ebuilds instead. #409611 - if [[ ${__AUTOTOOLS_AUTO_DEPEND} != ${AUTOTOOLS_AUTO_DEPEND} ]] ; then - die "AUTOTOOLS_AUTO_DEPEND changed value between inherits; please inherit ${ECLASS} first! ${__AUTOTOOLS_AUTO_DEPEND} -> ${AUTOTOOLS_AUTO_DEPEND}" + if [[ ${_AUTOTOOLS_AUTO_DEPEND} != ${AUTOTOOLS_AUTO_DEPEND} ]] ; then + die "AUTOTOOLS_AUTO_DEPEND changed value between inherits; please inherit ${ECLASS} first! ${_AUTOTOOLS_AUTO_DEPEND} -> ${AUTOTOOLS_AUTO_DEPEND}" fi fi @@ -134,7 +134,7 @@ if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then *) BDEPEND=${AUTOTOOLS_DEPEND} ;; esac fi -__AUTOTOOLS_AUTO_DEPEND=${AUTOTOOLS_AUTO_DEPEND} # See top of eclass +_AUTOTOOLS_AUTO_DEPEND=${AUTOTOOLS_AUTO_DEPEND} # See top of eclass unset _automake_atom _autoconf_atom
[gentoo-commits] repo/gentoo:master commit in: sys-apps/coreutils/
commit: dcf05bbf8740d5d5dbbdb2a07bdfd0ac93caa73f Author: Sam James gentoo org> AuthorDate: Tue Apr 12 05:58:03 2022 + Commit: Sam James gentoo org> CommitDate: Tue Apr 12 05:58:35 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf05bbf sys-apps/coreutils: add 9.0_p20220409 (unkeyworded) Add testing release from upstream to find any problems pre-release, given that upstream releases are rather infrequent usually. Signed-off-by: Sam James gentoo.org> sys-apps/coreutils/Manifest | 2 + sys-apps/coreutils/coreutils-9.0_p20220409.ebuild | 249 ++ 2 files changed, 251 insertions(+) diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index e13c336609db..fd48060a5f87 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -2,3 +2,5 @@ DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125e DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145 DIST coreutils-9.0.tar.xz 5612752 BLAKE2B 59617cd25fd4c70f51bfbef851bd83e73f9c9ba5c11eb539f7f75c0184d55832e004b28e9268fb8064db145cb071ead2b9c0c3346bc35a11934ffe1b15bf17ac SHA512 9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03 DIST coreutils-9.0.tar.xz.sig 833 BLAKE2B 1393f60361524e0a6eab5631aada50ee4124bd0e9ff3020b7593914a888f0edaec78339caee28847e85e1a1af6ea519ab9fad208db605f0c6b8a4e7ab19853a8 SHA512 1a368c92ddb57f386c188ef72f1edad7e217c983c296f9be0d27ffbaa673bf2f004c321fbaff8ae6cdebf6ffef402e3e8c69e6c8e30aca988e0ea38f2296cf30 +DIST coreutils-9.0_p20220409.tar.xz 5689096 BLAKE2B d9b037947362f6823339fc234051886370eb9d2cbb19b15006e6a5e44db80d259159ffe6255c42565f02a2dcb79499af9f57c3ed5c21fd1ece1589da8109cd74 SHA512 7f8fda5d3e65768f9b0aa5da7bbc84ac1e24a8e87a840bb9a013dd8875346b5e9ccc3613de95478c87b859dd2a454651768852cbd67e1466ec3f6d7fef4fe938 +DIST coreutils-9.0_p20220409.tar.xz.sig 833 BLAKE2B 8de0a283394dfc80b5cde5a051190af3c9fe5344881db3d2eacb2b3ae7a0cd037513a610dc564d37a055af8a2d823cdc7d6a0999bcc3a0c688d53570d792fe46 SHA512 72c491ec43d3deed3d291bdae13fb54a6b1ec2d37233f4a115075a60a19ec5b522a414b2e1768e3f21e66152a031777c8bd435624fd0171eb9257de20b3d11dc diff --git a/sys-apps/coreutils/coreutils-9.0_p20220409.ebuild b/sys-apps/coreutils/coreutils-9.0_p20220409.ebuild new file mode 100644 index ..8460bd016468 --- /dev/null +++ b/sys-apps/coreutils/coreutils-9.0_p20220409.ebuild @@ -0,0 +1,249 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc +inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig + +PATCH="${PN}-8.30-patches-01" +DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)" +HOMEPAGE="https://www.gnu.org/software/coreutils/; + +if [[ ${PV} == *_p* ]] ; then + # Note: could put this in devspace, but if it's gone, we don't want + # it in tree anyway. It's just for testing. + MY_SNAPSHOT="$(ver_cut 1-2).193-54bec" + SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz" + SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )" + S="${WORKDIR}"/${PN}-${MY_SNAPSHOT} +else + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + !vanilla? ( + mirror://gentoo/${PATCH}.tar.xz + https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz + ) + verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr" +RESTRICT="!test? ( test )" + +LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) + caps? ( sys-libs/libcap ) + gmp? ( dev-libs/gmp:=[static-libs] ) + xattr? ( sys-apps/attr[static-libs] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) + selinux? ( sys-libs/libselinux ) + nls? ( virtual/libintl )" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" +BDEPEND=" + app-arch/xz-utils + dev-lang/perl + test? ( + dev-lang/perl + dev-perl/Expect + dev-util/strace + ${PYTHON_DEPS} + ) + verify-sig? ( sec-keys/openpgp-keys-coreutils ) +" +RDEPEND+=" + hostname? (
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/nokogiri/
commit: 52308013eee310d812dea2668ebf3270bc5104fe Author: Hans de Graaff gentoo org> AuthorDate: Tue Apr 12 05:41:16 2022 + Commit: Hans de Graaff gentoo org> CommitDate: Tue Apr 12 05:42:50 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52308013 dev-ruby/nokogiri: add 1.13.4 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/nokogiri/Manifest | 1 + dev-ruby/nokogiri/nokogiri-1.13.4.ebuild | 95 2 files changed, 96 insertions(+) diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest index 15f1fb85ae4d..1dcd9deabaa2 100644 --- a/dev-ruby/nokogiri/Manifest +++ b/dev-ruby/nokogiri/Manifest @@ -3,3 +3,4 @@ DIST nokogiri-1.12.5-git.tgz 6158880 BLAKE2B 994fd89c5163d92110de40e2dc654698b11 DIST nokogiri-1.13.0-git.tgz 6188433 BLAKE2B ec603e4202b03cc74ce73c540cfccab51f0910b24a3cde0ecbc6267a83c0c4898bc40614261727f7c7e52561d0dec679e00d97a9a0066ac436037a1681a4125b SHA512 f11169ab0dfec9b16e9fc32c066910dcc71325795283fac1372a67383535ddfd09bf342e2a82b129b71c058153f338cba3ef16f85225f24b6d0c769c98cf DIST nokogiri-1.13.1-git.tgz 6190499 BLAKE2B daea484ee0e5bff581ae67528f1688002f1e2f550eb55e3164b631f9e87b188ec4152347aaa0ae6253feafbdae9182c54c92cb709c223ce04120ddd1b340cd17 SHA512 febb7b8a701c9be4f7b60a8b43bc24d17a37d39a8557ea4fc76d1490e7f9973d2a4516560f3335ba5d2405ae487e040e47fe24387a25e6c170e34719e9dd230c DIST nokogiri-1.13.3-git.tgz 6187128 BLAKE2B 7ab47b7e5d87a83eeaf9c5e10684199f67be1af80a5fa5d616cb4a3ffe91a9598be0576dc23d8f0cc6d143f8ce601a868e44af6411615f377cd43773659b25b8 SHA512 69666c1f62124a20fcfe3fa58091a463ed64d5a9c98355572c5822944ba6992fe1e150b694fa883d23605999f14065c5c59d7a34e2273041d9de416e42d75fb6 +DIST nokogiri-1.13.4-git.tgz 6249271 BLAKE2B bc8569a0c80e4efcedd6c5bb8a46c8504cc33ec3d2acdcefe2718047ffabef9404c76003cd279ac55e5a5fb17243af12c335b7d9e300b90d8a97e84015cf92bc SHA512 cca3e8558f8739cca2424e461a5e048a3675a23bcb6549f1c71ecfea0729859cda84ef3bf09a81d2b419e1a7b8ff2616a8dd84ac12f6e1f32b9626a0bd3e1bc4 diff --git a/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild new file mode 100644 index ..c4fd1981823b --- /dev/null +++ b/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_RUBY="ruby26 ruby27 ruby30 ruby31" + +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md" + +RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec" + +RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb) + +inherit ruby-fakegem multilib + +DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser" +HOMEPAGE="https://www.nokogiri.org/; +LICENSE="MIT" +SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +SLOT="0" +IUSE="" + +RDEPEND="${RDEPEND} + >=dev-libs/libxml2-2.9.13:= + >=dev-libs/libxslt-1.1.35 + sys-libs/zlib + virtual/libiconv" +DEPEND="${DEPEND} + >=dev-libs/libxml2-2.9.13 + >=dev-libs/libxslt-1.1.35 + sys-libs/zlib + virtual/libiconv" + +ruby_add_rdepend ">=dev-ruby/racc-1.4:0" + +ruby_add_bdepend " + dev-ruby/mini_portile2:2.8 + >=dev-ruby/rexical-1.0.7 + dev-ruby/rdoc + test? ( dev-ruby/minitest )" + +all_ruby_prepare() { + sed -i \ + -e '/tasks\/cross_compile/s:^:#:' \ + -e '/:test.*prerequisites/s:^:#:' \ + -e '/license/ s:^:#:' \ + Rakefile || die + # Remove the cross compilation options since they interfere with + # native building. + sed -i -e 's/cross_compile = true/cross_compile = false/' Rakefile || die + sed -i -e '/cross_config_options/d' Rakefile || die + + sed -e '/simplecov/,/^end/ s:^:#:' \ + -e '/reporters/I s:^:#:' \ + -i test/helper.rb || die + + # There is no need for mini_portile2 to be a runtime dependency on Gentoo + sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die +} + +each_ruby_configure() { + NOKOGIRI_USE_SYSTEM_LIBRARIES=true \ + ${RUBY} -Cext/${PN} extconf.rb \ + --with-zlib-include="${EPREFIX}"/usr/include \ + --with-zlib-lib="${EPREFIX}"/$(get_libdir) \ + --with-iconv-include="${EPREFIX}"/usr/include \ + --with-iconv-lib="${EPREFIX}"/$(get_libdir) \ + --with-xml2-include="${EPREFIX}"/usr/include/libxml2 \ + --with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \ + --with-xslt-dir="${EPREFIX}"/usr \ + --with-iconvlib=iconv \ + || die "extconf.rb failed" +} + +each_ruby_compile() { + if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then + ${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/nokogiri/
commit: d818c0d1b3a1912f92e20b21d7ab23eedef844c0 Author: Hans de Graaff gentoo org> AuthorDate: Tue Apr 12 05:41:44 2022 + Commit: Hans de Graaff gentoo org> CommitDate: Tue Apr 12 05:42:50 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d818c0d1 dev-ruby/nokogiri: drop 1.11.7, 1.13.0, 1.13.1 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/nokogiri/Manifest | 3 - dev-ruby/nokogiri/nokogiri-1.11.7.ebuild | 107 --- dev-ruby/nokogiri/nokogiri-1.13.0.ebuild | 96 --- dev-ruby/nokogiri/nokogiri-1.13.1.ebuild | 96 --- 4 files changed, 302 deletions(-) diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest index 1dcd9deabaa2..77c89c754dfb 100644 --- a/dev-ruby/nokogiri/Manifest +++ b/dev-ruby/nokogiri/Manifest @@ -1,6 +1,3 @@ -DIST nokogiri-1.11.7-git.tgz 5871407 BLAKE2B c0449b5cb8210d22be31f1f9a43c0c13c7ab21feae2d731bf30475fc21c69a3928395109936b9ff242a89da424a5192c8a8cb0ede9d05d6d9ac16c1d6e5a7f63 SHA512 f355185f490e0ce73fdfb496f49e36b39c89835ebef2cbe3aecbfc5aceb5a9757dc07738a709059c3e22b5808fac11e7b340b7ebbb3b2c1b5ea3df8aff0db131 DIST nokogiri-1.12.5-git.tgz 6158880 BLAKE2B 994fd89c5163d92110de40e2dc654698b11d5a18524cc4b7b668ec1475e7167014e1c7604932686e6ad888f352b04ac26a7fbe526d814b20e686c5d9da95c5df SHA512 36d233df250213c4614c34d045c4fbea099e81e991a6da49067c165bc95f36b281c58cc79deb3b6a8aaccc50743a79efa27969e067cc2b546bef7615b139d79b -DIST nokogiri-1.13.0-git.tgz 6188433 BLAKE2B ec603e4202b03cc74ce73c540cfccab51f0910b24a3cde0ecbc6267a83c0c4898bc40614261727f7c7e52561d0dec679e00d97a9a0066ac436037a1681a4125b SHA512 f11169ab0dfec9b16e9fc32c066910dcc71325795283fac1372a67383535ddfd09bf342e2a82b129b71c058153f338cba3ef16f85225f24b6d0c769c98cf -DIST nokogiri-1.13.1-git.tgz 6190499 BLAKE2B daea484ee0e5bff581ae67528f1688002f1e2f550eb55e3164b631f9e87b188ec4152347aaa0ae6253feafbdae9182c54c92cb709c223ce04120ddd1b340cd17 SHA512 febb7b8a701c9be4f7b60a8b43bc24d17a37d39a8557ea4fc76d1490e7f9973d2a4516560f3335ba5d2405ae487e040e47fe24387a25e6c170e34719e9dd230c DIST nokogiri-1.13.3-git.tgz 6187128 BLAKE2B 7ab47b7e5d87a83eeaf9c5e10684199f67be1af80a5fa5d616cb4a3ffe91a9598be0576dc23d8f0cc6d143f8ce601a868e44af6411615f377cd43773659b25b8 SHA512 69666c1f62124a20fcfe3fa58091a463ed64d5a9c98355572c5822944ba6992fe1e150b694fa883d23605999f14065c5c59d7a34e2273041d9de416e42d75fb6 DIST nokogiri-1.13.4-git.tgz 6249271 BLAKE2B bc8569a0c80e4efcedd6c5bb8a46c8504cc33ec3d2acdcefe2718047ffabef9404c76003cd279ac55e5a5fb17243af12c335b7d9e300b90d8a97e84015cf92bc SHA512 cca3e8558f8739cca2424e461a5e048a3675a23bcb6549f1c71ecfea0729859cda84ef3bf09a81d2b419e1a7b8ff2616a8dd84ac12f6e1f32b9626a0bd3e1bc4 diff --git a/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild deleted file mode 100644 index 4dac40ee475b.. --- a/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby25 ruby26 ruby27 ruby30" - -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md" - -RUBY_FAKEGEM_EXTRAINSTALL="ext" - -RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec" - -RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb) - -inherit ruby-fakegem multilib - -DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser" -HOMEPAGE="https://www.nokogiri.org/; -LICENSE="MIT" -SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz" - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -IUSE="" - -RDEPEND="${RDEPEND} - >=dev-libs/libxml2-2.9.12:= - >=dev-libs/libxslt-1.1.34 - sys-libs/zlib - virtual/libiconv" -DEPEND="${DEPEND} - >=dev-libs/libxml2-2.9.12 - >=dev-libs/libxslt-1.1.34 - sys-libs/zlib - virtual/libiconv" - -ruby_add_rdepend ">=dev-ruby/racc-1.4:0" - -ruby_add_bdepend " - >=dev-ruby/pkg-config-1.1.7 - >=dev-ruby/rexical-1.0.7 - dev-ruby/rdoc - test? ( dev-ruby/minitest )" - -all_ruby_prepare() { - sed -i \ - -e '/tasks\/cross_compile/s:^:#:' \ - -e '/:test.*prerequisites/s:^:#:' \ - -e '/license/ s:^:#:' \ - Rakefile || die - # Remove the cross compilation options since they interfere with - # native building. - sed -i -e 's/cross_compile = true/cross_compile = false/' Rakefile || die - sed -i -e '/cross_config_options/d' Rakefile || die - - sed -e '/simplecov/,/^end/ s:^:#:' \ - -e '/reporters/I s:^:#:' \ - -i test/helper.rb || die - - sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die - - # Account for fix making
[gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/
commit: 65b51a8d7cc4ee7d3aa238e968c17eca331133c0 Author: Matt Turner gentoo org> AuthorDate: Tue Apr 12 03:08:54 2022 + Commit: Matt Turner gentoo org> CommitDate: Tue Apr 12 03:15:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65b51a8d mail-client/claws-mail: Update for libcanberra USE=gtk2 Bug: https://bugs.gentoo.org/774918 Bug: https://bugs.gentoo.org/811531 Signed-off-by: Matt Turner gentoo.org> .../{claws-mail-3.18.0-r2.ebuild => claws-mail-3.18.0-r3.ebuild}| 2 +- .../{claws-mail-3.19.0.ebuild => claws-mail-3.19.0-r1.ebuild} | 2 +- mail-client/claws-mail/claws-mail-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mail-client/claws-mail/claws-mail-3.18.0-r2.ebuild b/mail-client/claws-mail/claws-mail-3.18.0-r3.ebuild similarity index 99% rename from mail-client/claws-mail/claws-mail-3.18.0-r2.ebuild rename to mail-client/claws-mail/claws-mail-3.18.0-r3.ebuild index 3458689be8e8..59fba3250567 100644 --- a/mail-client/claws-mail/claws-mail-3.18.0-r2.ebuild +++ b/mail-client/claws-mail/claws-mail-3.18.0-r3.ebuild @@ -68,7 +68,7 @@ COMMONDEPEND=" notification? ( dev-libs/glib:2 appindicator? ( dev-libs/libindicate:3[gtk] ) - libcanberra? ( media-libs/libcanberra[gtk] ) + libcanberra? ( media-libs/libcanberra[gtk2] ) libnotify? ( x11-libs/libnotify ) ) pdf? ( app-text/poppler[cairo] ) diff --git a/mail-client/claws-mail/claws-mail-3.19.0.ebuild b/mail-client/claws-mail/claws-mail-3.19.0-r1.ebuild similarity index 99% rename from mail-client/claws-mail/claws-mail-3.19.0.ebuild rename to mail-client/claws-mail/claws-mail-3.19.0-r1.ebuild index b949c8576708..9da3c7fb4cda 100644 --- a/mail-client/claws-mail/claws-mail-3.19.0.ebuild +++ b/mail-client/claws-mail/claws-mail-3.19.0-r1.ebuild @@ -68,7 +68,7 @@ COMMONDEPEND=" notification? ( dev-libs/glib:2 appindicator? ( dev-libs/libindicate:3[gtk] ) - libcanberra? ( media-libs/libcanberra[gtk] ) + libcanberra? ( media-libs/libcanberra[gtk2] ) libnotify? ( x11-libs/libnotify ) ) pdf? ( app-text/poppler[cairo] ) diff --git a/mail-client/claws-mail/claws-mail-.ebuild b/mail-client/claws-mail/claws-mail-.ebuild index 741739274283..20a455e49b3c 100644 --- a/mail-client/claws-mail/claws-mail-.ebuild +++ b/mail-client/claws-mail/claws-mail-.ebuild @@ -74,7 +74,7 @@ COMMONDEPEND=" appindicator? ( dev-libs/libindicate:3[gtk] ) libcanberra? ( !gtk2? ( media-libs/libcanberra[gtk3] ) - gtk2? ( media-libs/libcanberra[gtk] ) + gtk2? ( media-libs/libcanberra[gtk2] ) ) libnotify? ( x11-libs/libnotify ) )
[gentoo-commits] repo/gentoo:master commit in: media-libs/libcanberra/
commit: 045488f09d792adcd03ddb91e391c94ae2c6d225 Author: Matt Turner gentoo org> AuthorDate: Tue Apr 12 03:10:52 2022 + Commit: Matt Turner gentoo org> CommitDate: Tue Apr 12 03:15:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=045488f0 media-libs/libcanberra: Change IUSE=+gtk to IUSE=gtk2 Bug: https://bugs.gentoo.org/769464 Bug: https://bugs.gentoo.org/834685 Closes: https://bugs.gentoo.org/811531 Signed-off-by: Matt Turner gentoo.org> .../{libcanberra-0.30-r5.ebuild => libcanberra-0.30-r6.ebuild}| 8 media-libs/libcanberra/metadata.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild b/media-libs/libcanberra/libcanberra-0.30-r6.ebuild similarity index 94% rename from media-libs/libcanberra/libcanberra-0.30-r5.ebuild rename to media-libs/libcanberra/libcanberra-0.30-r6.ebuild index 034fb8144e22..8d44484cd997 100644 --- a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild +++ b/media-libs/libcanberra/libcanberra-0.30-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz; LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev" +IUSE="alsa gnome gstreamer gtk2 +gtk3 oss pulseaudio +sound tdb udev" DEPEND=" dev-libs/libltdl:0[${MULTILIB_USEDEP}] @@ -20,7 +20,7 @@ DEPEND=" media-libs/alsa-lib:=[${MULTILIB_USEDEP}] udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) ) gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] ) - gtk? ( + gtk2? ( >=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}] >=x11-libs/gtk+-2.20.0:2[${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] ) @@ -55,7 +55,7 @@ multilib_src_configure() { $(use_enable oss) \ $(use_enable pulseaudio pulse) \ $(use_enable gstreamer) \ - $(use_enable gtk) \ + $(use_enable gtk2 gtk) \ $(use_enable gtk3) \ $(use_enable tdb) \ $(use_enable udev) \ diff --git a/media-libs/libcanberra/metadata.xml b/media-libs/libcanberra/metadata.xml index c7135cf3b2f1..516948872738 100644 --- a/media-libs/libcanberra/metadata.xml +++ b/media-libs/libcanberra/metadata.xml @@ -17,7 +17,7 @@ Enables ALSA sound driver. Enables gstreamer sound driver. Not useful when alsa or pulseaudio is available. - Enables building of gtk+ helper library, gtk+ runtime + Enables building of gtk+ helper library, gtk+ runtime sound effects and the canberra-gtk-play utility. To enable the gtk+ sound effects add canberra-gtk-module to the colon separated list of modules in the GTK_MODULES environment variable.
[gentoo-commits] proj/portage:master commit in: .github/workflows/
commit: ebe8265dc2b41822e6a9e809cb079fdd76e14a29 Author: Sam James gentoo org> AuthorDate: Tue Apr 12 02:03:48 2022 + Commit: Sam James gentoo org> CommitDate: Tue Apr 12 03:12:53 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ebe8265d .github: add pypy3.8, pypy3.9 to CI Signed-off-by: Sam James gentoo.org> Closes: https://github.com/gentoo/portage/pull/808 Signed-off-by: Sam James gentoo.org> .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6b96a8f0..03cf1fc7f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,8 @@ jobs: - '3.9' - '3.10' - 'pypy-3.7' +- 'pypy-3.8' +- 'pypy-3.9' steps: - uses: actions/checkout@v2
[gentoo-commits] repo/gentoo:master commit in: net-misc/grive/
commit: 33f2e0fa462861f85cb86ce9685c738214684506 Author: Christoph Junghans gentoo org> AuthorDate: Tue Apr 12 02:03:06 2022 + Commit: Christoph Junghans gentoo org> CommitDate: Tue Apr 12 02:03:06 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33f2e0fa net-misc/grive: version bump Closes: https://bugs.gentoo.org/837860 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Christoph Junghans gentoo.org> net-misc/grive/Manifest | 1 + net-misc/grive/grive-0.5.2_pre20211128.ebuild | 35 +++ 2 files changed, 36 insertions(+) diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest index 4725836d3a39..493ad439d60f 100644 --- a/net-misc/grive/Manifest +++ b/net-misc/grive/Manifest @@ -1,2 +1,3 @@ DIST grive-0.5.1.tar.gz 169929 BLAKE2B a8f8fc9f3bcf019b7b713178f6a39ca6c62f6531054329d4ff8ac6fbfdfa5579f9e51aa8f9c493b90005194c3ab77934575e541c0986404a32e807c5c87c4cfd SHA512 609837fc93ad78d143dcb4d1f558743d413c887fec2e9aaac81edd58549b812db859aab5ce7f664f06564779cff4bae32d43529e47fcc36640f1a9b52c5b5888 DIST grive-0.5.2_pre20200205.tar.gz 170384 BLAKE2B dac8d75bdefe0c206f443010093e73b34ae8257a5ced87917cca240fb7134a6aac8e5f018eeb7bf7dec46d5043e144efb2c9586ca2b5ff55a1d0fe022f72675a SHA512 d1058649d2a3dce773eab53b1704c5dd8bb1998089099ed9c3bacdaa5d3f995fa08c1b2c2b723bbce0efa2c9c04729d97aade6df6130da32f975e2bb45f339e6 +DIST grive-0.5.2_pre20211128.tar.gz 171412 BLAKE2B 62e966917959ed4306a7a787948bc1533cca6a5521f262450658c81f6dc88cb7914df6c3a8271d87fdc189ff74ada421f76c38bd9b89157cd27ef0f2ba531e67 SHA512 33e6a382f979a0a7a6c4236bce1779bbda0b3817b7d2f1750f6759350d7de79bd999bd0f4f7cb72fd32586683053ef1d21dc830403a9d1225b6e9a3408f830fa diff --git a/net-misc/grive/grive-0.5.2_pre20211128.ebuild b/net-misc/grive/grive-0.5.2_pre20211128.ebuild new file mode 100644 index ..82bf739ad8c4 --- /dev/null +++ b/net-misc/grive/grive-0.5.2_pre20211128.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} = * ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git; +else + inherit vcs-snapshot + COMMIT="6901fbb169eaae51acb61778760ba2ac019675ae" + SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +fi + +DESCRIPTION="An open source Linux client for Google Drive" +HOMEPAGE="https://github.com/vitalif/grive2; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-libs/boost:= + dev-libs/expat + >=dev-libs/json-c-0.11-r1:= + dev-libs/libgcrypt:0= + dev-libs/yajl + || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) + sys-libs/binutils-libs:0= + sys-libs/glibc +" +DEPEND="${RDEPEND}"
[gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/
commit: 561e2d1f884c01d987e8bd812e01c1a29da7f082 Author: Sam James gentoo org> AuthorDate: Thu Mar 3 21:16:55 2022 + Commit: Sam James gentoo org> CommitDate: Tue Apr 12 01:59:55 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=561e2d1f install-qa-check.d/60pkgconfig: drop ${D} from output; don't repeat ${EPREFIX} It's confusing when the ebuild has been merged to the system and we should be consistent with other checks. Signed-off-by: Sam James gentoo.org> bin/install-qa-check.d/60pkgconfig | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/bin/install-qa-check.d/60pkgconfig b/bin/install-qa-check.d/60pkgconfig index 4c6f01f03..e2d839ca1 100644 --- a/bin/install-qa-check.d/60pkgconfig +++ b/bin/install-qa-check.d/60pkgconfig @@ -42,9 +42,12 @@ pkgconfig_check() { if [[ ${value} != "${EPREFIX}"* ]] ; then eqawarn "QA Notice: pkg-config files not respecting EPREFIX found" - eqawarn "${f}'s key=${key} does not respect EPREFIX:" + eqawarn "key=${key} does not respect EPREFIX:" eqawarn "${key}=${value}" - eqatag -v pkgconfig.bad-paths "${f}" + eqatag -v pkgconfig.bad-paths ${key}="${value}" "${f//${D}}" + + # Don't bother repeating for every variable in the same file + break fi done done @@ -67,12 +70,12 @@ pkgconfig_check() { fi if egrep -q "/lib64" ${f} ; then - bad_libdir+=( ${f} ) + bad_libdir+=( "${f//${D}}" ) fi elif [[ ${f} == *lib64/pkgconfig* ]] ; then # We want to match /lib/, /lib/foo/, but not e.g. /lib64 or /lib64/, or libfoo if grep -qP '/lib\b' ${f} ; then - bad_libdir+=( ${f} ) + bad_libdir+=( "${f//${D}}" ) fi fi done @@ -98,7 +101,7 @@ pkgconfig_check() { break fi - bad_file=f + bad_file="${f//${D}}" done # Skip result reporting if *_p* because for both _pN and _preN, we
[gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/
commit: e31acf622d632d093b01e51e03c1c3f98dbe3a1c Author: Sam James gentoo org> AuthorDate: Wed Mar 16 00:02:24 2022 + Commit: Sam James gentoo org> CommitDate: Tue Apr 12 01:59:56 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e31acf62 install-qa-check.d/60pkgconfig: change libdir regex We don't want to watch /var/lib/, for example. Signed-off-by: Sam James gentoo.org> bin/install-qa-check.d/60pkgconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/install-qa-check.d/60pkgconfig b/bin/install-qa-check.d/60pkgconfig index e2d839ca1..58f533e83 100644 --- a/bin/install-qa-check.d/60pkgconfig +++ b/bin/install-qa-check.d/60pkgconfig @@ -62,19 +62,19 @@ pkgconfig_check() { # e.g. https://bugs.gentoo.org/729642 local bad_libdir=() for f in "${files[@]}" ; do - # In ${ED}/usr/lib, we shouldn't reference lib64 if [[ ${f} == *lib/pkgconfig* ]] ; then if [[ -d "${ED}"/usr/lib && -L "${ED}"/usr/lib ]] ; then # (Don't bother if /usr/lib is a symlink to /usr/lib64) continue fi - if egrep -q "/lib64" ${f} ; then + # In ${ED}/usr/lib, we shouldn't reference lib64 + if egrep -q "=(/usr)?/lib64" ${f} ; then bad_libdir+=( "${f//${D}}" ) fi elif [[ ${f} == *lib64/pkgconfig* ]] ; then # We want to match /lib/, /lib/foo/, but not e.g. /lib64 or /lib64/, or libfoo - if grep -qP '/lib\b' ${f} ; then + if grep -qP '=(/usr)?/lib\b' ${f} ; then bad_libdir+=( "${f//${D}}" ) fi fi
[gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/
commit: 7aa2e188d6732088ae2a2926cc465988e4f117f9 Author: Sam James gentoo org> AuthorDate: Wed Feb 23 01:26:11 2022 + Commit: Sam James gentoo org> CommitDate: Tue Apr 12 01:59:54 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7aa2e188 install-qa-check.d/60pkgconfig: check for mismatched version We want to try catch cases where we're installing a pkg-config (.pc) file with an obviously incorrect version (here, we're testing for ${PV} != any version in all of the installed .pc files) because: 1. it's bad; 2. it has a large blast radius (breaking consumers). Bug: https://bugs.gentoo.org/833895 Bug: https://bugs.gentoo.org/833887 Bug: https://bugs.gentoo.org/833907 Bug: https://bugs.gentoo.org/833884 Bug: https://bugs.gentoo.org/833888 Signed-off-by: Sam James gentoo.org> bin/install-qa-check.d/60pkgconfig | 26 ++ 1 file changed, 26 insertions(+) diff --git a/bin/install-qa-check.d/60pkgconfig b/bin/install-qa-check.d/60pkgconfig index cb6660bcb..78c5b5a3c 100644 --- a/bin/install-qa-check.d/60pkgconfig +++ b/bin/install-qa-check.d/60pkgconfig @@ -78,6 +78,32 @@ pkgconfig_check() { eqatag -v pkgconfig.bad-libdir "${bad_libdir[@]}" fi + # Check for mismatched Version field vs ${PV} + # To be safe, let's make sure _all_ installed .pcs have a bad Version + # before warning, as this should catch the general cases we're worried + # about, while avoiding any pathological cases e.g. multiple libraries + # with different versioning within one package. + # Example bugs: bug #833895, bug #833887. + local all_bad=yes + # Record the last bad file matched + local bad_file + for f in "${files[@]}" ; do + if [[ ${PV} == $(pkg-config --modversion "${f}") ]] ; then + all_bad=no + break + fi + + bad_file=f + done + + # Skip result reporting if *_p* because for both _pN and _preN, we + # don't generally expect the versions to be exactly accurate, and + # we want to avoid false positives. + if [[ ${all_bad} == "yes" && ${PV} != *_p* ]] && ! has live ${PROPERTIES} ; then + eqawarn "QA Notice: pkg-config files with mismatched Version found!" + eqawarn "At least ${bad_file}'s Version field does not match ${PV}" + eqawarn "Please check all .pc files installed by this package." + fi } pkgconfig_check
[gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/
commit: 183dc3d778cf83102aa7ed8291979b71a287cf7e Author: Sam James gentoo org> AuthorDate: Thu Feb 24 22:43:47 2022 + Commit: Sam James gentoo org> CommitDate: Tue Apr 12 01:59:55 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=183dc3d7 install-qa-check.d/60pkgconfig: exit early if no pkg-config installed But we still run the LDFLAGS check. Signed-off-by: Sam James gentoo.org> bin/install-qa-check.d/60pkgconfig | 5 + 1 file changed, 5 insertions(+) diff --git a/bin/install-qa-check.d/60pkgconfig b/bin/install-qa-check.d/60pkgconfig index 78c5b5a3c..4c6f01f03 100644 --- a/bin/install-qa-check.d/60pkgconfig +++ b/bin/install-qa-check.d/60pkgconfig @@ -17,6 +17,11 @@ pkgconfig_check() { eqatag -v pkgconfig.bad-ldlags "${f//${D}}" fi + # Bail out now so we can rely on pkgconfig in subsequent checks if we want. + if ! type -P pkg-config >/dev/null ; then + return + fi + # Validate using pkgconfig # Some less common implementations may not support this? # seems like f.d.o, OpenBSD, and of course pkgconf do though.
[gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/
commit: 0d74ce0945f0567d2c695fe4443a5c94046dfe09 Author: Sam James gentoo org> AuthorDate: Thu Oct 28 00:37:15 2021 + Commit: Sam James gentoo org> CommitDate: Tue Apr 12 01:59:52 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0d74ce09 install-qa-check.d/60pkgconfig: run pkg-config --validate on installed files Similar to the XDG desktop file validation check. Signed-off-by: Sam James gentoo.org> bin/install-qa-check.d/60pkgconfig | 10 ++ 1 file changed, 10 insertions(+) diff --git a/bin/install-qa-check.d/60pkgconfig b/bin/install-qa-check.d/60pkgconfig index 2cc9f7c59..9c4768a95 100644 --- a/bin/install-qa-check.d/60pkgconfig +++ b/bin/install-qa-check.d/60pkgconfig @@ -16,6 +16,16 @@ pkgconfig_check() { eqawarn "QA Notice: pkg-config files with wrong LDFLAGS detected:" eqawarn "${f//${D}}" fi + + # Validate using pkgconfig + # Some less common implementations may not support this? + # seems like f.d.o, OpenBSD, and of course pkgconf do though. + # Need --maximum-traverse-depth=1 to avoid checking deps and giving + # unrelated warnings/errors. + if ! pkg-config --maximum-traverse-depth=1 --validate "${files[@]}" ; then + eqawarn "QA Notice: pkg-config files which fail validation found!" + eqawarn "Run 'pkg-config --validate ...' for more information" + fi } pkgconfig_check
[gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/
commit: 6bce6ac4dc87872c112e9f5c5a847acb78ec3d26 Author: Sam James gentoo org> AuthorDate: Thu Oct 28 00:37:41 2021 + Commit: Sam James gentoo org> CommitDate: Tue Apr 12 01:59:52 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6bce6ac4 install-qa-check.d/60pkgconfig: check if paths within .pc respect EPREFIX Seen this problem a few times and it's easy to miss. See: c90ab38e3577aae61fac2341b34ad593948de1cd in ::gentoo Signed-off-by: Sam James gentoo.org> bin/install-qa-check.d/60pkgconfig | 17 + 1 file changed, 17 insertions(+) diff --git a/bin/install-qa-check.d/60pkgconfig b/bin/install-qa-check.d/60pkgconfig index 9c4768a95..9e09a1053 100644 --- a/bin/install-qa-check.d/60pkgconfig +++ b/bin/install-qa-check.d/60pkgconfig @@ -26,6 +26,23 @@ pkgconfig_check() { eqawarn "QA Notice: pkg-config files which fail validation found!" eqawarn "Run 'pkg-config --validate ...' for more information" fi + + # Check for unexpected paths + # e.g. https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90ab38e3577aae61fac2341b34ad593948de1cd + if [[ -n ${EPREFIX} ]] ; then + for f in "${files[@]}" ; do + local key + for key in prefix exec_prefix libdir includedir ; do + local value=$(pkg-config --variable="${key}" "${f}") + + if [[ ${value} != "${EPREFIX}"* ]] ; then + eqawarn "QA Notice: pkg-config files not respecting EPREFIX found" + eqawarn "${f}'s key=${key} does not respect EPREFIX:" + eqawarn "${key}=${value}" + fi + done + done + fi } pkgconfig_check
[gentoo-commits] proj/portage:master commit in: bin/
commit: 23c4a45827fccebb969d5130ccc234ed3d1a9b35 Author: Thomas Bracht Laumann Jespersen laumann xyz> AuthorDate: Mon Apr 11 13:46:06 2022 + Commit: Sam James gentoo org> CommitDate: Tue Apr 12 01:59:50 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=23c4a458 eend: Output QA warning if ebegin has not been called The assumption here is that ebegin-eend aren't nested. Closes: https://bugs.gentoo.org/835824 Signed-off-by: Thomas Bracht Laumann Jespersen laumann.xyz> Closes: https://github.com/gentoo/portage/pull/807 Signed-off-by: Sam James gentoo.org> bin/isolated-functions.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index bd8c065b2..539fea952 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -339,6 +339,7 @@ ebegin() { [[ ${RC_ENDCOL} == "yes" ]] && echo >&2 LAST_E_LEN=$(( 3 + ${#RC_INDENTATION} + ${#msg} )) LAST_E_CMD="ebegin" + EBEGIN_EEND=1 return 0 } @@ -367,6 +368,11 @@ __eend() { eend() { [[ -n $1 ]] || eqawarn "QA Notice: eend called without first argument" + if [[ -v EBEGIN_EEND ]] ; then + unset EBEGIN_EEND + else + eqawarn "QA Notice: eend called without preceding ebegin (phase: ${EBUILD_PHASE})" + fi local retval=${1:-0} shift
[gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/
commit: 0ac65ddf7cff60a64730ca7c123f492fb68217a4 Author: Sam James gentoo org> AuthorDate: Thu Oct 28 00:38:43 2021 + Commit: Sam James gentoo org> CommitDate: Tue Apr 12 01:59:53 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0ac65ddf install-qa-check.d/60pkgconfig: check for not respecting libdir in pc files It's not valid to reference lib64 when installing to /usr/lib where we want 32-bit libraries. We want to make sure that if we're installing a pkgconfig file for a 32-bit variant (multilib), we make sure that the file references the right library: it should have e.g. /usr/lib, not /usr/lib64, or consumers trying to use the 32-bit library will try to link against a 64-bit library. (We also cover the opposite case: /usr/lib64 pkgconfig files referencing /usr/lib). Bug: https://bugs.gentoo.org/729642 Signed-off-by: Sam James gentoo.org> bin/install-qa-check.d/60pkgconfig | 37 - 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/bin/install-qa-check.d/60pkgconfig b/bin/install-qa-check.d/60pkgconfig index 9e09a1053..cb6660bcb 100644 --- a/bin/install-qa-check.d/60pkgconfig +++ b/bin/install-qa-check.d/60pkgconfig @@ -14,7 +14,7 @@ pkgconfig_check() { f=$(egrep -zsH '^Libs.*-Wl,(-O[012]|--hash-style)' "${files[@]}") if [[ -n ${f} ]] ; then eqawarn "QA Notice: pkg-config files with wrong LDFLAGS detected:" - eqawarn "${f//${D}}" + eqatag -v pkgconfig.bad-ldlags "${f//${D}}" fi # Validate using pkgconfig @@ -39,10 +39,45 @@ pkgconfig_check() { eqawarn "QA Notice: pkg-config files not respecting EPREFIX found" eqawarn "${f}'s key=${key} does not respect EPREFIX:" eqawarn "${key}=${value}" + eqatag -v pkgconfig.bad-paths "${f}" fi done done fi + + # TODO: Generalise for non-lib64 libdir? Not that this is very common now + # that riscv chose a more standard layout. + # + # If we're installing to ${ED}/usr/lib/pkgconfig, let's make sure + # we're not referencing lib64. + # + # e.g. https://bugs.gentoo.org/729642 + local bad_libdir=() + for f in "${files[@]}" ; do + # In ${ED}/usr/lib, we shouldn't reference lib64 + if [[ ${f} == *lib/pkgconfig* ]] ; then + if [[ -d "${ED}"/usr/lib && -L "${ED}"/usr/lib ]] ; then + # (Don't bother if /usr/lib is a symlink to /usr/lib64) + continue + fi + + if egrep -q "/lib64" ${f} ; then + bad_libdir+=( ${f} ) + fi + elif [[ ${f} == *lib64/pkgconfig* ]] ; then + # We want to match /lib/, /lib/foo/, but not e.g. /lib64 or /lib64/, or libfoo + if grep -qP '/lib\b' ${f} ; then + bad_libdir+=( ${f} ) + fi + fi + done + + if [[ -n "${bad_libdir[@]}" ]] ; then + eqawarn "QA Notice: pkg-config files not respecting libdir found" + eqawarn "(contains reference to either lib or lib64 in wrong directory)" + eqatag -v pkgconfig.bad-libdir "${bad_libdir[@]}" + fi + } pkgconfig_check
[gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/
commit: d872bb3b6e879d75445536b9b0fca4009822d433 Author: Sam James gentoo org> AuthorDate: Thu Oct 28 00:36:29 2021 + Commit: Sam James gentoo org> CommitDate: Tue Apr 12 01:59:51 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d872bb3b install-qa-check.d/60pkgconfig: create list of .pc files early (refactoring) This makes adding additional checks easier. We just bail out early if there's no work to be done. Signed-off-by: Sam James gentoo.org> bin/install-qa-check.d/60pkgconfig | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/bin/install-qa-check.d/60pkgconfig b/bin/install-qa-check.d/60pkgconfig index 1b34c04db..2cc9f7c59 100644 --- a/bin/install-qa-check.d/60pkgconfig +++ b/bin/install-qa-check.d/60pkgconfig @@ -1,8 +1,17 @@ # Check for pkg-config file issues pkgconfig_check() { + local files=() + # Make a list of .pc files and bail out if there aren't any + mapfile -d '' files < <( + find "${ED}"/usr/{lib*,share}/pkgconfig -maxdepth 1 -type f -name '*.pc' -print0 2>/dev/null + ) + [[ -z "${files[@]}" ]] && return + + local f + # Look for leaking LDFLAGS into pkg-config files - local f=$(egrep -sH '^Libs.*-Wl,(-O[012]|--hash-style)' "${ED}"/usr/*/pkgconfig/*.pc) + f=$(egrep -zsH '^Libs.*-Wl,(-O[012]|--hash-style)' "${files[@]}") if [[ -n ${f} ]] ; then eqawarn "QA Notice: pkg-config files with wrong LDFLAGS detected:" eqawarn "${f//${D}}"
[gentoo-commits] repo/gentoo:master commit in: app-admin/setools/
commit: b1332232a8ab363dc037ecb591552e4e9b9a3ebe Author: Jason Zaman gentoo org> AuthorDate: Tue Apr 12 01:29:50 2022 + Commit: Jason Zaman gentoo org> CommitDate: Tue Apr 12 01:32:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1332232 app-admin/setools: Add missing PYTHON_USEDEP Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Jason Zaman gentoo.org> .../{setools-.ebuild => setools-4.4.0-r3.ebuild} | 14 +++--- app-admin/setools/setools-.ebuild | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app-admin/setools/setools-.ebuild b/app-admin/setools/setools-4.4.0-r3.ebuild similarity index 77% copy from app-admin/setools/setools-.ebuild copy to app-admin/setools/setools-4.4.0-r3.ebuild index 82b8e1bd9964..82ee339e0806 100644 --- a/app-admin/setools/setools-.ebuild +++ b/app-admin/setools/setools-4.4.0-r3.ebuild @@ -13,20 +13,19 @@ HOMEPAGE="https://github.com/SELinuxProject/setools/wiki; if [[ ${PV} == ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git; - S="${WORKDIR}/${P}" else SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2; - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - S="${WORKDIR}/${PN}" + KEYWORDS="amd64 arm arm64 x86" fi LICENSE="GPL-2 LGPL-2.1" SLOT="0" IUSE="test infoflow X" RESTRICT="!test? ( test )" +S="${WORKDIR}/${PN}" RDEPEND="${PYTHON_DEPS} - dev-python/setuptools + dev-python/setuptools[${PYTHON_USEDEP}] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] ) @@ -34,8 +33,8 @@ RDEPEND="${PYTHON_DEPS} dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND=">=dev-python/cython-0.27 - dev-python/setuptools +BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] test? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] sys-apps/checkpolicy @@ -46,7 +45,8 @@ python_prepare_all() { sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \ die "failed to set lib_dirs" - use X || local PATCHES=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch ) + local PATCHES=( "${FILESDIR}"/0001-__init__.py-Make-NetworkX-dep-optional.patch ) + use X || PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch ) distutils-r1_python_prepare_all } diff --git a/app-admin/setools/setools-.ebuild b/app-admin/setools/setools-.ebuild index 82b8e1bd9964..965896ee5a44 100644 --- a/app-admin/setools/setools-.ebuild +++ b/app-admin/setools/setools-.ebuild @@ -26,7 +26,7 @@ IUSE="test infoflow X" RESTRICT="!test? ( test )" RDEPEND="${PYTHON_DEPS} - dev-python/setuptools + dev-python/setuptools[${PYTHON_USEDEP}] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] ) @@ -34,8 +34,8 @@ RDEPEND="${PYTHON_DEPS} dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND=">=dev-python/cython-0.27 - dev-python/setuptools +BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] test? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] sys-apps/checkpolicy
[gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-secadm/
commit: 0ab346c813437bbc90bbe61df61eb18037a5 Author: Grzegorz Filo wp pl> AuthorDate: Mon Apr 11 19:56:04 2022 + Commit: Jason Zaman gentoo org> CommitDate: Tue Apr 12 01:34:56 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ab3 sec-policy/selinux-secadm: Add secadm module. Closes: https://github.com/gentoo/gentoo/pull/24997 Signed-off-by: Grzegorz Filo wp.pl> Signed-off-by: Jason Zaman gentoo.org> sec-policy/selinux-secadm/Manifest| 4 sec-policy/selinux-secadm/metadata.xml| 8 .../selinux-secadm/selinux-secadm-2.20220106-r1.ebuild| 15 +++ .../selinux-secadm/selinux-secadm-2.20220106-r2.ebuild| 15 +++ .../selinux-secadm/selinux-secadm-2.20220106-r3.ebuild| 15 +++ sec-policy/selinux-secadm/selinux-secadm-.ebuild | 15 +++ 6 files changed, 72 insertions(+) diff --git a/sec-policy/selinux-secadm/Manifest b/sec-policy/selinux-secadm/Manifest new file mode 100644 index ..b087981383e1 --- /dev/null +++ b/sec-policy/selinux-secadm/Manifest @@ -0,0 +1,4 @@ +DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb42235f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf +DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad +DIST patchbundle-selinux-base-policy-2.20220106-r3.tar.bz2 309416 BLAKE2B 89852cce079300edcb00da41cfe42ea5041507f7d0a2a9897a4bd14f3ac68edfcc40ef49320e5ab826b1abb7fe7fc7ca4268042bbc019b3c76a58b9e112601c3 SHA512 4e23ad5e83df6c3501f0ac0a7201786d9f00809bedef248ae3a4b6af994e0006aaf70151c29ca21bb1c9c8887cc5bfeb18389d4f8e3bd3861c61d2d95d3a4e75 +DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176d3c8e508b2ff97d4f8a876d7c0a65534a62d86c9816ac59f6eed583f4b5c51cf432643edd2dad24dd51eb3cf22e2b75ac SHA512 794327d2dd07196b5f36771f9a961cdf294cf68f690735418d6bdd859499b7007c518cc022ccca9c245a5266b85bdb7cacdcaeefee14e4800937c9101476b373 diff --git a/sec-policy/selinux-secadm/metadata.xml b/sec-policy/selinux-secadm/metadata.xml new file mode 100644 index ..781bc07e6d59 --- /dev/null +++ b/sec-policy/selinux-secadm/metadata.xml @@ -0,0 +1,8 @@ + +https://www.gentoo.org/dtd/metadata.dtd;> + + + seli...@gentoo.org + SELinux Team + + diff --git a/sec-policy/selinux-secadm/selinux-secadm-2.20220106-r1.ebuild b/sec-policy/selinux-secadm/selinux-secadm-2.20220106-r1.ebuild new file mode 100644 index ..f2b7badace14 --- /dev/null +++ b/sec-policy/selinux-secadm/selinux-secadm-2.20220106-r1.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +IUSE="" +MODS="secadm" + +inherit selinux-policy-2 + +DESCRIPTION="SELinux policy for secadm" + +if [[ ${PV} != * ]] ; then + KEYWORDS="amd64 arm arm64 ~mips x86" +fi diff --git a/sec-policy/selinux-secadm/selinux-secadm-2.20220106-r2.ebuild b/sec-policy/selinux-secadm/selinux-secadm-2.20220106-r2.ebuild new file mode 100644 index ..f2b7badace14 --- /dev/null +++ b/sec-policy/selinux-secadm/selinux-secadm-2.20220106-r2.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +IUSE="" +MODS="secadm" + +inherit selinux-policy-2 + +DESCRIPTION="SELinux policy for secadm" + +if [[ ${PV} != * ]] ; then + KEYWORDS="amd64 arm arm64 ~mips x86" +fi diff --git a/sec-policy/selinux-secadm/selinux-secadm-2.20220106-r3.ebuild b/sec-policy/selinux-secadm/selinux-secadm-2.20220106-r3.ebuild new file mode 100644 index ..f2b7badace14 --- /dev/null +++ b/sec-policy/selinux-secadm/selinux-secadm-2.20220106-r3.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +IUSE="" +MODS="secadm" + +inherit selinux-policy-2 + +DESCRIPTION="SELinux policy for secadm" + +if [[ ${PV} != * ]] ; then + KEYWORDS="amd64 arm arm64 ~mips x86" +fi diff --git a/sec-policy/selinux-secadm/selinux-secadm-.ebuild b/sec-policy/selinux-secadm/selinux-secadm-.ebuild new file mode 100644 index ..bdf0650d567c --- /dev/null +++ b/sec-policy/selinux-secadm/selinux-secadm-.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU
[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/
commit: e7b03d201f4ccc710011e3b6aae3a5b5fbe1aabb Author: Sam James gentoo org> AuthorDate: Tue Apr 12 01:14:18 2022 + Commit: Sam James gentoo org> CommitDate: Tue Apr 12 01:14:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b03d20 app-emulation/cloud-init: fix IncorrectCopyright Signed-off-by: Sam James gentoo.org> app-emulation/cloud-init/cloud-init-20.4.ebuild | 2 +- app-emulation/cloud-init/cloud-init-21.2.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-emulation/cloud-init/cloud-init-20.4.ebuild b/app-emulation/cloud-init/cloud-init-20.4.ebuild index 63d26e689413..31a7326ac086 100644 --- a/app-emulation/cloud-init/cloud-init-20.4.ebuild +++ b/app-emulation/cloud-init/cloud-init-20.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/app-emulation/cloud-init/cloud-init-21.2.ebuild b/app-emulation/cloud-init/cloud-init-21.2.ebuild index 0a9661be7209..f99af619353e 100644 --- a/app-emulation/cloud-init/cloud-init-21.2.ebuild +++ b/app-emulation/cloud-init/cloud-init-21.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7
[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/
commit: 88dfac80462255c1e714f2539fefa96964b53627 Author: Sam James gentoo org> AuthorDate: Tue Apr 12 01:08:20 2022 + Commit: Sam James gentoo org> CommitDate: Tue Apr 12 01:08:20 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88dfac80 app-emulation/cloud-init: sync live ebuild, revbump for RDEPEND change See: https://github.com/gentoo/gentoo/pull/24980 Signed-off-by: Sam James gentoo.org> .../{cloud-init-22.1.ebuild => cloud-init-22.1-r1.ebuild} | 6 +++--- app-emulation/cloud-init/cloud-init-.ebuild| 7 +++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app-emulation/cloud-init/cloud-init-22.1.ebuild b/app-emulation/cloud-init/cloud-init-22.1-r1.ebuild similarity index 97% rename from app-emulation/cloud-init/cloud-init-22.1.ebuild rename to app-emulation/cloud-init/cloud-init-22.1-r1.ebuild index fcd8771ebb89..667839f99352 100644 --- a/app-emulation/cloud-init/cloud-init-22.1.ebuild +++ b/app-emulation/cloud-init/cloud-init-22.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,8 +35,8 @@ CDEPEND=" dev-python/jsonschema[${PYTHON_USEDEP}] dev-python/netifaces[${PYTHON_USEDEP}] " -DEPEND=" - ${CDEPEND} +BDEPEND=" + ${CDEPEND} test? ( >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] diff --git a/app-emulation/cloud-init/cloud-init-.ebuild b/app-emulation/cloud-init/cloud-init-.ebuild index 437a19fce005..6dbdf8e71fe9 100644 --- a/app-emulation/cloud-init/cloud-init-.ebuild +++ b/app-emulation/cloud-init/cloud-init-.ebuild @@ -34,10 +34,9 @@ CDEPEND=" dev-python/jsonpatch[${PYTHON_USEDEP}] dev-python/jsonschema[${PYTHON_USEDEP}] dev-python/netifaces[${PYTHON_USEDEP}] - " -DEPEND=" - ${CDEPEND} +BDEPEND=" + ${CDEPEND} test? ( >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] @@ -59,7 +58,7 @@ PATCHES=( "${FILESDIR}"/22.1-add-support-for-package_upgrade.patch ) -distutils_enable_tests nose +distutils_enable_tests pytest python_prepare_all() { # Fix location of documentation installation
[gentoo-commits] repo/gentoo:master commit in: media-tv/mythtv/
commit: 72f39eb34a2221e5f497416e786c6fc6ee9ecf1d Author: Wilson Michaels austincustomerrands com> AuthorDate: Mon Apr 11 14:01:49 2022 + Commit: Sam James gentoo org> CommitDate: Tue Apr 12 01:04:20 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72f39eb3 media-tv/mythtv: version bump to 32.0 Closes: https://bugs.gentoo.org/837659 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Wilson Michaels austincustomerrands.com> Closes: https://github.com/gentoo/gentoo/pull/24992 Signed-off-by: Sam James gentoo.org> media-tv/mythtv/Manifest | 1 + media-tv/mythtv/mythtv-32.0.ebuild | 424 + 2 files changed, 425 insertions(+) diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest index 2d343d705f3d..8f45d129c78d 100644 --- a/media-tv/mythtv/Manifest +++ b/media-tv/mythtv/Manifest @@ -1,2 +1,3 @@ DIST mythtv-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e DIST mythtv-31.0_p20210731.tar.gz 102637029 BLAKE2B 0ca6124d20d428c8b813c819c01a97c4806fbd2f70f5b50d698c5f9c3cafd3141ee1379b2b63510705e2083109d91362c3fcc6277f58d461f2138d1604fd SHA512 e262ce91fd8a523daa772d13675ff6639f95202f66be67b2a405e9ea9204d6663128621c5142752f2a889e25cbc8be6d92b3759508767e94207326343a91f092 +DIST mythtv-32.0.tar.gz 115960698 BLAKE2B 3be4106fa2c4fcb95fd5414b347fd6256658566bbb9775ed32cb9686e4a61ecf89e7c684db8d3408292c3737ae6090771862aa65ac0d5d467e90c3a110484898 SHA512 6a1472c954b929319a570d76769ababad43d086d53b6679c9d6da91446677f04b71918b326bb4ff0fc16fbaf7d9a447a86f623a6f1399f9ed29ca86a9782396c diff --git a/media-tv/mythtv/mythtv-32.0.ebuild b/media-tv/mythtv/mythtv-32.0.ebuild new file mode 100644 index ..5d5db2346313 --- /dev/null +++ b/media-tv/mythtv/mythtv-32.0.ebuild @@ -0,0 +1,424 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8,9} ) + +inherit flag-o-matic python-any-r1 qmake-utils readme.gentoo-r1 systemd user-info + +DESCRIPTION="Open Source DVR and media center hub" +HOMEPAGE="https://www.mythtv.org https://github.com/MythTV/mythtv; +if [[ $(ver_cut 3) == "p" ]] ; then + MY_COMMIT="5824c588db24b4e71a7d94e829e6419f71089297" + SRC_URI="https://github.com/MythTV/mythtv/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + # mythtv and mythplugins are separate builds in the github MythTV project + S="${WORKDIR}/mythtv-${MY_COMMIT}/mythtv" +else + SRC_URI="https://github.com/MythTV/mythtv/archive/v${PV}.tar.gz -> ${P}.tar.gz" + # mythtv and mythplugins are separate builds in the github mythtv project + S="${WORKDIR}/${P}/mythtv" +fi +KEYWORDS="~amd64 ~x86" +LICENSE="GPL-2+" +SLOT="0" + +IUSE_INPUT_DEVICES="input_devices_joystick" +IUSE_VIDEO_CAPTURE_DEVICES="v4l ieee1394 hdhomerun vbox ceton" +IUSE="alsa altivec asi autostart bluray cdda cdr cec debug dvd dvb exif fftw jack java + +lame lcd libass lirc nvdec +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx + +wrapper x264 x265 +xml xmltv +xvid +X zeroconf + ${IUSE_INPUT_DEVICES} ${IUSE_VIDEO_CAPTURE_DEVICES}" + +REQUIRED_USE=" + bluray? ( xml ) + cdr? ( cdda ) +" +RDEPEND=" + acct-user/mythtv + dev-libs/glib:2 + dev-libs/lzo + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5[jpeg] + dev-qt/qtnetwork:5 + dev-qt/qtscript:5 + dev-qt/qtsql:5[mysql] + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-fonts/corefonts + media-fonts/dejavu + media-fonts/liberation-fonts + media-fonts/tex-gyre + media-gfx/exiv2:= + media-libs/freetype:2 + media-libs/libsamplerate + media-libs/libsoundtouch + media-libs/taglib + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + autostart? ( + net-dialup/mingetty + x11-apps/xset + x11-wm/evilwm + ) + bluray? ( + dev-libs/libcdio:= + media-libs/libbluray:=[java?] + sys-fs/udisks:2 + ) + cec? ( dev-libs/libcec ) + dvd? ( + dev-libs/libcdio:= + media-libs/libdvdcss + sys-fs/udisks:2 + ) + fftw? ( sci-libs/fftw:3.0=[threads] ) + hdhomerun? ( media-libs/libhdhomerun ) + ieee1394? ( + media-libs/libiec61883 + sys-libs/libavc1394 + sys-libs/libraw1394 + ) + jack? ( virtual/jack ) + java? ( dev-java/ant-core ) + lame? ( media-sound/lame ) + lcd? ( app-misc/lcdproc ) + libass? ( media-libs/libass:= ) + lirc? (
[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/
commit: c8e61d9aeb9e101fbb37aee80cabe613ae036373 Author: Brett Holman gmail com> AuthorDate: Sun Apr 10 18:01:29 2022 + Commit: Sam James gentoo org> CommitDate: Tue Apr 12 01:07:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e61d9a app-emulation/cloud-init: Backport package dep fixes These were changed in upstream commits: 4d2684848722cb2d469ad4fa60999bf81cf7056e - May 2, 2020 - six removed 986f37b017134ced5d9dd38b420350916297002b - Mar 10, 2020 - nose -> pytest 8b4a9bc7b81e61943af873bad92e2133f8275b0b - Aug 9, 2021 - netifaces added Closes: https://github.com/gentoo/gentoo/pull/24980 Signed-off-by: Brett Holman gmail.com> Signed-off-by: Sam James gentoo.org> app-emulation/cloud-init/cloud-init-20.4.ebuild | 7 +++ app-emulation/cloud-init/cloud-init-21.2.ebuild | 7 +++ app-emulation/cloud-init/cloud-init-22.1.ebuild | 5 ++--- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app-emulation/cloud-init/cloud-init-20.4.ebuild b/app-emulation/cloud-init/cloud-init-20.4.ebuild index 89910008a34f..63d26e689413 100644 --- a/app-emulation/cloud-init/cloud-init-20.4.ebuild +++ b/app-emulation/cloud-init/cloud-init-20.4.ebuild @@ -32,14 +32,13 @@ CDEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/jsonpatch[${PYTHON_USEDEP}] dev-python/jsonschema[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] " DEPEND=" test? ( ${CDEPEND} >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] dev-python/coverage[${PYTHON_USEDEP}] ) " @@ -69,8 +68,8 @@ python_prepare_all() { } python_test() { - # Do not use Makefile target as it does not setup environment correclty - esetup.py nosetests -v --where cloudinit --where tests/unittests || die + # Do not use Makefile target as it does not setup environment correctly + esetup.py pytest -v cloudinit/ tests/unittests || die } python_install() { diff --git a/app-emulation/cloud-init/cloud-init-21.2.ebuild b/app-emulation/cloud-init/cloud-init-21.2.ebuild index 55f12c07641e..0a9661be7209 100644 --- a/app-emulation/cloud-init/cloud-init-21.2.ebuild +++ b/app-emulation/cloud-init/cloud-init-21.2.ebuild @@ -32,14 +32,13 @@ CDEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/jsonpatch[${PYTHON_USEDEP}] dev-python/jsonschema[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] " DEPEND=" ${CDEPEND} test? ( >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] dev-python/coverage[${PYTHON_USEDEP}] ) " @@ -69,8 +68,8 @@ python_prepare_all() { } python_test() { - # Do not use Makefile target as it does not setup environment correclty - esetup.py nosetests -v --where cloudinit --where tests/unittests || die + # Do not use Makefile target as it does not setup environment correctly + esetup.py pytest -v cloudinit tests/unittests || die } python_install() { diff --git a/app-emulation/cloud-init/cloud-init-22.1.ebuild b/app-emulation/cloud-init/cloud-init-22.1.ebuild index ace04bcfa721..fcd8771ebb89 100644 --- a/app-emulation/cloud-init/cloud-init-22.1.ebuild +++ b/app-emulation/cloud-init/cloud-init-22.1.ebuild @@ -33,14 +33,13 @@ CDEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/jsonpatch[${PYTHON_USEDEP}] dev-python/jsonschema[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] + dev-python/netifaces[${PYTHON_USEDEP}] " DEPEND=" ${CDEPEND} test? ( >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] dev-python/coverage[${PYTHON_USEDEP}] ) " @@ -59,7 +58,7 @@ PATCHES=( "${FILESDIR}"/22.1-add-support-for-package_upgrade.patch ) -distutils_enable_tests nose +distutils_enable_tests pytest python_prepare_all() { # Fix location of documentation installation
[gentoo-commits] repo/gentoo:master commit in: media-tv/mythtv/
commit: e867d2b46aed5cc4b91e9bb9100b3fed9b7558c1 Author: Sam James gentoo org> AuthorDate: Tue Apr 12 01:07:22 2022 + Commit: Sam James gentoo org> CommitDate: Tue Apr 12 01:07:22 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e867d2b4 media-tv/mythtv: fix typo Signed-off-by: Sam James gentoo.org> media-tv/mythtv/mythtv-32.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-tv/mythtv/mythtv-32.0.ebuild b/media-tv/mythtv/mythtv-32.0.ebuild index 5d5db2346313..aefb97fefea2 100644 --- a/media-tv/mythtv/mythtv-32.0.ebuild +++ b/media-tv/mythtv/mythtv-32.0.ebuild @@ -283,7 +283,7 @@ src_configure() { $(use_enable X x11) ) - # Hardware accellerators + # Hardware accelerators myconf+=( $(use_enable nvdec) $(use_enable vaapi)
[gentoo-commits] repo/gentoo:master commit in: x11-terms/guake/
commit: 9f350fc2c78b732254ba413b6239b66b87470cee Author: Ionen Wolkens gentoo org> AuthorDate: Tue Apr 12 00:00:05 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Tue Apr 12 00:55:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f350fc2 x11-terms/guake: add 3.8.5 One more bump from me to remove pbr, also switch to PEP517 mode and use plocale (don't expect more bumps from me, pick it up if you use it). Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/guake/Manifest | 1 + x11-terms/guake/guake-3.8.5.ebuild | 86 ++ 2 files changed, 87 insertions(+) diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest index dfad83dab875..bd16e1c94b80 100644 --- a/x11-terms/guake/Manifest +++ b/x11-terms/guake/Manifest @@ -1 +1,2 @@ DIST guake-3.8.1.tar.gz 1127132 BLAKE2B e91f74bf119c76ad214b5c29bceb4fe18f19c97f14dbb2973c6118bbb9affc06e919c56e0cd24f96b710d9c2468006289fcf1c13a2050e93cc01972f0c9ebe99 SHA512 5fbf4cc37bc501e4533bd27c1c7e1f783e570457867289702ab2122fcb6a55708df151e4307c4cf84a242ac1d2874ef5e8eb9411318e24eca140102a42b426f4 +DIST guake-3.8.5.tar.gz 1112897 BLAKE2B 221e6a388c3a5904cd20a762e6a669e30b59a742a550e5c2a411534c3b0730c7622f42c67fdc72785fac199c432a297beb9fb53be2b5e2b7545a5b03c2b8b545 SHA512 40605fadb3a0149ea488a7e93f1b7e4f5250f62fe058292f2c02f03f837f22e13171b28c4a9d1a14c2e4897c0066a683cae547e03862397310bc650d149181fb diff --git a/x11-terms/guake/guake-3.8.5.ebuild b/x11-terms/guake/guake-3.8.5.ebuild new file mode 100644 index ..aca9e52d877b --- /dev/null +++ b/x11-terms/guake/guake-3.8.5.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} ) +inherit distutils-r1 gnome2-utils plocale virtualx xdg + +PLOCALES="ca cs de el es fa fi fr gl hr hu id it ja ko nb nl pa pl pt_BR ru sv tr uk zh_CN zh_TW" + +DESCRIPTION="Drop-down terminal for GNOME" +HOMEPAGE="http://guake-project.org/; +SRC_URI="https://github.com/Guake/guake/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="utempter" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}]') + dev-libs/keybinder:3[introspection] + x11-libs/libnotify[introspection] + x11-libs/libwnck:3[introspection] + x11-libs/vte:2.91[introspection] + utempter? ( sys-libs/libutempter )" +BDEPEND=" + $(python_gen_cond_dep ' + dev-python/setuptools_scm[${PYTHON_USEDEP}] + test? ( + dev-python/pyfakefs[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + )') + dev-libs/glib:2 + gnome-base/gsettings-desktop-schemas + sys-devel/gettext" + +distutils_enable_tests pytest + +src_prepare() { + distutils-r1_src_prepare + + export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} # needed with github's tarball + + local po=($(plocale_get_locales disabled)) + po=("${po[@]/%/.po}") + (( ! ${#po[@]} )) || rm "${po[@]/#/po/}" || die + + emake PREFIX="${EPREFIX}"/usr prepare-install # paths.py.in -> paths.py +} + +python_test() { + # - uses /usr/bin/bash if SHELL is not exported + # - pytest-xvfb fails with Terminated, virtx alone works + SHELL=${SHELL} virtx epytest -p no:xvfb +} + +python_install() { + # use right schema/data dirs, done here so tests don't use the system's + sed -e "/^SCHEMA_DIR/s|=.*|= \"${EPREFIX}/usr/share/glib-2.0/schemas\"|" \ + -e "/def get_default_data_dir/{n;s|=.*|= \"${EPREFIX}/usr/share/guake\"|}" \ + -i "${BUILD_DIR}/install$(python_get_sitedir)"/guake/paths.py || die + + distutils-r1_python_install +} + +python_install_all() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install-{locale,schemas} + + dodoc NEWS.rst README.rst +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +}
[gentoo-commits] repo/gentoo:master commit in: dev-python/jupyter/
commit: c434fba6b450fd02b54c42484cd886084d3dc3e7 Author: Sam James gentoo org> AuthorDate: Mon Apr 11 23:23:11 2022 + Commit: Sam James gentoo org> CommitDate: Mon Apr 11 23:23:11 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c434fba6 dev-python/jupyter: Stabilize 1.0.0-r4 x86, #835228 Signed-off-by: Sam James gentoo.org> dev-python/jupyter/jupyter-1.0.0-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/jupyter/jupyter-1.0.0-r4.ebuild b/dev-python/jupyter/jupyter-1.0.0-r4.ebuild index dff5487ba45c..ff462ecc58d4 100644 --- a/dev-python/jupyter/jupyter-1.0.0-r4.ebuild +++ b/dev-python/jupyter/jupyter-1.0.0-r4.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" RDEPEND=" dev-python/notebook[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-mono/
commit: 63ddc80a8d50e4decc7000f65e3584d9b0d27147 Author: Sam James gentoo org> AuthorDate: Mon Apr 11 23:22:36 2022 + Commit: Sam James gentoo org> CommitDate: Mon Apr 11 23:22:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63ddc80a app-emulation/wine-mono: Stabilize 7.0.0 amd64, #834979 Signed-off-by: Sam James gentoo.org> app-emulation/wine-mono/wine-mono-7.0.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-emulation/wine-mono/wine-mono-7.0.0.ebuild b/app-emulation/wine-mono/wine-mono-7.0.0.ebuild index 7cfe19d1ba22..cbd75a5c9f9d 100644 --- a/app-emulation/wine-mono/wine-mono-7.0.0.ebuild +++ b/app-emulation/wine-mono/wine-mono-7.0.0.ebuild @@ -12,7 +12,7 @@ SRC_URI=" LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1" SLOT="${PV}" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="+shared" DEPEND="!!app-emulation/wine:0"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libusb/
commit: 5a9607b326de011308d29bd18ab8e6536ed09d89 Author: Sam James gentoo org> AuthorDate: Mon Apr 11 23:22:16 2022 + Commit: Sam James gentoo org> CommitDate: Mon Apr 11 23:22:32 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a9607b3 dev-libs/libusb: add 1.0.26 Signed-off-by: Sam James gentoo.org> dev-libs/libusb/Manifest | 1 + dev-libs/libusb/libusb-1.0.26.ebuild | 74 2 files changed, 75 insertions(+) diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest index f7d51a105801..282c76535cb9 100644 --- a/dev-libs/libusb/Manifest +++ b/dev-libs/libusb/Manifest @@ -1,2 +1,3 @@ DIST libusb-1.0.24.tar.bz2 606593 BLAKE2B f6188b5af1225cf8b6d1486b6efcf48e837ee4f2e3592adab3ae6aae0a74a67aa54f40f0dd547f951a194d40954f2ee33acf741d2eee0b8449ce64f2edcf1018 SHA512 5aea36a530aaa15c6dd656d0ed3ce204522c9946d8d39ffbb290dab4a98cda388a2598da4995123d1032324056090bd429e702459626d3e8d7daeebc4e7ff3dc DIST libusb-1.0.25.tar.bz2 609127 BLAKE2B 3aecfbf9fc068fdfb8e612918bb895988f8400dc2c3ffd96a81792ab844d632f0c098947200512ddc37cfa9003956f8454c1d0362973a5d646a225f81cc2923b SHA512 f1e6e5577d4bd1ff136927dc66c615014a06ac332ddd797b1d1ad5f7b68e2405e66068dcb210e2f0ae3e31681603ef72efbd88bf7fbe0eb41ce700fdc3f92f9d +DIST libusb-1.0.26.tar.bz2 620534 BLAKE2B 0cc397ecf4de0066abbff9b286a9e4fcd48658698d5e0d6b736abf56b48c1b55a05f15fff7be53fd33f767621e0c25d87275a47e05a4bcb44c4b8ac9221cd081 SHA512 fcdb85c98f21639668693c2fd522814d440972d65883984c4ae53d0555bdbdb7e8c7a32199cd4b01113556a1eb5be7841b750cc73c9f6bda79bfe1af80914e71 diff --git a/dev-libs/libusb/libusb-1.0.26.ebuild b/dev-libs/libusb/libusb-1.0.26.ebuild new file mode 100644 index ..328fa227b1de --- /dev/null +++ b/dev-libs/libusb/libusb-1.0.26.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal usr-ldscript + +DESCRIPTION="Userspace access to USB devices" +HOMEPAGE="https://libusb.info/ https://github.com/libusb/libusb; +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2; + +LICENSE="LGPL-2.1" +SLOT="1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="debug doc examples static-libs test udev" +RESTRICT="!test? ( test )" +REQUIRED_USE="static-libs? ( !udev )" + +RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + !udev? ( virtual/os-headers )" +BDEPEND="doc? ( app-doc/doxygen )" + +multilib_src_configure() { + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable udev) + $(use_enable debug debug-log) + $(use_enable test tests-build) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + emake + + if multilib_is_native_abi; then + use doc && emake -C doc + fi +} + +multilib_src_test() { + emake check + + # noinst_PROGRAMS from tests/Makefile.am + if [[ -e /dev/bus/usb ]]; then + tests/stress || die + else + # bug #824266 + ewarn "/dev/bus/usb does not exist, skipping stress test" + fi +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi; then + gen_usr_ldscript -a usb-1.0 + + use doc && dodoc -r doc/api-1.0 + fi +} + +multilib_src_install_all() { + find "${ED}" -type f -name "*.la" -delete || die + + dodoc AUTHORS ChangeLog NEWS PORTING README TODO + + if use examples; then + docinto examples + dodoc examples/*.{c,h} + fi +}
[gentoo-commits] repo/gentoo:master commit in: sys-fs/mtools/
commit: ab9d6c283ae4002956dfe591c1d0c2edf67cb54e Author: Sam James gentoo org> AuthorDate: Mon Apr 11 22:39:24 2022 + Commit: Sam James gentoo org> CommitDate: Mon Apr 11 23:22:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9d6c28 sys-fs/mtools: add 4.0.39 Signed-off-by: Sam James gentoo.org> sys-fs/mtools/Manifest | 1 + sys-fs/mtools/mtools-4.0.39.ebuild | 57 ++ 2 files changed, 58 insertions(+) diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest index 4d7315e52f86..99c9fff6b339 100644 --- a/sys-fs/mtools/Manifest +++ b/sys-fs/mtools/Manifest @@ -1,3 +1,4 @@ DIST mtools-4.0.35.tar.bz2 455988 BLAKE2B 9c1ac7f3ad3f9f13a572d0e1ea3c3a9d79bd08f0ae963c7357a19a687b74536cd8442eb167a9e50f7d22398c56736753b0d98bccdaa4c7d8427d1c09e1dd786c SHA512 ef563b3319285667993c82d819e08cb819a6bcd71c466fc252568996b4218cfb3731107ffcd6150ba33c0837e012e02057def41e2b011f751eaf550bfa366a10 DIST mtools-4.0.37.tar.bz2 441076 BLAKE2B a84ff9e532a1896706589dfe7e62b1e400baf0ab9b86cc3d4a09bd4a0a24d1e86f504b9005c98765f62d735d227d0a1d5ab78354c587c88e2d42a4146d127dc1 SHA512 5ff4da9050dd5d5c0929dd9977866086085bd8fef577f3c6ce2ed6fb958eec2304db612c0766e6be1a048819e29f62023cb0f0a9464a84ed7cc21de9561fadce DIST mtools-4.0.38.tar.bz2 440491 BLAKE2B 4d486b9bcbf31c9056ed6460d3d7ccb160f2d3d68e2b9a87590821251513a299ab321df825821722c41e13f608250eecad52e828c901ab956e471cd56871a50c SHA512 045e7dba159699c53abefd69e2065c116e2e360e7ec537df1e4d38309fb03587c600bb930363ecffef48cef1c8c118146691cf9a35c36abbb40e4546e532ce4a +DIST mtools-4.0.39.tar.bz2 429751 BLAKE2B b1b04fa1614cf36245c60c3ef35de1869e53786dbc9a7e864278a51c9519c63b59fff9dffbd761fbc59782161ba201908b4a5b6792a7231fff6f27be2bea1d67 SHA512 6f84ce57a7c088b526e3e4fa7c509f1869a55b87951134d6257533d311b4a97496c44fa374de6f8cb15c645d60b9f9745ccbdf405d0d77a30a86e31ed8d54ce4 diff --git a/sys-fs/mtools/mtools-4.0.39.ebuild b/sys-fs/mtools/mtools-4.0.39.ebuild new file mode 100644 index ..78c11df773a0 --- /dev/null +++ b/sys-fs/mtools/mtools-4.0.39.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic + +DESCRIPTION="Utilities to access MS-DOS disks from Unix without mounting them" +HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools; +SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris" +IUSE="X" + +RDEPEND="!elibc_glibc? ( virtual/libiconv ) + X? ( + x11-libs/libICE + x11-libs/libXau + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXt + )" +DEPEND="${RDEPEND}" + +src_prepare() { + default + + # Only needed for strtoi patch + eautoreconf +} + +src_configure() { + if ! use elibc_glibc && ! use elibc_musl ; then + # bug #447688 + append-libs "-liconv" + fi + + local myeconfargs=( + --sysconfdir="${EPREFIX}"/etc/mtools + $(use_with X x) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + local -a DOCS=( README* Release.notes ) + default + + insinto /etc/mtools + doins mtools.conf + + # Default is fine + sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die +}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/
commit: f2e38f26af3403f66457ba0dcefe6f4f07f622bf Author: Sam James gentoo org> AuthorDate: Mon Apr 11 23:22:37 2022 + Commit: Sam James gentoo org> CommitDate: Mon Apr 11 23:22:37 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e38f26 app-emulation/wine-vanilla: Stabilize 7.0 amd64, #834979 Signed-off-by: Sam James gentoo.org> app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild index e0221157f77a..b459ed7e6923 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} == "" ]] ; then else MAJOR_V=$(ver_cut 1) SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz; - KEYWORDS="-* ~amd64 x86" + KEYWORDS="-* amd64 x86" fi S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/
commit: a210226ef6cdac927522a72593ff0a0e1a8ef04e Author: Ionen Wolkens gentoo org> AuthorDate: Mon Apr 11 20:38:37 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Apr 11 23:19:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a210226e x11-terms/kitty: add 0.25.0 --update-check-interval "shouldn't" be necessary anymore, but keeping it in the ebuild while the option still exists Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/kitty/Manifest| 2 + x11-terms/kitty/kitty-0.25.0.ebuild | 132 2 files changed, 134 insertions(+) diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index 7dd1c235dca8..381ad1a52a1d 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,2 +1,4 @@ DIST kitty-0.24.4.tar.xz 4613232 BLAKE2B 3bcb957a2d1b43cbf07fbd12e5d098e0b9616370761d9f9629e8b39419405fb146d91281912f55b35611cf01d4e33232224cc3b710044d8423300c9b53c8 SHA512 28b1e2415b5c73ad8922d4ed17a63638c497a91c9aedba71c2f53e77fc89ed49951a2e873bba5bbe85c8eda22107d9ff4e4321010ac33a2d289c2fbd5d3a5b8f DIST kitty-0.24.4.tar.xz.sig 566 BLAKE2B 7a6513e6296b8c4a1781cef6bcea865b8187fcd8d2abd822627a401f943b1fb1d1432935fdbdc348c3062b07c91a85adcec280be64676782492f6245c72ed89b SHA512 34d24eebf08e19a96f715afb4a570746e1b7bcace6b6226dd596b2886b7bf3bc34b9842d0686c07a655b6b870da77cf25adf6d577dac811a01a70db8c477723a +DIST kitty-0.25.0.tar.xz 4640360 BLAKE2B 2f982ecb2d13c49a6971d4a863f2215f22ccae2cc50fd7b6c6b5c2facf781ac23ec627edcbec8ebaa538c5d67b0b62ad4cc05aedf90fd722d9d886c2f62d5b42 SHA512 fed8d66a9f7f2117f4b495305db0d56d8b85ef03bf7ef24a7dca31e63e16fc90e026aa8022237ad45678efb026f11fdd8aa377eb53917fd8ec885f2ccea721f8 +DIST kitty-0.25.0.tar.xz.sig 566 BLAKE2B 94d082c4520d1a25c9ea104df94876e342cc84fcc049ebc0b6061fe71206e98c5b5f8aa841ed636988b33f72f122b2d84f39e10d319c1d56c9cbf37d1b6fc064 SHA512 827546ea38af4babf431031184203bd11853469f87826a6b86f45b0b7d087e7523eee935908ca5a5e4a7a87e01d75114ed348ff39a9a0f6329d372fac15841af diff --git a/x11-terms/kitty/kitty-0.25.0.ebuild b/x11-terms/kitty/kitty-0.25.0.ebuild new file mode 100644 index ..16dd62bce059 --- /dev/null +++ b/x11-terms/kitty/kitty-0.25.0.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit optfeature python-single-r1 toolchain-funcs xdg + +if [[ ${PV} == ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git; +else + inherit verify-sig + SRC_URI=" + https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz + verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )" + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg" + KEYWORDS="~amd64 ~ppc64 ~x86" +fi + +DESCRIPTION="Fast, feature-rich, GPU-based terminal" +HOMEPAGE="https://sw.kovidgoyal.net/kitty/; + +LICENSE="GPL-3" +SLOT="0" +IUSE="+X debug test transfer wayland" +REQUIRED_USE=" + || ( X wayland ) + ${PYTHON_REQUIRED_USE}" +RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + media-libs/fontconfig + media-libs/freetype:2 + media-libs/harfbuzz:= + media-libs/lcms:2 + media-libs/libglvnd[X?] + media-libs/libpng:= + sys-apps/dbus + sys-libs/zlib:= + x11-libs/libxkbcommon[X?] + x11-misc/xkeyboard-config + ~x11-terms/kitty-shell-integration-${PV} + ~x11-terms/kitty-terminfo-${PV} + X? ( x11-libs/libX11 ) + transfer? ( net-libs/librsync:= ) + wayland? ( dev-libs/wayland )" +DEPEND=" + ${RDEPEND} + X? ( + x11-base/xorg-proto + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + ) + wayland? ( dev-libs/wayland-protocols )" +BDEPEND=" + ${PYTHON_DEPS} + sys-libs/ncurses + virtual/pkgconfig + test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') ) + wayland? ( dev-util/wayland-scanner )" +[[ ${PV} == ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.23.1-flags.patch +) + +src_prepare() { + default + + sed -i "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" setup.py || die + + if use !transfer; then + sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die + rm -r kittens/transfer || die + fi + + # test relies on 'who' command which doesn't detect users with pid-sandbox + rm kitty_tests/utmp.py || die + + # test may fail/hang depending on environment and shell initialization scripts + rm
[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/
commit: 8440f0ee96e9e6310a6d4c9c875767b160602251 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Apr 11 22:58:51 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Apr 11 23:19:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8440f0ee x11-terms/kitty: sync live Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/kitty/kitty-.ebuild | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/x11-terms/kitty/kitty-.ebuild b/x11-terms/kitty/kitty-.ebuild index 22dc6f82a916..16dd62bce059 100644 --- a/x11-terms/kitty/kitty-.ebuild +++ b/x11-terms/kitty/kitty-.ebuild @@ -81,6 +81,9 @@ src_prepare() { # test relies on 'who' command which doesn't detect users with pid-sandbox rm kitty_tests/utmp.py || die + # test may fail/hang depending on environment and shell initialization scripts + rm kitty_tests/ssh.py || die + # skip docs for live version [[ ${PV} != ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die } @@ -116,7 +119,8 @@ src_install() { insinto /usr doins -r linux-package/. - fperms +x /usr/bin/kitty + fperms +x /usr/bin/kitty \ + /usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty} } pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty-shell-integration/
commit: 2c5e5214af8b59055c03fc0a8b5aa220e151c367 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Apr 11 20:45:51 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Apr 11 23:19:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c5e5214 x11-terms/kitty-shell-integration: sync live Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/kitty-shell-integration/kitty-shell-integration-.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-.ebuild index 4bf3e29efd4b..c50ecb7f91d9 100644 --- a/x11-terms/kitty-shell-integration/kitty-shell-integration-.ebuild +++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-.ebuild @@ -31,4 +31,7 @@ src_install() { dosym -r /usr/share/{kitty/shell-integration/zsh/completions,zsh/site-functions}/_kitty # zsh integration is handled automatically without needing to modify rc files, # but may require user intervention depending on zsh invocation or if remote + + # this is used internally by the ssh kitten and is not useful there + rm -r "${ED}"/usr/share/kitty/shell-integration/ssh || die }
[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/
commit: bf02e73201788677d452c9e386ac2bc33358a615 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Apr 11 20:35:52 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Apr 11 23:19:01 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf02e732 x11-terms/kitty: drop 0.23.1-r1 Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/kitty/Manifest | 1 - x11-terms/kitty/kitty-0.23.1-r1.ebuild | 116 - 2 files changed, 117 deletions(-) diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index c7e9d4aabec3..7dd1c235dca8 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,3 +1,2 @@ -DIST kitty-0.23.1.tar.xz 184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94 DIST kitty-0.24.4.tar.xz 4613232 BLAKE2B 3bcb957a2d1b43cbf07fbd12e5d098e0b9616370761d9f9629e8b39419405fb146d91281912f55b35611cf01d4e33232224cc3b710044d8423300c9b53c8 SHA512 28b1e2415b5c73ad8922d4ed17a63638c497a91c9aedba71c2f53e77fc89ed49951a2e873bba5bbe85c8eda22107d9ff4e4321010ac33a2d289c2fbd5d3a5b8f DIST kitty-0.24.4.tar.xz.sig 566 BLAKE2B 7a6513e6296b8c4a1781cef6bcea865b8187fcd8d2abd822627a401f943b1fb1d1432935fdbdc348c3062b07c91a85adcec280be64676782492f6245c72ed89b SHA512 34d24eebf08e19a96f715afb4a570746e1b7bcace6b6226dd596b2886b7bf3bc34b9842d0686c07a655b6b870da77cf25adf6d577dac811a01a70db8c477723a diff --git a/x11-terms/kitty/kitty-0.23.1-r1.ebuild b/x11-terms/kitty/kitty-0.23.1-r1.ebuild deleted file mode 100644 index 67420a5f1402.. --- a/x11-terms/kitty/kitty-0.23.1-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit optfeature python-single-r1 toolchain-funcs xdg - -if [[ ${PV} == ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git; -else - SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz; - KEYWORDS="amd64 ~x86" -fi - -DESCRIPTION="Fast, feature-rich, GPU-based terminal" -HOMEPAGE="https://sw.kovidgoyal.net/kitty/; - -LICENSE="GPL-3" -SLOT="0" -IUSE="+X debug test wayland" -REQUIRED_USE=" - || ( X wayland ) - ${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - media-libs/fontconfig - media-libs/freetype:2 - media-libs/harfbuzz:= - media-libs/lcms:2 - media-libs/libglvnd[X?] - media-libs/libpng:= - sys-apps/dbus - sys-libs/zlib:= - x11-libs/libxkbcommon[X?] - x11-misc/xkeyboard-config - ~x11-terms/kitty-terminfo-${PV} - >x11-terms/kitty-terminfo-0.23.1-r0 - X? ( x11-libs/libX11 ) - wayland? ( dev-libs/wayland )" -DEPEND=" - ${RDEPEND} - X? ( - x11-base/xorg-proto - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - ) - wayland? ( dev-libs/wayland-protocols )" -BDEPEND=" - ${PYTHON_DEPS} - sys-libs/ncurses - virtual/pkgconfig - test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') ) - wayland? ( dev-util/wayland-scanner )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.23.1-flags.patch -) - -src_prepare() { - default - - sed "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" -i setup.py || die - sed "s/else linux_backends/else [$(usev X "'x11',")$(usev wayland "'wayland'")]/" \ - -i kitty_tests/check_build.py || die - use X || sed "/glfw_path('x11')/s/x11/wayland/" -i kitty_tests/glfw.py || die - - # skip docs for live version - [[ ${PV} != ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die -} - -src_compile() { - tc-export CC - export PKGCONFIG_EXE=$(tc-getPKG_CONFIG) - - local setup=( - ${EPYTHON} setup.py - --disable-link-time-optimization - --ignore-compiler-warnings - --libdir-name=$(get_libdir) - --update-check-interval=0 - --verbose - $(usev debug --debug) - linux-package - ) - - echo "${setup[*]}" - "${setup[@]}" || die "setup.py failed to compile ${PN}" - - [[ ${PV} == ]] || mv linux-package/share/doc/{${PN},${PF}} || die - rm -r linux-package/share/terminfo || die -} - -src_test() { - PATH=linux-package/bin:${PATH} KITTY_CONFIG_DIRECTORY=${T} \ - ${EPYTHON} test.py || die -} - -src_install() { - insinto /usr - doins -r linux-package/. - - fperms +x
[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty-terminfo/
commit: 965da80c27da93d119fee10ffbf827485f1f1ef8 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Apr 11 20:37:33 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Apr 11 23:19:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=965da80c x11-terms/kitty-terminfo: add 0.25.0 Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/kitty-terminfo/Manifest | 1 + .../kitty-terminfo/kitty-terminfo-0.25.0.ebuild| 23 ++ 2 files changed, 24 insertions(+) diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest index f46355894f81..9edf9fc6eacf 100644 --- a/x11-terms/kitty-terminfo/Manifest +++ b/x11-terms/kitty-terminfo/Manifest @@ -1 +1,2 @@ DIST kitty-0.24.4.tar.xz 4613232 BLAKE2B 3bcb957a2d1b43cbf07fbd12e5d098e0b9616370761d9f9629e8b39419405fb146d91281912f55b35611cf01d4e33232224cc3b710044d8423300c9b53c8 SHA512 28b1e2415b5c73ad8922d4ed17a63638c497a91c9aedba71c2f53e77fc89ed49951a2e873bba5bbe85c8eda22107d9ff4e4321010ac33a2d289c2fbd5d3a5b8f +DIST kitty-0.25.0.tar.xz 4640360 BLAKE2B 2f982ecb2d13c49a6971d4a863f2215f22ccae2cc50fd7b6c6b5c2facf781ac23ec627edcbec8ebaa538c5d67b0b62ad4cc05aedf90fd722d9d886c2f62d5b42 SHA512 fed8d66a9f7f2117f4b495305db0d56d8b85ef03bf7ef24a7dca31e63e16fc90e026aa8022237ad45678efb026f11fdd8aa377eb53917fd8ec885f2ccea721f8 diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.25.0.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.25.0.ebuild new file mode 100644 index ..35ff98034a87 --- /dev/null +++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.25.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Terminfo for kitty, a GPU-based terminal emulator" +HOMEPAGE="https://sw.kovidgoyal.net/kitty/; +SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz; +S="${WORKDIR}/kitty-${PV}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +RESTRICT="test" # intended to be ran on the full kitty package + +BDEPEND="sys-libs/ncurses" + +src_compile() { :; } + +src_install() { + dodir /usr/share/terminfo + tic -xo "${ED}"/usr/share/terminfo terminfo/kitty.terminfo || die +}
[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty-shell-integration/
commit: 44a1fc2f1a39754b769974ab7cfa146b1089a14f Author: Ionen Wolkens gentoo org> AuthorDate: Mon Apr 11 20:36:59 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Apr 11 23:19:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44a1fc2f x11-terms/kitty-shell-integration: add 0.25.0 Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/kitty-shell-integration/Manifest | 1 + .../kitty-shell-integration-0.25.0.ebuild | 37 ++ 2 files changed, 38 insertions(+) diff --git a/x11-terms/kitty-shell-integration/Manifest b/x11-terms/kitty-shell-integration/Manifest index f46355894f81..9edf9fc6eacf 100644 --- a/x11-terms/kitty-shell-integration/Manifest +++ b/x11-terms/kitty-shell-integration/Manifest @@ -1 +1,2 @@ DIST kitty-0.24.4.tar.xz 4613232 BLAKE2B 3bcb957a2d1b43cbf07fbd12e5d098e0b9616370761d9f9629e8b39419405fb146d91281912f55b35611cf01d4e33232224cc3b710044d8423300c9b53c8 SHA512 28b1e2415b5c73ad8922d4ed17a63638c497a91c9aedba71c2f53e77fc89ed49951a2e873bba5bbe85c8eda22107d9ff4e4321010ac33a2d289c2fbd5d3a5b8f +DIST kitty-0.25.0.tar.xz 4640360 BLAKE2B 2f982ecb2d13c49a6971d4a863f2215f22ccae2cc50fd7b6c6b5c2facf781ac23ec627edcbec8ebaa538c5d67b0b62ad4cc05aedf90fd722d9d886c2f62d5b42 SHA512 fed8d66a9f7f2117f4b495305db0d56d8b85ef03bf7ef24a7dca31e63e16fc90e026aa8022237ad45678efb026f11fdd8aa377eb53917fd8ec885f2ccea721f8 diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.0.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.0.ebuild new file mode 100644 index ..4c3e987c411b --- /dev/null +++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Shell integration scripts for kitty, a GPU-based terminal emulator" +HOMEPAGE="https://sw.kovidgoyal.net/kitty/; +SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz; +S="${WORKDIR}/kitty-${PV}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +RESTRICT="test" # intended to be ran on the full kitty package + +src_compile() { :; } + +src_install() { + # install the whole directory in the upstream suggested location + # for consistency (i.e. less variation between distros if someone + # ssh into Gentoo), then set symlinks to autoload where possible + # (these exit immediately if KITTY_SHELL_INTEGRATION is unset) + insinto /usr/share/kitty + doins -r shell-integration + + dosym -r {/usr/share/kitty/shell-integration/bash,/etc/bash/bashrc.d}/kitty.bash + + dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_completions.d/kitty.fish + dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_conf.d/kitty-shell-integration.fish + + dosym -r /usr/share/{kitty/shell-integration/zsh/completions,zsh/site-functions}/_kitty + # zsh integration is handled automatically without needing to modify rc files, + # but may require user intervention depending on zsh invocation or if remote + + # this is used internally by the ssh kitten and is not useful there + rm -r "${ED}"/usr/share/kitty/shell-integration/ssh || die +}
[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty-terminfo/
commit: 21fa509bdf9682435cc35945629a5d9549a4732f Author: Ionen Wolkens gentoo org> AuthorDate: Mon Apr 11 20:36:04 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Apr 11 23:19:01 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21fa509b x11-terms/kitty-terminfo: drop 0.23.1-r1 Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/kitty-terminfo/Manifest | 1 - .../kitty-terminfo/kitty-terminfo-0.23.1-r1.ebuild | 23 -- 2 files changed, 24 deletions(-) diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest index 6c36e90958ef..f46355894f81 100644 --- a/x11-terms/kitty-terminfo/Manifest +++ b/x11-terms/kitty-terminfo/Manifest @@ -1,2 +1 @@ -DIST kitty-0.23.1.tar.xz 184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94 DIST kitty-0.24.4.tar.xz 4613232 BLAKE2B 3bcb957a2d1b43cbf07fbd12e5d098e0b9616370761d9f9629e8b39419405fb146d91281912f55b35611cf01d4e33232224cc3b710044d8423300c9b53c8 SHA512 28b1e2415b5c73ad8922d4ed17a63638c497a91c9aedba71c2f53e77fc89ed49951a2e873bba5bbe85c8eda22107d9ff4e4321010ac33a2d289c2fbd5d3a5b8f diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1-r1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1-r1.ebuild deleted file mode 100644 index 39ccb7d51e93.. --- a/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Terminfo for kitty, a GPU-based terminal emulator" -HOMEPAGE="https://sw.kovidgoyal.net/kitty/; -SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz; -S="${WORKDIR}/kitty-${PV}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -RESTRICT="test" # intended to be ran on the full kitty package - -BDEPEND="sys-libs/ncurses" - -src_compile() { :; } - -src_install() { - dodir /usr/share/terminfo - tic -xo "${ED}"/usr/share/terminfo terminfo/kitty.terminfo || die -}
[gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
commit: e339e6cbf5ffefcb7a7b6b70ca876b33f70b56ef Author: Matt Turner gentoo org> AuthorDate: Mon Apr 11 23:15:21 2022 + Commit: Matt Turner gentoo org> CommitDate: Mon Apr 11 23:15:21 2022 + URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=e339e6cb app-benchmarks/glmark2: Remove unneeded python-any-r1 inherit Signed-off-by: Matt Turner gentoo.org> app-benchmarks/glmark2/glmark2-2021.12.ebuild | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app-benchmarks/glmark2/glmark2-2021.12.ebuild b/app-benchmarks/glmark2/glmark2-2021.12.ebuild index 4c76c3c8..00290d61 100644 --- a/app-benchmarks/glmark2/glmark2-2021.12.ebuild +++ b/app-benchmarks/glmark2/glmark2-2021.12.ebuild @@ -3,10 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) -inherit meson python-single-r1 - -REV=${PV#*_p} +inherit meson DESCRIPTION="glmark2 is an OpenGL 2.0 and ES 2.0 benchmark" HOMEPAGE="https://github.com/glmark2/glmark2;
[gentoo-commits] proj/x11:master commit in: metadata/
commit: 908e700e6523280d1d179e3132a781efb78b9fe6 Author: Matt Turner gentoo org> AuthorDate: Mon Apr 11 23:17:08 2022 + Commit: Matt Turner gentoo org> CommitDate: Mon Apr 11 23:17:08 2022 + URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=908e700e metadata: Update hashes Signed-off-by: Matt Turner gentoo.org> metadata/layout.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/layout.conf b/metadata/layout.conf index 760df689..65e1b259 100644 --- a/metadata/layout.conf +++ b/metadata/layout.conf @@ -1,6 +1,6 @@ masters = gentoo # Use new hashes -manifest-hashes = SHA256 SHA512 WHIRLPOOL +manifest-hashes = BLAKE2B SHA512 # Do not update changelogs update-changelog = false # Use thin manifests
[gentoo-commits] repo/gentoo:master commit in: app-emacs/spacemacs-theme/files/, app-emacs/spacemacs-theme/
commit: 1b2314b134b62d2015bb0da946c1fd05cfef4b57 Author: Maciej Barć gentoo org> AuthorDate: Mon Apr 11 23:08:48 2022 + Commit: Maciej Barć gentoo org> CommitDate: Mon Apr 11 23:14:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b2314b1 app-emacs/spacemacs-theme: new package; add version 0.2 Signed-off-by: Maciej Barć gentoo.org> app-emacs/spacemacs-theme/Manifest | 1 + .../files/50spacemacs-theme-gentoo.el| 2 ++ app-emacs/spacemacs-theme/metadata.xml | 13 + app-emacs/spacemacs-theme/spacemacs-theme-0.2.ebuild | 20 4 files changed, 36 insertions(+) diff --git a/app-emacs/spacemacs-theme/Manifest b/app-emacs/spacemacs-theme/Manifest new file mode 100644 index ..98be3987e3c6 --- /dev/null +++ b/app-emacs/spacemacs-theme/Manifest @@ -0,0 +1 @@ +DIST spacemacs-theme-0.2.tar.gz 688604 BLAKE2B 1806fbe9b2b1b9a625778415aa6df74e4acc62279d811ff782620a7bb18e6a1327b16dacc174267c61fd959191f2ccaecaaf08f30ae5bb2844652bf92919cda2 SHA512 250f15e11c38e16930107bc2bf0c265876ba74383743714c0aa6bdb270f55cb14ee41c1f2c4d1008a6d90d3c361f44f363d36af0fb0e92087df8d320e0a888a0 diff --git a/app-emacs/spacemacs-theme/files/50spacemacs-theme-gentoo.el b/app-emacs/spacemacs-theme/files/50spacemacs-theme-gentoo.el new file mode 100644 index ..14e3d2142040 --- /dev/null +++ b/app-emacs/spacemacs-theme/files/50spacemacs-theme-gentoo.el @@ -0,0 +1,2 @@ +(add-to-list 'load-path "@SITELISP@") +(add-to-list 'custom-theme-load-path (file-name-as-directory "@SITELISP@")) diff --git a/app-emacs/spacemacs-theme/metadata.xml b/app-emacs/spacemacs-theme/metadata.xml new file mode 100644 index ..6a0340f0ac33 --- /dev/null +++ b/app-emacs/spacemacs-theme/metadata.xml @@ -0,0 +1,13 @@ + +https://www.gentoo.org/dtd/metadata.dtd;> + + + +gnu-em...@gentoo.org +Gentoo GNU Emacs project + + +https://github.com/nashamri/spacemacs-theme/issues/ +nashamri/spacemacs-theme + + diff --git a/app-emacs/spacemacs-theme/spacemacs-theme-0.2.ebuild b/app-emacs/spacemacs-theme/spacemacs-theme-0.2.ebuild new file mode 100644 index ..634cda8539e9 --- /dev/null +++ b/app-emacs/spacemacs-theme/spacemacs-theme-0.2.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +NEED_EMACS=24 + +inherit elisp + +DESCRIPTION="Emacs color theme that started as a theme for Spacemacs" +HOMEPAGE="https://github.com/nashamri/spacemacs-theme/; +SRC_URI="https://github.com/nashamri/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DOCS=( README.md img ) +ELISP_REMOVE="spacemacs-theme-pkg.el" +SITEFILE="50${PN}-gentoo.el"
[gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
commit: 09b02cfdbbdcdce8a6249841048b33c1b900ac8b Author: Matt Turner gentoo org> AuthorDate: Mon Apr 11 22:47:35 2022 + Commit: Matt Turner gentoo org> CommitDate: Mon Apr 11 22:47:35 2022 + URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=09b02cfd app-benchmarks/glmark2: Version bump to 2021.12 Signed-off-by: Matt Turner gentoo.org> app-benchmarks/glmark2/glmark2-2021.12.ebuild | 72 +++ 1 file changed, 72 insertions(+) diff --git a/app-benchmarks/glmark2/glmark2-2021.12.ebuild b/app-benchmarks/glmark2/glmark2-2021.12.ebuild new file mode 100644 index ..4c76c3c8 --- /dev/null +++ b/app-benchmarks/glmark2/glmark2-2021.12.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit meson python-single-r1 + +REV=${PV#*_p} + +DESCRIPTION="glmark2 is an OpenGL 2.0 and ES 2.0 benchmark" +HOMEPAGE="https://github.com/glmark2/glmark2; +SRC_URI="https://github.com/glmark2/glmark2/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+drm gles2 +opengl wayland X" + +RDEPEND=" + virtual/jpeg:0= + media-libs/libpng:0= + + gles2? ( media-libs/mesa[gles2?] ) + drm? ( + x11-libs/libdrm + media-libs/mesa[gbm(+)] + virtual/libudev:= + ) + X? ( x11-libs/libX11 ) + wayland? ( + dev-libs/wayland + >=dev-libs/wayland-protocols-1.12 + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + wayland? ( dev-util/wayland-scanner ) +" + +REQUIRED_USE="|| ( opengl gles2 ) + || ( drm wayland X )" + +src_configure() { + local flavors=() + + if use X; then + use opengl && flavors+=("x11-gl") + use gles2 && flavors+=("x11-glesv2") + fi + + if use drm; then + use opengl && flavors+=("drm-gl") + use gles2 && flavors+=("drm-glesv2") + fi + + if use wayland; then + use opengl && flavors+=("wayland-gl") + use gles2 && flavors+=("wayland-glesv2") + fi + + flavor_list() { + local flavors="$(sort -u <<< "${1// /$'\n'}")" + echo "${flavors//$'\n'/,}" + } + + local emesonargs=( + -Dflavors=$(flavor_list "${flavors[*]}") + ) + meson_src_configure +}
[gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/files/, app-benchmarks/glmark2/
commit: 706f35cb43e30a6926bea56771e53047a7a24a50 Author: Matt Turner gentoo org> AuthorDate: Mon Apr 11 23:02:31 2022 + Commit: Matt Turner gentoo org> CommitDate: Mon Apr 11 23:02:31 2022 + URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=706f35cb app-benchmarks/glmark2: Drop old versions Signed-off-by: Matt Turner gentoo.org> ...020.04-Build-Fix-Python-3-incompatibility.patch | 25 app-benchmarks/glmark2/glmark2-2020.04.ebuild | 66 -- 2 files changed, 91 deletions(-) diff --git a/app-benchmarks/glmark2/files/glmark2-2020.04-Build-Fix-Python-3-incompatibility.patch b/app-benchmarks/glmark2/files/glmark2-2020.04-Build-Fix-Python-3-incompatibility.patch deleted file mode 100644 index ca13bb8b.. --- a/app-benchmarks/glmark2/files/glmark2-2020.04-Build-Fix-Python-3-incompatibility.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 06e4728ba7312efa0fd595e30745e60ce88f1a4f Mon Sep 17 00:00:00 2001 -From: Marvin Schmidt -Date: Sun, 3 May 2020 18:20:05 +0200 -Subject: [PATCH] Build: Fix Python 3 incompatibility - - wscript | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wscript b/wscript -index aefde70..e09fa78 100644 a/wscript -+++ b/wscript -@@ -20,7 +20,7 @@ FLAVORS = { - 'x11-gl' : 'glmark2', - 'x11-glesv2' : 'glmark2-es2', - } --FLAVORS_STR = ", ".join(sorted(FLAVORS.keys() + ['all-linux', 'all-win32'])) -+FLAVORS_STR = ", ".join(sorted(list(FLAVORS) + ['all-linux', 'all-win32'])) - - def linux_flavors(): - return [f for f in FLAVORS.keys() if not f.startswith('win32')] --- -2.27.0 - diff --git a/app-benchmarks/glmark2/glmark2-2020.04.ebuild b/app-benchmarks/glmark2/glmark2-2020.04.ebuild deleted file mode 100644 index 230109a4.. --- a/app-benchmarks/glmark2/glmark2-2020.04.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit waf-utils python-single-r1 - -REV=${PV#*_p} - -DESCRIPTION="Opengl test suite" -HOMEPAGE="https://launchpad.net/glmark2; -SRC_URI="https://github.com/glmark2/glmark2/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="drm gles2 +opengl wayland X" - -RDEPEND="media-libs/libpng - media-libs/mesa[gles2?] - X? ( x11-libs/libX11 ) - wayland? ( >=dev-libs/wayland-1.2 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -REQUIRED_USE="|| ( opengl gles2 ) - || ( drm wayland X )" - -PATCHES=( - "${FILESDIR}/${PN}"-2020.04-Build-Fix-Python-3-incompatibility.patch -) - -src_prepare() { - default - rm -rf "${S}/src/libpng" -} - -src_configure() { - : ${WAF_BINARY:="${S}/waf"} - - local myconf - - if use X; then - use opengl && myconf+="x11-gl" - use gles2 && myconf+=",x11-glesv2" - fi - - if use drm; then - use opengl && myconf+=",drm-gl" - use gles2 && myconf+=",drm-glesv2" - fi - - if use wayland; then - use opengl && myconf+=",wayland-gl" - use gles2 && myconf+=",wayland-glesv2" - - fi - myconf=${myconf#,} - - # it does not know --libdir specification, dandy huh - CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \ - --prefix=/usr \ - --with-flavors ${myconf} \ - configure || die "configure failed" -}
[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: 65701019d3531f43e471c0060fe9724bf3b7751a Author: Sam James gentoo org> AuthorDate: Mon Apr 11 22:25:49 2022 + Commit: Sam James gentoo org> CommitDate: Mon Apr 11 22:25:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65701019 distutils-r1.eclass: don't call copy_egg_info if USE_PEP517=setuptools Fixes: 6451cf647f04b31a56ea2dc8c3f84a70c2468f87 Thanks-to: Ionen Wolkens gentoo.org> Signed-off-by: Sam James gentoo.org> eclass/distutils-r1.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 2c3aee011847..7a7bdb4a4d39 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1168,7 +1168,7 @@ distutils-r1_python_compile() { eqawarn "be picked up by setuptools when building for another interpreter." eqawarn "Please remove this directory prior to building." fi - else + elif [[ ! ${DISTUTILS_USE_PEP517} ]]; then _distutils-r1_copy_egg_info fi
[gentoo-commits] repo/gentoo:master commit in: app-emacs/geiser-chez/files/, app-emacs/geiser-chez/
commit: 115fd828f55035d8c3fa1851726531747d6cbd6a Author: Maciej Barć gentoo org> AuthorDate: Mon Apr 11 20:51:57 2022 + Commit: Maciej Barć gentoo org> CommitDate: Mon Apr 11 21:24:27 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=115fd828 app-emacs/geiser-chez: new package; add version 0.17 Signed-off-by: Maciej Barć gentoo.org> app-emacs/geiser-chez/Manifest | 1 + .../geiser-chez/files/50geiser-chez-gentoo.el | 5 +++ .../files/geiser-chez-chez-scheme-binary.patch | 12 ++ .../files/geiser-chez-chez-scheme-src-dir.patch| 12 ++ app-emacs/geiser-chez/geiser-chez-0.17.ebuild | 44 ++ app-emacs/geiser-chez/metadata.xml | 17 + 6 files changed, 91 insertions(+) diff --git a/app-emacs/geiser-chez/Manifest b/app-emacs/geiser-chez/Manifest new file mode 100644 index ..13aabdb1033a --- /dev/null +++ b/app-emacs/geiser-chez/Manifest @@ -0,0 +1 @@ +DIST geiser-chez-0.17.tar.gz 6664 BLAKE2B d4f72de512e9d443a1ea2dc0cf6cf03f59980097ff26dd51df7a618c651c5beef142c42b1dea9bb56f94fe4a97b370c6844231eea8968618f6d0dbff499c601d SHA512 bfb1e77a3a0be3750e0e30c421a2b34179edbdb3585fe318c3f6a5a14d7220b3933c63cb970e80af4e14f8d220b620915192d7a34759cc91dfed45878d63ed6e diff --git a/app-emacs/geiser-chez/files/50geiser-chez-gentoo.el b/app-emacs/geiser-chez/files/50geiser-chez-gentoo.el new file mode 100644 index ..e839ddce889c --- /dev/null +++ b/app-emacs/geiser-chez/files/50geiser-chez-gentoo.el @@ -0,0 +1,5 @@ +(add-to-list 'load-path "@SITELISP@") +(autoload 'run-chez "geiser-chez" + "Start a Geiser Chez REPL." t) +(autoload 'switch-to-chez "geiser-chez" + "Start a Geiser Chez REPL, or switch to a running one." t) diff --git a/app-emacs/geiser-chez/files/geiser-chez-chez-scheme-binary.patch b/app-emacs/geiser-chez/files/geiser-chez-chez-scheme-binary.patch new file mode 100644 index ..321dffa716f6 --- /dev/null +++ b/app-emacs/geiser-chez/files/geiser-chez-chez-scheme-binary.patch @@ -0,0 +1,12 @@ +index 7f29927..45c194e 100644 +--- a/geiser-chez.el b/geiser-chez.el +@@ -40,7 +40,7 @@ + :group 'geiser) + + (geiser-custom--defcustom geiser-chez-binary +-"scheme" ++"chezscheme" + "Name to use to call the Chez Scheme executable when starting a REPL." + :type '(choice string (repeat string)) + :group 'geiser-chez) diff --git a/app-emacs/geiser-chez/files/geiser-chez-chez-scheme-src-dir.patch b/app-emacs/geiser-chez/files/geiser-chez-chez-scheme-src-dir.patch new file mode 100644 index ..547c8663012b --- /dev/null +++ b/app-emacs/geiser-chez/files/geiser-chez-chez-scheme-src-dir.patch @@ -0,0 +1,12 @@ +index 7f29927..cc1f4ca 100644 +--- a/geiser-chez.el b/geiser-chez.el +@@ -78,7 +78,7 @@ init file at this location in remote host." + geiser-chez-binary)) + + (defvar geiser-chez-scheme-dir +- (expand-file-name "src" (file-name-directory load-file-name)) ++ (expand-file-name "src" "@SITEETC@") + "Directory where the Chez scheme geiser modules are installed.") + + (defun geiser-chez--parameters () diff --git a/app-emacs/geiser-chez/geiser-chez-0.17.ebuild b/app-emacs/geiser-chez/geiser-chez-0.17.ebuild new file mode 100644 index ..9aa98f60f933 --- /dev/null +++ b/app-emacs/geiser-chez/geiser-chez-0.17.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +NEED_EMACS=26.1 + +inherit elisp + +DESCRIPTION="Chez Scheme's implementation of the Geiser protocols" +HOMEPAGE="https://gitlab.com/emacs-geiser/chez/; +SRC_URI="https://gitlab.com/emacs-geiser/chez/-/archive/${PV}/chez-${PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}"/chez-${PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND="app-emacs/geiser" +RDEPEND=" + ${BDEPEND} + dev-scheme/chez +" + +DOCS=( readme.org ) +PATCHES=( + "${FILESDIR}"/${PN}-chez-scheme-binary.patch + "${FILESDIR}"/${PN}-chez-scheme-src-dir.patch +) +SITEFILE="50${PN}-gentoo.el" + +src_prepare() { + elisp_src_prepare + + sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i ${PN}.el || die +} + +src_install() { + elisp_src_install + + insinto ${SITEETC}/${PN} + doins -r src +} diff --git a/app-emacs/geiser-chez/metadata.xml b/app-emacs/geiser-chez/metadata.xml new file mode 100644 index ..a2f55c9af35d --- /dev/null +++ b/app-emacs/geiser-chez/metadata.xml @@ -0,0 +1,17 @@ + +https://www.gentoo.org/dtd/metadata.dtd;> + + + +gnu-em...@gentoo.org +Gentoo GNU Emacs project + + +sch...@gentoo.org +Gentoo Scheme Project + + +https://gitlab.com/emacs-geiser/chez/-/issues/ +emacs-geiser/chez + +
[gentoo-commits] repo/gentoo:master commit in: app-emacs/flycheck-guile/files/, app-emacs/flycheck-guile/
commit: 8e5fc7482c3c861271bd031b9416a1f037680006 Author: Maciej Barć gentoo org> AuthorDate: Mon Apr 11 21:20:51 2022 + Commit: Maciej Barć gentoo org> CommitDate: Mon Apr 11 21:24:28 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e5fc748 app-emacs/flycheck-guile: new package; add version 0.2 Signed-off-by: Maciej Barć gentoo.org> app-emacs/flycheck-guile/Manifest | 1 + .../files/50flycheck-guile-gentoo.el | 1 + app-emacs/flycheck-guile/flycheck-guile-0.2.ebuild | 28 ++ app-emacs/flycheck-guile/metadata.xml | 17 + 4 files changed, 47 insertions(+) diff --git a/app-emacs/flycheck-guile/Manifest b/app-emacs/flycheck-guile/Manifest new file mode 100644 index ..7d2c368e6b8d --- /dev/null +++ b/app-emacs/flycheck-guile/Manifest @@ -0,0 +1 @@ +DIST flycheck-guile-0.2.tar.gz 15138 BLAKE2B db557f69c3069ff378724438954e65f35dddba15a80211c33f06a12a1f8e72881f2b9e717bbf83d52e6b80f877ac8229ed8431669a1780c8aeaf458a577afa79 SHA512 7689ba434bbb53724bed6c60a36e48578f8f00a4d8bf2a82e2e6e6a08a3180b2b83de2f0659202d500fd04469b1528f5867c4f6a12a3579f143d1b4749149ae2 diff --git a/app-emacs/flycheck-guile/files/50flycheck-guile-gentoo.el b/app-emacs/flycheck-guile/files/50flycheck-guile-gentoo.el new file mode 100644 index ..431f7e90ae73 --- /dev/null +++ b/app-emacs/flycheck-guile/files/50flycheck-guile-gentoo.el @@ -0,0 +1 @@ +(add-to-list 'load-path "@SITELISP@") diff --git a/app-emacs/flycheck-guile/flycheck-guile-0.2.ebuild b/app-emacs/flycheck-guile/flycheck-guile-0.2.ebuild new file mode 100644 index ..f20480a76901 --- /dev/null +++ b/app-emacs/flycheck-guile/flycheck-guile-0.2.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +NEED_EMACS=24.1 + +inherit elisp + +DESCRIPTION="Flycheck checker for the GNU Guile Scheme implementation" +HOMEPAGE="https://github.com/flatwhatson/flycheck-guile/; +SRC_URI="https://github.com/flatwhatson/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + >=dev-scheme/guile-2.0.0 + app-emacs/flycheck + app-emacs/geiser-guile +" +BDEPEND="${RDEPEND}" + +DOCS=( README.md ) +ELISP_REMOVE=".dir-locals.el" +SITEFILE="50${PN}-gentoo.el" diff --git a/app-emacs/flycheck-guile/metadata.xml b/app-emacs/flycheck-guile/metadata.xml new file mode 100644 index ..26be2e4194b2 --- /dev/null +++ b/app-emacs/flycheck-guile/metadata.xml @@ -0,0 +1,17 @@ + +https://www.gentoo.org/dtd/metadata.dtd;> + + + +gnu-em...@gentoo.org +Gentoo GNU Emacs project + + +sch...@gentoo.org +Gentoo Scheme Project + + +https://gitlab.com/flatwhatson/flycheck-guile/issues/ +flatwhatson/flycheck-guile + +
[gentoo-commits] repo/gentoo:master commit in: app-emacs/geiser/, app-emacs/geiser/files/
commit: 4ad79333bdaaca3861a712363ff5a78635f1ce12 Author: Maciej Barć gentoo org> AuthorDate: Mon Apr 11 20:22:52 2022 + Commit: Maciej Barć gentoo org> CommitDate: Mon Apr 11 21:24:27 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad79333 app-emacs/geiser: new package; add version 0.23.2 Signed-off-by: Maciej Barć gentoo.org> app-emacs/geiser/Manifest | 1 + app-emacs/geiser/files/50geiser-gentoo.el | 7 ++ app-emacs/geiser/geiser-0.23.2.ebuild | 41 +++ app-emacs/geiser/metadata.xml | 17 + 4 files changed, 66 insertions(+) diff --git a/app-emacs/geiser/Manifest b/app-emacs/geiser/Manifest new file mode 100644 index ..16ed076ce353 --- /dev/null +++ b/app-emacs/geiser/Manifest @@ -0,0 +1 @@ +DIST geiser-0.23.2.tar.gz 653228 BLAKE2B ef0ce0a925a9d5df32a2b67b216dc46da535d68d70b706ffc9dd4d3bb01af879c957b2e8293c7bed8d3cdebeecd3f4443b3071f865cf1b7280347b202298 SHA512 dd6852d95296aaef44ad0e9a6723986372d58f9beab20bd45330aeffae590fbd5ea45822032fb9cc2712756e3b13ba5c829fbefeead4e5f41c94400bf059110e diff --git a/app-emacs/geiser/files/50geiser-gentoo.el b/app-emacs/geiser/files/50geiser-gentoo.el new file mode 100644 index ..b23f0decf094 --- /dev/null +++ b/app-emacs/geiser/files/50geiser-gentoo.el @@ -0,0 +1,7 @@ +(add-to-list 'load-path "@SITELISP@") +(autoload 'geiser "geiser-repl" + "Start a Geiser REPL, or switch to a running one." t) +(autoload 'geiser-mode "geiser-mode" + "Minor mode adding Geiser REPL interaction to Scheme buffers." t) +(autoload 'run-geiser "geiser-repl" + "Start a Geiser REPL." t) diff --git a/app-emacs/geiser/geiser-0.23.2.ebuild b/app-emacs/geiser/geiser-0.23.2.ebuild new file mode 100644 index ..1fc8fadfed40 --- /dev/null +++ b/app-emacs/geiser/geiser-0.23.2.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +NEED_EMACS=25.1 + +inherit elisp + +DESCRIPTION="Generic interaction mode between Emacs and different Scheme implementations" +HOMEPAGE="https://gitlab.com/emacs-geiser/geiser/; +SRC_URI="https://gitlab.com/emacs-geiser/${PN}/-/archive/${PV}/${P}.tar.gz; + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="app-emacs/transient" +BDEPEND=" + ${RDEPEND} + app-text/texi2html + sys-apps/texinfo +" + +DOCS=( readme.org news.org doc/html ) +ELISP_REMOVE=".dir-locals.el" +SITEFILE="50${PN}-gentoo.el" + +src_compile() { + BYTECOMPFLAGS="-L elisp" elisp-compile elisp/*.el + + emake -C doc info web +} + +src_install() { + elisp-install ${PN} elisp/*.el{,c} + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + + doinfo doc/*.info + einstalldocs +} diff --git a/app-emacs/geiser/metadata.xml b/app-emacs/geiser/metadata.xml new file mode 100644 index ..c94387f2f223 --- /dev/null +++ b/app-emacs/geiser/metadata.xml @@ -0,0 +1,17 @@ + +https://www.gentoo.org/dtd/metadata.dtd;> + + + +gnu-em...@gentoo.org +Gentoo GNU Emacs project + + +sch...@gentoo.org +Gentoo Scheme Project + + +https://gitlab.com/emacs-geiser/geiser/-/issues/ +emacs-geiser/geiser + +
[gentoo-commits] repo/gentoo:master commit in: app-emacs/geiser-guile/, app-emacs/geiser-guile/files/
commit: c0793a75cba53098a46a48db6bdac9f1e6b3a717 Author: Maciej Barć gentoo org> AuthorDate: Mon Apr 11 21:01:52 2022 + Commit: Maciej Barć gentoo org> CommitDate: Mon Apr 11 21:24:28 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0793a75 app-emacs/geiser-guile: new package; add version 0.23.2 Signed-off-by: Maciej Barć gentoo.org> app-emacs/geiser-guile/Manifest| 1 + .../geiser-guile/files/50geiser-guile-gentoo.el| 7 .../files/geiser-guile-guile-scheme-src-dir.patch | 12 +++ app-emacs/geiser-guile/geiser-guile-0.23.2.ebuild | 42 ++ app-emacs/geiser-guile/metadata.xml| 17 + 5 files changed, 79 insertions(+) diff --git a/app-emacs/geiser-guile/Manifest b/app-emacs/geiser-guile/Manifest new file mode 100644 index ..69d46e3c16b1 --- /dev/null +++ b/app-emacs/geiser-guile/Manifest @@ -0,0 +1 @@ +DIST geiser-guile-0.23.2.tar.gz 15615 BLAKE2B e30f5eef1496f8016be35fa3eda2bf02fc651e5bdb9ac8cf8c90a130bd72dd13b67140f172aab24ed38858294ff83c366eaa4b3e354b0a1107c28a0258b2f787 SHA512 c696bc0e406869d9c68f3cda9bbc2f5f0690148264e221c6fc3217f867a5cae3fd6df59851fdbec8a6c9eb6aab7f9482c3231fe75a509d58d2d9d16c008774b8 diff --git a/app-emacs/geiser-guile/files/50geiser-guile-gentoo.el b/app-emacs/geiser-guile/files/50geiser-guile-gentoo.el new file mode 100644 index ..c9ac820301e1 --- /dev/null +++ b/app-emacs/geiser-guile/files/50geiser-guile-gentoo.el @@ -0,0 +1,7 @@ +(add-to-list 'load-path "@SITELISP@") +(autoload 'connect-to-guile "geiser-guile" + "Start a Guile REPL connected to a remote process." t) +(autoload 'run-guile "geiser-guile" + "Start a Geiser Guile REPL." t) +(autoload 'switch-to-guile "geiser-guile" + "Start a Geiser Guile REPL, or switch to a running one." t) diff --git a/app-emacs/geiser-guile/files/geiser-guile-guile-scheme-src-dir.patch b/app-emacs/geiser-guile/files/geiser-guile-guile-scheme-src-dir.patch new file mode 100644 index ..e86ffaa5edb7 --- /dev/null +++ b/app-emacs/geiser-guile/files/geiser-guile-guile-scheme-src-dir.patch @@ -0,0 +1,12 @@ +index db42945..2a6537c 100644 +--- a/geiser-guile.el b/geiser-guile.el +@@ -141,7 +141,7 @@ effect on new REPLs. For existing ones, use the command + geiser-guile-binary)) + + (defvar geiser-guile-scheme-dir +- (expand-file-name "src" (file-name-directory load-file-name)) ++ (expand-file-name "src" "@SITEETC@") + "Directory where the Guile scheme geiser modules are installed.") + + (defvar-local geiser-guile-scheme-local-dir diff --git a/app-emacs/geiser-guile/geiser-guile-0.23.2.ebuild b/app-emacs/geiser-guile/geiser-guile-0.23.2.ebuild new file mode 100644 index ..fb3e084e139d --- /dev/null +++ b/app-emacs/geiser-guile/geiser-guile-0.23.2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +NEED_EMACS=25.1 + +inherit elisp + +DESCRIPTION="Guile's implementation of the Geiser protocols" +HOMEPAGE="https://gitlab.com/emacs-geiser/guile/; +SRC_URI="https://gitlab.com/emacs-geiser/guile/-/archive/${PV}/guile-${PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}"/guile-${PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND="app-emacs/geiser" +RDEPEND=" + ${BDEPEND} + dev-scheme/guile +" + +DOCS=( readme.org ) +PATCHES=( "${FILESDIR}"/${PN}-guile-scheme-src-dir.patch ) +ELISP_TEXINFO="${PN}.texi" +SITEFILE="50${PN}-gentoo.el" + +src_prepare() { + elisp_src_prepare + + sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i ${PN}.el || die +} + +src_install() { + elisp_src_install + + insinto ${SITEETC}/${PN} + doins -r src +} diff --git a/app-emacs/geiser-guile/metadata.xml b/app-emacs/geiser-guile/metadata.xml new file mode 100644 index ..7698a7c42f05 --- /dev/null +++ b/app-emacs/geiser-guile/metadata.xml @@ -0,0 +1,17 @@ + +https://www.gentoo.org/dtd/metadata.dtd;> + + + +gnu-em...@gentoo.org +Gentoo GNU Emacs project + + +sch...@gentoo.org +Gentoo Scheme Project + + +https://gitlab.com/emacs-geiser/guile/-/issues/ +emacs-geiser/guile + +
[gentoo-commits] repo/gentoo:master commit in: dev-util/difftastic/, dev-util/difftastic/files/
commit: 3bfd14b5eb9c34f97c08f747afe806715eb7c8d0 Author: Patrick McLean gentoo org> AuthorDate: Mon Apr 11 21:09:42 2022 + Commit: Patrick McLean gentoo org> CommitDate: Mon Apr 11 21:09:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bfd14b5 dev-util/difftastic: drop 0.25.0 Signed-off-by: Patrick McLean gentoo.org> dev-util/difftastic/Manifest | 1 - dev-util/difftastic/difftastic-0.25.0.ebuild | 113 - .../files/difftastic-0.24.0-regex-dep.patch| 16 --- 3 files changed, 130 deletions(-) diff --git a/dev-util/difftastic/Manifest b/dev-util/difftastic/Manifest index 4c340076bb7c..22bce9aa5f80 100644 --- a/dev-util/difftastic/Manifest +++ b/dev-util/difftastic/Manifest @@ -15,7 +15,6 @@ DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ce DIST crossbeam-utils-0.8.7.crate 39751 BLAKE2B 79e1d6454887e8c61f498be0f4475726529e1c45d5b24bb0799cebedacc8d92db735bbc0ececf2d64a9601dfffd142b372bd2802fd0aa0e98dd4994158846a3e SHA512 b9c999f570640513c38c95fe5e50d0e89adfd27a9370952a8ee441118ffc0f092d21f6dbe7c68f653a6e766e5c1aeb209145d49542f1bdaa1f561e6707ad482b DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71 DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16 -DIST difftastic-0.25.0.tar.gz 8645342 BLAKE2B 2e7b72881849c655b838e20a64c477f0c2763e345b54979a052b14ff35c1adee0edd9b9ee03a6109416397c3eed9bbd1d49f9a2ad4b32b8c05f9066b68a15032 SHA512 b421a591cbd896cacff832ce0e39cb9fc952690f2e334969bdd2722ff17b43f5c6fd81a4223490e38e0a9c5b639a558c6c3682123d5280ba5f29950072626473 DIST difftastic-0.26.3.tar.gz 10100584 BLAKE2B 9121a9747f761f13830028d8ae01655d6d15ceb846f966b92d905224f54280a354873afb19419fb3a496e67ebca12df1cf15369e69588a1066d7682bea0fee93 SHA512 91ef6c359e709f0f63d3627621ed6a03627248cb31ef90ce1a617294425d5ca8803f3f7608d1b2c1326fd1247ee89a8fc200f1188c659028d9af43bc69fa9467 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f diff --git a/dev-util/difftastic/difftastic-0.25.0.ebuild b/dev-util/difftastic/difftastic-0.25.0.ebuild deleted file mode 100644 index e1b4ece14a37.. --- a/dev-util/difftastic/difftastic-0.25.0.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 2017-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Auto-Generated by cargo-ebuild 0.3.2-alpha.0 - -EAPI=8 - -CRATES=" - aho-corasick-0.7.18 - ansi_term-0.12.1 - archery-0.4.0 - atty-0.2.14 - autocfg-1.0.1 - bitflags-1.3.2 - cc-1.0.72 - cfg-if-1.0.0 - clap-3.0.13 - const_format-0.2.22 - const_format_proc_macros-0.2.22 - crossbeam-channel-0.5.1 - crossbeam-deque-0.8.1 - crossbeam-epoch-0.9.5 - crossbeam-utils-0.8.7 - ctor-0.1.21 - diff-0.1.12 - either-1.6.1 - env_logger-0.7.1 - hashbrown-0.11.2 - hermit-abi-0.1.19 - humantime-1.3.0 - indexmap-1.8.0 - itertools-0.10.3 - lazy_static-1.4.0 - libc-0.2.112 - libmimalloc-sys-0.1.23 - log-0.4.14 - memchr-2.4.1 - memoffset-0.6.5 - mimalloc-0.1.27 - num_cpus-1.13.1 - os_str_bytes-6.0.0 - output_vt100-0.1.2 - owo-colors-3.2.0 - pretty_assertions-1.0.0 - pretty_env_logger-0.4.0 - proc-macro2-1.0.36 - quick-error-1.2.3 - quote-1.0.13 - radix-heap-0.4.2 - rayon-1.5.1 - rayon-core-1.9.1 - regex-1.5.5 - regex-syntax-0.6.25 - rpds-0.10.0 - rustc-hash-1.1.0 - same-file-1.0.6 - scopeguard-1.1.0 - static_assertions-1.1.0 - strsim-0.10.0 - syn-1.0.84 - term_size-0.3.2 - termcolor-1.1.2 - textwrap-0.14.2 - tree-sitter-0.20.5 - typed-arena-2.0.1 - unicode-xid-0.2.2 - walkdir-2.3.2 - winapi-0.3.9 -
[gentoo-commits] repo/gentoo:master commit in: sys-auth/fprintd/
commit: 81b1aacb9030dac0a0df1f9bdbc1248ca98a168a Author: Yu Gu gmail com> AuthorDate: Tue Mar 22 09:18:23 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Mon Apr 11 21:05:30 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81b1aacb sys-auth/fprintd: keyword 1.94.1 for ~riscv Bug: https://bugs.gentoo.org/825290 Signed-off-by: Yu Gu gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24705 Signed-off-by: Jakov Smolić gentoo.org> sys-auth/fprintd/fprintd-1.94.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-auth/fprintd/fprintd-1.94.1.ebuild b/sys-auth/fprintd/fprintd-1.94.1.ebuild index 967fef4729c7..bc2964936bc2 100644 --- a/sys-auth/fprintd/fprintd-1.94.1.ebuild +++ b/sys-auth/fprintd/fprintd-1.94.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${MY_P} LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86" +KEYWORDS="amd64 ~arm ~ia64 ~ppc ~riscv ~sparc x86" IUSE="doc pam systemd test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-util/difftastic/files/, dev-util/difftastic/
commit: 21baa8c6d377f09206431b6be9858117209056c1 Author: Patrick McLean gentoo org> AuthorDate: Mon Apr 11 21:02:43 2022 + Commit: Patrick McLean gentoo org> CommitDate: Mon Apr 11 21:03:24 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21baa8c6 dev-util/difftastic: add 0.26.3 Signed-off-by: Patrick McLean gentoo.org> dev-util/difftastic/Manifest | 1 + dev-util/difftastic/difftastic-0.26.3.ebuild | 113 + .../files/difftastic-0.26.3-regex-dep.patch| 29 ++ 3 files changed, 143 insertions(+) diff --git a/dev-util/difftastic/Manifest b/dev-util/difftastic/Manifest index 2f173860f1fa..4c340076bb7c 100644 --- a/dev-util/difftastic/Manifest +++ b/dev-util/difftastic/Manifest @@ -16,6 +16,7 @@ DIST crossbeam-utils-0.8.7.crate 39751 BLAKE2B 79e1d6454887e8c61f498be0f44757265 DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71 DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16 DIST difftastic-0.25.0.tar.gz 8645342 BLAKE2B 2e7b72881849c655b838e20a64c477f0c2763e345b54979a052b14ff35c1adee0edd9b9ee03a6109416397c3eed9bbd1d49f9a2ad4b32b8c05f9066b68a15032 SHA512 b421a591cbd896cacff832ce0e39cb9fc952690f2e334969bdd2722ff17b43f5c6fd81a4223490e38e0a9c5b639a558c6c3682123d5280ba5f29950072626473 +DIST difftastic-0.26.3.tar.gz 10100584 BLAKE2B 9121a9747f761f13830028d8ae01655d6d15ceb846f966b92d905224f54280a354873afb19419fb3a496e67ebca12df1cf15369e69588a1066d7682bea0fee93 SHA512 91ef6c359e709f0f63d3627621ed6a03627248cb31ef90ce1a617294425d5ca8803f3f7608d1b2c1326fd1247ee89a8fc200f1188c659028d9af43bc69fa9467 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c diff --git a/dev-util/difftastic/difftastic-0.26.3.ebuild b/dev-util/difftastic/difftastic-0.26.3.ebuild new file mode 100644 index ..cfca879d4a2f --- /dev/null +++ b/dev-util/difftastic/difftastic-0.26.3.ebuild @@ -0,0 +1,113 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Auto-Generated by cargo-ebuild 0.5.1 + +EAPI=8 + +CRATES=" + aho-corasick-0.7.18 + ansi_term-0.12.1 + archery-0.4.0 + atty-0.2.14 + autocfg-1.0.1 + bitflags-1.3.2 + cc-1.0.72 + cfg-if-1.0.0 + clap-3.0.13 + const_format-0.2.22 + const_format_proc_macros-0.2.22 + crossbeam-channel-0.5.1 + crossbeam-deque-0.8.1 + crossbeam-epoch-0.9.5 + crossbeam-utils-0.8.7 + ctor-0.1.21 + diff-0.1.12 + either-1.6.1 + env_logger-0.7.1 + hashbrown-0.11.2 + hermit-abi-0.1.19 + humantime-1.3.0 + indexmap-1.8.0 + itertools-0.10.3 + lazy_static-1.4.0 + libc-0.2.112 + libmimalloc-sys-0.1.23 + log-0.4.14 + memchr-2.4.1 + memoffset-0.6.5 + mimalloc-0.1.27 + num_cpus-1.13.1 + os_str_bytes-6.0.0 + output_vt100-0.1.2 + owo-colors-3.2.0 + pretty_assertions-1.0.0 + pretty_env_logger-0.4.0 + proc-macro2-1.0.36 + quick-error-1.2.3 + quote-1.0.13 + radix-heap-0.4.2 + rayon-1.5.1 + rayon-core-1.9.1 + regex-1.5.5 + regex-syntax-0.6.25 + rpds-0.10.0 + rustc-hash-1.1.0 + same-file-1.0.6 + scopeguard-1.1.0 + static_assertions-1.1.0 + strsim-0.10.0 + syn-1.0.84 + term_size-0.3.2 + termcolor-1.1.2 + textwrap-0.14.2 + tree-sitter-0.20.5 + typed-arena-2.0.1 + unicode-xid-0.2.2 + walkdir-2.3.2 + winapi-0.3.9 +
[gentoo-commits] repo/gentoo:master commit in: dev-python/python-lsp-black/
commit: bf3d175385b8049623b5f85e81b00db22ba232ee Author: Jakov Smolić gentoo org> AuthorDate: Mon Apr 11 21:02:31 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Mon Apr 11 21:02:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf3d1753 dev-python/python-lsp-black: Stabilize 1.2.0 ALLARCHES, #837458 Signed-off-by: Jakov Smolić gentoo.org> dev-python/python-lsp-black/python-lsp-black-1.2.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/python-lsp-black/python-lsp-black-1.2.0.ebuild b/dev-python/python-lsp-black/python-lsp-black-1.2.0.ebuild index 8525c6e386f5..40bb1d745c1b 100644 --- a/dev-python/python-lsp-black/python-lsp-black-1.2.0.ebuild +++ b/dev-python/python-lsp-black/python-lsp-black-1.2.0.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" >=dev-python/python-lsp-server-1.4.0[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgit2/
commit: 454ec0dd0c5c975c944eba3c5f5acf9b04150948 Author: Jakov Smolić gentoo org> AuthorDate: Mon Apr 11 21:02:34 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Mon Apr 11 21:02:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=454ec0dd dev-libs/libgit2: Stabilize 1.4.2 x86, #837755 Signed-off-by: Jakov Smolić gentoo.org> dev-libs/libgit2/libgit2-1.4.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libgit2/libgit2-1.4.2.ebuild b/dev-libs/libgit2/libgit2-1.4.2.ebuild index 441391f6fb9c..90d76ea26428 100644 --- a/dev-libs/libgit2/libgit2-1.4.2.ebuild +++ b/dev-libs/libgit2/libgit2-1.4.2.ebuild @@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-} LICENSE="GPL-2-with-linking-exception" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv ~x86 ~ppc-macos" +KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv x86 ~ppc-macos" IUSE="examples gssapi +ssh test +threads trace" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/
commit: 8c043ec747dd81177820e087838a6dd3b0272562 Author: Jakov Smolić gentoo org> AuthorDate: Mon Apr 11 21:02:18 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Mon Apr 11 21:02:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c043ec7 net-irc/quassel: Stabilize 0.14.0-r1 arm64, #832465 Signed-off-by: Jakov Smolić gentoo.org> net-irc/quassel/quassel-0.14.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-irc/quassel/quassel-0.14.0-r1.ebuild b/net-irc/quassel/quassel-0.14.0-r1.ebuild index 80e4b8d72d5f..aee271bd8c1a 100644 --- a/net-irc/quassel/quassel-0.14.0-r1.ebuild +++ b/net-irc/quassel/quassel-0.14.0-r1.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} != ** ]]; then SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz -> ${P}.tar.gz" else SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2; - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~sparc-solaris" + KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~sparc-solaris" fi S="${WORKDIR}/${MY_P}" else
[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/
commit: 0af0d0c74fdab7a59a6757e07cdae97e01bacd50 Author: Jakov Smolić gentoo org> AuthorDate: Mon Apr 11 21:02:26 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Mon Apr 11 21:02:26 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0af0d0c7 net-libs/webkit-gtk: Stabilize 2.34.6 arm64, #833923 Signed-off-by: Jakov Smolić gentoo.org> net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild index bc14607662e0..6c420cdeac2f 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz; LICENSE="LGPL-2+ BSD" SLOT="4/37" # soname version of libwebkit2gtk-4.0 -KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86" IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/level-zero/
commit: 91ace6889eaebe778987476e1039fff5724a0152 Author: Conrad Kostecki gentoo org> AuthorDate: Mon Apr 11 20:58:06 2022 + Commit: Conrad Kostecki gentoo org> CommitDate: Mon Apr 11 20:58:32 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ace688 dev-libs/level-zero: drop 1.7.9 Signed-off-by: Conrad Kostecki gentoo.org> dev-libs/level-zero/Manifest| 1 - dev-libs/level-zero/level-zero-1.7.9.ebuild | 22 -- 2 files changed, 23 deletions(-) diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest index 94fa8efc2552..fe14bd04b0c2 100644 --- a/dev-libs/level-zero/Manifest +++ b/dev-libs/level-zero/Manifest @@ -1,2 +1 @@ DIST level-zero-1.7.15.tar.gz 396788 BLAKE2B 794b1ee0955ffaa8671918cba8b31f388bfd8464bd59c3e041cc976d36831ee8e11ec64b1428613bd1621a6118b7794c908071756060f1bd8f2239e77f3c6817 SHA512 84600ff4fd18abffc8765c071454e7fef7a49d7ff711c97e326bae4a8e4295f2e611fac99bcaaf7ad555916d7078b36dd91b45cf57a00bd9e995fc028a40fd2e -DIST level-zero-1.7.9.tar.gz 396946 BLAKE2B c0b09e5318d5ba430b760d28d0f0943f8de910eaa0acc6477947ef4d6e0dc8af6ba3e1f8b2728e6fd9e763f038d1a22acd8c1d23eaac2e6fafa1f1f6913a91cd SHA512 65721d00de32d4b483eeca2b9f803a05724619afc46f664d6d5fb344fcff6a053a9a23daf24ab0fa05f598c7fde3e91c6b350fb9e8bf6ea38c596dbfe42fadc1 diff --git a/dev-libs/level-zero/level-zero-1.7.9.ebuild b/dev-libs/level-zero/level-zero-1.7.9.ebuild deleted file mode 100644 index af873cd942fa.. --- a/dev-libs/level-zero/level-zero-1.7.9.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="oneAPI Level Zero headers, loader and validation layer" -HOMEPAGE="https://github.com/oneapi-src/level-zero; -SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" - -src_prepare() { - cmake_src_prepare - - # According to upstream, release tarballs should contain this file but at least - # some of them do not. Fortunately it is trivial to make one ourselves. - echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/level-zero/
commit: f3f0637ab2203f94506da811a7330dc7651a774d Author: Conrad Kostecki gentoo org> AuthorDate: Mon Apr 11 20:57:28 2022 + Commit: Conrad Kostecki gentoo org> CommitDate: Mon Apr 11 20:58:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f0637a dev-libs/level-zero: amd64 stable Signed-off-by: Conrad Kostecki gentoo.org> dev-libs/level-zero/level-zero-1.7.15.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/level-zero/level-zero-1.7.15.ebuild b/dev-libs/level-zero/level-zero-1.7.15.ebuild index 84d0079b1c54..af873cd942fa 100644 --- a/dev-libs/level-zero/level-zero-1.7.15.ebuild +++ b/dev-libs/level-zero/level-zero-1.7.15.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" src_prepare() { cmake_src_prepare
[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/, net-misc/openssh/
commit: 65eb435aaada201aa4447f13911db365513c9bdd Author: Patrick McLean gentoo org> AuthorDate: Mon Apr 11 20:56:56 2022 + Commit: Patrick McLean gentoo org> CommitDate: Mon Apr 11 20:57:13 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65eb435a net-misc/openssh: add 9.0_p1 Signed-off-by: Patrick McLean gentoo.org> net-misc/openssh/Manifest | 4 + .../files/openssh-9.0_p1-X509-glue-13.3.2.patch| 54 +++ net-misc/openssh/openssh-9.0_p1.ebuild | 485 + 3 files changed, 543 insertions(+) diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index dc2617579f57..3142cc61e56b 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -9,3 +9,7 @@ DIST openssh-8.9p1.tar.gz.asc 833 BLAKE2B fd44a5545bd0795ee335e480011dbe3c12011d DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914 +DIST openssh-9.0p1+x509-13.3.2.diff.gz 1128591 BLAKE2B fb560e2f1803ceb946a1ba8bd53a1f9fd262896b820c23d4b0015218433d2200f1fd9df5b1889a670261f13936d8153da1ab4beb2a5d52ede78168189c522bf3 SHA512 e643168d7098c44f85a9bac9894a936a3480ec843162197ce56e016dd4f634ef182dcfae1f7e18408f6a18832e0a95d2d249a23fdbc3dc46df76989ca0a0c7fc +DIST openssh-9.0p1-sctp-1.2.patch.xz 6768 BLAKE2B 8a18aea57b0b3f8f0a641870f0cd1570c6cc48d1e28ef7261344918905e94a548d3a3acb6feb1c6ef13f0c6cacf2b845163cad2b96ab20cb9fc58a49aeb699c1 SHA512 d6aa5f32464d5f3e2e63e9ba82108f33bdaa890e2adf2ccc47ce0d672979fc67510d9dd7561b17eaba0c2f11a8eb565029b0ebff3b2d050e9e04e6143aedb8a3 +DIST openssh-9.0p1.tar.gz 1822183 BLAKE2B 49724a400951964d659d136908657940f79e150056728cc4dadf8ff8652a832f7fd46eebb47b15085e57fca4b00c77d1ec4dd1b056ea2bbcee89f54a121ed5e2 SHA512 613ae95317e734868c6a60d9cc5af47a889baa3124bbdd2b31bb51dd6b57b136f4cfcb5604cca78a03bd500baab9b9b45eaf77e038b1ed776c86dce0437449a9 +DIST openssh-9.0p1.tar.gz.asc 833 BLAKE2B e29ff08f10feee7347c02a7ce4b33b8d9c71a26656f0430a2511c25bc6b5006f1683d845826a68ff4eed068b30c911e273cb34e5b4880854d55a776415474019 SHA512 7b1445764058435d2fa8a9c7553643983650d4232036c088e46e44beeb538d32cba88f775b1be9da5f21a01d6caea59b3dc4714507781e9cb946546fa54f169f diff --git a/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.3.2.patch b/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.3.2.patch new file mode 100644 index ..3d702eb35be8 --- /dev/null +++ b/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.3.2.patch @@ -0,0 +1,54 @@ +diff -ur '--exclude=.*.un~' a/openssh-9.0p1+x509-13.3.2.diff b/openssh-9.0p1+x509-13.3.2.diff +--- a/openssh-9.0p1+x509-13.3.2.diff 2022-04-11 10:32:02.364576985 -0700 b/openssh-9.0p1+x509-13.3.2.diff 2022-04-11 10:38:29.267348410 -0700 +@@ -47526,8 +47526,8 @@ + gss_create_empty_oid_set(, ); + gss_add_oid_set_member(, ctx->oid, ); + +-- if (gethostname(lname, MAXHOSTNAMELEN)) { +-+ if (gethostname(lname, MAXHOSTNAMELEN) == -1) { ++- if (gethostname(lname, HOST_NAME_MAX)) { +++ if (gethostname(lname, HOST_NAME_MAX) == -1) { + gss_release_oid_set(, ); + return (-1); + } +@@ -55662,12 +55662,11 @@ + + install-files: + $(MKDIR_P) $(DESTDIR)$(bindir) +-@@ -395,6 +372,8 @@ ++@@ -395,6 +372,7 @@ + $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 + $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 + $(MKDIR_P) $(DESTDIR)$(libexecdir) + + $(MKDIR_P) $(DESTDIR)$(sshcadir) +-+ $(MKDIR_P) $(DESTDIR)$(piddir) + $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) + $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) + $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) +@@ -76764,7 +76763,7 @@ + +if test "$sshd_type" = "pkix" ; then + + unset_arg='' + +else +-+ unset_arg=none +++ unset_arg='' + +fi + + + cat > $OBJ/sshd_config.i << _EOF +@@ -141144,16 +141143,6 @@ + +int asnmprintf(char **, size_t, int *, const char *, ...) +
[gentoo-commits] repo/gentoo:master commit in: www-plugins/chrome-binary-plugins/
commit: 200b1c79cae1bfbae7b8b2f6dd73551754662144 Author: Stephan Hartmann gentoo org> AuthorDate: Mon Apr 11 20:37:05 2022 + Commit: Stephan Hartmann gentoo org> CommitDate: Mon Apr 11 20:37:39 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=200b1c79 www-plugins/chrome-binary-plugins: automated update (100.0.4896.88) Signed-off-by: Stephan Hartmann gentoo.org> www-plugins/chrome-binary-plugins/Manifest | 2 +- ...-100.0.4896.75.ebuild => chrome-binary-plugins-100.0.4896.88.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest index 62c8de81523f..427ac1ea9c60 100644 --- a/www-plugins/chrome-binary-plugins/Manifest +++ b/www-plugins/chrome-binary-plugins/Manifest @@ -1,3 +1,3 @@ DIST google-chrome-beta_101.0.4951.26-1_amd64.deb 87811856 BLAKE2B 262ec96663e6b3e228e4422afc227ba5fb5e845052fed8ffc9559a4dc579766eeaba027a4a50ffdee279a4cb02545ca37a8700774015d64662f99d459c366736 SHA512 2dede580f8dbd6cc14300e7d7a69e02b5b82c6f71e2735b3ab8393c9dbff9d9415927e495ccc1045537444c198c40dc55ebcf718b1fa7a05e48ee76a60790836 -DIST google-chrome-stable_100.0.4896.75-1_amd64.deb 87094916 BLAKE2B b7d201dc88200e3c826de1601a990e64f44036e83931b9c4b75d7a70fdd9fc59a56b0dc434bfe668dd2c2a5f83bfacbe60802f222a99c4e548fe5641d04377dd SHA512 fba11509496bb8293a8ec4bf6183832581aa700cdc88cb3f9a1b9b1cbd2eaca837a6644f952160a184fd8254587826601b080347e7cf2babfbc44fd1a1e4b0f7 +DIST google-chrome-stable_100.0.4896.88-1_amd64.deb 87072160 BLAKE2B df2fae89b45efd3b54cbacb67fd89563bfb7d823ca0f72709d016274c16f39f5d661688d31c90b6375dd14f4ea2680652b803814011a9c648d2cd69d1794a959 SHA512 91a0b3f3229d3d46f7d9a8597fa66824246fcc8b454ed770c4eaa182c4ed63a7908721dfc3c05520eabdd7ff9c444dea58e7fda5bd369ee15faddabc896d60ce DIST google-chrome-unstable_102.0.4987.0-1_amd64.deb 85145928 BLAKE2B 5c5702f66ad90709c082cbc2fd57cb1d14072138f4b9501ce0f1d5b04ec28800a352563c6fdca93409817a7f4458d013472081a5d49b7b24cdc03fc6163a75ae SHA512 fa4c44d618a196f8452d74296f95e654c28a092d9d6bc636c55ce6567649cd3fdaa6eaa199707e1c26be1c063452d14f86c0acc81e7091eff167016f2e3a3f33 diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-100.0.4896.75.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-100.0.4896.88.ebuild similarity index 100% rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-100.0.4896.75.ebuild rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-100.0.4896.88.ebuild
[gentoo-commits] repo/gentoo:master commit in: www-client/google-chrome/
commit: cf2e864dcd588f1af656ba071bf11db18e2ca781 Author: Stephan Hartmann gentoo org> AuthorDate: Mon Apr 11 20:37:03 2022 + Commit: Stephan Hartmann gentoo org> CommitDate: Mon Apr 11 20:37:38 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf2e864d www-client/google-chrome: automated update (100.0.4896.88) Signed-off-by: Stephan Hartmann gentoo.org> www-client/google-chrome/Manifest | 2 +- ...e-chrome-100.0.4896.75.ebuild => google-chrome-100.0.4896.88.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest index 130c27e5529c..4f35bfc5bcad 100644 --- a/www-client/google-chrome/Manifest +++ b/www-client/google-chrome/Manifest @@ -1 +1 @@ -DIST google-chrome-stable_100.0.4896.75-1_amd64.deb 87094916 BLAKE2B b7d201dc88200e3c826de1601a990e64f44036e83931b9c4b75d7a70fdd9fc59a56b0dc434bfe668dd2c2a5f83bfacbe60802f222a99c4e548fe5641d04377dd SHA512 fba11509496bb8293a8ec4bf6183832581aa700cdc88cb3f9a1b9b1cbd2eaca837a6644f952160a184fd8254587826601b080347e7cf2babfbc44fd1a1e4b0f7 +DIST google-chrome-stable_100.0.4896.88-1_amd64.deb 87072160 BLAKE2B df2fae89b45efd3b54cbacb67fd89563bfb7d823ca0f72709d016274c16f39f5d661688d31c90b6375dd14f4ea2680652b803814011a9c648d2cd69d1794a959 SHA512 91a0b3f3229d3d46f7d9a8597fa66824246fcc8b454ed770c4eaa182c4ed63a7908721dfc3c05520eabdd7ff9c444dea58e7fda5bd369ee15faddabc896d60ce diff --git a/www-client/google-chrome/google-chrome-100.0.4896.75.ebuild b/www-client/google-chrome/google-chrome-100.0.4896.88.ebuild similarity index 100% rename from www-client/google-chrome/google-chrome-100.0.4896.75.ebuild rename to www-client/google-chrome/google-chrome-100.0.4896.88.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-python/lazr-delegates/
commit: 0674505adf1300f847f8fcd2f4095f04fc75b65f Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 20:23:21 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 20:31:47 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0674505a dev-python/lazr-delegates: PEP517, rm namespace dep Signed-off-by: Michał Górny gentoo.org> .../lazr-delegates/lazr-delegates-2.0.4-r1.ebuild | 37 ++ 1 file changed, 37 insertions(+) diff --git a/dev-python/lazr-delegates/lazr-delegates-2.0.4-r1.ebuild b/dev-python/lazr-delegates/lazr-delegates-2.0.4-r1.ebuild new file mode 100644 index ..3cbdd908e114 --- /dev/null +++ b/dev-python/lazr-delegates/lazr-delegates-2.0.4-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} ) + +inherit distutils-r1 + +MY_PN=${PN/-/.} + +DESCRIPTION="Easily write objects that delegate behavior" +HOMEPAGE="https://code.launchpad.net/lazr.delegates; +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/zope-interface[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest + +src_prepare() { + # strip unused rdeps + sed -i -e "/'setuptools'/d" -e "/'nose'/d" setup.py || die + distutils-r1_src_prepare +} + +python_compile() { + distutils-r1_python_compile + find "${BUILD_DIR}" -name '*.pth' -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: dev-python/lazr-config/
commit: 5f814bf3bbed61c7d04bd66b4dd0a013c565fa21 Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 20:31:20 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 20:31:48 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f814bf3 dev-python/lazr-config: PEP517, rm namespace dep Signed-off-by: Michał Górny gentoo.org> dev-python/lazr-config/lazr-config-2.2.3-r1.ebuild | 44 ++ 1 file changed, 44 insertions(+) diff --git a/dev-python/lazr-config/lazr-config-2.2.3-r1.ebuild b/dev-python/lazr-config/lazr-config-2.2.3-r1.ebuild new file mode 100644 index ..828363c5573e --- /dev/null +++ b/dev-python/lazr-config/lazr-config-2.2.3-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} ) + +inherit distutils-r1 + +MY_PN=${PN/-/.} + +DESCRIPTION="Create configuration schemas, and process and validate configurations" +HOMEPAGE="https://code.launchpad.net/lazr.config; +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/lazr-delegates[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest + +src_prepare() { + # strip rdep specific to namespaces + sed -i -e "/'setuptools'/d" setup.py || die + distutils-r1_src_prepare +} + +python_compile() { + distutils-r1_python_compile + find "${BUILD_DIR}" -name '*.pth' -delete || die +} + +python_test() { + cd "${BUILD_DIR}/install$(python_get_sitedir)" || die + distutils_write_namespace lazr + epytest +}
[gentoo-commits] proj/releng:master commit in: releases/portage/livegui/package.use/
commit: dbfd52262cea56bda4a2ffed4b22f4d522bb81ad Author: Andreas K. Hüttel gentoo org> AuthorDate: Mon Apr 11 20:24:07 2022 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Mon Apr 11 20:24:07 2022 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=dbfd5226 livegui: drop x11-drivers/xf86-video-qxl, bug 837890 Bug: https://bugs.gentoo.org/837890 Signed-off-by: Andreas K. Hüttel gentoo.org> releases/portage/livegui/package.use/video_cards | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/portage/livegui/package.use/video_cards b/releases/portage/livegui/package.use/video_cards index 01901250..e6caa3a5 100644 --- a/releases/portage/livegui/package.use/video_cards +++ b/releases/portage/livegui/package.use/video_cards @@ -1 +1 @@ -*/* VIDEO_CARDS: virtualbox vmware qxl +*/* VIDEO_CARDS: virtualbox vmware
[gentoo-commits] repo/gentoo:master commit in: dev-python/pastedeploy/
commit: 89e7232f67f287be94a8ae80971511d71b58186b Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 20:08:14 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 20:08:14 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89e7232f dev-python/pastedeploy: EAPI 8, PEP517, rm namespace dep Signed-off-by: Michał Górny gentoo.org> dev-python/pastedeploy/pastedeploy-2.1.1-r2.ebuild | 33 ++ 1 file changed, 33 insertions(+) diff --git a/dev-python/pastedeploy/pastedeploy-2.1.1-r2.ebuild b/dev-python/pastedeploy/pastedeploy-2.1.1-r2.ebuild new file mode 100644 index ..5a53351d1158 --- /dev/null +++ b/dev-python/pastedeploy/pastedeploy-2.1.1-r2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} pypy3 ) + +inherit distutils-r1 + +MY_PN="PasteDeploy" +MY_P="${MY_PN}-${PV}" +DESCRIPTION="Load, configure, and compose WSGI applications and servers" +HOMEPAGE="https://pypi.org/project/PasteDeploy/; +# pypi tarball does not include tests +SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" + +PATCHES=( + "${FILESDIR}/${P}-change-sphinx-theme.patch" +) + +distutils_enable_tests pytest +distutils_enable_sphinx docs \ + dev-python/sphinx_rtd_theme + +python_compile() { + distutils-r1_python_compile + find "${BUILD_DIR}" -name '*.pth' -delete || die +}
[gentoo-commits] proj/portage:master commit in: cnf/
commit: dbb4d075ee4991e2b5efdc55dc2d1da2572d8afd Author: Mike Gilbert gentoo org> AuthorDate: Mon Apr 11 12:50:12 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Mon Apr 11 12:50:12 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=dbb4d075 dispatch-conf: add a warning about changing the use-rcs setting If there are existing files in the archive directory, this may cause conflicts with the files/directories managed using rcs. Bug: https://bugs.gentoo.org/837533 Signed-off-by: Mike Gilbert gentoo.org> cnf/dispatch-conf.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf index d21434963..96574eb8e 100644 --- a/cnf/dispatch-conf.conf +++ b/cnf/dispatch-conf.conf @@ -15,6 +15,9 @@ archive-dir=${EPREFIX}/etc/config-archive # the ci(1) man page, users can control access to RCS files by setting # the permissions of the directory containing the files (see # archive-dir above). +# WARNING: When changing this setting, you should ensure that +# archive-dir is empty by removing or renaming any existing directory. +# Otherwise, conflicts may occur (bug 837533). # (yes or no) use-rcs=no
[gentoo-commits] repo/gentoo:master commit in: dev-python/paste/
commit: 38d8c5124010283bf4b8f7801350ef4e2ccc2aff Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 20:07:17 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 20:07:17 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d8c512 dev-python/paste: EAPI 8, PEP517, rm namespace dep Signed-off-by: Michał Górny gentoo.org> dev-python/paste/paste-3.5.0-r1.ebuild | 36 ++ 1 file changed, 36 insertions(+) diff --git a/dev-python/paste/paste-3.5.0-r1.ebuild b/dev-python/paste/paste-3.5.0-r1.ebuild new file mode 100644 index ..243ab2deafcf --- /dev/null +++ b/dev-python/paste/paste-3.5.0-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} pypy3 ) + +inherit distutils-r1 + +MY_P="Paste-${PV}" +DESCRIPTION="Tools for using a Web Server Gateway Interface stack" +HOMEPAGE="https://pypi.org/project/Paste/; +SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris" + +RDEPEND=" + >=dev-python/six-1.4.0[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest +distutils_enable_sphinx docs + +EPYTEST_DESELECT=( + # Internet + tests/test_proxy.py +) + +python_compile() { + distutils-r1_python_compile + find "${BUILD_DIR}" -name '*.pth' -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: dev-python/zope-exceptions/
commit: 45bb9dfded885da22a1c99b0158ca9b105e15903 Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 18:43:53 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:48 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45bb9dfd dev-python/zope-exceptions: Use distutils_write_namespace Signed-off-by: Michał Górny gentoo.org> dev-python/zope-exceptions/zope-exceptions-4.5.ebuild | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dev-python/zope-exceptions/zope-exceptions-4.5.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.5.ebuild index 7e70344cb57e..912c26d00ee7 100644 --- a/dev-python/zope-exceptions/zope-exceptions-4.5.ebuild +++ b/dev-python/zope-exceptions/zope-exceptions-4.5.ebuild @@ -40,11 +40,6 @@ python_compile() { python_test() { cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - # this is needed to keep the tests working while - # dev-python/namespace-zope is still installed - cat > zope/__init__.py <<-EOF || die - __path__ = __import__('pkgutil').extend_path(__path__, __name__) - EOF + distutils_write_namespace zope eunittest - rm zope/__init__.py || die }
[gentoo-commits] repo/gentoo:master commit in: dev-python/zope-testing/
commit: 1d67b43d7c61fbd920ba7be986748aa2057b8a7e Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 18:43:57 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d67b43d dev-python/zope-testing: Use distutils_write_namespace Signed-off-by: Michał Górny gentoo.org> dev-python/zope-testing/zope-testing-4.10-r1.ebuild | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dev-python/zope-testing/zope-testing-4.10-r1.ebuild b/dev-python/zope-testing/zope-testing-4.10-r1.ebuild index 0ad39021764d..8f8245db3264 100644 --- a/dev-python/zope-testing/zope-testing-4.10-r1.ebuild +++ b/dev-python/zope-testing/zope-testing-4.10-r1.ebuild @@ -38,11 +38,6 @@ python_compile() { python_test() { cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - # this is needed to keep the tests working while - # dev-python/namespace-zope is still installed - cat > zope/__init__.py <<-EOF || die - __path__ = __import__('pkgutil').extend_path(__path__, __name__) - EOF + distutils_write_namespace zope eunittest - rm zope/__init__.py || die }
[gentoo-commits] repo/gentoo:master commit in: dev-python/manuel/
commit: 998495aed106e96640c9f5cfda3169a71ed56957 Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 18:54:15 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998495ae dev-python/manuel: EAPI 8, PEP517 Signed-off-by: Michał Górny gentoo.org> dev-python/manuel/manuel-1.10.1-r1.ebuild | 37 +++ 1 file changed, 37 insertions(+) diff --git a/dev-python/manuel/manuel-1.10.1-r1.ebuild b/dev-python/manuel/manuel-1.10.1-r1.ebuild new file mode 100644 index ..300f45e5df0c --- /dev/null +++ b/dev-python/manuel/manuel-1.10.1-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} ) + +inherit distutils-r1 + +DESCRIPTION="Lets you mix and match traditional doctests with custom test syntax" +HOMEPAGE=" + https://github.com/benji-york/manuel/ + https://pypi.org/project/manuel/ +" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + +RDEPEND=" + dev-python/six[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/zope-testing[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests setup.py + +src_prepare() { + # unused rdep + sed -i -e "/'setuptools'/d" setup.py || die + distutils-r1_src_prepare +}
[gentoo-commits] repo/gentoo:master commit in: dev-python/zope-i18nmessageid/
commit: 6c4ba40f01ccc3ec4063777a7d51ca8e7e817f58 Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 18:43:54 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:48 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c4ba40f dev-python/zope-i18nmessageid: Use distutils_write_namespace Signed-off-by: Michał Górny gentoo.org> dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r1.ebuild | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r1.ebuild index d54e7387684c..079692d0987e 100644 --- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r1.ebuild +++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r1.ebuild @@ -41,11 +41,6 @@ python_compile() { python_test() { cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - # this is needed to keep the tests working while - # dev-python/namespace-zope is still installed - cat > zope/__init__.py <<-EOF || die - __path__ = __import__('pkgutil').extend_path(__path__, __name__) - EOF + distutils_write_namespace zope eunittest - rm zope/__init__.py || die }
[gentoo-commits] repo/gentoo:master commit in: dev-python/zope-interface/
commit: 6ee56f868d6f06d19c8cb8baa9d3919591a1d223 Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 18:43:55 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee56f86 dev-python/zope-interface: Use distutils_write_namespace Signed-off-by: Michał Górny gentoo.org> dev-python/zope-interface/zope-interface-5.4.0-r1.ebuild | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dev-python/zope-interface/zope-interface-5.4.0-r1.ebuild b/dev-python/zope-interface/zope-interface-5.4.0-r1.ebuild index 52e20bfda75f..955faef03f65 100644 --- a/dev-python/zope-interface/zope-interface-5.4.0-r1.ebuild +++ b/dev-python/zope-interface/zope-interface-5.4.0-r1.ebuild @@ -46,11 +46,6 @@ python_compile() { python_test() { cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - # this is needed to keep the tests working while - # dev-python/namespace-zope is still installed - cat > zope/__init__.py <<-EOF || die - __path__ = __import__('pkgutil').extend_path(__path__, __name__) - EOF + distutils_write_namespace zope eunittest - rm zope/__init__.py || die }
[gentoo-commits] repo/gentoo:master commit in: dev-python/zope-schema/
commit: e62b3abda82668cb8884ae974bd4a08f072460b3 Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 18:43:56 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:50 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e62b3abd dev-python/zope-schema: Use distutils_write_namespace Signed-off-by: Michał Górny gentoo.org> dev-python/zope-schema/zope-schema-6.2.0-r1.ebuild | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dev-python/zope-schema/zope-schema-6.2.0-r1.ebuild b/dev-python/zope-schema/zope-schema-6.2.0-r1.ebuild index b3e6ad9b6e45..3657288c1276 100644 --- a/dev-python/zope-schema/zope-schema-6.2.0-r1.ebuild +++ b/dev-python/zope-schema/zope-schema-6.2.0-r1.ebuild @@ -48,11 +48,6 @@ python_compile() { python_test() { cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - # this is needed to keep the tests working while - # dev-python/namespace-zope is still installed - cat > zope/__init__.py <<-EOF || die - __path__ = __import__('pkgutil').extend_path(__path__, __name__) - EOF + distutils_write_namespace zope eunittest - rm zope/__init__.py || die }
[gentoo-commits] repo/gentoo:master commit in: dev-python/ruamel-yaml/
commit: 4307ae5047240a1a5c4f5618624ca6bc496485e9 Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 18:41:24 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4307ae50 dev-python/ruamel-yaml: Use distutils_write_namespace Signed-off-by: Michał Górny gentoo.org> dev-python/ruamel-yaml/ruamel-yaml-0.17.21-r1.ebuild | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.21-r1.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.21-r1.ebuild index 004d9aa196d3..a5c9a8fbd528 100644 --- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.21-r1.ebuild +++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.21-r1.ebuild @@ -52,9 +52,6 @@ python_test() { # this is needed to keep the tests working while # dev-python/namespace-ruamel is still installed - cat > "${BUILD_DIR}/install$(python_get_sitedir)"/ruamel/__init__.py <<-EOF || die - __path__ = __import__('pkgutil').extend_path(__path__, __name__) - EOF + distutils_write_namespace ruamel epytest - rm "${BUILD_DIR}/install$(python_get_sitedir)"/ruamel/__init__.py || die }
[gentoo-commits] repo/gentoo:master commit in: dev-python/zope-deprecation/
commit: e23a94b0f330d57b190cfb209e9cc5f76b186d68 Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 18:43:52 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e23a94b0 dev-python/zope-deprecation: Use distutils_write_namespace Signed-off-by: Michał Górny gentoo.org> dev-python/zope-deprecation/zope-deprecation-4.4.0-r1.ebuild | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dev-python/zope-deprecation/zope-deprecation-4.4.0-r1.ebuild b/dev-python/zope-deprecation/zope-deprecation-4.4.0-r1.ebuild index 3aa022b61549..3e1bd14058bd 100644 --- a/dev-python/zope-deprecation/zope-deprecation-4.4.0-r1.ebuild +++ b/dev-python/zope-deprecation/zope-deprecation-4.4.0-r1.ebuild @@ -37,11 +37,6 @@ python_compile() { python_test() { cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - # this is needed to keep the tests working while - # dev-python/namespace-zope is still installed - cat > zope/__init__.py <<-EOF || die - __path__ = __import__('pkgutil').extend_path(__path__, __name__) - EOF + distutils_write_namespace zope eunittest - rm zope/__init__.py || die }
[gentoo-commits] repo/gentoo:master commit in: dev-python/zope-configuration/
commit: f8564dea7520cee34f0735a9ab0c875fa0ac49dd Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 18:43:51 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:45 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8564dea dev-python/zope-configuration: Use distutils_write_namespace Signed-off-by: Michał Górny gentoo.org> dev-python/zope-configuration/zope-configuration-4.4.1-r1.ebuild | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dev-python/zope-configuration/zope-configuration-4.4.1-r1.ebuild b/dev-python/zope-configuration/zope-configuration-4.4.1-r1.ebuild index 28d09ca112b4..a176c8e70382 100644 --- a/dev-python/zope-configuration/zope-configuration-4.4.1-r1.ebuild +++ b/dev-python/zope-configuration/zope-configuration-4.4.1-r1.ebuild @@ -51,11 +51,6 @@ python_compile() { python_test() { cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - # this is needed to keep the tests working while - # dev-python/namespace-zope is still installed - cat > zope/__init__.py <<-EOF || die - __path__ = __import__('pkgutil').extend_path(__path__, __name__) - EOF + distutils_write_namespace zope eunittest - rm zope/__init__.py || die }
[gentoo-commits] repo/gentoo:master commit in: dev-python/sphinxcontrib-bibtex/
commit: b136c79419e3c5b19d5580cf898de1ce2aa6cf56 Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 18:43:13 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b136c794 dev-python/sphinxcontrib-bibtex: Use distutils_write_namespace Signed-off-by: Michał Górny gentoo.org> dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.2.ebuild | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.2.ebuild b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.2.ebuild index 5d8bcffd2fd0..d63be4fb2ab4 100644 --- a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.2.ebuild +++ b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.2.ebuild @@ -37,11 +37,6 @@ python_compile() { } python_test() { - # this is needed to keep the tests working while - # dev-python/namespace-sphinxcontrib is still installed - cat > "${BUILD_DIR}/install$(python_get_sitedir)/sphinxcontrib/__init__.py" <<-EOF || die - __path__ = __import__('pkgutil').extend_path(__path__, __name__) - EOF + distutils_write_namespace sphinxcontrib epytest - rm "${BUILD_DIR}/install$(python_get_sitedir)/sphinxcontrib/__init__.py" || die }
[gentoo-commits] repo/gentoo:master commit in: dev-python/zope-event/
commit: afac1df64308b2ed502e0d1bbcb7cb060de96ba9 Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 18:43:53 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:47 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afac1df6 dev-python/zope-event: Use distutils_write_namespace Signed-off-by: Michał Górny gentoo.org> dev-python/zope-event/zope-event-4.5.0-r2.ebuild | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dev-python/zope-event/zope-event-4.5.0-r2.ebuild b/dev-python/zope-event/zope-event-4.5.0-r2.ebuild index 578489805cb5..c9556f35b783 100644 --- a/dev-python/zope-event/zope-event-4.5.0-r2.ebuild +++ b/dev-python/zope-event/zope-event-4.5.0-r2.ebuild @@ -37,11 +37,6 @@ python_compile() { python_test() { cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - # this is needed to keep the tests working while - # dev-python/namespace-zope is still installed - cat > zope/__init__.py <<-EOF || die - __path__ = __import__('pkgutil').extend_path(__path__, __name__) - EOF + distutils_write_namespace zope eunittest - rm zope/__init__.py || die }
[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: ec45b77385c686cf6e4e0e014e6e61e3b6dacc54 Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 15:14:37 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec45b773 distutils-r1.eclass: Bump min. dependency versions Bump min. dependency versions to match oldest stable in ::gentoo, in order to avoid requiring developers to repeat them in BDEPEND with higher version. Closes: https://github.com/gentoo/gentoo/pull/24965 Signed-off-by: Michał Górny gentoo.org> eclass/distutils-r1.eclass | 20 +++- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index a7d5890a6b1b..2c3aee011847 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -196,23 +196,23 @@ _distutils_set_globals() { case ${DISTUTILS_USE_PEP517} in flit) bdep+=' - dev-python/flit_core[${PYTHON_USEDEP}]' + >=dev-python/flit_core-3.7.1[${PYTHON_USEDEP}]' ;; hatchling) bdep+=' - dev-python/hatchling[${PYTHON_USEDEP}]' + >=dev-python/hatchling-0.22.0[${PYTHON_USEDEP}]' ;; jupyter) bdep+=' - dev-python/jupyter_packaging[${PYTHON_USEDEP}]' + >=dev-python/jupyter_packaging-0.11.1[${PYTHON_USEDEP}]' ;; pdm) bdep+=' - dev-python/pdm-pep517[${PYTHON_USEDEP}]' + >=dev-python/pdm-pep517-0.12.3[${PYTHON_USEDEP}]' ;; poetry) bdep+=' - dev-python/poetry-core[${PYTHON_USEDEP}]' + >=dev-python/poetry-core-1.0.8[${PYTHON_USEDEP}]' ;; setuptools) bdep+=' @@ -425,7 +425,7 @@ distutils_enable_sphinx() { _DISTUTILS_SPHINX_PLUGINS=( "${@}" ) local deps autodoc=1 d - deps="dev-python/sphinx[\${PYTHON_USEDEP}]" + deps=">=dev-python/sphinx-4.4.0[\${PYTHON_USEDEP}]" for d; do if [[ ${d} == --no-autodoc ]]; then autodoc= @@ -449,13 +449,15 @@ distutils_enable_sphinx() { use doc || return 0 local p - for p in dev-python/sphinx "${_DISTUTILS_SPHINX_PLUGINS[@]}"; do + for p in ">=dev-python/sphinx-4.4.0" \ + "${_DISTUTILS_SPHINX_PLUGINS[@]}" + do python_has_version "${p}[${PYTHON_USEDEP}]" || return 1 done } else - deps="dev-python/sphinx" + deps=">=dev-python/sphinx-4.4.0" fi sphinx_compile_all() { @@ -538,7 +540,7 @@ distutils_enable_tests() { test_pkg=">=dev-python/nose-1.3.7-r4" ;; pytest) - test_pkg=">=dev-python/pytest-6.2.5-r2" + test_pkg=">=dev-python/pytest-7.0.1" ;; setup.py) ;;
[gentoo-commits] repo/gentoo:master commit in: dev-python/ruamel-std-pathlib/
commit: b711a2572cd074ebb71c58e934fa82d7e19802d6 Author: Michał Górny gentoo org> AuthorDate: Sun Apr 10 09:46:03 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b711a257 dev-python/ruamel-std-pathlib: Use distutils_write_namespace Signed-off-by: Michał Górny gentoo.org> dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.2-r1.ebuild | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.2-r1.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.2-r1.ebuild index 7ebe0572a78b..ada76ed82820 100644 --- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.2-r1.ebuild +++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.2-r1.ebuild @@ -30,11 +30,6 @@ python_compile() { } python_test() { - # this is needed to keep the tests working while - # dev-python/namespace-ruamel is still installed - cat > "${BUILD_DIR}/install$(python_get_sitedir)"/ruamel/__init__.py <<-EOF || die - __path__ = __import__('pkgutil').extend_path(__path__, __name__) - EOF + distutils_write_namespace ruamel epytest - rm "${BUILD_DIR}/install$(python_get_sitedir)"/ruamel/__init__.py || die }
[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: 157dbddd0dc3a6518ea1fed156ec6827fff1e1bb Author: Michał Górny gentoo org> AuthorDate: Sun Apr 10 09:44:54 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:40 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=157dbddd distutils-r1.eclass: Introduce distutils_write_namespace Introduce a distutils_write_namespace helper that can be used to temporarily write a namespace __init__.py as needed to run tests when legacy dev-python/namespace-* packages are installed. Signed-off-by: Michał Górny gentoo.org> eclass/distutils-r1.eclass | 41 + 1 file changed, 41 insertions(+) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index f9cb41aa3d42..ccdf0e025758 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -750,6 +750,42 @@ distutils_install_for_testing() { esetup.py install "${add_args[@]}" "${@}" } +# @FUNCTION: distutils_write_namespace +# @USAGE: ... +# @DESCRIPTION: +# Write the __init__.py file for the requested namespace into PEP517 +# install tree, in order to fix running tests when legacy namespace +# packages are installed (dev-python/namespace-*). +# +# This function must only be used in python_test(). The created file +# will automatically be removed upon leaving the test phase. +distutils_write_namespace() { + debug-print-function ${FUNCNAME} "${@}" + + if [[ ! ${DISTUTILS_USE_PEP517} ]]; then + die "${FUNCNAME} is available only in PEP517 mode" + fi + if [[ ${EBUILD_PHASE} != test || ! ${BUILD_DIR} ]]; then + die "${FUNCNAME} should only be used in python_test" + fi + + local namespace + for namespace; do + if [[ ${namespace} == *[./]* ]]; then + die "${FUNCNAME} does not support nested namespaces at the moment" + fi + + local path=${BUILD_DIR}/install$(python_get_sitedir)/${namespace}/__init__.py + if [[ -f ${path} ]]; then + die "Requested namespace ${path} exists already!" + fi + cat > "${path}" <<-EOF || die + __path__ = __import__('pkgutil').extend_path(__path__, __name__) + EOF + _DISTUTILS_POST_PHASE_RM+=( "${path}" ) + done +} + # @FUNCTION: _distutils-r1_disable_ez_setup # @INTERNAL # @DESCRIPTION: @@ -1477,10 +1513,15 @@ distutils-r1_run_phase() { esac local -x LDSHARED="${CC} ${ldopts}" LDCXXSHARED="${CXX} ${ldopts}" + local _DISTUTILS_POST_PHASE_RM=() "${@}" local ret=${?} + if [[ -n ${_DISTUTILS_POST_PHASE_RM} ]]; then + rm "${_DISTUTILS_POST_PHASE_RM[@]}" || die + fi + cd "${_DISTUTILS_INITIAL_CWD}" || die return "${ret}" }
[gentoo-commits] repo/gentoo:master commit in: dev-python/zope-component/
commit: dc4750beaaedee1f0f1ea220524ee620edc8db77 Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 18:43:19 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:45 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc4750be dev-python/zope-component: Use distutils_write_namespace Signed-off-by: Michał Górny gentoo.org> dev-python/zope-component/zope-component-4.4.1-r1.ebuild | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dev-python/zope-component/zope-component-4.4.1-r1.ebuild b/dev-python/zope-component/zope-component-4.4.1-r1.ebuild index 6d9231a1bdf8..acb95d8facf8 100644 --- a/dev-python/zope-component/zope-component-4.4.1-r1.ebuild +++ b/dev-python/zope-component/zope-component-4.4.1-r1.ebuild @@ -49,11 +49,6 @@ python_compile() { python_test() { cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - # this is needed to keep the tests working while - # dev-python/namespace-zope is still installed - cat > zope/__init__.py <<-EOF || die - __path__ = __import__('pkgutil').extend_path(__path__, __name__) - EOF + distutils_write_namespace zope eunittest - rm zope/__init__.py || die }
[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: 21d5a7abedebab5719a9942a618c7b132b514f40 Author: Michał Górny gentoo org> AuthorDate: Sat Apr 9 20:56:58 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:38 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21d5a7ab distutils-r1.eclass: Update namespace package doc URL Signed-off-by: Michał Górny gentoo.org> eclass/distutils-r1.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 2e4a11bb8826..cf6998e2680e 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1637,7 +1637,7 @@ _distutils-r1_check_namespace_pth() { ewarn "read our documentation on reliable handling of namespaces and update" ewarn "the ebuild accordingly:" ewarn - ewarn " https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages; + ewarn " https://projects.gentoo.org/python/guide/concept.html#namespace-packages; fi }
[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: 6451cf647f04b31a56ea2dc8c3f84a70c2468f87 Author: Michał Górny gentoo org> AuthorDate: Sat Apr 9 15:55:46 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:37 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6451cf64 distutils-r1.eclass: Issue a QA warning if "build" exists Signed-off-by: Michał Górny gentoo.org> eclass/distutils-r1.eclass | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index e6b0ab5e0e32..2e4a11bb8826 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1115,7 +1115,13 @@ distutils-r1_python_compile() { # call setup.py build when using setuptools (either via PEP517 # or in legacy mode) if [[ ${DISTUTILS_USE_PEP517:-setuptools} == setuptools ]]; then - if [[ ! ${DISTUTILS_USE_PEP517} ]]; then + if [[ ${GPEP517_TESTING} ]]; then + if [[ -d build ]]; then + eqawarn "A 'build' directory exists already. Artifacts from this directory may" + eqawarn "be picked up by setuptools when building for another interpreter." + eqawarn "Please remove this directory prior to building." + fi + else _distutils-r1_copy_egg_info fi
[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: 50cf28d11e3908467f6c10030ce66f55eea1c23a Author: Michał Górny gentoo org> AuthorDate: Sat Apr 9 15:46:59 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50cf28d1 distutils-r1.eclass: Prefer "rm -rf build" over "setup.py clean -a" Prefer using "rm -rf build" directly over "setup.py clean -a". This has three advantages: 1. It is much faster. 2. It works on packages that have broken "setup.py clean", e.g. dev-python/pydantic. 3. It works on packages that block "setup.py clean" and tell you to use "git clean" (sic!), e.g. dev-python/scipy. This is a potentially (but unlikely) breaking change, so do it conditionally to GPEP517_TESTING. Signed-off-by: Michał Górny gentoo.org> eclass/distutils-r1.eclass | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index de891215e688..e6b0ab5e0e32 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1090,7 +1090,11 @@ distutils_pep517_install() { # clean the build tree; otherwise we may end up with PyPy3 # extensions duplicated into CPython dists if [[ ${DISTUTILS_USE_PEP517:-setuptools} == setuptools ]]; then - esetup.py clean -a + if [[ ${GPEP517_TESTING} ]]; then + rm -rf build || die + else + esetup.py clean -a + fi fi }
[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: 41f25bec0bbf5d9bc3444f10a7da291c50b07a1b Author: Michał Górny gentoo org> AuthorDate: Mon Apr 11 07:46:15 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f25bec distutils-r1.eclass: Print deprecation warning for distutils builds Print deprecation warnings for non-PEP517 builds using plain distutils. This is a small subset of Python packages overall, and the first step towards deprecating legacy build support. Transitioning pure distutils packages is also important to avoid .egg-info collisions when we switch from CPython distutils to setuptools-vendored distutils. Signed-off-by: Michał Górny gentoo.org> eclass/distutils-r1.eclass | 9 + 1 file changed, 9 insertions(+) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index ccdf0e025758..a7d5890a6b1b 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -867,6 +867,15 @@ distutils-r1_python_prepare_all() { if [[ ! ${DISTUTILS_USE_PEP517} ]]; then _distutils-r1_disable_ez_setup _distutils-r1_handle_pyproject_toml + + case ${DISTUTILS_USE_SETUPTOOLS} in + no) + eqawarn "Non-PEP517 builds are deprecated for ebuilds using plain distutils." + eqawarn "Please migrate to DISTUTILS_USE_PEP517=setuptools." + eqawarn "Please see Python Guide for more details:" + eqawarn " https://projects.gentoo.org/python/guide/distutils.html; + ;; + esac fi if [[ ${DISTUTILS_IN_SOURCE_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: 4986eb8eece688f596bbf6e2cbcbe532df07c95f Author: Michał Górny gentoo org> AuthorDate: Sat Apr 9 21:55:50 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:39 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4986eb8e distutils-r1.eclass: Skip build_ext when there no .c/.pyx files Skip issuing build_ext when there appears to be no .c/.pyx files. Since starting setuptools is expensive, this gives a major speedup to building pure Python packages. If the check misfires, the worst that can happen is that C extensions will be built serialized. Signed-off-by: Michał Górny gentoo.org> eclass/distutils-r1.eclass | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 1a0097647c41..f9cb41aa3d42 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1133,7 +1133,17 @@ distutils-r1_python_compile() { fi if [[ ${DISTUTILS_USE_PEP517} && ${GPEP517_TESTING} ]]; then - esetup.py build_ext -j "${jobs}" "${@}" + # issue build_ext only if it looks like we have something + # to build; setuptools is expensive to start + # see extension.py for list of suffixes + # .pyx is added for Cython + if [[ -n $( + find '(' -name '*.c' -o -name '*.cc' -o -name '*.cpp' \ + -o -name '*.cxx' -o -name '*.c++' -o -name '*.m' \ + -o -name '*.mm' -o -name '*.pyx' ')' -print -quit + ) ]]; then + esetup.py build_ext -j "${jobs}" "${@}" + fi else esetup.py build -j "${jobs}" "${@}" fi
[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: ac1735e34dad0a1f96543daa3d7ceb303b78d842 Author: Michał Górny gentoo org> AuthorDate: Sat Apr 9 21:42:28 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 11 19:58:38 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac1735e3 distutils-r1.eclass: Call build_ext instead of build in PEP517 mode Call `setup.py build_ext` instead of the wholesale `build` in PEP517 mode. After all, the call is not strictly necessary; it is only done in order to build C extensions in parallel (PEP517 backend does not support specifying job count). By skipping the other tasks build command does (and then repeats via PEP517 call), the ebuild can build a few seconds faster. Since this is a potentially breaking change (but very unlikely to actually break anything), let's test it behind GPEP517_TESTING. Signed-off-by: Michał Górny gentoo.org> eclass/distutils-r1.eclass | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index cf6998e2680e..1a0097647c41 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1132,7 +1132,11 @@ distutils-r1_python_compile() { jobs=$(( nproc + 1 )) fi - esetup.py build -j "${jobs}" "${@}" + if [[ ${DISTUTILS_USE_PEP517} && ${GPEP517_TESTING} ]]; then + esetup.py build_ext -j "${jobs}" "${@}" + else + esetup.py build -j "${jobs}" "${@}" + fi fi if [[ ${DISTUTILS_USE_PEP517} ]]; then
[gentoo-commits] repo/gentoo:master commit in: dev-python/twisted/
commit: e5bfc5e400c04a3c427fe64cd3eaf48a941bde10 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Apr 11 19:44:57 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Apr 11 19:44:57 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5bfc5e4 dev-python/twisted: Stabilize 22.4.0 arm64, #837845 Signed-off-by: Arthur Zamarin gentoo.org> dev-python/twisted/twisted-22.4.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/twisted/twisted-22.4.0.ebuild b/dev-python/twisted/twisted-22.4.0.ebuild index a8f3f14af373..38d5be8138a1 100644 --- a/dev-python/twisted/twisted-22.4.0.ebuild +++ b/dev-python/twisted/twisted-22.4.0.ebuild @@ -19,7 +19,7 @@ S=${WORKDIR}/${PN}-${P} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="conch crypt http2 serial test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/files/
commit: 2f56448cbb1052dbaf2c4fee7686542036cfceeb Author: Sam James gentoo org> AuthorDate: Mon Apr 11 19:24:45 2022 + Commit: Sam James gentoo org> CommitDate: Mon Apr 11 19:24:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f56448c games-engines/devilutionx: fix patch line endings Closes: https://bugs.gentoo.org/837764 Signed-off-by: Sam James gentoo.org> .../files/devilutionx-1.2.1-disable-ccache.patch | 23 +++--- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch b/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch index a89b53e63d34..177287810c94 100644 --- a/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch +++ b/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch @@ -1,17 +1,16 @@ We let users enable ccache by themselves. Avoids sandbox violation. - https://bugs.gentoo.org/813768 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,11 +54,6 @@ if(NOT VERSION_NUM) - endif() - endif() - --find_program(CCACHE_PROGRAM ccache) --if(CCACHE_PROGRAM) -- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") --endif() -- - if(VERSION_NUM MATCHES untagged) - project(DevilutionX - LANGUAGES C CXX) + endif() + endif() + +-find_program(CCACHE_PROGRAM ccache) +-if(CCACHE_PROGRAM) +- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") +-endif() +- + if(VERSION_NUM MATCHES untagged) + project(DevilutionX + LANGUAGES C CXX)
[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
commit: 5c47e43829e96f9d83685a31210fbfa60359ee67 Author: Sam James gentoo org> AuthorDate: Sun Apr 10 23:18:59 2022 + Commit: Sam James gentoo org> CommitDate: Mon Apr 11 19:24:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c47e438 net-ftp/proftpd: update upstream metadata Signed-off-by: Sam James gentoo.org> net-ftp/proftpd/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml index 8b0715aefd77..21976ea2f9ed 100644 --- a/net-ftp/proftpd/metadata.xml +++ b/net-ftp/proftpd/metadata.xml @@ -39,6 +39,6 @@ server. gssmod - Castaglia/proftpd-mod_vroot + proftpd/proftpd
[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/
commit: 04cd13b0ae61d6179a31751a9842fbe66d6631d8 Author: Sam James gentoo org> AuthorDate: Sun Apr 10 23:16:35 2022 + Commit: Sam James gentoo org> CommitDate: Mon Apr 11 19:24:50 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04cd13b0 sci-libs/gdal: use pcre2 instead of pcre1 Signed-off-by: Sam James gentoo.org> sci-libs/gdal/gdal-3.4.2-r1.ebuild | 329 + 1 file changed, 329 insertions(+) diff --git a/sci-libs/gdal/gdal-3.4.2-r1.ebuild b/sci-libs/gdal/gdal-3.4.2-r1.ebuild new file mode 100644 index ..f3416fb72a6e --- /dev/null +++ b/sci-libs/gdal/gdal-3.4.2-r1.ebuild @@ -0,0 +1,329 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GENTOO_DEPEND_ON_PERL="no" +PYTHON_COMPAT=( python3_{8,9,10} ) +DISTUTILS_OPTIONAL=1 +inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs + +DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)" +HOMEPAGE="https://gdal.org/; +SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz; + +LICENSE="BSD Info-ZIP MIT" +SLOT="0/30" # subslot is libgdal.so. +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd" + +REQUIRED_USE=" + mdb? ( java ) + python? ( ${PYTHON_REQUIRED_USE} ) + spatialite? ( sqlite ) + java? ( threads ) +" + +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) + java? ( + dev-java/ant-core + dev-lang/swig:0 + >=virtual/jdk-1.8:* + ) + perl? ( dev-lang/swig:0 ) + python? ( + dev-lang/swig:0 + dev-python/setuptools[${PYTHON_USEDEP}] + ) +" +DEPEND=" + dev-libs/expat + dev-libs/json-c:= + dev-libs/libpcre2 + dev-libs/libxml2:2 + dev-libs/openssl:= + media-libs/tiff + >=sci-libs/libgeotiff-1.5.1-r1:= + >=sci-libs/proj-6.0.0:= + sys-libs/zlib[minizip(+)] + armadillo? ( sci-libs/armadillo:=[lapack] ) + curl? ( net-misc/curl ) + fits? ( sci-libs/cfitsio:= ) + geos? ( >=sci-libs/geos-3.8.0 ) + gif? ( media-libs/giflib:= ) + gml? ( >=dev-libs/xerces-c-3.1 ) + heif? ( media-libs/libheif:= ) + hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) + jpeg? ( virtual/jpeg:0= ) + jpeg2k? ( media-libs/openjpeg:2= ) + lzma? ( || ( + app-arch/xz-utils + app-arch/lzma + ) ) + mdb? ( dev-java/jackcess:1 ) + mysql? ( virtual/mysql ) + netcdf? ( sci-libs/netcdf:= ) + odbc? ( dev-db/unixODBC ) + ogdi? ( sci-libs/ogdi ) + opencl? ( virtual/opencl ) + oracle? ( dev-db/oracle-instantclient:= ) + pdf? ( app-text/poppler:= ) + perl? ( dev-lang/perl:= ) + png? ( media-libs/libpng:0= ) + postgres? ( >=dev-db/postgresql-8.4:= ) + python? ( + ${PYTHON_DEPS} + dev-python/numpy[${PYTHON_USEDEP}] + ) + spatialite? ( dev-db/spatialite ) + sqlite? ( dev-db/sqlite:3 ) + webp? ( media-libs/libwebp:= ) + xls? ( dev-libs/freexl ) + zstd? ( app-arch/zstd:= ) +" +RDEPEND="${DEPEND} + java? ( >=virtual/jre-1.8:* ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2.2.3-soname.patch" + "${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840 + "${FILESDIR}/${PN}-3.3.0-libdir.patch" +) + +src_prepare() { + default + + # Drop a --prefix hack in the upstream build system + # We don't want the line at all, so let's just drop it rather than + # trying to put in the right libdir value. + # bug #696106 + sed -e '/\$ADD_PREFIX\/lib/d' \ + -i configure.ac || die + + sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \ + -i configure.ac || die + + sed -e 's:^ar:$(AR):g' \ + -i ogr/ogrsf_frmts/sdts/install-libs.sh || die + + # SWIG: Use of the include path to find the input file is deprecated and will not work with ccache. + sed -e "s: gdal_array.i: ../include/gdal_array.i:" \ + -i swig/python/GNUmakefile || die "sed python makefile failed" + + # autoconf 2.70+ + # bug #775209 + config_rpath_update . + + eautoreconf +} + +src_configure() { + local myconf=( + # charls - not packaged in Gentoo ebuild repository + # kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore + # bsb - legal issues + # ingres - same story as oracle oci + # jasper -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgit2/
commit: d2b24f2f6c6065379d5778f9ce16f11ca47ddbc2 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Apr 11 19:24:21 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Apr 11 19:24:21 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b24f2f dev-libs/libgit2: Stabilize 1.4.2 arm, #837755 Signed-off-by: Arthur Zamarin gentoo.org> dev-libs/libgit2/libgit2-1.4.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libgit2/libgit2-1.4.2.ebuild b/dev-libs/libgit2/libgit2-1.4.2.ebuild index c752648e2cf6..441391f6fb9c 100644 --- a/dev-libs/libgit2/libgit2-1.4.2.ebuild +++ b/dev-libs/libgit2/libgit2-1.4.2.ebuild @@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-} LICENSE="GPL-2-with-linking-exception" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm arm64 ppc ppc64 ~riscv ~x86 ~ppc-macos" +KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv ~x86 ~ppc-macos" IUSE="examples gssapi +ssh test +threads trace" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/
commit: a49c1e4861cbc3ef6c03859193849d05261f3f36 Author: Lars Wendler gentoo org> AuthorDate: Mon Apr 11 19:22:27 2022 + Commit: Lars Wendler gentoo org> CommitDate: Mon Apr 11 19:23:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a49c1e48 sys-apps/fwupd: Revbump to fix vala detection which has been changed for EAPI-8 Closes: https://bugs.gentoo.org/837866 Closes: https://bugs.gentoo.org/837857 Signed-off-by: Lars Wendler gentoo.org> sys-apps/fwupd/{fwupd-1.7.7.ebuild => fwupd-1.7.7-r1.ebuild} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys-apps/fwupd/fwupd-1.7.7.ebuild b/sys-apps/fwupd/fwupd-1.7.7-r1.ebuild similarity index 99% rename from sys-apps/fwupd/fwupd-1.7.7.ebuild rename to sys-apps/fwupd/fwupd-1.7.7-r1.ebuild index 0bdeddaad956..9982065f894a 100644 --- a/sys-apps/fwupd/fwupd-1.7.7.ebuild +++ b/sys-apps/fwupd/fwupd-1.7.7-r1.ebuild @@ -88,6 +88,7 @@ DEPEND=" pkg_setup() { python-single-r1_pkg_setup + vala_setup if use nvme ; then kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" fi @@ -104,8 +105,6 @@ src_prepare() { sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \ -i data/builder/meson.build || die - - vala_src_prepare } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgit2/
commit: 7afe1061a68198b37384d05692f2aa1412635fd1 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Apr 11 19:20:49 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Apr 11 19:20:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7afe1061 dev-libs/libgit2: Stabilize 1.4.2 arm64, #837755 Signed-off-by: Arthur Zamarin gentoo.org> dev-libs/libgit2/libgit2-1.4.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libgit2/libgit2-1.4.2.ebuild b/dev-libs/libgit2/libgit2-1.4.2.ebuild index 9a416264a267..c752648e2cf6 100644 --- a/dev-libs/libgit2/libgit2-1.4.2.ebuild +++ b/dev-libs/libgit2/libgit2-1.4.2.ebuild @@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-} LICENSE="GPL-2-with-linking-exception" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~riscv ~x86 ~ppc-macos" +KEYWORDS="~amd64 ~arm arm64 ppc ppc64 ~riscv ~x86 ~ppc-macos" IUSE="examples gssapi +ssh test +threads trace" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgit2/
commit: 31a6f54b692eb272eebcafc24edf205acf5838e6 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Apr 11 19:20:19 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Apr 11 19:20:19 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31a6f54b dev-libs/libgit2: Stabilize 1.4.2 ppc64, #837755 Signed-off-by: Arthur Zamarin gentoo.org> dev-libs/libgit2/libgit2-1.4.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libgit2/libgit2-1.4.2.ebuild b/dev-libs/libgit2/libgit2-1.4.2.ebuild index 803fb39c7a64..9a416264a267 100644 --- a/dev-libs/libgit2/libgit2-1.4.2.ebuild +++ b/dev-libs/libgit2/libgit2-1.4.2.ebuild @@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-} LICENSE="GPL-2-with-linking-exception" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86 ~ppc-macos" +KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~riscv ~x86 ~ppc-macos" IUSE="examples gssapi +ssh test +threads trace" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgit2/
commit: 3819c7bfdc3be57a388cf95357c1df5a445e6711 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Apr 11 19:20:14 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Apr 11 19:20:14 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3819c7bf dev-libs/libgit2: Stabilize 1.4.2 ppc, #837755 Signed-off-by: Arthur Zamarin gentoo.org> dev-libs/libgit2/libgit2-1.4.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libgit2/libgit2-1.4.2.ebuild b/dev-libs/libgit2/libgit2-1.4.2.ebuild index 8727c6dbff6b..803fb39c7a64 100644 --- a/dev-libs/libgit2/libgit2-1.4.2.ebuild +++ b/dev-libs/libgit2/libgit2-1.4.2.ebuild @@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-} LICENSE="GPL-2-with-linking-exception" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos" +KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86 ~ppc-macos" IUSE="examples gssapi +ssh test +threads trace" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-util/flatpak-builder/files/, dev-util/flatpak-builder/
commit: 43e759c25a8e2960d3dff78c6696cb257ebaa394 Author: Alfred Persson Forsberg catcream org> AuthorDate: Mon Apr 11 13:49:23 2022 + Commit: Zac Medico gentoo org> CommitDate: Mon Apr 11 19:18:58 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43e759c2 dev-util/flatpak-builder: fixed building for musl Closes: https://github.com/gentoo/gentoo/pull/24991 Closes: https://bugs.gentoo.org/834671 Signed-off-by: Alfred Persson Forsberg catcream.org> Signed-off-by: Zac Medico gentoo.org> ...usl.patch => flatpak-builder-1.0.11-musl.patch} | 4 +- .../files/flatpak-builder-1.2.2-musl.patch | 55 +- .../flatpak-builder/flatpak-builder-1.0.11.ebuild | 2 + 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch b/dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch similarity index 87% copy from dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch copy to dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch index db207e0e353c..b5ef0ec15504 100644 --- a/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch +++ b/dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch @@ -1,5 +1,5 @@ a/subprojects/libglnx/glnx-macros.h -+++ b/subprojects/libglnx/glnx-macros.h +--- a/libglnx/glnx-macros.h b/libglnx/glnx-macros.h @@ -28,6 +28,16 @@ G_BEGIN_DECLS diff --git a/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch b/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch index db207e0e353c..626fbddd0352 100644 --- a/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch +++ b/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch @@ -1,9 +1,59 @@ +diff --git a/subprojects/debugedit/tools/debugedit.c b/subprojects/debugedit/tools/debugedit.c +index 668777a..b3ba5cb 100644 +--- a/subprojects/debugedit/tools/debugedit.c b/subprojects/debugedit/tools/debugedit.c +@@ -25,7 +25,11 @@ + #include + #include + #include ++#ifdef __GLIBC__ + #include ++#else ++#include "error.h" ++#endif + #include + #include + #include +diff --git a/subprojects/debugedit/tools/error.h b/subprojects/debugedit/tools/error.h +new file mode 100644 +index 000..c330dc3 +--- /dev/null b/subprojects/debugedit/tools/error.h +@@ -0,0 +1,26 @@ ++#ifndef _ERROR_H ++#define _ERROR_H ++#include ++#include ++#include ++#include ++#include ++ ++static unsigned int error_message_count = 0; ++ ++static inline void error(int status, int errnum, const char* format, ...) ++{ ++ va_list ap; ++ fprintf(stderr, "%s: ", program_invocation_name); ++ va_start(ap, format); ++ vfprintf(stderr, format, ap); ++ va_end(ap); ++ if (errnum) ++fprintf(stderr, ": %s", strerror(errnum)); ++ fprintf(stderr, "\n"); ++ error_message_count++; ++ if (status) ++exit(status); ++} ++ ++#endif +diff --git a/subprojects/libglnx/glnx-macros.h b/subprojects/libglnx/glnx-macros.h +index 6d8aca9..e3e4e33 100644 --- a/subprojects/libglnx/glnx-macros.h +++ b/subprojects/libglnx/glnx-macros.h @@ -28,6 +28,16 @@ - + G_BEGIN_DECLS - + +/* taken from glibc unistd.h and fixes musl */ +#ifndef TEMP_FAILURE_RETRY +#define TEMP_FAILURE_RETRY(expression) \ @@ -16,3 +66,4 @@ + /* All of these are for C only. */ #ifndef __GI_SCANNER__ + diff --git a/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild b/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild index a8017f003f1d..20d616e0056d 100644 --- a/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild +++ b/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild @@ -33,6 +33,8 @@ BDEPEND=" ) " +PATCHES=("${FILESDIR}/flatpak-builder-1.0.11-musl.patch") + src_configure() { econf \ $(use_enable doc documentation) \
[gentoo-commits] repo/gentoo:master commit in: dev-util/pycharm-professional/
commit: 0ac3d5529e1553370fb063292267285b01adda00 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Mon Apr 11 18:26:12 2022 + Commit: Conrad Kostecki gentoo org> CommitDate: Mon Apr 11 19:12:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ac3d552 dev-util/pycharm-professional: use https Closes: https://github.com/gentoo/gentoo/pull/24995 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> .../pycharm-professional/pycharm-professional-2021.1.2-r1.ebuild| 6 +++--- dev-util/pycharm-professional/pycharm-professional-2021.3.2.ebuild | 4 ++-- dev-util/pycharm-professional/pycharm-professional-2021.3.3.ebuild | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-util/pycharm-professional/pycharm-professional-2021.1.2-r1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2021.1.2-r1.ebuild index e720741472c2..7f49ff573948 100644 --- a/dev-util/pycharm-professional/pycharm-professional-2021.1.2-r1.ebuild +++ b/dev-util/pycharm-professional/pycharm-professional-2021.1.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,8 +6,8 @@ EAPI=7 inherit desktop readme.gentoo-r1 wrapper xdg-utils DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis" -HOMEPAGE="http://www.jetbrains.com/pycharm/; -SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz; +HOMEPAGE="https://www.jetbrains.com/pycharm/; +SRC_URI="https://download.jetbrains.com/python/${P}.tar.gz; LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview" SLOT="0" diff --git a/dev-util/pycharm-professional/pycharm-professional-2021.3.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-2021.3.2.ebuild index 6812ec1659ec..75ca0a7db25d 100644 --- a/dev-util/pycharm-professional/pycharm-professional-2021.3.2.ebuild +++ b/dev-util/pycharm-professional/pycharm-professional-2021.3.2.ebuild @@ -7,8 +7,8 @@ inherit desktop readme.gentoo-r1 wrapper MY_PN=${PN/-professional/} DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis" -HOMEPAGE="http://www.jetbrains.com/pycharm/; -SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz; +HOMEPAGE="https://www.jetbrains.com/pycharm/; +SRC_URI="https://download.jetbrains.com/python/${P}.tar.gz; S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview" diff --git a/dev-util/pycharm-professional/pycharm-professional-2021.3.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2021.3.3.ebuild index 6812ec1659ec..75ca0a7db25d 100644 --- a/dev-util/pycharm-professional/pycharm-professional-2021.3.3.ebuild +++ b/dev-util/pycharm-professional/pycharm-professional-2021.3.3.ebuild @@ -7,8 +7,8 @@ inherit desktop readme.gentoo-r1 wrapper MY_PN=${PN/-professional/} DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis" -HOMEPAGE="http://www.jetbrains.com/pycharm/; -SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz; +HOMEPAGE="https://www.jetbrains.com/pycharm/; +SRC_URI="https://download.jetbrains.com/python/${P}.tar.gz; S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/
commit: 3c9d2b811abb9700f7ac18d8626f4820e74db790 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Mon Apr 11 18:15:36 2022 + Commit: Conrad Kostecki gentoo org> CommitDate: Mon Apr 11 19:12:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c9d2b81 sys-apps/iproute2: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/24994 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> ...route2-5.16.0-fix-ax25.h-include-for-musl.patch | 25 -- 1 file changed, 25 deletions(-) diff --git a/sys-apps/iproute2/files/iproute2-5.16.0-fix-ax25.h-include-for-musl.patch b/sys-apps/iproute2/files/iproute2-5.16.0-fix-ax25.h-include-for-musl.patch deleted file mode 100644 index 28307131a3db.. --- a/sys-apps/iproute2/files/iproute2-5.16.0-fix-ax25.h-include-for-musl.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://marc.info/?l=linux-netdev=16420615772=2 - -From: Sam James -Date: Thu, 13 Jan 2022 08:05:33 + -Subject: [PATCH] Fix ax25.h include for musl - -ax25.h isn't guaranteed to be avilable in netax25/*; -it's dependent on our choice of libc (it's not available -on musl at least) [0]. - -Let's use the version from linux-headers. - -[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers -Bug: https://bugs.gentoo.org/831102 a/lib/ax25_ntop.c -+++ b/lib/ax25_ntop.c -@@ -2,7 +2,7 @@ - - #include - #include --#include -+#include - - #include "utils.h" -
[gentoo-commits] repo/gentoo:master commit in: net-nds/tac_plus/
commit: 5bba24e22989e0db951e0a04933ea5ecd739b9f8 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Mon Apr 11 18:30:38 2022 + Commit: Conrad Kostecki gentoo org> CommitDate: Mon Apr 11 19:12:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bba24e2 net-nds/tac_plus: use https Closes: https://github.com/gentoo/gentoo/pull/24996 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> net-nds/tac_plus/tac_plus-4.0.4.19-r5.ebuild | 2 +- net-nds/tac_plus/tac_plus-4.0.4.27a-r2.ebuild | 4 ++-- net-nds/tac_plus/tac_plus-4.0.4.27a-r3.ebuild | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-nds/tac_plus/tac_plus-4.0.4.19-r5.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.19-r5.ebuild index 01b5ac9551ab..22217527ea78 100644 --- a/net-nds/tac_plus/tac_plus-4.0.4.19-r5.ebuild +++ b/net-nds/tac_plus/tac_plus-4.0.4.19-r5.ebuild @@ -7,7 +7,7 @@ inherit autotools MY_P="tacacs+-F${PV}" DESCRIPTION="An updated version of Cisco's TACACS+ server" -HOMEPAGE="http://www.shrubbery.net/tac_plus/; +HOMEPAGE="https://www.shrubbery.net/tac_plus/; SRC_URI="ftp://ftp.shrubbery.net/pub/tac_plus/${MY_P}.tar.gz; S="${WORKDIR}/${MY_P}" diff --git a/net-nds/tac_plus/tac_plus-4.0.4.27a-r2.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.27a-r2.ebuild index 09fda604c646..a5026cae2b98 100644 --- a/net-nds/tac_plus/tac_plus-4.0.4.27a-r2.ebuild +++ b/net-nds/tac_plus/tac_plus-4.0.4.27a-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools MY_P="tacacs+-F${PV}" DESCRIPTION="An updated version of Cisco's TACACS+ server" -HOMEPAGE="http://www.shrubbery.net/tac_plus/; +HOMEPAGE="https://www.shrubbery.net/tac_plus/; SRC_URI="ftp://ftp.shrubbery.net/pub/tac_plus/${MY_P}.tar.gz; S="${WORKDIR}/${MY_P}" diff --git a/net-nds/tac_plus/tac_plus-4.0.4.27a-r3.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.27a-r3.ebuild index 1aefca883a29..ef68cb7a41cb 100644 --- a/net-nds/tac_plus/tac_plus-4.0.4.27a-r3.ebuild +++ b/net-nds/tac_plus/tac_plus-4.0.4.27a-r3.ebuild @@ -7,7 +7,7 @@ inherit autotools pam MY_P="tacacs+-F${PV}" DESCRIPTION="An updated version of Cisco's TACACS+ server" -HOMEPAGE="http://www.shrubbery.net/tac_plus/; +HOMEPAGE="https://www.shrubbery.net/tac_plus/; SRC_URI="ftp://ftp.shrubbery.net/pub/tac_plus/${MY_P}.tar.gz; S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-init-scripts/, dev-db/mysql-init-scripts/files/
commit: a2e045276140813d197d5eb341bb583dc76cac41 Author: Conrad Kostecki gentoo org> AuthorDate: Thu Apr 7 19:00:48 2022 + Commit: Conrad Kostecki gentoo org> CommitDate: Mon Apr 11 19:09:05 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e04527 dev-db/mysql-init-scripts: update tmpfiles path The path '/var/run' is deprecated, as the following message is being shown: /usr/lib/tmpfiles.d/mysql.conf:1: Line references path below legacy directory /var/run/, updating /var/run/mysqld /run/mysqld; please update the tmpfiles.d/ drop-in file accordingly. Closes: https://github.com/gentoo/gentoo/pull/24947 Signed-off-by: Conrad Kostecki gentoo.org> dev-db/mysql-init-scripts/files/mysql.conf| 1 - dev-db/mysql-init-scripts/files/mysql.conf-r1 | 1 + ...ql-init-scripts-2.3-r3.ebuild => mysql-init-scripts-2.3-r4.ebuild} | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-db/mysql-init-scripts/files/mysql.conf b/dev-db/mysql-init-scripts/files/mysql.conf deleted file mode 100644 index 74cd5f836e76.. --- a/dev-db/mysql-init-scripts/files/mysql.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/run/mysqld 0755 mysql mysql - diff --git a/dev-db/mysql-init-scripts/files/mysql.conf-r1 b/dev-db/mysql-init-scripts/files/mysql.conf-r1 new file mode 100644 index ..6883dc798881 --- /dev/null +++ b/dev-db/mysql-init-scripts/files/mysql.conf-r1 @@ -0,0 +1 @@ +d /run/mysqld 0755 mysql mysql - diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r4.ebuild similarity index 95% rename from dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild rename to dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r4.ebuild index 34fe271b9756..889e84ccfc61 100644 --- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild +++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -49,7 +49,7 @@ src_install() { doexe "${FILESDIR}"/mysqld-wait-ready systemd_newunit "${FILESDIR}/mysqld-v2.service" "mysqld.service" systemd_newunit "${FILESDIR}/mysqld_at-v2.service" "mysqld@.service" - dotmpfiles "${FILESDIR}/mysql.conf" + newtmpfiles "${FILESDIR}/mysql.conf-r1" "mysql.conf" insinto /etc/logrotate.d newins "${FILESDIR}/logrotate.mysql-2.3" "mysql"