Merge updates from master

2026-07-18 03:23:20 -04:00 · 2020-06-01 12:05:09 +00:00
parent 46772b68b9 2d3aeb3ff2
commit 49f59b8531
9 changed files with 216 additions and 7 deletions
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,4 +1,4 @@
 DIST httpx-0.11.1.tar.gz 177579 BLAKE2B a5722e997a79fd9b5c701a862abb4bf70458bf57057d2a9fb9a2dccdbbca2f4f54bf59e91437ed8ff452737a3b01d69dbf4efe3ef03d49e240bc5bf54e51ebea SHA512 4da80a0232092d2423fd95d4549df79d9885e6ce34af0480f1d5a4904c9ca0fdb725b600f603c482179ea3b7c6ee5b584a70b8c0722918ba28f1bcc5c48201ad
 DIST httpx-0.12.1.tar.gz 186169 BLAKE2B 1b118081e55a5424eafdcf756cae8c1e9d72857d4fc24472cf118e4130bcb814e307f6fae52c0de61d89303cb1a876c8cda60fb98e138745a74712a1e7f2da08 SHA512 fe978a16f945e17a27815bc65f2adf36bd2a70b6e5e3c0ee8df83172d041c3084eaf99b10f7e015fc4a3de00ed081e83a54275256f9e85bf7cd32d553b316883
-DIST httpx-0.13.2.tar.gz 175958 BLAKE2B 4a9e846a3539ab139eef2e25bd9484ea41eae30bf2ef5e6ad76588e3bf9e1793c5d0db4b722e2152c121aacf154dccb89895f2adbe1095436b858692f293dfbf SHA512 d1e2f296fb68125ff353e5705ab315b97742696455adbc420d73ec801f6360747104d1696e2a5f20438fa295e985f110a0cbc597f1580497bcb7df2365c824fd
+DIST httpx-0.13.3.tar.gz 176199 BLAKE2B d3a56c2386841909668e34eaa78d202f91ad900230b9d1d4254bfa08312312d020e081aea2839dbb57d85fa26ccfc3f093404801c4dd5c47051f3c9fd2746552 SHA512 54cdee16e8253c221c3298817ccf63a4a0d6755a86feea2aa5a2efe9af44eb1eb0a578b21f593fe28fceace17b0a0badb52a66965c35bf456ea57dd3b905ebbe
 DIST httpx-0.9.3.tar.gz 170954 BLAKE2B 420993bc556e510d8f0d1ff0f3f200d9dce98c1475d40a1f7f5047cd34600bade5e184485d88642169685bf903dedc46d988e608d1f93f718cdb550801c1bb8e SHA512 171e4ea2a19882c90ced9af995e5ecce1ff27308f95f027ddc7197a599624125d94f70f9f0a0672b6a04db0569f1eaa05a935fd8d43f517335fe26b30dc53d1a
--- a/dev-python/httpx/httpx-0.13.3.ebuild
+++ b/dev-python/httpx/httpx-0.13.3.ebuild
--- a/dev-python/tekore/Manifest
+++ b/dev-python/tekore/Manifest
@@ -1,2 +1,2 @@
 DIST tekore-1.7.0.tar.gz 191852 BLAKE2B ca0be9e5b8f4e291de87d495098f295529c75457aca466627ab2d8973365a64b40f7a618883c0178ed6482ac4d62ef95d78341992404a4bbbec803fe939afcfb SHA512 a62b456621633e05edb39944e0cf36a0df092468c9e238f6028f8ea684613e37c32f5257d6fb681c758e01f451e2f3d0993f5fa9344463e9f12b5945add161b0
