Merge updates from master

2026-07-16 02:23:16 -04:00 · 2021-01-24 11:33:04 +00:00
parent 40a32f396c ef1590ca1b
commit 8d0184c8a3
16 changed files with 15 additions and 118 deletions
--- a/acct-group/jackett/jackett-0.ebuild
+++ b/acct-group/jackett/jackett-0.ebuild
@@ -7,4 +7,4 @@ inherit acct-group

 ACCT_GROUP_ID=-1
 DESCRIPTION="Group for www-apps/jackett-bin"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
--- a/acct-user/jackett/jackett-0.ebuild
+++ b/acct-user/jackett/jackett-0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit acct-user

 DESCRIPTION="User for www-apps/jackett-bin"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 ACCT_USER_ID=-1
 ACCT_USER_GROUPS=( jackett )
 ACCT_USER_HOME="/var/jackett/"
--- a/dev-python/pytest-isort/Manifest
+++ b/dev-python/pytest-isort/Manifest
@@ -1 +1 @@
-DIST pytest-isort-1.2.0.tar.gz 7285 BLAKE2B e1e2222424e338adf746f87a0210191c6c160cd141315c67c0c01822ffd6d5c5c07e6e3c2e40a131dac1f1d176cc50ea88d8f36e6560b0e89c91f739c3801faa SHA512 9ef37e1eb6020d108db0d8c3e885b4bf6dbbb51894f9390df7753a6ec792615e069dd111686896888c8342f57b3baac40cefdba41c4f9dec38db54172f3451d1
+DIST pytest-isort-1.3.0.tar.gz 7321 BLAKE2B b65bf2a4e0e8133ed0c724b22f7ae4fa61341c34e01a1de3229b37144be21dc15c44842e05ddd427addf1028d5eac496e2b84646fec8e21fe4fc05544a4e30ea SHA512 a26c5dd9428b85d1387239245c437fded84ece8148ab016de9e41be3dff72627d0e7a47176d9fa5768b366655fe7affd4f665c3d2cd6fb2f2a2e15334e1fff63
--- a/dev-python/pytest-isort/pytest-isort-1.3.0.ebuild
+++ b/dev-python/pytest-isort/pytest-isort-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
--- a/dev-python/tekore/Manifest
+++ b/dev-python/tekore/Manifest
@@ -1 +1 @@
-DIST tekore-3.4.2.tar.gz 168478 BLAKE2B dffa3dffe79c29b40e95f0f4f03e34d898cc0b7be3ce8194b813603636b0fc945bb4d2f810029dc1c3710cb55a9c7750e8b7ad2594145dac0584c545f49f9440 SHA512 755fced288c24840d7232418e8d5a4d85727e8311d7759633c8c5bef0f720ee75dae212a40943c788e10da555b63c0f41d3fd8ea0961ea7b9784b69d2247b0db
+DIST tekore-3.5.0.tar.gz 256322 BLAKE2B a0f29594eefcaa3d7d6d7a56b3b7cf850dc41b0cf96e2d3db6a4a5e3f7f1047e9a2e25578fb3eb92f553b858803b3ce1e8f0593ad6362ff4fe73f238bba2e1b0 SHA512 e09012b433f8f4e74f85b97575cc19da1a1923e8eab51ab167e7eb8500a5853e9c47a221f5373d68610507e812f5aeaa8e68cc663646b273bb6fdc5a6e52dfc4
--- a/dev-python/tekore/tekore-3.5.0.ebuild
+++ b/dev-python/tekore/tekore-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
--- a/dev-python/trio/Manifest
+++ b/dev-python/trio/Manifest
@@ -1 +1 @@
-DIST trio-0.17.0.tar.gz 488878 BLAKE2B bf24f5a80e7fed19a3efea833bd3336ebe3b164f495026913ec933e2b9f3150cdfc732bb029fb5d07b71523d811003cd8fa9fb487023c604b28c963d335adc55 SHA512 511c281aeefdd2197586aa1b3609836b06ac208cfac68b5e47af98ba9289e127899f45adc002c5750a9c868c214f04410e0077d34e20adbac5a9d0bf82b442fd
+DIST trio-0.18.0.tar.gz 484421 BLAKE2B 239cf63076f8ae2c3ea0b4c5d1b88b88e27f8d43ff85c65a6c25785d797e48746df0acffbae741ce8f5e71301b12b7fb7ce4900248db3bec375f651b8379b22b SHA512 ebed3ebee93d2dde03a5c1063b0053a885b7aef29269c0459d470c14dd5c917800a91c38304dfc505c92a32c197eb802310fee7b224beb130b920d0201f4a33e
--- a/dev-python/trio/trio-0.18.0.ebuild
+++ b/dev-python/trio/trio-0.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
--- a/games-action/ATLauncher/ATLauncher-3.4.2.6.ebuild
+++ b/games-action/ATLauncher/ATLauncher-3.4.2.6.ebuild
--- a/games-action/ATLauncher/Manifest
+++ b/games-action/ATLauncher/Manifest
@@ -1,2 +1,2 @@
-DIST ATLauncher-3.4.2.5.jar 13756449 BLAKE2B 0ebc7110d84ee4fa69b7738192cbba4e3973bb08cd165e7ca9fb95a87410d7298acc07f37b0484d1e0964637674ff810f54e09930f2061f9f4ee864e0f55bc13 SHA512 6447678b791deab5b8b09c05470d1ba971dd0988326d8fe99f1856a744fbbafe712f4afea6c4f507fe70b3033903701c595150340394ac7e633b2f15a396b820
+DIST ATLauncher-3.4.2.6.jar 13759682 BLAKE2B 12771388aa8b006cae75526fbf31645ffb183a986b376a0c25353dc6f3aa2d4c2fcaf8aecc7b88455e029b7852120fc152c820a17fe4a42289ed25f2989b28d9 SHA512 e141eec65ae485377df9f630041506fe5911c3e40dad698cd3fbe2de98257f6a2048648822285500a2d394bb1a32f4e985a0852ad3028fd8ebdb6a64fc0f217c
 DIST ATLauncher.ico 370070 BLAKE2B 992e5df968054884c21f136b8f16f2b14e8d321b2196ebc07f7a59621223ca79b896f63b21dba864f61f238ca1864039a410d8089127714163092f65d0ca7f27 SHA512 353f6dd68475778cc8e97a773e800fe532df2f6d28d5babc751cfb5ed7ef24ef6246f76d26e3e25706e458741d604bb8fa8e79cb8904900284f0f7b0f9488bfb
