diff --git a/app-editors/typora-bin/Manifest b/app-editors/typora-bin/Manifest index aa2a5bb957..566140d5fe 100644 --- a/app-editors/typora-bin/Manifest +++ b/app-editors/typora-bin/Manifest @@ -1 +1 @@ -DIST typora-9999-linux-x64.tar.gz 90347518 BLAKE2B 09ad07338afd4f91769f317edfda60b006a7b20b328ea7e74dfe742e7d20d81333e951532ce869961509cca7000f34295a328cc919b7450dd3bd0a7ead49afd7 SHA512 0ab3a1c0bdd32fe1b7311e1d02f6962a477c7209710c95fd66d1490a3cba3b823263baa42305250ad8ef113394b8a5faec3f9a2557ecd3402dc5aa5134c3c602 +DIST typora_0.10.7_amd64.deb 67149180 BLAKE2B b1ede052143ae96136941768e586dcd60df64504c182e01e837bf16c343523ad87553401b725e472698e7ad0aaedb326366c01b470778ca279af214508fc1320 SHA512 ccfe965514b71b31e1c8f986e1ea46976c6a0f87edc65f04e936897bc417880f0b915e4539eb50114125206a75235762a01d02ca16a9f6063da1adc812127226 diff --git a/app-editors/typora-bin/typora-bin-9999.ebuild b/app-editors/typora-bin/typora-bin-0.10.7.ebuild similarity index 56% rename from app-editors/typora-bin/typora-bin-9999.ebuild rename to app-editors/typora-bin/typora-bin-0.10.7.ebuild index 19b801b33e..e87604f14f 100644 --- a/app-editors/typora-bin/typora-bin-9999.ebuild +++ b/app-editors/typora-bin/typora-bin-0.10.7.ebuild @@ -3,15 +3,15 @@ EAPI=7 -inherit desktop xdg +inherit unpacker xdg DESCRIPTION="a markdown editor,markdown reader." HOMEPAGE="https://typora.io" -SRC_URI="https://typora.io/linux/Typora-linux-x64.tar.gz -> typora-${PV}-linux-x64.tar.gz" +SRC_URI="https://typora.io/linux/typora_${PV}_amd64.deb" LICENSE="Typora-EULA" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="-* ~amd64" IUSE="" DEPEND="" @@ -39,20 +39,9 @@ RDEPEND=" BDEPEND="" QA_PREBUILT="*" - -src_unpack() { - if [ ${A} != "" ]; then - unpack ${A} - fi - S="${WORKDIR}/bin/Typora-linux-x64/" -} +S="${WORKDIR}" src_install() { - insinto /opt/ - doins -r "${S}" - newicon "$S/resources/app/asserts/icon/icon_512x512@2x.png" "${PN}.png" - dosym ../../opt/Typora-linux-x64/Typora /usr/bin/Typora - fperms 0755 /opt/Typora-linux-x64/Typora - fperms 4755 /opt/Typora-linux-x64/chrome-sandbox - domenu "${FILESDIR}/Typora.desktop" + mv "${S}"/* "${ED}" || die + mv "${ED}/usr/share/doc/${PN//-bin}" "${ED}/usr/share/doc/${PF}" || die } diff --git a/app-emulation/arnold/metadata.xml b/app-emulation/arnold/metadata.xml index 257786bedf..86a1bf921a 100644 --- a/app-emulation/arnold/metadata.xml +++ b/app-emulation/arnold/metadata.xml @@ -2,8 +2,8 @@ - mazes-80 - mazes-80@none.org + Samuel Bauer + samuel.bauer@yahoo.fr Use inkz80 processor emulation diff --git a/games-action/blackvoxel/metadata.xml b/games-action/blackvoxel/metadata.xml index ffffe40227..c04f7b6646 100644 --- a/games-action/blackvoxel/metadata.xml +++ b/games-action/blackvoxel/metadata.xml @@ -2,7 +2,7 @@ - mazes-80 - mazes-80@none.org + Samuel Bauer + samuel.bauer@yahoo.fr diff --git a/games-emulation/mupen64plus-qt/metadata.xml b/games-emulation/mupen64plus-qt/metadata.xml index ffffe40227..c04f7b6646 100644 --- a/games-emulation/mupen64plus-qt/metadata.xml +++ b/games-emulation/mupen64plus-qt/metadata.xml @@ -2,7 +2,7 @@ - mazes-80 - mazes-80@none.org + Samuel Bauer + samuel.bauer@yahoo.fr diff --git a/games-emulation/yuzu/metadata.xml b/games-emulation/yuzu/metadata.xml index de9ad3b9ba..ac55d48f0c 100644 --- a/games-emulation/yuzu/metadata.xml +++ b/games-emulation/yuzu/metadata.xml @@ -2,8 +2,8 @@ - mazes-80 - mazes-80@github.com + Samuel Bauer + samuel.bauer@yahoo.fr Enable the Boxcat service, a yuzu high-level implementation of BCAT diff --git a/media-video/jellyfin-desktop/Manifest b/media-video/jellyfin-desktop/Manifest index 8daa4b50de..1e1f40df54 100644 --- a/media-video/jellyfin-desktop/Manifest +++ b/media-video/jellyfin-desktop/Manifest @@ -1,3 +1,3 @@ -DIST jellyfin-desktop-1.10.2.tar.gz 462478 BLAKE2B b8fa8642dda49323ae86f6b2848fbf1e65b4f993448a3dc922416cf16051e9ed1e971932ce0ebfd5c6e9f9682f365c2e3a6eeace28c24b4a304235cb30a0d212 SHA512 32ecbb30e08ade248c9e5233984253b0805185efb53b990800ced0ee119e409549ee2282e551bf13c5403c55761d47541a3d319b74fe672e96d10511a7c89738 +DIST jellyfin-desktop-1.10.2.tar.gz 462456 BLAKE2B b2a97937e016e8e998f48a5baf6fb20d2feaeefaeda0db484c6004752cae81f70846630a4baff29b49aa4d40e72d46642cca77a658784d5f089e6adffa30afca SHA512 fff04450a7f948bc234797a11af143b75da7c8fcd116c1777e4d004998803ce18cb235e81e84ec0028a3f4e29e3bfc510cb6b3be1f0b131e963b03771da6010a DIST jellyfin-mpv-shim-shader-pack-1.1.0.tar.gz 1326518 BLAKE2B ef1d1c699698cc62163b903e20e4a9cbad14169f2aca1058e58da5102e72be4291504cbad5bb877820fb7d4ed6749b04319bca7d210bfcf103693be9a0cc4e69 SHA512 26cacd859c0d0fef06fbd598007f291a652fd52d617af2df71104f705156ae78665dee2ae963f3e7bdb01e91d3fa41f555824a47f9d621d1627a06b2b5f9ba75 DIST jellyfin-web-1.7.0.zip 34771390 BLAKE2B cab30609bda5936b5a9d3f9a0a9d59ceec88abf8e80e9ddc3e00b2d3a5f20e5cef28318b13b9c529cd1a175ebc87376348471b19d0de2ef92f4e584ee45c672a SHA512 ab674911f20172b56baf06ea0cccb9b89083266661f1b9aecc2e620735de901d355a7f0f93e1b9e109e00b1e8097bd5aa1b185f3e4670ee9f22e38bbaa84f5d2 diff --git a/sys-apps/dool/dool-0.8_pre20191010.ebuild b/sys-apps/dool/dool-0.8_pre20191010-r1.ebuild similarity index 93% rename from sys-apps/dool/dool-0.8_pre20191010.ebuild rename to sys-apps/dool/dool-0.8_pre20191010-r1.ebuild index ae22099fda..92ce074f94 100644 --- a/sys-apps/dool/dool-0.8_pre20191010.ebuild +++ b/sys-apps/dool/dool-0.8_pre20191010-r1.ebuild @@ -31,6 +31,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch" +) + src_compile() { : } diff --git a/sys-apps/dool/dool-9999.ebuild b/sys-apps/dool/dool-9999.ebuild index ae22099fda..92ce074f94 100644 --- a/sys-apps/dool/dool-9999.ebuild +++ b/sys-apps/dool/dool-9999.ebuild @@ -31,6 +31,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch" +) + src_compile() { : } diff --git a/sys-apps/dool/files/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch b/sys-apps/dool/files/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch new file mode 100644 index 0000000000..05db739070 --- /dev/null +++ b/sys-apps/dool/files/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch @@ -0,0 +1,43 @@ +From 67b58a3e453d6a7b9c225c1f210e20fe2605908a Mon Sep 17 00:00:00 2001 +From: Florian Schmaus +Date: Mon, 3 May 2021 19:34:41 +0200 +Subject: [PATCH] Key for key in dool_disk_avgqu.py to avoid KeyError + +Running "make test" may fail with: + +Traceback (most recent call last): + File "./dool", line 2899, in + main() + File "./dool", line 2751, in main + scheduler.run() + File "/usr/lib/python3.7/sched.py", line 151, in run + action(*argument, **kwargs) + File "./dool", line 2847, in perform + o.extract() + File "", line 63, in extract +KeyError: 'rq_ticks' +make: *** [Makefile:38: test] Error 1 + +See https://bugs.gentoo.org/784704 +--- + plugins/dool_disk_avgqu.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/plugins/dool_disk_avgqu.py b/plugins/dool_disk_avgqu.py +index 5da8d4666d5c..bc421a82028a 100644 +--- a/plugins/dool_disk_avgqu.py ++++ b/plugins/dool_disk_avgqu.py +@@ -60,6 +60,10 @@ class dstat_plugin(dstat): + ) + + for name in self.vars: ++ # Avoid KeyError: 'rq_ticks' ++ # See https://bugs.gentoo.org/784704 ++ if 'rq_ticks' not in self.set1[name] or 'rq_ticks' not in self.set2[name]: ++ continue + self.val[name] = ( ( self.set2[name]['rq_ticks'] - self.set1[name]['rq_ticks'] ) * 1.0 / elapsed / 1000, ) + + if step == op.delay: +-- +2.30.2 + diff --git a/www-client/browsh/browsh-1.6.4_p1.ebuild b/www-client/browsh/browsh-1.6.4_p1.ebuild index 461a3efb07..b545972d91 100644 --- a/www-client/browsh/browsh-1.6.4_p1.ebuild +++ b/www-client/browsh/browsh-1.6.4_p1.ebuild @@ -207,7 +207,7 @@ SRC_URI=" " S="${WORKDIR}/${PN}-${COMMIT}/interfacer" -LICENSE="Apache-2.0 BSD BSD-2 LGPL-2.1 MIT MPL-2.0" +LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-3.0 ISC LGPL-2.1 MIT MPL-2.0" SLOT="0" KEYWORDS="~amd64 ~arm64" diff --git a/www-servers/thin/thin-1.8.0.ebuild b/www-servers/thin/thin-1.8.0.ebuild index 3ea7476f74..9f43ab6033 100644 --- a/www-servers/thin/thin-1.8.0.ebuild +++ b/www-servers/thin/thin-1.8.0.ebuild @@ -5,6 +5,10 @@ EAPI=7 USE_RUBY="ruby24 ruby25 ruby26" +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + inherit ruby-fakegem DESCRIPTION="This a Ruby gem that delivers a thin and fast web server" @@ -22,8 +26,6 @@ ruby_add_depend " dev-ruby/rack " -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - all_ruby_prepare() { # Fix Ragel-based parser generation (uses a *very* old syntax that # is not supported in Gentoo) @@ -49,8 +51,8 @@ all_ruby_prepare() { -e '/tracing routines (with NO custom logger)/,/^ end/ s:^:#:'\ spec/logging_spec.rb || die - find spec/perf -name "*_spec.rb" -exec \ - sed -i '/be_faster_then/ i \ pending' {} \; + # Remove failing perfomance tests + rm -r spec/perf || die sed -i -e "s/Spec::Runner/Rspec/" spec/spec_helper.rb || die # nasty but too complex to fix up for now :( @@ -58,16 +60,16 @@ all_ruby_prepare() { } each_ruby_configure() { - ${RUBY} -Cext/thin_parser extconf.rb || die + ${RUBY} -Cext/thin_parser extconf.rb || die } each_ruby_compile() { - emake V=1 -Cext/thin_parser - cp ext/thin_parser/thin_parser.so lib/ || die + emake V=1 CFLAGS="${CFLAGS} -fPIC" DLDFLAGS="${LDFLAGS}" -Cext/thin_parser + cp ext/thin_parser/thin_parser.so lib/ || die } all_ruby_install() { - ruby_fakegem_binwrapper thin + ruby_fakegem_binwrapper thin } all_ruby_install() {