-DIST tekore-2.0.0.tar.gz 200852 BLAKE2B e4611083dd442e557b05924335ac2607aa02e9894e95d129bc78d5eff477c0eecf6ab797c6d683e64230a45cca7c301c02ec31f6a0c7430dd8375dbbad98ad6f SHA512 a1f9584ff3d43e160761a93f7150265e37f974a28aacb7071d29ccb10de769ad1cda7e402b94edec6207e08d5724b2c7a65ac1dbc8b4849b7819c3f6f15a8df0
+DIST tekore-2.1.0.tar.gz 201657 BLAKE2B 239abbf2e5c0093cf59e568ae6cbe62c9a4ee62c669b83071681df14219d12e30884ba0d809c154c3b7b4030939fc3102d1b5333f81a5ee6be9b97b8f380c3e4 SHA512 f32b4e3ff07c11628b1b0ae504b7b8671632819d848864d9ab5310fbb8f5c83c3096eb794d24ee6487d2f35ec32c7c4e9ee23a04036d4a3615912bf185839af2
--- a/dev-python/tekore/tekore-2.1.0.ebuild
+++ b/dev-python/tekore/tekore-2.1.0.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	>=dev-python/httpx-0.11.1[${PYTHON_USEDEP}]
-	<dev-python/httpx-0.13[${PYTHON_USEDEP}]
+	<dev-python/httpx-0.14[${PYTHON_USEDEP}]
 	media-sound/spotify
 	$(python_gen_cond_dep 'dev-python/dataclasses[${PYTHON_USEDEP}]' python3_6)
 "
--- a/media-video/kikoplay/Manifest
+++ b/media-video/kikoplay/Manifest
@@ -1 +1,2 @@
 DIST kikoplay-0.6.2.tar.gz 7520940 BLAKE2B 4015463b137a7605107a87db86d56658ef5e563374f67cc42f401d71ef2b72be10c9b817b90cb294674c9ee4a285fd908521be7b01fa37df879214c3c37c54a2 SHA512 c436da509b89d3ecb0e86cb195cb058fbe594e643959f24a91792b69ce2649ef5186116bc4b3e01b14bcb7286d30303276d48d4f0b2db45d6fbf385e370b8db5
+DIST kikoplay-0.7.0.tar.gz 7721267 BLAKE2B 33e1afa2485b8fe35bc88b1557f825823a501d82927c5e65f9bda87e45b9bc7c257c5cce3f0e6462bf0cb216f4b9559575afdcc136c3230d0a6f2505be367f0d SHA512 38478ce735eba6363061ec235054e2021b89a5f4277b28fa4e03271cfd003e85b3e77285aafb06db8df4e62f01e1fc39f721c66af014f54c8d4e6b18c4ba91f1
--- a/media-video/kikoplay/kikoplay-0.7.0.ebuild
+++ b/media-video/kikoplay/kikoplay-0.7.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+GIT_PN="KikoPlay"
+
+inherit qmake-utils xdg
+
+DESCRIPTION="KikoPlay is a full-featured danmu player"
+HOMEPAGE="
+	https://kikoplay.fun
+	https://github.com/Protostars/KikoPlay
+"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Protostars/${GIT_PN}.git"
+else
+	SRC_URI="https://github.com/Protostars/${GIT_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~m68k ~mips ~ppc ~ppc64 ~s390 ~x86"
+	S="${WORKDIR}/${GIT_PN}-${PV}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+# Please unmask dev-lang/lua:5.3 in /etc/portage/package.unmask/lua
+# Waiting for dev-lang/lua:5.3 unmasked in ::gentoo
+# With out dev-lang/lua:5.3, this package can't work
+# See also: https://github.com/gentoo/guru/issues/9
+RDEPEND="
+	dev-lang/lua:5.3
+	dev-libs/qhttpengine:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	media-video/mpv[libmpv,-luajit]
+	net-misc/aria2
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	eqmake5 PREFIX="${D}"/usr
+}
+
+src_install() {
+	# Can't use default, set INSTALL_ROOT
+	emake INSTALL_ROOT="${D}" install
+}
--- a/media-video/kikoplay/kikoplay-9999.ebuild
+++ b/media-video/kikoplay/kikoplay-9999.ebuild
@@ -50,10 +50,6 @@ BDEPEND="
 	virtual/pkgconfig
 "

