diff --git a/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild b/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild index a467dbdff9..a550f7b13c 100644 --- a/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild +++ b/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild @@ -10,16 +10,16 @@ DESCRIPTION="TTS engine with extended languages support (including Russian)" HOMEPAGE="https://rhvoice.su https://github.com/RHVoice/RHVoice" SRC_URI=" https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz - l10n_en? ( https://github.com/RHVoice/evgeniy-eng/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-eng-4.0.tar.gz ) + l10n_en? ( https://github.com/${MY_PN}/evgeniy-eng/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-eng-4.0.tar.gz ) l10n_ru? ( - https://github.com/RHVoice/evgeniy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-rus-4.0.tar.gz - https://github.com/RHVoice/victoria-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-victoria-4.0.tar.gz + https://github.com/${MY_PN}/evgeniy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-rus-4.0.tar.gz + https://github.com/${MY_PN}/victoria-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-victoria-4.0.tar.gz ) " S="${WORKDIR}/${MY_PN}-${PV}" CMAKE_REMOVE_MODULES_LIST="Hardening VersionFromGit" -LICENSE="l10n_pt-BR? ( CC-BY-SA-4.0 ) BSD GPL-2 GPL-3+ LGPL-2.1+ MIT" +LICENSE="l10n_pt-BR? ( CC-BY-SA-4.0 ) BSD GPL-2 GPL-3+ LGPL-2.1+" KEYWORDS="~amd64 ~x86" SLOT="0" IUSE="ao bindist cli client portaudio +pulseaudio +server +speech-dispatcher utils" @@ -54,6 +54,7 @@ RDEPEND=" " BDEPEND="${DEPEND} dev-cpp/cli11 + dev-libs/rapidxml dev-libs/utfcpp " REQUIRED_USE="|| ( ao portaudio pulseaudio )" @@ -91,8 +92,9 @@ src_prepare() { sed 's|/systemd/system||' \ -i src/service/CMakeLists.txt || die - rm -r src/third-party/{sonic,tclap,utf8} || die - sed "/sonic/d" -i src/third-party/CMakeLists.txt || die + sed -e "/sonic/d" \ + -e "/set(RAPIDXML_INCLUDE_DIR/d" \ + -i src/third-party/CMakeLists.txt || die sed "/set(UTF8_INCLUDE_DIR/d" -i src/CMakeLists.txt || die sed 's/ "RHVoice_question_match"//' \ @@ -136,10 +138,9 @@ src_configure() { -DWITH_PULSE=$(usex pulseaudio) -DWITH_PORTAUDIO=$(usex portaudio) # src/third-party/CMakeLists.txt - -DRAPIDXML_INCLUDE_DIR="${S}"/src/third-party/rapidxml + -DRAPIDXML_INCLUDE_DIR=/usr/include/rapidxml -DUTF8_INCLUDE_DIR=/usr/include/utf8cpp ) - append-cppflags -std=gnu++11 cmake_src_configure } diff --git a/app-misc/cheat/Manifest b/app-misc/cheat/Manifest index 8067e9d327..774759353c 100644 --- a/app-misc/cheat/Manifest +++ b/app-misc/cheat/Manifest @@ -1,9 +1,6 @@ -DIST cheat-4.2.0.tar.gz 1565865 BLAKE2B ffcdcb5beae2009549d8fd7f4f3c520439321736e56b23c731b3415fa7a212c9f700f63ae22c133f939d7ed39cc6eca9cee68afdc6065d9fcf7df7f177f9c626 SHA512 88c4ccb8c14730c1194144d03cac7b5b3fe6cd0f03db8ff5cfd8993966e68ae88d1ab1c241a3cd364f92540cd0351738a04e91e73ab85a583f4c0e99ce6e581e DIST cheat-4.2.1.tar.gz 1649032 BLAKE2B 131c6f82b2bc94ccc1fcea0d8f68e5cbab7718643d411e6b8a9cdb7ded89ae8785e728a4014e7bfdd60c82f4b07f659317840395fc8cd601780cd93a72f656a6 SHA512 bf461f4d27b8fe15c6aaf5f57a61dfa5790f4ac9953c72d2eebbe7b235f5f593c84397a2d348e448aa91a93f5551df6d27cb4096d72d95b8d7fa8f0a7dc8ec46 DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod 36 BLAKE2B d0745757255951a92d471fdb1eeaae2e118d367caf0fcea00a405536d7e30609f22276e7a453aac1ca38063635df798a0843f279c178d394a7cbef9c9f9b3c27 SHA512 87ff97fea3e25aa903503e56fe5afc337918f7253dd7175833adb144a7296451a7d4ebd76df504737a5b4c5237b1102920728d21a587957d5d25db5d38e1217b DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip 73310 BLAKE2B b0aaa346be477c14bd504f98219659c8a82ba08afdd94f1a5ffbb44cfcb6cc9b014c1ee35aec6071d4733134931e6d2a569940e9f1f06a5e69b00f56d82579e9 SHA512 adf9a3b8bda92edd028f497ca10648900a7aac4dae9372469b511afc74e79f8b990e448f375ab2a8df651a491bab5413196c06db531adc10358865f74de6f26b -DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.2.mod 687 BLAKE2B b987855d98e0e6181e8f28c12976081b5e0699cffc79b0721c811eaf6962e6edc5a01135519f787eac6d38e742517aa4d6e061ac4e5ba986e5c5e0cbd2a19177 SHA512 bf5c7b4933d685d90882099aa8c5bc33f8ec58e5a35138180b58771185306b6119cfaab319a43ade929b4560be9746f9155c8d55d1755df12b177613982c7617 -DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.2.zip 816641 BLAKE2B 5ca6160412d4760ff0d7cbe7a5805bf2af26402dedeb3ee46cff993db6c7d88dff20d21e69f4959798515531bb7cc21ec3383963cd310efabb97a7b8bdcc79cc SHA512 431e8a1e183f2bd140fdfcca245fa4fe7c7ab096f17ae3b91f66e0198bc3d58b6242d68cc784d307333b6746d72ea58d6f46ec2611913f8babac92f83ece755e DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.1.mod 687 BLAKE2B 037093f3c31b25f31fdb74e339017a8d9b9d8288c45e17b0f3e2fa68dc2e202a497de538003135ccb129e5011085188ab1cfc170982bd681a318469734931b51 SHA512 3446750138a9161864d481e2ffdb0076dca59e2b0ea4dc9538d40f024b499f4a632e128be53a7da3ecbb4b3205d60ba10890376ff7212fccd8443e77f1aa41ad DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.1.zip 844766 BLAKE2B 502d3f48542d93e652d32cc95487df9ad03d7e0a6278b3a67ad2d7e8a0b9551241275d44c9688e96d09d5dad81d70100d8d21729f3ee996f1294dbb30d8e95c2 SHA512 ffdc4ccb5b9335406d699bad88a1a1d62b6da4d47c74c1c5a26b6247e2650819a7550bbe6e02b2b2e606d7cfe6f402c8cc8f6309816d8bca6c34921f63146b6c DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod 36 BLAKE2B 60ece6720c6735e5b01efc335fef7d7f1186087068e573d5fa073b811053ea60b761350f9c371dada8cdeb5b285911c4ff87495b800f9c19ffeb69739f4b143b SHA512 971e35af5346054a0930f5543dc936c5f32ca801433d3ca26461ae7c1583b4f814376e8880f4d5329c46c36a3bde5ee4290b825bf19fd70c6bf2fbbab03f8ff1 @@ -17,17 +14,13 @@ DIST github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d9 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb -DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod 34 BLAKE2B 900b7c39f85b3c32ae1cdcb56063defb238ec2dd7620f1a13b0a7b7a5c1eb237854d00d7a6063cc546fb6c7a41bb0fe6d71ba4589bca57d8dd1183a806685f9e SHA512 91475e539eb45a642590606c6174f07b3461691aa18cc232362694890b446a7f033834676273e33cac54db288a793fd70d07d5997997716f954d1806ac879091 -DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip 691188 BLAKE2B a59e078427dcfedf06e31b212306e6c1bf0ba16248a86b5b3bfabe913acab2ef35b6d3f9f6b165cd773cffc9f030f1aa930e1a3dea7e066820949703962614bb SHA512 009731d05f05cfa69b710df82c894a2f31a53bd90aa3554b34bffc9f304548e5ed5c1142338e8917fd526e0fc54d1b5cb010eba8508a689efa0d852bdfe484c4 DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.mod 34 BLAKE2B 900b7c39f85b3c32ae1cdcb56063defb238ec2dd7620f1a13b0a7b7a5c1eb237854d00d7a6063cc546fb6c7a41bb0fe6d71ba4589bca57d8dd1183a806685f9e SHA512 91475e539eb45a642590606c6174f07b3461691aa18cc232362694890b446a7f033834676273e33cac54db288a793fd70d07d5997997716f954d1806ac879091 DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.zip 692349 BLAKE2B 02c92a8873c16c3cc5d0f558e760e4f6f9a7c08b4d16b264a667c6a78f42264aa156cd1ef4740b08c8d417d9b138d8dabdbf47cd4e28c2708a6650f9adb4c0c6 SHA512 0e0de83ae85cbd89d7594697a9e1786338cf2f27083f2fe3f95d5eb127fe488169472a5efc59bd5023ee3a27eff2074aa4ec2909ccffa38aedd83c529fa2c9a2 DIST github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod 35 BLAKE2B 03d1120023db31c39a39e5b7f336b05bed30e652c890e12986c81778e49c771e97e8ff0dcbb053f00627ffdb229223b385a9524fa1d35ee83860ca3e0b0701e8 SHA512 7f90935b89bc2fc83b0f52d0090d8cc3f7262415b1feb9c19420f663da4ab8d87bb5cf42c2a558038c57e3e772b468132509b45fe40a4993d0b64b80aeb64ebf DIST github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.zip 45402 BLAKE2B bcaba5db279468e0879501ec5f859edc4d600d777fad112a7f679b915ca14fce6b8f7b2e0b75d3d76f11d6ee37710c03c83d70e2fb2b793b2f9f1656e52a3a92 SHA512 15d0c4f21eb5fbc1546b79e7c52c553859835fdd2850b82fe03edf5419779c33449074d9ac353e99340096b138c72ef98ca057eb51e0d7777d2d926a847836f2 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d -DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce -DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb9430e2e7b497ace820ab8c47dcde253226e54f08b922404df7ba7a2dc74555a059e95b81471dc36fc5b63b55e385004fd9a16d61f SHA512 9fbff125d97ce2c4b9b301021a987edbeb686b37927504df4e5c2f0ddbebc8ed28ee5152de7db2eceb0a0fc5728579823dc4145f36df9ba1961b9c2da1ac4461 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5 @@ -38,31 +31,23 @@ DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e003600 DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod 78 BLAKE2B 7cde27fce0ec4a1c5c2e5205fb962352037c873d6183a6c1d8a9d385fe6a3bc8c9b66590401f8a715960858576d100626889e02361860bde65f8b66074d93837 SHA512 ee531fe5de94a4f4fc57592864a42beaf57be600d3fc11205ff79b44615429ccf46922cc3d80ab8df77b2db31a85bf40248ce0b1e1079d6861f317828b3305ea DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip 13281 BLAKE2B eb14a393cfba4230af192cd76a63a20568fe80ff650113640eb63d880c276307e792b0bc3339ea37f1387f78ee5e9f15a8ff66d0c4b8c8cfb09fddb1e73288fc SHA512 96747fb5890efdf10e0793afc08df1ced6dc8c71462397a0e4149f32f77470f1af6bf8fb2637693497d33a2a7483c4609380ee89ee0a85ce21102a32b7a1000e DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0 -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c -DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip 52931 BLAKE2B e511ef9edf7d968d848e021658001daefe7c8cc7169b1c6984ca5388fc4d6a5f54def9060483e57392711617892d21322d9de099234901bd1c251e57e6489f6b SHA512 e3d8a20d1cc351b8944579988feff39cb0aa3e1f2aacf2e2307180c25c153a0473f2a5a3ebda9d96868cb1f477ccccffdce06b117be7fa5409b2d1926b4c270a DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod 281 BLAKE2B 15a1cb67527ae81338a77cffa1432cd83c798bd7094eadfbc88a7eb79f5236690dc2d5c93e3daefedb396516c41bf05da21b5e12966f69fd2663e7621267d015 SHA512 7af123ea69147856e23249740b882d90213ccc3f19cf698d960dd5950fa3f3f72c600854c5e0bb94977e6c5eab617736dcd20e180eebf599399215ad8c5c0051 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip 55374 BLAKE2B 39f93770143cb70ef29156c1d31247bcab91ca7cc02f4164ed28a98769f1eede3e680b9b41dc55371a4dcbfe27b92bfce546ee2f1ca447f8623fb3fd88174888 SHA512 908f2454a0722d403aa33ea6cd1d40617ae8b84c62efc9a5de0bcf9c40413b6ba8412ac831e4b54b237190131be56e23266a9e18b0b680da5fd588e889985da3 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.zip 1913147 BLAKE2B b29c9c32f5141a45284bb17e0236b0650a8bc60da0326e47e153563ba2259b5e30d043db1d1aa5bf98cb80b28f5481483a3b2c33776e8c40ccc6e2955b440dbd SHA512 26e655cb67ad0630e05c176a342135ec67c08eaa396000095f568f0c112810a262c204d7973e16a16539c69b7f543062ba29b6b1c9bc934f7b0783b79dd33b7a DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.zip 1471634 BLAKE2B cd90cd97113e500e5d20b6bb1c9921be7132157089936ca68d862efc531e2e3a8ede741d6c682c8f38122dc33cb65c84a8962eb1eb9cf25277502740639091d6 SHA512 c3fce15b61446dc0805383e55eefcbace75fe1e8149561692624f47ad69d20eb81e6415dc0000beec435a6caf0937b9bbbef67504016a5f77faaf72a46125085 -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201126233918-771906719818.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201126233918-771906719818.zip 1530019 BLAKE2B 8c40931e785824b6e379fd0372647a3ed286ff9abd9245ad328b9c6862fed06d7a3bfb051e44b22847361b8588224f5b28efe623999688d57ce473296652d2f7 SHA512 ea86d8335445737bda343fc12b351342408b639da38e3a538b2b44f6fccf7d174ed5279e40e8e32e163328f072283db0778b2b83fa63bdbb37939577ef489c55 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.zip 1693022 BLAKE2B 3944f66744718f14312f18a04dc8efa68254217830a36ec222b121af87a1d863df4b4da5df90bf4761d0983ec0deb77bb8850b0fb3d2575bb712db29562a0b9a SHA512 95bb9341b37d8400807ad99bc7d40a5905f5a1975b4608ab627f1d6baea82a9a9bf2ec751a0551845d9f603d9b18564a302637733b5a31607843f75b04dfc5a3 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLAKE2B b3dab69dbd1ebb999938c12595de7007dce9431cfeaeb5e77aba80c49918d1a4edf7fb95279e9b66686cb45deaf57a011c083e55fb66ec2c614582ba323954da SHA512 97c96a92ec86372c2f06141c30bceaa86ed62c1db34696f9542f43f3411cb0a37dea654de923a5ee054e603198179b9048e3b477da140e4092ffadc4525b9241 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip 41484 BLAKE2B 34fbdc1525bbea7fc6b7f74e74ab407ed03d3b58e25e9b3b79ec35945acce36b7c4be54388c1244d508c7cf67ac6e4f1ff7c9eb5245f01ff27dec82cfe87bdb8 SHA512 713c79551d48a99cc9feed3bcf71b7f1fe95270701787dfb114237bd358ad104d18ce7ca412f65d1ce6b7f94ffb6c01afe28c9b821e1a5378b05c93340aa8a49 diff --git a/app-misc/cheat/cheat-4.2.0.ebuild b/app-misc/cheat/cheat-4.2.0.ebuild deleted file mode 100644 index d910f38cad..0000000000 --- a/app-misc/cheat/cheat-4.2.0.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit go-module - -EGO_SUM=( - "github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38" - "github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod" - "github.com/alecthomas/chroma v0.8.2" - "github.com/alecthomas/chroma v0.8.2/go.mod" - "github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721" - "github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod" - "github.com/alecthomas/kong v0.2.4/go.mod" - "github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897" - "github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod" - "github.com/creack/pty v1.1.9/go.mod" - "github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964" - "github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod" - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.1" - "github.com/davecgh/go-spew v1.1.1/go.mod" - "github.com/dlclark/regexp2 v1.2.0" - "github.com/dlclark/regexp2 v1.2.0/go.mod" - "github.com/dlclark/regexp2 v1.4.0" - "github.com/dlclark/regexp2 v1.4.0/go.mod" - "github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815" - "github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod" - "github.com/kr/pretty v0.1.0" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pty v1.1.1/go.mod" - "github.com/kr/text v0.1.0" - "github.com/kr/text v0.1.0/go.mod" - "github.com/kr/text v0.2.0" - "github.com/kr/text v0.2.0/go.mod" - "github.com/mattn/go-colorable v0.1.6/go.mod" - "github.com/mattn/go-isatty v0.0.12" - "github.com/mattn/go-isatty v0.0.12/go.mod" - "github.com/mitchellh/go-homedir v1.1.0" - "github.com/mitchellh/go-homedir v1.1.0/go.mod" - "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e" - "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod" - "github.com/pkg/errors v0.8.1" - "github.com/pkg/errors v0.8.1/go.mod" - "github.com/pkg/errors v0.9.1/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/sergi/go-diff v1.0.0" - "github.com/sergi/go-diff v1.0.0/go.mod" - "github.com/sergi/go-diff v1.1.0" - "github.com/sergi/go-diff v1.1.0/go.mod" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/testify v1.2.2/go.mod" - "github.com/stretchr/testify v1.3.0" - "github.com/stretchr/testify v1.3.0/go.mod" - "github.com/stretchr/testify v1.4.0" - "github.com/stretchr/testify v1.4.0/go.mod" - "golang.org/x/sys v0.0.0-20200116001909-b77594299b42" - "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod" - "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod" - "golang.org/x/sys v0.0.0-20200413165638-669c56c373c4" - "golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod" - "golang.org/x/sys v0.0.0-20201126233918-771906719818" - "golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f" - "gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod" - "gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0" - "gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod" - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v2 v2.2.4/go.mod" - "gopkg.in/yaml.v2 v2.4.0" - "gopkg.in/yaml.v2 v2.4.0/go.mod" -) - -go-module_set_globals - -DESCRIPTION="cheat allows you to create and view interactive cheatsheets on the command-line" -HOMEPAGE="https://github.com/cheat/cheat" -SRC_URI=" - https://github.com/cheat/cheat/archive/${PV}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI} -" - -# licenses present in the final built -# software. Checked with dev-go/golicense -LICENSE="MIT Apache-2.0 BSD BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="zsh-completion" - -RDEPEND="zsh-completion? ( !app-shells/zsh-completions )" -BDEPEND="app-text/pandoc" - -src_test() { - # we can't use the default behavior - # since the check rule performs formatting - # with a non-standard go tool - emake test -} - -src_install() { - dobin "dist/${PN}" - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - newins scripts/cheat.zsh _cheat - fi - doman doc/cheat.1 -} diff --git a/app-misc/cheat/cheat-4.2.1.ebuild b/app-misc/cheat/cheat-4.2.1.ebuild index 547d313640..3a1e844890 100644 --- a/app-misc/cheat/cheat-4.2.1.ebuild +++ b/app-misc/cheat/cheat-4.2.1.ebuild @@ -71,7 +71,7 @@ go-module_set_globals DESCRIPTION="cheat allows you to create and view interactive cheatsheets on the command-line" HOMEPAGE="https://github.com/cheat/cheat" SRC_URI=" - https://github.com/cheat/cheat/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz ${EGO_SUM_SRC_URI} " @@ -80,32 +80,35 @@ SRC_URI=" LICENSE="MIT Apache-2.0 BSD BSD-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="zsh-completion" +IUSE="man zsh-completion" RDEPEND="zsh-completion? ( !app-shells/zsh-completions )" -BDEPEND="app-text/pandoc" +BDEPEND="man? ( app-text/pandoc )" -src_prepare() { - sed -e "s|\/tmp|${T}|g" -i Makefile || die - default +src_compile() { + go build -o ${PN} ./cmd/${PN} || die "compile failed" + + if use man; then + pandoc -s -t man doc/${PN}.1.md -o doc/${PN}.1 || die "building manpage failed" + fi } src_test() { - # we can't use the default behavior - # since the check rule performs formatting - # with a non-standard go tool - emake test + go test ./cmd/${PN} || die } src_install() { - dobin "dist/${PN}" - newbashcomp scripts/cheat.bash "${PN}" + dobin ${PN} + + use man && doman doc/${PN}.1 + + newbashcomp scripts/${PN}.bash ${PN} insinto /usr/share/fish/vendor_completions.d - doins scripts/cheat.fish - doman doc/cheat.1 + doins scripts/${PN}.fish + if use zsh-completion; then insinto /usr/share/zsh/site-functions - newins scripts/cheat.zsh _cheat + newins scripts/${PN}.zsh _cheat fi } diff --git a/dev-games/surgescript/Manifest b/dev-games/surgescript/Manifest index f83d2f38fe..b5ad7109ff 100644 --- a/dev-games/surgescript/Manifest +++ b/dev-games/surgescript/Manifest @@ -1,2 +1,2 @@ -DIST surgescript-0.5.4.3.tar.gz 500022 BLAKE2B 08598ad4adbd3cbf841354cde8ef3c9348abd196a828e9a9606b3cfa3b268c68aa7561a95c09692ef0d78d7c497207ddfc176e2528e6ae9a064af229c24e80d6 SHA512 0ffbb464326f019a6b523eca280c75c02f5976c07f61e6507cb46b1b2bf8bf0779b6fbd56c9204aee33ecf0ce513e07be8d5503d3cbd06443205ab57d674a6b3 DIST surgescript-0.5.4.4.tar.gz 501298 BLAKE2B b86545dfaea83e7a8387060c90495c51fd150149c7922b741a666a853d83bc4daa1f80d7ef8f2d2563b81f460f207d759d154cf20ae555cdbfe418f9d23c29ef SHA512 76d7d913353803372b7eec7226385f048f249a71e0a06fbdb255fddf411a0d4bf82773511a3db9c132e483d0dbca575dbfd35c5afae98287608fa2405bcc8200 +DIST surgescript-0.5.5.tar.gz 504167 BLAKE2B 7537a7e29e2e5ab02c8c503b65c17a50d2fbe8ac0d2fac4d662a7da701559be2ab16c9539dcc5d9b8efd3d273d898e322a7e7a38b6ced78d17fc4178a99e07b9 SHA512 b3b79f36463b9ff91f2f8108d6917961d8aabfbd0693a9e9e275f57faa09022570519c553ceff8db93101058964d76df82448b487ed82c5331598df065fae34a diff --git a/dev-games/surgescript/surgescript-0.5.4.3.ebuild b/dev-games/surgescript/surgescript-0.5.5.ebuild similarity index 53% rename from dev-games/surgescript/surgescript-0.5.4.3.ebuild rename to dev-games/surgescript/surgescript-0.5.5.ebuild index d7a9c5bc11..297698c7f2 100644 --- a/dev-games/surgescript/surgescript-0.5.4.3.ebuild +++ b/dev-games/surgescript/surgescript-0.5.5.ebuild @@ -5,10 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) DOCS_BUILDER="mkdocs" -DOCS_DEPEND=" - dev-python/mkdocs - dev-python/mkdocs-material -" +DOCS_DEPEND="dev-python/mkdocs-material" inherit cmake python-any-r1 docs @@ -17,15 +14,25 @@ HOMEPAGE="https://alemart.github.io/surgescript" if [[ "${PV}" == "9999" ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/alemart/surgescript.git" + EGIT_REPO_URI="https://github.com/alemart/${PN}.git" SLOT="0" else - SRC_URI="https://github.com/alemart/surgescript/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/alemart/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" - SLOT="0/${PV}" + SLOT="0/$(ver_cut 1-3)" fi LICENSE="Apache-2.0" +IUSE="examples static-libs" + +DOCS=( CHANGES.md README.md ) + +src_configure() { + local mycmakeoptions=( + -DWANT_STATIC=$(usex static-libs) + ) + cmake_src_configure +} src_compile() { cmake_src_compile @@ -34,5 +41,7 @@ src_compile() { src_install() { cmake_src_install - mv "${D}"/usr/lib "${D}"/usr/"$(get_libdir)" || die "Failed moving to libdir" + + docompress -x /usr/share/doc/${PF}/examples + use examples && dodoc -r examples } diff --git a/dev-games/surgescript/surgescript-9999.ebuild b/dev-games/surgescript/surgescript-9999.ebuild index 6016491e0a..297698c7f2 100644 --- a/dev-games/surgescript/surgescript-9999.ebuild +++ b/dev-games/surgescript/surgescript-9999.ebuild @@ -5,10 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) DOCS_BUILDER="mkdocs" -DOCS_DEPEND=" - dev-python/mkdocs - dev-python/mkdocs-material -" +DOCS_DEPEND="dev-python/mkdocs-material" inherit cmake python-any-r1 docs @@ -17,17 +14,34 @@ HOMEPAGE="https://alemart.github.io/surgescript" if [[ "${PV}" == "9999" ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/alemart/surgescript.git" + EGIT_REPO_URI="https://github.com/alemart/${PN}.git" SLOT="0" else - SRC_URI="https://github.com/alemart/surgescript/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/alemart/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" - SLOT="0/${PV}" + SLOT="0/$(ver_cut 1-3)" fi LICENSE="Apache-2.0" +IUSE="examples static-libs" + +DOCS=( CHANGES.md README.md ) + +src_configure() { + local mycmakeoptions=( + -DWANT_STATIC=$(usex static-libs) + ) + cmake_src_configure +} src_compile() { cmake_src_compile docs_compile } + +src_install() { + cmake_src_install + + docompress -x /usr/share/doc/${PF}/examples + use examples && dodoc -r examples +} diff --git a/dev-python/aiomysql/Manifest b/dev-python/aiomysql/Manifest deleted file mode 100644 index 2bc4fed4c3..0000000000 --- a/dev-python/aiomysql/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST aiomysql-0.0.21.tar.gz 97049 BLAKE2B 58e7982139721422b39f84da550c41a9f52272981de8d913768ee3c4a5cb88dcde5df690af1e15087fe9043c721205b3ef0e2545c4af9f820dfdb7a675ce94b9 SHA512 e715c02541cadc483851b8a0e2c6f5cc5a0c499b41e785f2ab7519869d184d50c30f37e83f330f8be3494719d1a9eb64f6ce37746e9a75533f63d2f97fd3372d diff --git a/dev-python/aiomysql/aiomysql-0.0.21.ebuild b/dev-python/aiomysql/aiomysql-0.0.21.ebuild deleted file mode 100644 index 96b07077cb..0000000000 --- a/dev-python/aiomysql/aiomysql-0.0.21.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit distutils-r1 - -DESCRIPTION="aiomysql is a library for accessing a MySQL database from the asyncio" -HOMEPAGE=" - https://aiomysql.readthedocs.io/en/latest/ - https://github.com/aio-libs/aiomysql -" -SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RESTRICT="test" - -RDEPEND=">=dev-python/pymysql-0.9.0[${PYTHON_USEDEP}]" - -DEPEND="test? ( - dev-python/docker-py[${PYTHON_USEDEP}] - dev-python/ipdb[${PYTHON_USEDEP}] - - - - - - piotr.staroszczyk@get24.org - Piotr Staroszczyk - - diff --git a/dev-python/aiosqlite/Manifest b/dev-python/aiosqlite/Manifest index 442711215c..fb7002456a 100644 --- a/dev-python/aiosqlite/Manifest +++ b/dev-python/aiosqlite/Manifest @@ -1,2 +1 @@ -DIST aiosqlite-0.16.0.tar.gz 25690 BLAKE2B be06e8ebea9f3e0c16649fbaaf86317584bd6329e5d890aa3cac432d54122c5441461a40f3690e59453a573bffc56277338391b466abaf121a28c2d71929687c SHA512 f554293663b15303f0aea0d1c10730d15766a30efa0538501a4f08acaccf8807bad78382d5c8a034cdffcfbceb42cbbe4eecdb97e2ef97c5143ab374e9b314b4 DIST aiosqlite-0.17.0.tar.gz 25941 BLAKE2B 869d165bc8c791cb94159f6508f5113d915f5531117d0d79ac1f297de16cbb78574a7eaafc1bceccc9e4397f88f490b90d49becb4b7cc2c0d51e14f0afd7561b SHA512 50f9965ef7dafe91a2f41dc41489395e437080aa4b7853800d806d21f4f8042d92ff6cfd2aeadefa7ca5e4debd14f39d93ca28c89f3116b3b61b2e8829533e6e diff --git a/dev-python/aiosqlite/aiosqlite-0.16.0.ebuild b/dev-python/aiosqlite/aiosqlite-0.16.0.ebuild deleted file mode 100644 index 1d55ccc842..0000000000 --- a/dev-python/aiosqlite/aiosqlite-0.16.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=no - -inherit distutils-r1 - -DESCRIPTION="asyncio bridge to the standard sqlite3 module" -HOMEPAGE="https://github.com/jreese/aiosqlite" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND="test? ( - dev-python/aiounittest[${PYTHON_USEDEP}] -)" - -distutils_enable_tests unittest -# TypeError: add_source_parser() takes 2 positional arguments but 3 were given -#distutils_enable_sphinx docs diff --git a/dev-python/aiosqlite/aiosqlite-0.17.0-r1.ebuild b/dev-python/aiosqlite/aiosqlite-0.17.0-r1.ebuild new file mode 100644 index 0000000000..9e67528f4b --- /dev/null +++ b/dev-python/aiosqlite/aiosqlite-0.17.0-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS="pyproject.toml" + +inherit distutils-r1 + +DESCRIPTION="asyncio bridge to the standard sqlite3 module" +HOMEPAGE=" + https://aiosqlite.omnilib.dev + https://pypi.org/project/aiosqlite + https://github.com/jreese/aiosqlite +" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-python/typing-extensions[${PYTHON_USEDEP}]" +BDEPEND="test? ( + dev-python/aiounittest[${PYTHON_USEDEP}] +)" + +distutils_enable_tests unittest +# AttributeError: 'str' object has no attribute 'supported' +#distutils_enable_sphinx docs dev-python/m2r diff --git a/dev-python/aiosqlite/aiosqlite-0.17.0.ebuild b/dev-python/aiosqlite/aiosqlite-0.17.0.ebuild deleted file mode 100644 index 1d55ccc842..0000000000 --- a/dev-python/aiosqlite/aiosqlite-0.17.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=no - -inherit distutils-r1 - -DESCRIPTION="asyncio bridge to the standard sqlite3 module" -HOMEPAGE="https://github.com/jreese/aiosqlite" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND="test? ( - dev-python/aiounittest[${PYTHON_USEDEP}] -)" - -distutils_enable_tests unittest -# TypeError: add_source_parser() takes 2 positional arguments but 3 were given -#distutils_enable_sphinx docs diff --git a/dev-python/databases/Manifest b/dev-python/databases/Manifest index 7a97fb8223..ede27d2819 100644 --- a/dev-python/databases/Manifest +++ b/dev-python/databases/Manifest @@ -1 +1 @@ -DIST databases-0.4.1.tar.gz 26359 BLAKE2B e1974e48560b186c4d9f017c3468ccfa425deef8aea6541c17076c1567036eabb16d3267178ca02b5f8e1aaf1cc4b5a0cce1431ed496b1852bb17a9d74b6705c SHA512 9df0bf1597015f120cef44fc270f353b75d712bcc9cc635b55d69892ba1f4ead9402230382a74caaefff75f4fac2d29e79d3014a8658404072e460c5a1d22ce1 +DIST databases-0.4.3.tar.gz 26517 BLAKE2B 38b9f86e42740a723f4022b225913e0e7a2c635eb34793fcbf62efa0917ddb6b7ee3b59cce7f4c8503aef31befb0caea3fb3e655617606296cb8ae1bb4cebfc7 SHA512 aa49f1a33edd3bf9ae7aa203dcef4941d1a1766c930cbe34405caf3dca0801bbca494ec39357591b6339977b86294d32a031bf2020f206436e7d19edc6a8e158 diff --git a/dev-python/databases/databases-0.4.1.ebuild b/dev-python/databases/databases-0.4.3.ebuild similarity index 58% rename from dev-python/databases/databases-0.4.1.ebuild rename to dev-python/databases/databases-0.4.3.ebuild index 99c8e4e2a9..0330e77949 100644 --- a/dev-python/databases/databases-0.4.1.ebuild +++ b/dev-python/databases/databases-0.4.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{8..9} ) DOCS_BUILDER="mkdocs" DOCS_DEPEND="dev-python/mkdocs-material" @@ -21,28 +21,15 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc" +RDEPEND="=dev-python/sphinx_rtd_theme-0.4.0" \ - dev-python/readme_renderer + dev-python/sphinx_rtd_theme python_test() { epytest \ diff --git a/dev-python/graphene/Manifest b/dev-python/graphene/Manifest index 3618cd539f..aa53b7d8bc 100644 --- a/dev-python/graphene/Manifest +++ b/dev-python/graphene/Manifest @@ -1 +1,2 @@ DIST graphene-3.0.0_beta7.tar.gz 113258 BLAKE2B 4a3adadfea6dc6fd936b8bad83cf02c1b2b7937648712ee26ce3c5eb7e6d6631790ae2f22fff334de4495ed3197761862e88450e7f837ee06f71e7de4009efe4 SHA512 df4dee75c8c5bc5643dd5231bff61f7f1e2efe7203e61a3e32b10c80c2f44139a408ca99726fea51d6aa6e844e648c860c41e3e20ee4679dd3573f43047e71fa +DIST sphinx-graphene-3.0.0_beta7.zip 22270 BLAKE2B 7cc467f12e7857cedb0336c7d0708f9429b9ccaa7f65077e6453a3e4ce0af92cbdb6d4dd3bec5801bd3e5fb233b4994dbce52fabe690da196ee25b5eec7fb63f SHA512 00cdaee50a7c16729d9d820de7d6c0f61215e3b906777b0705f2de0d2029f2ffb1f86134b1d673d00675d77729be47765999537fc42aeefafb026248b9b0b3b0 diff --git a/dev-python/graphene/graphene-3.0.0_beta7.ebuild b/dev-python/graphene/graphene-3.0.0_beta7.ebuild index d0223b9900..1f9259316a 100644 --- a/dev-python/graphene/graphene-3.0.0_beta7.ebuild +++ b/dev-python/graphene/graphene-3.0.0_beta7.ebuild @@ -3,16 +3,21 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit distutils-r1 -MYPV="${PV/_beta/b}" -MYP="${PN}-${MYPV}" +MY_PV="${PV/_beta/b}" +MY_P="${PN}-${MY_PV}" DESCRIPTION="GraphQL Framework for Python" -HOMEPAGE="https://github.com/graphql-python/graphene" -SRC_URI="https://github.com/graphql-python/${PN}/archive/v${MYPV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://graphene-python.org + https://pypi.org/project/graphene + https://github.com/graphql-python/graphene +" +SRC_URI="https://github.com/graphql-python/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz + doc? ( https://graphene-python.org/sphinx_graphene_theme.zip -> sphinx-${P}.zip ) +" LICENSE="MIT" SLOT="0" @@ -24,20 +29,35 @@ RDEPEND=" dev-python/graphql-relay[${PYTHON_USEDEP}] " -DEPEND="test? ( - dev-python/iso8601[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/promise[${PYTHON_USEDEP}] - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/pytest-benchmark[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/snapshottest[${PYTHON_USEDEP}] -)" +BDEPEND=" + doc? ( app-arch/unzip ) + test? ( + dev-python/iso8601[${PYTHON_USEDEP}] + dev-python/promise[${PYTHON_USEDEP}] + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pytest-benchmark[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/snapshottest[${PYTHON_USEDEP}] + ) +" -S="${WORKDIR}/${MYP}" +S="${WORKDIR}/${MY_P}" distutils_enable_tests pytest -# ModuleNotFoundError: No module named 'sphinx_graphene_theme' -# There is a archived github, but no releases at the moment -#distutils_enable_sphinx docs + +distutils_enable_sphinx docs + +src_unpack() { + unpack ${P}.tar.gz + + if use doc ; then + unpack sphinx-${P}.zip + mv "${WORKDIR}"/sphinx_graphene_theme "${S}"/docs || die + fi +} + +python_test() { + epytest --benchmark-disable \ + --deselect graphene/types/tests/test_schema.py::TestUnforgivingExecutionContext::test_unexpected_error +} diff --git a/dev-python/graphql-core/Manifest b/dev-python/graphql-core/Manifest index c9df08c1b4..5bd18e7eee 100644 --- a/dev-python/graphql-core/Manifest +++ b/dev-python/graphql-core/Manifest @@ -1 +1 @@ -DIST graphql-core-3.1.4.tar.gz 496344 BLAKE2B a8060e0f23b147d91a19ea6bf05bfdd137d8d543c7839f287dcaa49039c9a23dace692d605d29885ae38ed8ac1dbd2385fa24b4fb491063dfb2693f599e8310a SHA512 f4e700d9ff00d737930581ec52a2555594a398ea3b04f8b700c8baa6aa129003dfc0ed8d8f5783126ef3e7ae4e7c3f3a0cff2cc9f30e8a7a5a6cf0dd3df94205 +DIST graphql-core-3.1.5.tar.gz 497629 BLAKE2B 28b8a32669c7367bb1343e04bf3f5a1b20ce13f83e2514d243b69df067306f2fbd8d380d6a9f833fe1296831853898b3f1a0d0ec73fc3d0ea8a4726ed3062674 SHA512 d6fccd751ecc575649c4eb697b98f6b581d56db58e4d4d8b73eec8cf8285cc749dd55c6e3dc54fe9aeb216b1ae4a6d14c9e617ca65eecba4fe1d3ba41de6f7c4 diff --git a/dev-python/graphql-core/graphql-core-3.1.4.ebuild b/dev-python/graphql-core/graphql-core-3.1.5.ebuild similarity index 63% rename from dev-python/graphql-core/graphql-core-3.1.4.ebuild rename to dev-python/graphql-core/graphql-core-3.1.5.ebuild index 0b481cbd7f..5af66bc804 100644 --- a/dev-python/graphql-core/graphql-core-3.1.4.ebuild +++ b/dev-python/graphql-core/graphql-core-3.1.5.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..8} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit distutils-r1 @@ -15,7 +15,14 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -BDEPEND="test? ( dev-python/pytest-benchmark[${PYTHON_USEDEP}] )" +BDEPEND=" + test? ( + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pytest-describe[${PYTHON_USEDEP}] + dev-python/pytest-benchmark[${PYTHON_USEDEP}] + dev-python/pytest-timeout[${PYTHON_USEDEP}] + ) +" distutils_enable_tests pytest distutils_enable_sphinx docs dev-python/sphinx_rtd_theme diff --git a/dev-python/graphql-relay/Manifest b/dev-python/graphql-relay/Manifest index 9fd138c371..94cd47b487 100644 --- a/dev-python/graphql-relay/Manifest +++ b/dev-python/graphql-relay/Manifest @@ -1 +1 @@ -DIST graphql-relay-3.0.0.tar.gz 41928 BLAKE2B a206692a2fa1b39d002aad8a324b1be1c1e67305e65978f3eceaa28df6c12791f3fc19fad3f68320d16e063f54710a94d89fe078a9a3a361334299a8c6e31a21 SHA512 5e09d0cc21b1f6241a3a19b96f6607fb13ebe87798338669d2cc687b15d858acb24e884fc0752c091414f857560dae2e7b1d52011c9ce4718986919997dae7ff +DIST graphql-relay-3.1.0.tar.gz 47738 BLAKE2B 84a13dee3371345ca7af7ff87b4210a787e261c8446ab6d54b7c1ee196f0bd8faef15be438be424d78ab0fa7cc9df6641020da85052d9abe21d17ed2cb89b28c SHA512 7006da1ebd0a7fde2a88b6c03d2355d1cc26b14e86f51387cd91c922b498f2fcbe120af730b9634b57af0b638244fb464808e7af16e2dfdae9fa71f404bb5d65 diff --git a/dev-python/graphql-relay/graphql-relay-3.0.0.ebuild b/dev-python/graphql-relay/graphql-relay-3.1.0.ebuild similarity index 65% rename from dev-python/graphql-relay/graphql-relay-3.0.0.ebuild rename to dev-python/graphql-relay/graphql-relay-3.1.0.ebuild index 33fcad3bf9..8331a052d8 100644 --- a/dev-python/graphql-relay/graphql-relay-3.0.0.ebuild +++ b/dev-python/graphql-relay/graphql-relay-3.1.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit distutils-r1 @@ -15,10 +15,14 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -BDEPEND="test? ( - dev-python/pytest-asyncio[${PYTHON_USEDEP}] -)" +BDEPEND=" + test? ( + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pytest-describe[${PYTHON_USEDEP}] + ) +" +# typing-extensions is not needed since python 3.8 RDEPEND=" dev-python/graphql-core[${PYTHON_USEDEP}] dev-python/typing-extensions[${PYTHON_USEDEP}] diff --git a/dev-python/manhole/manhole-1.8.0.ebuild b/dev-python/manhole/manhole-1.8.0.ebuild index f0e68e5aed..e6edae08f8 100644 --- a/dev-python/manhole/manhole-1.8.0.ebuild +++ b/dev-python/manhole/manhole-1.8.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 @@ -21,7 +21,7 @@ LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND=" +BDEPEND=" test? ( dev-python/eventlet[${PYTHON_USEDEP}] dev-python/gevent[${PYTHON_USEDEP}] @@ -32,13 +32,11 @@ DEPEND=" S="${WORKDIR}/${MY_PN}-${PV}" -distutils_enable_tests pytest -distutils_enable_sphinx docs \ - dev-python/sphinx-py3doc-enhanced-theme \ - dev-python/sphinxcontrib-napoleon +distutils_enable_tests --install pytest + +distutils_enable_sphinx docs dev-python/sphinx-py3doc-enhanced-theme python_test() { - distutils_install_for_testing epytest \ --deselect tests/test_manhole.py::test_non_daemon_connection \ --deselect tests/test_manhole.py::test_daemon_connection \ @@ -47,6 +45,7 @@ python_test() { --deselect tests/test_manhole.py::test_connection_handler_exec[str] \ --deselect tests/test_manhole.py::test_connection_handler_exec[func] \ --deselect tests/test_manhole.py::test_environ_variable_activation \ + --deselect tests/test_manhole.py::test_stderr_doesnt_deadlock \ --deselect tests/test_manhole_cli.py::test_help } diff --git a/dev-python/promise/promise-2.3.0.ebuild b/dev-python/promise/promise-2.3.0.ebuild index 359afc5f91..9e7e9e873d 100644 --- a/dev-python/promise/promise-2.3.0.ebuild +++ b/dev-python/promise/promise-2.3.0.ebuild @@ -1,22 +1,21 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit distutils-r1 -DESCRIPTION="Bytecode optimisation using staticness assertions" +DESCRIPTION="Promises/A+ implementation for Python" HOMEPAGE="https://github.com/syrusakbary/promise" -SRC_URI="https://github.com/syrusakbary/promise/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/syrusakbary/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" BDEPEND="test? ( - dev-python/mock[${PYTHON_USEDEP}] dev-python/pytest-asyncio[${PYTHON_USEDEP}] dev-python/pytest-benchmark[${PYTHON_USEDEP}] )" @@ -24,3 +23,7 @@ BDEPEND="test? ( RDEPEND="dev-python/six[${PYTHON_USEDEP}]" distutils_enable_tests pytest + +python_test() { + epytest --benchmark-disable --deselect tests/test_awaitable.py +} diff --git a/dev-python/python-multipart/Manifest b/dev-python/python-multipart/Manifest index 32f58ebd79..f2ef213f18 100644 --- a/dev-python/python-multipart/Manifest +++ b/dev-python/python-multipart/Manifest @@ -1 +1 @@ -DIST python-multipart-0.0.5.tar.gz 32581 BLAKE2B 79a55b620d45f529f3c823b5452f7a100934ae2f1229e02344c5e8e4ac251225b66ea5505773a0f639cab2f1596e4b6d7a77f3919e56bab2ea9a2e2b04fec796 SHA512 159472175c7b21ddcfb6d026d2efe1dc68ceacb6b30afef7f2aab078542eef6faf61d7e40abb2d22d18346c88e2fbee12283795f3e4a8b1f36673a5dd9163a8e +DIST python-multipart-0.0.5.tar.gz 48018 BLAKE2B cfff5c1c57ada3ba3d50da71273435781d62d3907ca1b7e6180cd319f2680258b3e1e278dff760106e7ca9c116f4c5c7adf957601d6d8465bf300e6211b83773 SHA512 c2fabeb77a25119c4bbb71c3faa6de58e27ac2f0c768298eac62b519fc51e5d95fdea05c4f3846ed47205f297802982a001577a73b2feec2d9f585c784d6c3d7 diff --git a/dev-python/python-multipart/python-multipart-0.0.5.ebuild b/dev-python/python-multipart/python-multipart-0.0.5.ebuild index 4f97af5d82..2a30dfc609 100644 --- a/dev-python/python-multipart/python-multipart-0.0.5.ebuild +++ b/dev-python/python-multipart/python-multipart-0.0.5.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=(python3_{7,8} ) +PYTHON_COMPAT=(python3_{7..9} ) inherit distutils-r1 @@ -11,7 +11,7 @@ DESCRIPTION="A streaming multipart parser for Python" HOMEPAGE=" https://andrew-d.github.io/python-multipart https://github.com/andrew-d/python-multipart" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/andrew-d/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" @@ -22,10 +22,8 @@ RESTRICT="test" RDEPEND="dev-python/six[${PYTHON_USEDEP}]" -DEPEND="test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] )" +DEPEND="test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )" distutils_enable_tests pytest -# there are docs on github, but there is no 0.0.5 release tarball there for some reason -#distutils_enable_sphinx docs/source dev-python/sphinx-bootstrap-theme + +distutils_enable_sphinx docs/source dev-python/sphinx-bootstrap-theme diff --git a/dev-python/sse-starlette/Manifest b/dev-python/sse-starlette/Manifest index 227cd82365..4820bbf06a 100644 --- a/dev-python/sse-starlette/Manifest +++ b/dev-python/sse-starlette/Manifest @@ -1 +1,2 @@ DIST sse-starlette-0.6.1.tar.gz 6081 BLAKE2B d11c713f106334bd54b419fce4a6c9dc9a19b265220c281ee58165b14d8cccffc7e3636a90e3d741c38da498f4e747362310326bbfd7a57c96400118347c75b5 SHA512 ffb184ae36de1a54e244a6beacc138088afc0c4ea3312b9ac7de37a993934564a30daeee16d5477eb9f185a160426281bdcb1107a07eab5495251e8733b6367f +DIST sse-starlette-0.7.2.tar.gz 510457 BLAKE2B f56849be2725b62bb4dd17afed337f21ad07bd2d6c1e0ef9e4c2f33652df2306385caa3920cc81009a7daf699d7556d7af1aece6a7fa7f1299f95df843ed070b SHA512 c02b638e6a378be21a730059a340f08bb9b1100da7d38a506858c8f9aaadf24c230394923f04e1af1989e8cc0de2b1dda4784151460829ee6daca8bad6d6334b diff --git a/dev-python/sse-starlette/sse-starlette-0.7.2.ebuild b/dev-python/sse-starlette/sse-starlette-0.7.2.ebuild new file mode 100644 index 0000000000..7177196ad1 --- /dev/null +++ b/dev-python/sse-starlette/sse-starlette-0.7.2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..9} ) + +inherit distutils-r1 + +DESCRIPTION="Server Sent Events for Starlette" +HOMEPAGE=" + https://pypi.org/project/sse-starlette/ + https://github.com/sysid/sse-starlette +" +SRC_URI="https://github.com/sysid/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-python/starlette" +BDEPEND=" + test? ( + dev-python/pytest-asyncio + dev-python/requests + ) +" + +distutils_enable_tests pytest diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest index a42baca71c..18540adc68 100644 --- a/dev-python/starlette/Manifest +++ b/dev-python/starlette/Manifest @@ -1 +1 @@ -DIST starlette-0.14.1.tar.gz 438036 BLAKE2B 9531459d6af3860cad7743a395360f573476bab642eb69c2dcc41c6240acff7309a3fc47676db4d106210dff81957974656fd68f03aa4e2fdc9f080afe2c4e31 SHA512 792075ec6d7b8fa16b40b12c092adfc1c95ce0f17b0dd8b34c8578fe407a863279cebf77218d1d89459d1b4161078684c6339ff48c124e67899313bae6794e01 +DIST starlette-0.14.2.tar.gz 438350 BLAKE2B 862f1f6526f194e0dfd52e14860b63fbd97507a4a6d694d71e44041edbb435608a1e3511144e6fb3e8b39405672baf81e00685ad3928aebb244e566cfcd665d0 SHA512 4321d3d1890c49dea53d7923b456772ecc9d28083d28392e0e9cd1f39f33180cc1cb28914bee443849fa8c87015dd99610ea18e03f0101b0eaf3f8df56249fab diff --git a/dev-python/starlette/starlette-0.14.1.ebuild b/dev-python/starlette/starlette-0.14.2.ebuild similarity index 81% rename from dev-python/starlette/starlette-0.14.1.ebuild rename to dev-python/starlette/starlette-0.14.2.ebuild index deb7df9c2a..ce6438b912 100644 --- a/dev-python/starlette/starlette-0.14.1.ebuild +++ b/dev-python/starlette/starlette-0.14.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{8..9} ) DOCS_BUILDER="mkdocs" DOCS_DEPEND="dev-python/mkdocs-material" @@ -22,14 +22,10 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -# ModuleNotFoundError: No module named 'graphql.execution.executors' -# Now graphql is at the newest version and this still doesn't work :( -# though there are less errors now -RESTRICT="test" - -DEPEND="test? ( +BDEPEND="test? ( dev-python/aiofiles[${PYTHON_USEDEP}] dev-python/aiosqlite[${PYTHON_USEDEP}] + dev-python/databases[${PYTHON_USEDEP}] dev-python/graphene[${PYTHON_USEDEP}] dev-python/itsdangerous[${PYTHON_USEDEP}] dev-python/jinja[${PYTHON_USEDEP}] @@ -42,8 +38,10 @@ DEPEND="test? ( python_prepare_all() { # do not install LICENSE to /usr/ sed -i -e '/data_files/d' setup.py || die - # do not depend on pytest-cov - sed -i -e '/--cov/d' setup.cfg || die + # do not depend on pytest-cov and fail on DeprecationWarning + rm setup.cfg || die + # ModuleNotFoundError: No module named 'graphql.execution.executors' + rm tests/test_graphql.py || die distutils-r1_python_prepare_all } @@ -54,7 +52,7 @@ pkg_postinst() { optfeature "Required if you want to support form parsing, with request.form()" dev-python/python-multipart optfeature "Required for SessionMiddleware support." dev-python/itsdangerous optfeature "Required for SchemaGenerator support." dev-python/pyyaml - optfeature "Required for GraphQLApp support" media-libs/graphene + optfeature "Required for GraphQLApp support" dev-python/graphene optfeature "Required if you want to use UJSONResponse." dev-python/ujson optfeature "Server Sent Events" dev-python/sse-starlette } diff --git a/games-fps/quakespasm/Manifest b/games-fps/quakespasm/Manifest new file mode 100644 index 0000000000..c7353589ad --- /dev/null +++ b/games-fps/quakespasm/Manifest @@ -0,0 +1 @@ +DIST quakespasm-0.93.2.tgz 8527223 BLAKE2B 98128174cde86bdd9cee17860302f5364531bb473c0fa07ab613462a8a2247143919614824fa8caab7033204531680bc5ea81684e954460d1064fe59c09d3d37 SHA512 30e8515aa9c6a64ef76f2440e878493e98e85e8c19356738e35b5bbd6e5f49ed42b4d73dc716cce0e687b4e7e27a65fa97541e89ae7857fb165a63e09385743f diff --git a/games-fps/quakespasm/metadata.xml b/games-fps/quakespasm/metadata.xml new file mode 100644 index 0000000000..1a8ab4d948 --- /dev/null +++ b/games-fps/quakespasm/metadata.xml @@ -0,0 +1,11 @@ + + + + + contact@hacktivis.me + Haelwenn (lanodan) Monnier + + + Use media-libs/libsdl2 instead of media-libs/libsdl + + diff --git a/games-fps/quakespasm/quakespasm-0.93.2.ebuild b/games-fps/quakespasm/quakespasm-0.93.2.ebuild new file mode 100644 index 0000000000..2b5141550e --- /dev/null +++ b/games-fps/quakespasm/quakespasm-0.93.2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="git://git.code.sf.net/p/quakespasm/quakespasm.git" +else + SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Modern, cross-platform Quake 1 engine based on FitzQuake" +HOMEPAGE="http://quakespasm.sourceforge.net" +LICENSE="GPL-2" +SLOT="0" +IUSE="sdl2" + +DEPEND=" + media-libs/libvorbis + media-libs/libogg + media-libs/libmad + virtual/opengl + sdl2? ( media-libs/libsdl2 ) + !sdl2? ( media-libs/libsdl ) +" +RDEPEND="${DEPEND}" +DOCS=( Quakespasm.html Quakespasm-Music.txt Quakespasm.txt ) + +src_compile() { + cd Quake || die + emake COMMON_LIBS="-lm -lOpenGL" USE_SDL2=$(usex sdl2 1 0) STRIP="/bin/true" +} + +src_install() { + einstalldocs + dobin Quake/quakespasm +} diff --git a/games-fps/quakespasm/quakespasm-9999.ebuild b/games-fps/quakespasm/quakespasm-9999.ebuild new file mode 100644 index 0000000000..2b5141550e --- /dev/null +++ b/games-fps/quakespasm/quakespasm-9999.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="git://git.code.sf.net/p/quakespasm/quakespasm.git" +else + SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Modern, cross-platform Quake 1 engine based on FitzQuake" +HOMEPAGE="http://quakespasm.sourceforge.net" +LICENSE="GPL-2" +SLOT="0" +IUSE="sdl2" + +DEPEND=" + media-libs/libvorbis + media-libs/libogg + media-libs/libmad + virtual/opengl + sdl2? ( media-libs/libsdl2 ) + !sdl2? ( media-libs/libsdl ) +" +RDEPEND="${DEPEND}" +DOCS=( Quakespasm.html Quakespasm-Music.txt Quakespasm.txt ) + +src_compile() { + cd Quake || die + emake COMMON_LIBS="-lm -lOpenGL" USE_SDL2=$(usex sdl2 1 0) STRIP="/bin/true" +} + +src_install() { + einstalldocs + dobin Quake/quakespasm +} diff --git a/gui-apps/wob/wob-0.11.ebuild b/gui-apps/wob/wob-0.11.ebuild index b61a2044df..fefa16e7ae 100644 --- a/gui-apps/wob/wob-0.11.ebuild +++ b/gui-apps/wob/wob-0.11.ebuild @@ -5,15 +5,28 @@ EAPI=7 inherit meson -DESCRIPTION="A lightweight overlay volume/backlight/progress/anything bar for Wayland." +DESCRIPTION="Lightweight overlay volume/backlight/progress/anything bar for Wayland" HOMEPAGE="https://github.com/francma/wob" SRC_URI="https://github.com/francma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="ISC" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="+man +seccomp" -DEPEND="dev-libs/wayland" -RDEPEND="${DEPEND}" -BDEPEND="" +RDEPEND="dev-libs/wayland" +DEPEND="${RDEPEND} + dev-libs/wayland-protocols +" +BDEPEND=" + dev-util/wayland-scanner + man? ( app-text/scdoc ) +" + +src_configure() { + local emesonargs=( + $(meson_feature man man-pages) + $(meson_feature seccomp) + ) + meson_src_configure +} diff --git a/media-gfx/azpainter/Manifest b/media-gfx/azpainter/Manifest index 40a96a3551..ec3e16aa9d 100644 --- a/media-gfx/azpainter/Manifest +++ b/media-gfx/azpainter/Manifest @@ -1 +1,2 @@ DIST azpainter-2.1.7.tar.xz 758960 BLAKE2B a70371777d8f5a8a976032fb13fe21343d852442c3ca1eaa8d4ebdb0aeec25bf9d532a2d03c58c55df629b4a299b2d40100ba83909476d4e0a15b05ea27a5527 SHA512 7edcfe1e3a1f87b6cd3006da288d9a11c3667f49da73d9fa7665f4e2edb90282b30ec356b5f1eda3559b3c51c1f99e585f4b60d6039ba3c8c28da50022f9c798 +DIST azpainter-3.0.0.tar.xz 884588 BLAKE2B fd5e17c94d6b578ba40107aacf0f35cb6378ae93f984184cda317d2229daf9fc32ae2cdbec8732cfab34f31d51eb74677876fb732b7b4959ea11502f693666e9 SHA512 5e47ae67ff920190cb007da35b2750874e6ea7a78df969424d54033e9f66b4c77b804ebbae1f2717370d161ac387d93c859bf2b87e1b2fc70dec2cb6c535386c diff --git a/media-gfx/azpainter/azpainter-3.0.0.ebuild b/media-gfx/azpainter/azpainter-3.0.0.ebuild new file mode 100644 index 0000000000..16bc4ac056 --- /dev/null +++ b/media-gfx/azpainter/azpainter-3.0.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 2018-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs xdg + +DESCRIPTION="Full color painting software for Linux for illustration drawing" +HOMEPAGE="http://azsky2.html.xdomain.jp/soft/azpainter.html" +SRC_URI="http://azsky2.html.xdomain.jp/arc/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0/3" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + x11-libs/libX11:= + x11-libs/libXext:= + x11-libs/libXcursor:= + x11-libs/libXi:= + media-libs/freetype:= + media-libs/fontconfig:= + sys-libs/zlib:= + media-libs/libpng:= + media-libs/libjpeg-turbo:= + media-libs/libwebp:= + media-libs/tiff:= +" +RDEPEND="${DEPEND}" + +DOCS=( + about_mlk_en.txt + about_mlk_ja.txt + translation/tool/about-en.txt + translation/tool/about-ja.txt +) + +src_configure() { + sh ./configure \ + --prefix=/usr \ + --docdir=/usr/share/doc/${PF} \ + CC="$(tc-getCC)" CFLAGS="${CFLAGS:-02}" LDFLAGS="${LDFLAGS}" || die +} + +src_compile() { + tc-export AR + default +} + +src_install() { + default + rm "${ED}"/usr/share/doc/${PF}/GPL3 +} diff --git a/www-client/woob/woob-3.0-r1.ebuild b/www-client/woob/woob-3.0-r1.ebuild index b0535df1d6..51f6d07077 100644 --- a/www-client/woob/woob-3.0-r1.ebuild +++ b/www-client/woob/woob-3.0-r1.ebuild @@ -42,19 +42,20 @@ RDEPEND=" dev-python/termcolor[${PYTHON_USEDEP}] dev-python/unidecode[${PYTHON_USEDEP}] " -DEPEND="${RDEPEND}" +BDEPEND="test? ( ${RDEPEND} )" distutils_enable_tests nose distutils_enable_sphinx docs/source -src_prepare() { - default - +python_prepare_all() { sed -i \ -e '/woob.browser.browsers,/d' \ -e '/woob.browser.pages,/d' \ - setup.cfg || die "Failed removing network-dependent tests" + -e '/woob.tools.application.formatters.table,/d' \ + setup.cfg || die + + distutils-r1_python_prepare_all } python_install_all() { diff --git a/www-client/woob/woob-9999.ebuild b/www-client/woob/woob-9999.ebuild index b0535df1d6..51f6d07077 100644 --- a/www-client/woob/woob-9999.ebuild +++ b/www-client/woob/woob-9999.ebuild @@ -42,19 +42,20 @@ RDEPEND=" dev-python/termcolor[${PYTHON_USEDEP}] dev-python/unidecode[${PYTHON_USEDEP}] " -DEPEND="${RDEPEND}" +BDEPEND="test? ( ${RDEPEND} )" distutils_enable_tests nose distutils_enable_sphinx docs/source -src_prepare() { - default - +python_prepare_all() { sed -i \ -e '/woob.browser.browsers,/d' \ -e '/woob.browser.pages,/d' \ - setup.cfg || die "Failed removing network-dependent tests" + -e '/woob.tools.application.formatters.table,/d' \ + setup.cfg || die + + distutils-r1_python_prepare_all } python_install_all() {