--- a/games-action/minecraft-launcher/Manifest
+++ b/games-action/minecraft-launcher/Manifest
@@ -1,5 +1,4 @@
 DIST minecraft-launcher-1.6.93.jar 4481683 BLAKE2B 29597977cc70f831bff7f77cb2493d8c8f8138518c79f5e92f91ed6440ae2224b4140546c37645370173c668d9db894ca6b548b6cfd41da40c4e1ff51f0d820b SHA512 85739c0c0828af5b901b9933173f08229175aef1e8dec40c83981fb6fc330285b4c3a206cdf4405408106eff56ce1e516368d18bf44f631446ebac45e9aba125
-DIST minecraft-launcher-2.2.1262_beta.tar.gz 81924041 BLAKE2B e6d87eab64320e8bb57907ce32f8fde5041e1adb5c201ef8987d1625618f149ac48610f215e8bf4a62c5224b17f30478292fa322afb4d1044c2f1c2b21be5ad5 SHA512 ab85de39e394be804d4561b19e098e62dbd15c391cfa2f511b20122c24ec4afc999c1d685f2cea89605bfa9045ed426627d2d16faac5f197d51a5acb942dc141
-DIST minecraft-launcher-2.2.909.tar.gz 81697814 BLAKE2B 066c0074df2479cabfa1e5a53a22c7fa990c70183df02643ea5b1a92092aaaf31c426102873106ad122a74a9f1af10474de98270aba058a37eaefa93b05f5a90 SHA512 d74725b49dd0bad1c9ffbaceda8fa4061e6e7367df084e84533a3adc9192c0f7f40f34c517d3731a06be127e30ca068ec1dd463f303347dc10acce5ad669ef8a
+DIST minecraft-launcher-2.2.1262.tar.gz 81924041 BLAKE2B e6d87eab64320e8bb57907ce32f8fde5041e1adb5c201ef8987d1625618f149ac48610f215e8bf4a62c5224b17f30478292fa322afb4d1044c2f1c2b21be5ad5 SHA512 ab85de39e394be804d4561b19e098e62dbd15c391cfa2f511b20122c24ec4afc999c1d685f2cea89605bfa9045ed426627d2d16faac5f197d51a5acb942dc141
 DIST minecraft-launcher-legacy.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a
 DIST minecraft-launcher.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a