-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.2-fix-define.patch # fix define problem
-)
-
 src_configure() {
 	eqmake5 PREFIX="${D}"/usr
 }
--- a/net-misc/castor/Manifest
+++ b/net-misc/castor/Manifest
@@ -11,6 +11,7 @@ DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1
 DIST cairo-rs-0.8.1.crate 46018 BLAKE2B f3879b08d404495a401df205a4e51c67caa36722e0661b6eb3bc6c1dc830d52b01149d4cb27ad2c40b4870771f9f5f356ed1cd02c879dcce3bba5e18fd81b7a8 SHA512 33ec3b7b1069934aae88b76c11a6be76974fdc6d2eedee3e6d20328a4a2df7d248960a3fa4de7deb696f6c0dd332f77f9d8004cdf0bc36be1187cbb5ccf9b682
 DIST cairo-sys-rs-0.9.2.crate 11650 BLAKE2B ac664b7976de57907ae543c1afc2fd8fe166b2a147e1be31d6f60aec0b08949bb53b9f59c16e02f33a299a225f8e8202c5d7ad744c6aa8c5f03ec421a773ff33 SHA512 cab877b76951212710c7e668093fda218ac9c7e1e26fcffc448d759a3f968a7faeeea347025189a1aee7579b15916c141d0d727f986bb7061183a695b52bf39b
 DIST castor-0.8.11.tar.gz 91340 BLAKE2B d7ea232ca841a75039f6f38c82e7268388d35dfe622864cad19b6056d1ed568e9d9ed3cbbe9c471eb82187d1a2d22f7cb836a245fe33a2366aeeddfb0493de60 SHA512 ae150f83a4f2a4959cbd3575cc252e0d68e8a3311b84c3f446e1a9efd31add5c1190707038353f169f90ac8246f5e8e8005eb62eebb9a7ead33417652d72ecce
+DIST castor-0.8.12.tar.gz 91403 BLAKE2B 486f235efe1a03a16a784903cccc1c832a9cffbc9409653c3002685f1cad005229939233999254e4488654552bf54a346054aab1e572e026adc6290b66fb8f27 SHA512 95449344540eda24639d49c4a4eb02c408a065c4b6700d5267dc01fd5495c3757fb95b3635f29ea5e57c2abcd97565f6a0b93498b76f47bea8030cd110ff8468
 DIST cc-1.0.52.crate 51006 BLAKE2B a19083042845bc1fcead482b1e644ce09701fc97aad60afc0750d7ee191e26257e5c926fb5a70bef8cc5a37a694581e6098a29c56e63868d67302bb270a8f8f8 SHA512 50558f9b76748298568a1e010ab85b0a0e1cf47d6f8589de718aac0afc130158b092e1be11b73bb1ff51d3a281c5e6ad72ecad5bce9dbff90b4c330c8d95dd90
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
--- a/net-misc/castor/castor-0.8.12.ebuild
+++ b/net-misc/castor/castor-0.8.12.ebuild
@@ -0,0 +1,151 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# NOTE: Generate new list with `cargo-ebuild ebuild` on every bump.
+CRATES="
+	aho-corasick-0.7.10
+	ansi-parser-0.6.5
+	arrayref-0.3.6
+	arrayvec-0.5.1
+	atk-0.8.0
+	atk-sys-0.9.1
+	autocfg-1.0.0
+	base64-0.11.0
+	bitflags-1.2.1
+	blake2b_simd-0.5.10
+	cairo-rs-0.8.1
+	cairo-sys-rs-0.9.2
+	cc-1.0.52
+	cfg-if-0.1.10
+	constant_time_eq-0.1.5
+	core-foundation-0.7.0
+	core-foundation-sys-0.7.0
+	crossbeam-utils-0.7.2
+	dirs-2.0.2
+	dirs-sys-0.3.4
+	foreign-types-0.3.2
+	foreign-types-shared-0.1.1
+	futures-channel-0.3.5
+	futures-core-0.3.5
+	futures-executor-0.3.5
+	futures-io-0.3.5
+	futures-macro-0.3.5
+	futures-task-0.3.5
+	futures-util-0.3.5
+	gdk-0.12.1
+	gdk-pixbuf-0.8.0
+	gdk-pixbuf-sys-0.9.1
+	gdk-sys-0.9.1
+	getrandom-0.1.14
+	gio-0.8.1
+	gio-sys-0.9.1
+	glib-0.9.3
+	glib-sys-0.9.1
+	gobject-sys-0.9.1
+	gtk-0.8.1
+	gtk-sys-0.9.2
+	idna-0.2.0
+	lazy_static-1.4.0
+	libc-0.2.70
+	log-0.4.8
+	matches-0.1.8
+	memchr-2.3.3
+	native-tls-0.2.4
+	nom-4.2.3
+	once_cell-1.4.0
+	open-1.4.0
+	openssl-0.10.29
+	openssl-probe-0.1.2
+	openssl-sys-0.9.56
+	pango-0.8.0
+	pango-sys-0.9.1
+	percent-encoding-2.1.0
+	pin-project-0.4.16
+	pin-project-internal-0.4.16
+	pin-utils-0.1.0
+	pkg-config-0.3.17
+	ppv-lite86-0.2.6
+	proc-macro-hack-0.5.15
+	proc-macro-nested-0.1.4
+	proc-macro2-1.0.12
+	quote-1.0.5
+	rand-0.7.3
+	rand_chacha-0.2.2
+	rand_core-0.5.1
+	rand_hc-0.2.0
+	redox_syscall-0.1.56
+	redox_users-0.3.4
+	regex-1.3.7
+	regex-syntax-0.6.17
+	remove_dir_all-0.5.2
+	rust-argon2-0.7.0
+	schannel-0.1.19
+	security-framework-0.4.4
+	security-framework-sys-0.4.3
+	serde-1.0.110
+	serde_derive-1.0.110
+	slab-0.4.2
+	smallvec-1.4.0
+	syn-1.0.21
+	tempfile-3.1.0
+	thread_local-1.0.1
+	toml-0.5.6
+	unicode-bidi-0.3.4
+	unicode-normalization-0.1.12
+	unicode-xid-0.2.0
+	url-2.1.1
+	vcpkg-0.2.8
+	version_check-0.1.5
+	wasi-0.9.0+wasi-snapshot-preview1
+	winapi-0.3.8
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo desktop xdg
+
+DESCRIPTION="A graphical browser for plain-text protocols"
+HOMEPAGE="https://git.sr.ht/~julienxx/castor"
+SRC_URI="
+	https://git.sr.ht/~julienxx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})
+"
+
+LICENSE="Apache-2.0 BSD-2 CC0-1.0 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/openssl
+	x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	xdg_src_prepare
+
+	# Upstream uses forks to support LibreSSL. We revert to official sources.
+	sed -Ei 's/(native-tls|openssl(-sys)?) = \{.+/\1 = "*"/' Cargo.toml || die
+}
+
+src_test() {
+	# FIXME: test absolute_url::test_make_absolute_just_path fails without this,
+	# but I couldn't reproduce it.
+	RUST_BACKTRACE=1 cargo_src_test
+}
+
+src_install() {
+	cargo_src_install
+
+	einstalldocs
+	newdoc data/castor_settings.toml.example settings.toml.example
+
+	doicon data/org.typed-hole.castor.svg
+	for icon in data/org.typed-hole.castor-*.png; do
+		local size=$(grep -Eo '[0-9]{2,3}' <<<${icon})
+		newicon --size ${size} ${icon} $(basename ${icon/-${size}/})
+	done
+	domenu data/Castor.desktop
+}