--- a/games-action/minecraft-launcher/minecraft-launcher-2.2.1262.ebuild
+++ b/games-action/minecraft-launcher/minecraft-launcher-2.2.1262.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
--- a/games-action/minecraft-launcher/minecraft-launcher-2.2.1262_beta.ebuild
+++ b/games-action/minecraft-launcher/minecraft-launcher-2.2.1262_beta.ebuild
@@ -1,64 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg
-
-DESCRIPTION="An open-world game whose gameplay revolves around breaking and placing blocks"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${PV//_beta}.tar.gz -> ${P}.tar.gz
-	https://launcher.mojang.com/download/minecraft-launcher.svg"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Mojang"
-SLOT="2"
-
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.24.32-r1[X]
-	dev-libs/nss
-	dev-libs/libbsd
-	dev-libs/libffi
-	dev-libs/libpcre
-	media-libs/alsa-lib
-	media-libs/openal
-	net-libs/gnutls[idn]
-	net-print/cups
-	sys-apps/dbus
-	virtual/jre:1.8
-	virtual/opengl
-	x11-apps/xrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-"
-
-S="${WORKDIR}/${PN}"
-
-QA_PRESTRIPPED="
-	/opt/minecraft-launcher/libcef.so
-	/opt/minecraft-launcher/liblauncher.so
-	/opt/minecraft-launcher/minecraft-launcher
-"
-
-src_install() {
-	dodir /opt/${PN}
-	insinto /opt/${PN}/
-	doins -r .
-
-	fperms +x /opt/${PN}/${PN}
-
-	dosym ../${PN}/${PN} /opt/bin/${PN}
-
-	doicon -s scalable "${DISTDIR}/${PN}.svg"
-	make_desktop_entry ${PN} "Minecraft" ${PN} Game
-}
--- a/www-apps/jackett-bin/Manifest
+++ b/www-apps/jackett-bin/Manifest
@@ -1,6 +1,3 @@
-DIST jackett-bin-0.17.294-amd64.tar.gz 44583457 BLAKE2B 5ba8e70a53ff4c35e87d63037f65cca6b74df8024c1bfd9efb95f655136ee0f9fd916836f163ed4cfdd8bda51c0b117cde0d5c4af60dc3f9807f325646027057 SHA512 6c5fb01a0807ff315dad021fcba005b9829c634f54b7d74004846b5a63626a8edd233217820971d9824abc35d826feb5125fa3472a599956269678d748e83d74
-DIST jackett-bin-0.17.294-arm.tar.gz 42461074 BLAKE2B 33731e9b31c41410a6aac7f16de3f837e28b1d0885834beed9a40ac78c310f1dc0f720e1a0b93c8eddc03a20c8982991a97f49c3868b66690ef742aacece74de SHA512 e962cfa17d9f482e1851e340380649b0d86b488b5c4646455b416a6d11ed7abaac9d15e57351e30c536da956643552bafc16bd7a439a41f23385c1f964754211
-DIST jackett-bin-0.17.294-arm64.tar.gz 41829676 BLAKE2B b142f8b3c150053ce0dbcff80e1596b63c561c231d8feda37bff3f466893456c03fe343ae6f3dde57af39cb55a780f955a9e739afc2d8672c71f371f4274b91c SHA512 42e64ea82192f0f7053d312697540b68d11eb8238dd836e0402f26af090f1c198509f03f3d030d3432d6f8a3f44e4b0acc20113f8a5af7ba3096444d08f4d801
-DIST jackett-bin-0.17.311-amd64.tar.gz 44584716 BLAKE2B f4f9b81c839d27b5dbb805afe8f07dc23ac071ac2611c7e3f760952da62aca5395eafe2a0ba56e09648316a335ea87c95c5fc36e4e1a402b6a42a380db30049d SHA512 f4c77b0b7bd75ce05b238bd94a1b4e49da76ad2863ef7210b58a1a683e7cd8ad820a8b44d43831007c9924d378532b1a8622f06ccab55380da686699e69825b4
-DIST jackett-bin-0.17.311-arm.tar.gz 42463826 BLAKE2B d33dbc62acfd4a1d27315f0b3b8d5e9350be7603b3c824c60fb7dd54f7b7b51bcc3f9a7b3fc50496648ab8afd9f8e73e87840bf0024cf74c4a727da08e5873df SHA512 deafc30f87a966385afdc7b429d5c20f9f35c6f82503f80dd0c1d172def7096900699fe1159c008c2e5e2dedd823502787eab6f2bd8976525e6cc2b86bcc5531
-DIST jackett-bin-0.17.311-arm64.tar.gz 41833052 BLAKE2B 78138b909fa5890c9e90e91368fed68122e24b62b0a6f1ffc8dbf6c98fa12cd22f8880ddf48b2ebc19271b9293d488a9b6b14bd613287063477cf8cd0b67aa44 SHA512 a94b0ca55c66b44a0216a1df83bd7bdbb3beb0a8d8336d1c6d923224ca6f5a40cb7cd8c23f187196adb4712b0bba01c6578a6e5d4559ef778fe03db5a1af3598
+DIST jackett-bin-0.17.348-amd64.tar.gz 44619810 BLAKE2B d28f1fb4f829a26413f6022006a183a4f4e995e0d93c8453fc01d8d90626f77f6c46a11d34eb6a648cfb2a2e078c315a49ec2c9a93d08ce87492a8154f7c8649 SHA512 6094a8bb8062cb048dd0dea3e8eebae265dbdb7bcd17149a5a00e7ea771392e4ed3ec03097a510e141287bde4fb246ea2cb9a1e9531138fc9d0b9bc9e334916a
+DIST jackett-bin-0.17.348-arm.tar.gz 42508847 BLAKE2B e5b0bac9e741a003ae72b12f15aa1beefb6100dce27043cccd02e37fb17e4177ee92ebeaff106441574fd48e672e84caa3ed253368a5cc4dd86f67a19e4315a2 SHA512 a84600a4ea311593ea0466c4330fb4791653f228b025419a541810654b3a1fc71926b1cb2311e4d2a0f6b4a0d0df909e407221269b695dd44433d6159d653159
+DIST jackett-bin-0.17.348-arm64.tar.gz 41870487 BLAKE2B e0f98ccdf6611efa1469da324f24b9fbfbc8f6edc2ccfb62656dac613d3929947ebf34942a82b9644470bcc2772bd59a4eb210fa76afab6d611b0fa4e3b66619 SHA512 ce53f7dfa93d5166e9d8c50c8a3c1b594e3ee330acd06e48a615357f705caa54d4de7b769e8bc4e67fd2ef992a9ba3e6af0c92ee54c7429136fa99ea1e6784ff
--- a/www-apps/jackett-bin/jackett-bin-0.17.294.ebuild
+++ b/www-apps/jackett-bin/jackett-bin-0.17.294.ebuild
@@ -1,36 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="API Support for your favorite torrent trackers"
-HOMEPAGE="https://github.com/Jackett/Jackett"
-SRC_URI="
-	amd64? ( https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxAMDx64.tar.gz -> ${P}-amd64.tar.gz )
-	arm? ( https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxARM32.tar.gz -> ${P}-arm.tar.gz )
-	arm64? ( https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxARM64.tar.gz -> ${P}-arm64.tar.gz )
-"
-
-KEYWORDS="~amd64 ~arm ~arm64"
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT="strip"
-
-RDEPEND="
-	app-crypt/mit-krb5
-	dev-libs/icu
-	dev-util/lttng-ust
-"
-
-QA_PREBUILT="*"
-S="${WORKDIR}"/Jackett
-
-src_install() {
-	dodir /opt/jackett
-	cp -a "${S}"/. "${ED}"/opt/jackett || die
-	newinitd "${FILESDIR}"/jackett.initd jackett
-	systemd_dounit "${FILESDIR}"/jackett.service
-	doenvd "${FILESDIR}"/99jackett
-}
--- a/www-apps/jackett-bin/jackett-bin-0.17.348.ebuild
+++ b/www-apps/jackett-bin/jackett-bin-0.17.348.ebuild
@@ -19,6 +19,7 @@ SLOT="0"
 RESTRICT="strip"

 RDEPEND="
+	acct-user/jackett
 	app-crypt/mit-krb5
 	dev-libs/icu
 	dev-util/lttng-ust