Sync with portage [Mon Mar 28 10:48:14 MSK 2022].

master
root 2 years ago
parent a3cbba0007
commit 6f4179eafd

@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
MANIFEST Manifest.files.gz 29616 BLAKE2B 13f6ed7a6a63465c1b153f4ef538d33a99beb37b6e4a751f12a11f271375757131ae76d2c4aff21a75510cb1b207f505ef4467cfd7461646fddcbcd87c38f78c SHA512 724d497e5a063186b3ae2631f2aad54422e1e89bd5dbe77a41890265f1bd782ca5434a8a631dfcfdc3dcc900010ec53ff3e12695a003997f415efa410829bf45
TIMESTAMP 2022-03-26T20:39:21Z
MANIFEST Manifest.files.gz 29606 BLAKE2B d7b6abab687be372f9b008622fe4a517d8349ea447a8f385f982ed9613103f4456781a5ec67b3f6c30efb44e740c747c71fa2d0d3ef0bdfbef44d01068da05b4 SHA512 ba3528bf1aa8d89a0e25cdaee611c8944e33bd747d3032283aa8cdded98e395af63d6774858c9ca6a20920df66cf1bf0f0ff8b36b10794b2a14fa3226a53cbb8
TIMESTAMP 2022-03-28T07:09:25Z
-----BEGIN PGP SIGNATURE-----
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmI/eflfFIAAAAAALgAo
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmJBXyVfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
klDgLQ//bsYshzj8LKSHGjmA+ycEh7km6qpXRrch21DOjexTumqOihBgT29QhAdP
k33Bq1LvTHLsCuOE8gIk3IiLVuwAC2FcxQdbWkiVXMFyUovNsX/CUjmfLScwrPp0
Vt6Rk2CoKlvqNBMzoK+Lb0B9A69aBonurjldwNKBP2PPJgrcQqpHv9Br05csHf3S
AtIudWKFXNr6NBpJTol4ZPIzYZjpNefnQcK4H5MiXv1G4Si6Ftd/sJeE5j5IHidy
5Wyaqm+qJCzW9TIAD60v5ipEVeKRfTpj52ZpRbHWO+V979GmNBUn/ses1hVMB/Yo
Oq3aswTfnfJx88ChADJTMg4JzQFXzyf4oeb/xfSohE0Jif32wdc2XDyQ1/uuuTDL
IW55EsFdIz2RoEQx1CaSH+YL/bqjYsMfGVlapCe3+D05e2ndnLH0CeAXBah3+yX2
HOklNkgciGLJond1og8JM4sceg931+bYH2f1EF5Ww2jXX4ZcVsze0eyXPdhIWXqa
j+fyWKvNcmaM9OT7C0n3mTxz2axS/+zjoNxfMwLoRh11zwoRoRznoGkAaVGC3MDW
Hxxpq5Ai0dYAGvApFt7IRiwaz4sCwnKtpk295H18OjYy24fw0h6EzzQOKrNjn+TH
yf4zGF3QxPryFevEi81Rqc1bViz9KH2V19QO+mhfCEj32nxiAVQ=
=pJ6k
klBciQ//QTrhW7rHyVtFLyshPpHnOl+uwGwz3m6m/9V+KY7PUdfuTrUgtimJ+Lxz
WhdpCRrXyE24jlCRvSbFsbRxw5n1gUyJv2EOwPhRP9d/7JjM1Aus4HlWrfF+qQ+D
9JRH3qOiAfP0reGoOqMygfW/khL4ya9fr1Od+Ur9qNWJ9Zx2hI2zzaixIPxFZa9i
8ok7IeQ03eKXBodj3di20tsM6b2LkgJEtj53hPuOd4QGPfSPSGgk//bYbFKbIpYD
GrEfHwuflF8tLRYpdJq46KQlWAWq32jlDsF9PnGYkmf7kAmzRxTuvH9N9kg1ctk+
SAgMGypn9s8f60RGzz7hQRb+H48BAq8JjwQW0gAPIjtsIaLTar/7AOLua5gFCIQA
NFJU+67/iv//nxXsino+xITtq7DOqYBdL6BXxPHo+GnaxQq+Dx4O8g+/r/uMXWu/
DWbMBdb+Q66Hhc4VogMHJUZ8LYDZN4D+iiQLkva2jvfXOWb97CYk7EHJQrRP6l8H
IREzaq9aU8wIomUDDG/tgtjZJR1KDhPKTx32HENlupK/m64ergyYIUu0Q2IkIJZi
glOfN0eapy1mDeSWvAnWPhAIf/SzQIRR/vnll+CIpux4/fqXdkszGFk/aH3RijXA
/T6k9vvV+UmAxazqlK2c9iGkQEIYap0LKJaLtB+EBYRTQ/GJBnI=
=zuhV
-----END PGP SIGNATURE-----

Binary file not shown.

Binary file not shown.

@ -0,0 +1,2 @@
EBUILD gitlab-runner-1.ebuild 146 BLAKE2B 8cd9fe9d4eede23823dd4b24485c5b001e6282525ad64cc11ba235739ee55ce6b84957f22611b417c882d63eea31d866b4ac26bad67a3df9e82970793e7954a3 SHA512 91ad3a7179f36f3d387b7da6337379a819751d862e03cae51528140c0b32836485c3c6e5fc87a48aebc7915a3754efe8e139632116514ad4ea687a0b4e11c422
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251

@ -0,0 +1,8 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit acct-group
ACCT_GROUP_ID=510

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
</pkgmetadata>

Binary file not shown.

@ -0,0 +1,2 @@
EBUILD gitlab-runner-1.ebuild 312 BLAKE2B 0b91df00506dd521e9a66472643ae56de19dcf1feb46bbc7f3ac9427b9eba3380a915fc9ed632da2b472e5c9c9e00b0af0b490720a8003c6231efd2831dc4560 SHA512 ac81a2750760c851d8b1405f3a4a83a3e9e55a08e397a2f402a79cfb255a8b8c26a1a5de62871824e91fa85f642319135aacbb009e9629dc90b096f8a35e93d4
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251

@ -0,0 +1,16 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit acct-user
DESCRIPTION="Dedicated user for gitlab-runner"
ACCT_USER_ID=510
ACCT_USER_GROUPS=( gitlab-runner )
ACCT_USER_HOME=/var/lib/gitlab-runner
ACCT_USER_HOME_PERMS=0770
acct-user_add_deps

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
</pkgmetadata>

Binary file not shown.

@ -23,6 +23,7 @@ AUX salt-3003-gentoolkit-revdep.patch 514 BLAKE2B aff27558a2043970feeb3eda70cf8e
AUX salt-3003-skip-tests-that-oom-machine.patch 732 BLAKE2B b9e10cf8d9ce7f36371fd30fcf592dce4933a05ca2d85c41b2159233272f2e7c90315fbd998c4064f3733b5b1944f9f96816418ed7eb434f3b9df324de2e859b SHA512 e7bc9c63d95a9af4e85372ca973c5023660c332b67486382ce898e7d60c3f50e2aca59e2634a2e87ab7fa8b34e45bfd3a781e04b8003108efbfcc67cd921aff4
AUX salt-3003-tests.patch 5792 BLAKE2B 6a383c400bfb1f261d284844dc12bfabe4fc1741c5bc840131440ea991d64e61432f4e9ac4059d5bc8680b7752c6ceed16c474d0908b53657f15560a7c6f0e8f SHA512 fdb3eef283b62da9955cbe88d7f99f889c23147d3b60af7d49e4a54f61d158903ea77ff321764e0f3aa62b38ac7045d46d9f17ccfb2870c56b8b32baa856b6a8
AUX salt-3003.1-tests.patch 1151 BLAKE2B b2f0d99bf4bd90a7ea85ae5cc6abb91dd078ad8a95b062863a21573067f3df6045fe23ffd1b3f397e28b90b25126798253e8a9001509ad786cee3f318a900321 SHA512 9340a1dd343af45467be63b1f6991cd06fa57ffc187bcff4a96c75a9666a1429b98ce5b497354bc4cb975c0f6bcd9a64dbfb819b6bfdba02bb5917446d0a36fc
AUX salt-3003.3-jinja.patch 5036 BLAKE2B 7b54f79a2c24daf706cade5e3fe9470a01ddb81e2c7ac1a74d9d3f3bcc6f365562435607d6829433bfc31a5cbb8fcff603fbc183ee07ef32582b4ca1fda9f7be SHA512 e3d5db2143b7cd80bc1c0eee297ef9cc05301be43a57cd9471e28e01e405749bad1823eb992cab9267a47a1dca690c15b782c2a9dd2ab54a2b4a0375e8f75663
AUX salt-3003.3-tests.patch 9888 BLAKE2B b8785f6498246e3a61079721c060aebda15a595232600aad408e01cae052ccf15d0b482efd17c12de74bd227cabaf2e95812420f157bdc97edac60e9a25d1c44 SHA512 4709c63ffe1c8205672238855f07adcc28556d8d8fcb746402e07651552015ce8ae6754f2a6ec07545d58f4c018a27d14273e8cbba1ecfdc7a1527007ee7a928
AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
@ -33,20 +34,15 @@ AUX syndic-initd-5 558 BLAKE2B 5e1ea25b57f56ad7bfb8be0c845e7da9f99af03c50c31ca20
DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f
DIST salt-3000.8.tar.gz 15249139 BLAKE2B df306669ba11dd650621222ff9c69f5a6e16b6f431e9d93e6712ee95da43091bfe28416fe0d71988ed9ee70cb347755b779a356c50fa59c63c67a874ed1906f4 SHA512 a18d5bea3b3835f83d5b1e5315990d83f6c58c36df5589d5de0f8cc3a46db4c960b58032e29d56841a160b9b170cdbb81bca38dbbd72ccb5866ccc8a7da6e800
DIST salt-3000.9.tar.gz 15250432 BLAKE2B b76c166363b0b0fd3e3aa4b5306ba8280a2c99fbc7fd9866d957406bba8e6fcc03b769b53dbb80b115f9fa9f1fdc93e1eb257f4bf04283e414a309c16e4f078f SHA512 94214f20a8a080ebdcbb7e3351f60a466c3a92cc85d177c2ea677192a63e58b0f9cacfb1af04e14022a7ac570ebd0b931722d1d001a7655dcd7502813c29a092
DIST salt-3001.6.tar.gz 15736056 BLAKE2B 00e7674452e9d61c3cd487d27a3a1f3435c6b12dcc89008aa63c96814957b6ce8654f4d4d51dbce7b14027f0cee66fd2ea9602f6be18bf2f4beac11ae164f89f SHA512 e45c9cfddb64ab1c9d66b6b6b3e5ff8d9010c01307161e5013140b4362ee630cf912ab153d1afa72f56d18fc5353293b2f4b449caf8ee384d1e93204d490bf4c
DIST salt-3001.8.tar.gz 15740488 BLAKE2B 77875a670b81438280becd1f29b64fbc766379192a9ca041568cd9360a3c4213bb3018063e88a297e9d1f637fb7ca3ef049a73a258022ec07e42f01a40bdf09a SHA512 8e90b2a1f82f951ab40a53a8af2ab421758ed8244f1881cc7aa71a8d9c2e2e6d892166ec8f8f6182966e56eb28c9aee6a060ee54b559b1d073fba97ad0afb013
DIST salt-3002.5.tar.gz 15784880 BLAKE2B baa90bb0caea572dfbe12d92fb488ee0c4adef9a07221f394009cd43a62ffef18c57f2e7cdcfcd923807c7a3d02ce6833480f74d70250c29d311420f30514300 SHA512 dda2caa338f646ec51d2de6b0df10fbb27eceddbe8c797ae192b9ef1312d566ae71a243a3a95918fa375b125089aa29a73b1b908c5cc1b0451dccb582a4978a1
DIST salt-3002.7.tar.gz 15792124 BLAKE2B b4cb4a6d73c45f3c2183a7adfe8196bbc5788dce1995bd5c640cd9957bdfdba2e96deebaba927d6103fc50f4eaab86d51f4dd4594d25b7357db79ed67b39258e SHA512 c1e7bbcd39b5c2bef351bd74026346bf729839c4161f6eff8162620e9cb08a63073abeeb8af6bab635070386a883df494ef08cc07a84efa9aa7f2160b357a938
DIST salt-3003.1.tar.gz 16010476 BLAKE2B 3cd141061d8fa6ad00fe60615e8d36fda9fb26264adb2722d34e0b93c626fe09d78c3b9280ad8fe98924469a1ede1ad93cc06bde24a121c3db8c957be0ab7d75 SHA512 bf5ec7f1d16c776be5c2e90bff30e11817f369c3b08c0fe8bd991e7be31179b10cbd244048fb08c05aff30d7b6037c0575c311da4a0f300ce02bcf677aa6616f
DIST salt-3003.3.tar.gz 16017984 BLAKE2B 9cd1e33a7b6dff4d3c6c5a87e1204f7f113b6190da8301061e26fcec178aba597a9e17ab60a54a67b52a895a9a8aef58bec70e9fdd8d8edc5a42945f6de21a58 SHA512 4fe50922833fce48fcc679adb16a0e1fe893531b2feb08b235a1461c58b8d9a72af2acd89fc0f712207fb0cd215d6b446e31a40001b46c43d0cc4ac827ce29e3
DIST salt-3003.tar.gz 15830910 BLAKE2B ea4f02eece951c3fb4fcc480d00f7b531ac549b2e23ff9a210b73f749f9ba83e0402e02a59028f41f94958d17512e417b7c1b7015e8ee3aeac55be9b1374fe6f SHA512 7f631466372f303c03f2852a5cfba1ee5c6ba1636a6fe1e1622e90d0b1376ef9f670aa1b4754f3d9c8c7fe1b99fe1b4c49e140dc86d90d157a1ec1e73ba43c38
EBUILD salt-3000.8-r1.ebuild 6621 BLAKE2B 07886dd10693134d3e01db34e6847f96272d3510854e1b8130c999ae1fd026bce5024cd6d311a8a69eb60ee8a0cc39284aba640162ecb0ca22058e1e21810a7f SHA512 d044a41745e400cfc7d9d976ff78b736ef3c630e9df89502eef78867e57a628d78f032366e0e4d68d63856d453cf13e034597c1f6b3a30279f5edc89dc781d37
EBUILD salt-3000.9-r1.ebuild 6663 BLAKE2B 257266c6734f4c859234e73e654bb2ce8c685c4509b1d49e4e60b4f6e0cc3b08be0aa9be70746f1f114d498e00d25111753e5297a63e71d3b39bfe7c7173f1b1 SHA512 b892b57e2aecbd6e521c3f6973c0e75e037b1a310ddfb1c1c107512adbdb108c4e9e47a1d8542734883fe74e6e951aed051abe35e7401d6ed70e6abd23f9f11f
EBUILD salt-3001.6-r1.ebuild 6244 BLAKE2B 464d3ab8f791d67b9e0964a34a9b516dca8733e49d13c848fde451f5bdc5b7cad8eba0ca7ab0303e6c0bfe13489080b112c10c3e2dc183d1327bb794a71efd4e SHA512 8adeba357f9a824d7c5ee68f0a157720aa67b0715938f2967ba4eaea41054ab9c7f3d1a4616cd2af5666080325a5e372836de6ffb84d71778a6dde2ae3844d21
EBUILD salt-3001.8.ebuild 6233 BLAKE2B eda71511e995977e91fdd0a1b323a47fad5a6ab9b2969ca696f410066d859db205c12ca7ce00154a562b83e8542c5445cb27e8ac72f33bf4615b2fb234899496 SHA512 790c10e9770a8b859cb6e721e962d0e992f2bf3d0d11db2fbe2811b7f4c122218b317f64172d3a65175d62511db5906f1d3873a98336d726d089493796defef0
EBUILD salt-3002.5-r1.ebuild 6275 BLAKE2B 1138d07246b4c41419af18af9acdb3332c88815da20c27d46d3ccf68882e5c389f1bc8f0b40c429b6c7afde4427f8289eec9e5277510f559858e228d6b1a010a SHA512 8d07d275808b8b052269848dd6fa6e030d7f78ffa575b798d95598761d6cfa4542310f5b960bb9ef8a88183eb97a8f830160ce78c6936b259496b613dbd86afb
EBUILD salt-3002.7.ebuild 6506 BLAKE2B 225e4b18c276e26f7d9dffb06920f6ad7990b9b7de7c3e838325c8582e6408ce483e284e03b549dd62b87beb778c2742c12e14e6f65e89c890cdab912e138525 SHA512 0b06ca50fe3f0b943a7270f617e61eb4d73fb0a3187068d37495987ee267f53e499abd638a88c098bbcf07ea51ff46f2ed9ba7c0717069239b81cfbfa82ac92e
EBUILD salt-3003-r1.ebuild 6580 BLAKE2B ba2d5c5a2461694213918dc4d7cb88600235b1b1428ffe77282e24aa21f69b95194085e785e59ad2d51f0319b1da29ea21181d55ff5be7ac9314cc8da5cd8196 SHA512 45f17a2d32ea81bbf01552d9efb2804093b5cd567cc17b23e591a89a692b2ed719676c7d5ecaeee6d723e0d1443f2873d02b4f35e945c5270c8709f0c106c4c2
EBUILD salt-3003.1-r1.ebuild 6812 BLAKE2B 4c7cef012fb1fa832f12571b744e4336913a381c64f282edbde0415368c96086022f7eee077f58f57d8b966270536588580b1eeb32114c9318fed6fa918d4bfa SHA512 009e12efd0ed72ba24e4ee5c9bd12a1626d61ea3a5a41b34b1fecc857c3665144217e27255f6349f7de8c07d60fb37d0af25645e0429b366d38931ef9d54697f
EBUILD salt-3003.3-r1.ebuild 6842 BLAKE2B d273b5b3a717022a75cc83563f9d0f8412c5250f062312be30c36560faf1250ca64382b4cc4f4e180196217b97158090dd7593a4f4e450904840f5a7d4c88104 SHA512 46aa981c49279c984d622bd38782099919845fa47597eb343a8a40bdcbf76ac29e1377c09ee4c33b6d6930e789c34bafeef308094adc873646be5805b7710f6f
EBUILD salt-3003.3.ebuild 6801 BLAKE2B 5146a9a20ca1de9ef167f896df8cafea100a1b5245d747aea685a6811151c3909040c3cf53d80ed5eb7359e76914a5fdf94ad8af8d643995d46c727d9163cc66 SHA512 95a055ce3a69a358bfdd221f139b86964a7ce5ea18d3f12b9270bcb03f4873cdab55b738338165b785d039f869096928758a8ccb1c0c6a87c3e1897da0a89ae6
MISC metadata.xml 2362 BLAKE2B 60fd7a02823e610b4d12b1d4c6a066cf16f8ef4094397553381d62bc027715164f02ccad4c86e431a30822d5c4c25e4eebd814f99e43b7a45bc08a3fd885cfee SHA512 4aa7549a76e69233949c68841bfcdba6630eeb78a507f20119469f7835a6532b737f41d117c09b1e4c7574f95dec759deacf5d5482be961755d63a19b9eee9a7

@ -0,0 +1,155 @@
https://github.com/saltstack/salt/issues/61848
https://patch-diff.githubusercontent.com/raw/saltstack/salt/pull/61856.patch
Dropped a bunch of irrelevant hunks (CI files and a test not in 3003.3)
From 03c2a607a0722ad5e55b6c8f8eda630be7c7fee5 Mon Sep 17 00:00:00 2001
From: jonyhy96 <hy352144278@gmail.com>
Date: Thu, 10 Mar 2022 10:41:48 +0800
Subject: [PATCH 1/5] fix: jinja2 contextfuntion base on version
---
salt/utils/jinja.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
index 4c430b5ccf32..9a1938c2d69b 100644
--- a/salt/utils/jinja.py
+++ b/salt/utils/jinja.py
@@ -707,7 +707,11 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, **f_kwargs)
-@jinja2.contextfunction
+if jinja2.__version__ < '3.0.0' :
+ contextfunction = jinja2.contextfunction
+else:
+ contextfunction = jinja2.pass_context
+@contextfunction
def show_full_context(ctx):
return salt.utils.data.simple_types_filter(
{key: value for key, value in ctx.items()}
From 1aba938021b86732a211a899dc4c2a46afa488a2 Mon Sep 17 00:00:00 2001
From: jonyhy96 <hy352144278@gmail.com>
Date: Thu, 3 Mar 2022 16:21:17 +0800
Subject: [PATCH 2/5] fix: jinja2 DeprecationWarning
---
salt/utils/jinja.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
index 9a1938c2d69b..207a2cb77035 100644
--- a/salt/utils/jinja.py
+++ b/salt/utils/jinja.py
@@ -710,7 +710,7 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
if jinja2.__version__ < '3.0.0' :
contextfunction = jinja2.contextfunction
else:
- contextfunction = jinja2.pass_context
+ contextfunction = jinja2.pass_context
@contextfunction
def show_full_context(ctx):
return salt.utils.data.simple_types_filter(
From 7f281bbfc8efda40cfe7d607c0ddebb2fb00bd5d Mon Sep 17 00:00:00 2001
From: Megan Wilhite <mwilhite@vmware.com>
Date: Fri, 25 Mar 2022 08:31:24 -0600
Subject: [PATCH 3/5] Use the correct Markup from jinja for each version
---
salt/utils/jinja.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
index 207a2cb77035..558f063d7206 100644
--- a/salt/utils/jinja.py
+++ b/salt/utils/jinja.py
@@ -26,7 +26,7 @@
import salt.utils.stringutils
import salt.utils.url
import salt.utils.yaml
-from jinja2 import BaseLoader, Markup, TemplateNotFound, nodes
+from jinja2 import BaseLoader, TemplateNotFound, nodes
from jinja2.environment import TemplateModule
from jinja2.exceptions import TemplateRuntimeError
from jinja2.ext import Extension
@@ -35,6 +35,12 @@
from salt.utils.odict import OrderedDict
from salt.utils.versions import LooseVersion
+try:
+ from jinja2 import Markup
+except ImportError:
+ # Markup moved to markupsafe in jinja>= 3.1
+ from markupsafe import Markup
+
log = logging.getLogger(__name__)
__all__ = ["SaltCacheLoader", "SerializerExtension"]
diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
index 558f063d7206..5d00b134e25f 100644
--- a/salt/utils/jinja.py
+++ b/salt/utils/jinja.py
@@ -713,10 +713,12 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, **f_kwargs)
-if jinja2.__version__ < '3.0.0' :
+if jinja2.__version__ < "3.0.0":
contextfunction = jinja2.contextfunction
else:
contextfunction = jinja2.pass_context
+
+
@contextfunction
def show_full_context(ctx):
return salt.utils.data.simple_types_filter(
From 9056e636beaea7de2e3a61876ba0345e5d390973 Mon Sep 17 00:00:00 2001
From: Megan Wilhite <mwilhite@vmware.com>
Date: Fri, 25 Mar 2022 11:14:01 -0600
Subject: [PATCH 5/5] Fix requested feedback
---
requirements/static/ci/docs.in | 1 +
requirements/static/ci/py3.10/docs.txt | 3 ++-
requirements/static/ci/py3.6/docs.txt | 1 +
requirements/static/ci/py3.7/docs.txt | 3 ++-
requirements/static/ci/py3.8/docs.txt | 3 ++-
requirements/static/ci/py3.9/docs.txt | 3 ++-
salt/utils/jinja.py | 10 +++++-----
8 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
index 5d00b134e25f..aa8ebe90546c 100644
--- a/salt/utils/jinja.py
+++ b/salt/utils/jinja.py
@@ -36,10 +36,10 @@
from salt.utils.versions import LooseVersion
try:
- from jinja2 import Markup
-except ImportError:
- # Markup moved to markupsafe in jinja>= 3.1
from markupsafe import Markup
+except ImportError:
+ # jinja < 3.1
+ from jinja2 import Markup
log = logging.getLogger(__name__)
@@ -713,9 +713,9 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, **f_kwargs)
-if jinja2.__version__ < "3.0.0":
+try:
contextfunction = jinja2.contextfunction
-else:
+except AttributeError:
contextfunction = jinja2.pass_context

@ -1,187 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7..8} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit systemd distutils-r1
DESCRIPTION="Salt is a remote execution and configuration manager"
HOMEPAGE="https://www.saltstack.com/resources/community/
https://github.com/saltstack"
if [[ ${PV} == 9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
EGIT_BRANCH="develop"
SRC_URI=""
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
LICENSE="Apache-2.0"
SLOT="0"
IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
mongodb neutron nova openssl portage profile redis selinux test raet
+zeromq vim-syntax"
RDEPEND="
sys-apps/pciutils
dev-python/distro[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/libnacl[${PYTHON_USEDEP}]
>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
>=dev-python/pycryptodome-3.9.7[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/markupsafe[${PYTHON_USEDEP}]
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/toml[${PYTHON_USEDEP}]
dev-python/watchdog[${PYTHON_USEDEP}]
libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
libvirt? (
$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
)
openssl? (
dev-libs/openssl:0=[-bindist(-)]
dev-python/pyopenssl[${PYTHON_USEDEP}]
)
raet? (
>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
)
cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
selinux? ( sec-policy/selinux-salt )
nova? (
$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8)
)
neutron? (
$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8)
)
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
vim-syntax? ( app-vim/salt-vim )
zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
"
BDEPEND="
test? (
${RDEPEND}
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
dev-python/pip[${PYTHON_USEDEP}]
dev-python/psutil[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
>=dev-python/pytest-salt-2020.1.27[${PYTHON_USEDEP}]
dev-python/pytest-salt-factories[${PYTHON_USEDEP}]
dev-python/pytest-tempdir[${PYTHON_USEDEP}]
>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
)"
DOCS=( README.rst AUTHORS )
REQUIRED_USE="|| ( raet zeromq )
test? ( cheetah genshi )"
RESTRICT="!test? ( test ) x86? ( test )"
PATCHES=(
"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
"${FILESDIR}/salt-3001.1-tests.patch"
"${FILESDIR}/salt-3001.6-tests.patch"
)
python_prepare_all() {
# remove tests with external dependencies that may not be available, and
# tests that don't work in sandbox
rm tests/unit/{test_{zypp_plugins,module_names},utils/test_{extend,cache}}.py || die
rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
rm tests/unit/states/test_boto_vpc.py || die
rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
# tests that require network access
rm tests/unit/{states,modules}/test_zcbuildout.py || die
# make sure pkg_resources doesn't bomb because pycrypto isn't installed
find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
# pycryptodome rather than pycryptodomex
find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
distutils-r1_python_prepare_all
}
python_prepare() {
einfo "Fixing collections.abc warnings for ${EPYTHON}"
local abc
abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
}
python_install_all() {
local svc
USE_SETUPTOOLS=1 distutils-r1_python_install_all
for svc in minion master syndic api; do
newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
systemd_dounit "${FILESDIR}"/salt-${svc}.service
done
insinto /etc/${PN}
doins -r conf/*
}
python_test() {
local tempdir
# testsuite likes lots of files
ulimit -n 3072 || die
# ${T} is too long a path for the tests to work
tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
mkdir "${T}/$(basename "${tempdir}")"
(
cleanup() { rm -f "${tempdir}" || die; }
trap cleanup EXIT
addwrite "${tempdir}"
ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
TMPDIR="${tempdir}" \
${EPYTHON} tests/runtests.py \
--unit-tests --no-report --verbose \
|| die "testing failed with ${EPYTHON}"
)
}
pkg_postinst() {
if use python_targets_python3_8; then
if use nova; then
ewarn "Salt's nova functionality will not work with python3.8 since"
ewarn "dev-python/python-novaclient does not support it yet"
fi
if use neutron; then
ewarn "Salt's neutron functionality will not work with python3.8 since"
ewarn "dev-python/python-neutronclient does not support it yet"
fi
if use libvirt; then
ewarn "Salt's libvirt functionality will not work with python3.8 since"
ewarn "dev-python/libvirt-python does not support it yet"
fi
fi
}

@ -1,187 +0,0 @@
# 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=rdepend
inherit systemd distutils-r1
DESCRIPTION="Salt is a remote execution and configuration manager"
HOMEPAGE="https://www.saltstack.com/resources/community/
https://github.com/saltstack"
if [[ ${PV} == 9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
EGIT_BRANCH="develop"
SRC_URI=""
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
LICENSE="Apache-2.0"
SLOT="0"
IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
mongodb neutron nova openssl portage profile redis selinux test raet
+zeromq vim-syntax"
RDEPEND="
sys-apps/pciutils
>=dev-python/distro-1.5[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/libnacl[${PYTHON_USEDEP}]
>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/markupsafe[${PYTHON_USEDEP}]
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/toml[${PYTHON_USEDEP}]
dev-python/watchdog[${PYTHON_USEDEP}]
libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
libvirt? (
$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
)
openssl? (
dev-libs/openssl:0=[-bindist(-)]
dev-python/pyopenssl[${PYTHON_USEDEP}]
)
raet? (
>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
)
cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
selinux? ( sec-policy/selinux-salt )
nova? (
$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8)
)
neutron? (
$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8)
)
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
vim-syntax? ( app-vim/salt-vim )
zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
"
BDEPEND="
test? (
${RDEPEND}
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
dev-python/pip[${PYTHON_USEDEP}]
dev-python/psutil[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
>=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}]
dev-python/pytest-tempdir[${PYTHON_USEDEP}]
>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
)"
DOCS=( README.rst AUTHORS )
REQUIRED_USE="|| ( raet zeromq )
test? ( cheetah genshi )"
RESTRICT="!test? ( test ) x86? ( test )"
PATCHES=(
"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
"${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch"
"${FILESDIR}/salt-3002-tests.patch"
"${FILESDIR}/salt-3002.5-tests.patch"
)
python_prepare_all() {
# remove tests with external dependencies that may not be available, and
# tests that don't work in sandbox
rm tests/unit/{test_{zypp_plugins,module_names},utils/test_{extend,cache}}.py || die
rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
rm tests/unit/states/test_boto_vpc.py || die
rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
# tests that require network access
rm tests/unit/{states,modules}/test_zcbuildout.py || die
# make sure pkg_resources doesn't bomb because pycrypto isn't installed
# make sure pkg_resources doesn't bomb because pycrypto isn't installed
find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
# pycryptodome rather than pycryptodomex
find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
distutils-r1_python_prepare_all
}
python_prepare() {
einfo "Fixing collections.abc warnings for ${EPYTHON}"
local abc
abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
}
python_install_all() {
local svc
USE_SETUPTOOLS=1 distutils-r1_python_install_all
for svc in minion master syndic api; do
newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
systemd_dounit "${FILESDIR}"/salt-${svc}.service
done
insinto /etc/${PN}
doins -r conf/*
}
python_test() {
local tempdir
# testsuite likes lots of files
ulimit -n 3072 || die
# ${T} is too long a path for the tests to work
tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
mkdir "${T}/$(basename "${tempdir}")"
(
cleanup() { rm -f "${tempdir}" || die; }
trap cleanup EXIT
addwrite "${tempdir}"
ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
TMPDIR="${tempdir}" \
${EPYTHON} tests/runtests.py \
--unit-tests --no-report --verbose \
|| die "testing failed with ${EPYTHON}"
)
}
pkg_postinst() {
if use python_targets_python3_8; then
if use nova; then
ewarn "Salt's nova functionality will not work with python3.8 since"
ewarn "dev-python/python-novaclient does not support it yet"
fi
if use neutron; then
ewarn "Salt's neutron functionality will not work with python3.8 since"
ewarn "dev-python/python-neutronclient does not support it yet"
fi
if use libvirt; then
ewarn "Salt's libvirt functionality will not work with python3.8 since"
ewarn "dev-python/libvirt-python does not support it yet"
fi
fi
}

@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7..9} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit systemd distutils-r1
DESCRIPTION="Salt is a remote execution and configuration manager"
@ -91,6 +91,7 @@ BDEPEND="
dev-python/pytest-subtests[${PYTHON_USEDEP}]
dev-python/flaky[${PYTHON_USEDEP}]
dev-python/libcloud[${PYTHON_USEDEP}]
net-dns/bind-tools
>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
)"
@ -105,8 +106,9 @@ PATCHES=(
"${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch"
"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
"${FILESDIR}/salt-3002-tests.patch"
"${FILESDIR}/salt-3003-tests.patch"
"${FILESDIR}/salt-3003.3-tests.patch"
"${FILESDIR}/salt-3003.1-tests.patch"
"${FILESDIR}/salt-3003.3-jinja.patch"
)
python_prepare_all() {

Binary file not shown.

@ -1,8 +1,8 @@
AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037538ae23562c5663742a7453e00412eeafa72129a4806f3610f3f77865c7ebf3e58223a7286c9f712e SHA512 b70abb44d6bc0cdd8115104ef1fbb5099a270c29040351ceff738b9b6ff796a802f92dbbe2c49e04ae058043546bbe6a854e25044f5c07bea7bf6b6fc4f66018
DIST containerd-1.4.11.tar.gz 6406769 BLAKE2B a4882223e2f71944a4d46fb0500a95248cfa33735447952f94c7d7350c2cb62b4911adc77f96559116cca462be02b7270185a0a3dfed5ce4c530465cca7e2078 SHA512 16aa6ae4209939754e122545b454d8b25027a3621464a4b4e0379480b35adf0efb318271f82cf2b959a62fffe531979c9bdfee9ac7d47d4b33269a6bafe2d070
DIST containerd-1.4.12.tar.gz 6408402 BLAKE2B 559164a9d8680edea52040690da8e9b45777a39e471b1a7cc56ff4cf207cee7c83dc73969a8868db5d531f6e4e27cc7a975f073ffcf7f9c2768858b1a4001ddf SHA512 52dc4b0344eb4c6a6f1cc5690ff0c70ee052ef05c02300ed4a806458c40bb1970c26b374b0733b2c30a05c04a731d62a7c4206b1d768075d51c202912efd32b1
DIST containerd-1.5.9.tar.gz 7695248 BLAKE2B 1bbd755cadee9022671e6340a194c7190b7249001b56128cb6a94982d83c01dc9292e08ab591728fa223523d7488bed63d055ce0b552196cf4d1c7dfb41928b5 SHA512 13d5b8bcfd811b1abf67008d1c664962f315cd45d885adaa88847bcc4f1c5d743dccd62bc34fe77348ca18a4f8841ce7a8a022cccb275b19b59017b3fbf1054b
EBUILD containerd-1.4.11.ebuild 1988 BLAKE2B 744953bb015872ed4e18ffa9dd1a6d111e13bfa9983919d8dd3e2a137287da5a8bc363e005635e32c77f04608ac98f4fc5043be038459b9b7f7ba78a1ef15e91 SHA512 26cf0e4682242f736f2b4f05cabd321aada08219bd0d6052f54b4badfe9866b5d9b22b23c1a2c3ff0387919dc103f5d54b939ceb7c9f1e8acc8cb086317474dd
EBUILD containerd-1.4.12.ebuild 1988 BLAKE2B 3447137eadd57b14b0fb293b9684e3ad7b70261b757fbb5ce5849ae99460deb19e87b3028532f45b5d9801f73b5075ac48a34b748054f598a83d002067dc6c75 SHA512 cda6b6cbc9cae03e3d75c90cad822582e1ba5dd5a05ba4661f9665dc0f9e9c1bd1e3743144fb8f483cdc3d83afd00a6638822cd7b0f215a5671e94984a98dcab
EBUILD containerd-1.5.9.ebuild 1959 BLAKE2B 5eb7f8d70b38dc977fbdf3515a747e55e570c61232a3defc7350dafa0e7c570fc205d9f4267ec936d912e5673c71ad310fef4586c2dd6a7f05244e28e63efa29 SHA512 5697f62cc180c536347b73ade64bd0351d6bcee75f0bcacf635b3ab691a7ba1631717582585f1626923ad74d12d4070b6a539ca9f1aa672e8c74ac837b3eb793
DIST containerd-1.5.11.tar.gz 7494477 BLAKE2B 2415e85694e5f4410c8cee7be08d1d304adfcdb95c4078f7a92c710a5a11a29ae011daa70fcfa72c2fabf5b48b7cac962b39121f18bb027931ef77214e86b1aa SHA512 6348f4ae7f9b473aac7d5e7325ca4539345d09f01b95383cec28f09d5e5b0b831e25fe305c3a15050f1e1959948ee8dcad788a1d6dd4780cf3077132d5617ef8
EBUILD containerd-1.4.11.ebuild 1937 BLAKE2B 28d77a75c41972622bd514aebcd0771c3528fa0076834c97f83a7008b258b64785902b6a41d424599022e834a316e4366d89e5108b8d43f017c8769604efc6ee SHA512 e2799565ca0698c214f3a29adbdcdf001af3b7c39e7780838e8a8e7f9b155334a1f7e4ee7d0af61bb9650c2a6a135fa5bfdca1014f7947915b37f86c9aa2dca8
EBUILD containerd-1.4.12.ebuild 1937 BLAKE2B 4177d3ab1f97f30217835d21421f6ad8c6dab38198e6559efdef57e9f8bef77e0a6719b2dc1182216bbb5b9bda1ef3484f9709bc0ca615edcf8f262fd1e1a856 SHA512 3f3dba551539a584a6d64b1a48e1a3cc892d0e060b734428e5d7c4d9f94e189b8c102f3e637ee07321f8ff637f9db7b93d4a61d87f4fcb6a7b1c47eaaf48ad3c
EBUILD containerd-1.5.11.ebuild 1908 BLAKE2B d07f9b4cd9cc0ef2ad986daf4a528bb2111f8efb5609ebce87c59166af04c9f8c4d2a4f54e0bc50e4f7fd6905a93bbb0f5135f5a7066c6932f2b7b3d4e0ec80c SHA512 5d4a4612a49ec3d820902b2cd38118d91d6c7f48457aa5937ea1f088cccd8fa62fd7cd027d44b41f11ef31fef4e093aa5f94fb027e18eeccc5d26855b559af51
MISC metadata.xml 1144 BLAKE2B 960f8dd81a1e56c0d381355da41a845c2e9c12db0c8c546da1593a0499e4929b37610dff83943c388f8edc5878b9824e47ddac02ba129176a916054400e10e90 SHA512 904a5a11d7729ea6021aaf1b1d91ae3f7609c08b8c191d9f4c35c62914b0acf1ee45f3f7e0416711225809f129da4b4c76c934e6207026b69b0096f431820982

@ -1,4 +1,4 @@
# Copyright 1999-2022 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@ -27,9 +27,7 @@ RDEPEND="
~app-containers/runc-1.0.2
"
# bug #835367 for Go < 1.18 dep
BDEPEND="
<dev-lang/go-1.18
dev-go/go-md2man
virtual/pkgconfig
test? ( ${RDEPEND} )

@ -27,9 +27,7 @@ RDEPEND="
~app-containers/runc-1.0.2
"
# bug #835367 for Go < 1.18 dep
BDEPEND="
<dev-lang/go-1.18
dev-go/go-md2man
virtual/pkgconfig
test? ( ${RDEPEND} )

@ -1,8 +1,8 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
GIT_REVISION=1407cab509ff0d96baa4f0eb6ff9980270e6e620
EAPI=8
GIT_REVISION=3df54a852345ae127d1fa3092b95168e4a88e2f8
inherit go-module systemd
DESCRIPTION="A daemon to control runC"
@ -25,9 +25,7 @@ RDEPEND="
~app-containers/runc-1.0.3
"
# bug #835367 for Go < 1.18 dep
BDEPEND="
<dev-lang/go-1.18
dev-go/go-md2man
virtual/pkgconfig
"

Binary file not shown.

@ -2,6 +2,6 @@ AUX signify-30-man_compress.patch 576 BLAKE2B b6c82f0737dcfd569bc781d84eaecad2c0
DIST signify-30.sha.sig 246 BLAKE2B b5c26ad1d90ce562a5e6e8cb0a26c031da6bcc9d04cdd668f7b81410ba38ef1777db8f1a4b38fc515c251c840baf38e3df6b3f730a59a0921180ccb88f457fe5 SHA512 b0aea8736b4508ce5a45a296e11150218d694351b15d87478cad235869a6b0150d1893247d1600ea1679d47e71e87e629f5cf4932ecafa2ad4f05aa962f1743d
DIST signify-30.tar.gz 94593 BLAKE2B 2d432cef9990a8ce23d0f05449ef02dcf7a00f4328a25dcab98cd25c2c74875fd8ea7ed7a67b7e4ac6c9f432a91564edcc1fc9260627c37352c19cc17581aea3 SHA512 4a1ebcdbf7aa74865b97cadbf5380460702306b6d0a77306e6c943bb0c3419ca929ecd3455522da4448d780a56c8eddeb26fb4d7fb006fc3bf23f69693c39e87
DIST signify-30.tar.xz 73824 BLAKE2B 27de72ac82d9b66346185292cad71e57af0767111123ba0c618a7d5d4add2e5502b546ffd53ffa2956c66b8f00d2b1a96d21958125d5649d6efb23254c0f56ac SHA512 e760fd89de8a3fea76bd0aa52c683e1d331968620190f4ac487bbca30da00f8d6e2636bbe3c59b0e6fa925b1bbcf81516f50c0bc37707ae7e7465b61fee5c372
EBUILD signify-30-r2.ebuild 1137 BLAKE2B fa466b98a5df610406a1bab438e04e50dadef8a87889f99bfcb41b4c1220e38d0a9ebeff497b104c8bcbcca8aaa3a0c6f71b288b29297400d02a8d4c160f200f SHA512 a7c9f00c477a785665ced2e85cda6a1c8a65f96261ea51f030018a85a4958da578ffe708a25a16037af90b056ebe9bec512cb560e36f9e784ee06e3ca68aa64d
EBUILD signify-30-r2.ebuild 1144 BLAKE2B 1463b947fd34a8898efa28bfffea0a766129b4a09280467a50ee37e10600db8180357b4337c9f511917aa7e5519dcfe391e41cfa5a5262e312072969d543f0b9 SHA512 b3825f9fafa36d88f52c81774739acb37b45fb9812e23e87d0bd06274b0358ef18a89072c0a975858ff1070172daf46f0001a05fe6bd99316500b2e8aad28bad
EBUILD signify-30.ebuild 616 BLAKE2B 970eeb3f56883853c77608f81af3f712d8057bb71cd5c99565a551a5e1a267358cf21e52c9e020461c8cfff09b18170cb3fb26645e8c811f9694e3169494de89 SHA512 3973c9115bf57c8582575a3791dae541bd3125241b0bfee2c046c795e627d818db8910fba83acb997fc8c27525df172908c136435006bc3fd4da571d5611f0b1
MISC metadata.xml 437 BLAKE2B 75f7f8a4b2475b052a41134e41ab274386c5f59847bad67ad3d8bd447984a2b42a119bbc60b13df0ebed9988f98ea5382c4aff4fa093cf44c7c8d2907d0db26a SHA512 ce3b623779a2b51556bb440df1b08f386f9fcdca641d1c0b06b3c2f0d1e98649ca8b45d8b32406f7b2b53a6f781c58121da09802c1fedb76e0c604c0a3627f44

@ -17,7 +17,7 @@ SRC_URI="
LICENSE="BSD-1"
SLOT="0"
KEYWORDS="amd64 x86"
KEYWORDS="amd64 ~riscv x86"
RDEPEND="!net-mail/signify
>=dev-libs/libbsd-0.7"

Binary file not shown.

@ -1,7 +1,7 @@
AUX devmanual-eclasses.patch 486 BLAKE2B 7e772ed7386c199c697808137ecf6f999e60ff32f05a89eb0ceeb41b34576d667996fe9b7f7279b87a40bd8c1efbef5415d69be1b0b9f9f0954e813ab890ffa5 SHA512 1f34bf4e0ed105122eb45ad498ddc737774103720cef9a3a30346a16e85173bc8fb38dc9cc1e9bb2d9b902feb167e5df0ff4cb39f62640f4314fe750533f7cf3
DIST devmanual-0_pre20200207.tar.xz 163940 BLAKE2B c6cf856a8f6c80b500466e27cc4106c070cff2dcf8c89d58c9ca90d03cb34a1e6a2048cb99364993f224f3497309fc24207dc44f9c14ece37c49aa602480dac0 SHA512 f6a88312e2030bf4d9fcf64bf1f38397087cb151aa41cd0c254cfc6251e4d5b291e3b361094a7c1d5fdb16e40c1702c0f0b7460ba230bfb217ad733f400c9089
DIST devmanual-0_pre20210118.tar.xz 165552 BLAKE2B 17b11ab8b5ec31b93fca95c472e7d137157c3d7629b80be26648d5b77f6a6a0709d1a622a079207695fe48cd9d24d48f5ece0a24259106547d84e7c47cb2199b SHA512 2cf40936ab6ee0acda6f71d44d4cbff03ed195688f172d749b32dab9edde005ab9c4ad28d84f7ad01fc82e0fb8a9441cba20c4c7435f21067abf49fe8da739ff
EBUILD devmanual-0_pre20200207.ebuild 1377 BLAKE2B 3502d2091e7b3fa13ae090abe57dea9cadc54fba9ed826ac6d7d693f6ee38e1a41ac9bcffbe37f1ab2d74c0112bf406aa660ecfe723db9d54bb0123f665c1325 SHA512 cf3eaab81ab85038b6b6f0a064110c3f6c581e702a774bcc3c22a8dc542d9d6844cea471a3587a725bd4c044094d0d0a2fd9de86b8913dd819258e28444b48ed
DIST devmanual-0_pre20220326.tar.xz 183228 BLAKE2B 67ab1a24e8f1043f2d7938a76f4d819ecfaffaf3516cf5ce9eff20ac0e481c60be06c83c4adc3835e6ee66c44def290aa682567662dbf7a7a7057b0d168e1677 SHA512 364fe3504ba424201b450e08fe2043e55d1067c3603c4d3248112117461a4ab667d50f82deac9daaf50e28ea5d996c1ae08668d55b7379915cc175f66edddf9b
EBUILD devmanual-0_pre20210118.ebuild 1502 BLAKE2B b5d447d8971ba6fcf71ef00bd19cc8e6d853e2a2d174939096cf2493f14172a5e224eb6bfa9d4fe86a7ebe542e807671e09fa410bf48de56c8af038e98b58b21 SHA512 52174b6d6f836ec3adea99ceab79dddf5113cdb04d764f612953fcc00f3895c60d3a5509465890913a03edd30e1ba3ee5e08c1b0eab915726e6b635c8ae0673f
EBUILD devmanual-9999.ebuild 1573 BLAKE2B 80bfa3bdff6a6dfc78f333acc0c29a7b029905c566c92dcdb735d1b03831a162903776907d13e434749c479c240e5e281d9bcb7c3f9980ead2d35aca49e35275 SHA512 a64be10893e0ab57870683b93b11c2d4d9d94d45d69ff791043e030f7b3442c86a1eb52612aec48c8e930956fe6259fcc8c14e209d1764e0f752701e6a5be8b2
EBUILD devmanual-0_pre20220326.ebuild 1580 BLAKE2B 117a0b67beadac8420b1377d94279d631f6a7c3b449a508dd04c1525921fccb5771922ffc4fe618c9954d979a338aaf193e0d1b4514e40cc50b134ab4351f9a3 SHA512 29c24dfd6ac2fd97efcd5600c2e1e93ef73dd35048ecef65679a9f0dc94488b7f37fecf59c30a48420c5199671b618e0c03619dabcd8db777abae09ab50aa847
EBUILD devmanual-9999.ebuild 1580 BLAKE2B 117a0b67beadac8420b1377d94279d631f6a7c3b449a508dd04c1525921fccb5771922ffc4fe618c9954d979a338aaf193e0d1b4514e40cc50b134ab4351f9a3 SHA512 29c24dfd6ac2fd97efcd5600c2e1e93ef73dd35048ecef65679a9f0dc94488b7f37fecf59c30a48420c5199671b618e0c03619dabcd8db777abae09ab50aa847
MISC metadata.xml 482 BLAKE2B e338138fd26d7940b74d33dda52c89c02237bc1256d43651acb1f9eebb3d1184e6a8b2ad636b8a661d1ebadb30d21932489cb05d86220bd65c7d594fd9b3dc41 SHA512 8675cb666e2a92264a4806fb6e957b398208cb53b075ebd9e63a6a2f9631b66e42495ddeb56712700a2612f2d231e75204eb132a36c237b3bf19107ef9e276bf

@ -1,9 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
inherit readme.gentoo-r1
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="xml"
inherit python-any-r1 readme.gentoo-r1
DESCRIPTION="The Gentoo Development Guide"
HOMEPAGE="https://devmanual.gentoo.org/"
@ -12,19 +14,23 @@ if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/devmanual.git"
else
# "make dist" in devmanual repo
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${PN}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
fi
LICENSE="CC-BY-SA-4.0"
SLOT="0"
IUSE="+offline"
IUSE="+offline test"
RESTRICT="!test? ( test )"
BDEPEND="dev-libs/libxml2
BDEPEND=">=dev-libs/libxml2-2.9.12
dev-libs/libxslt
gnome-base/librsvg
media-fonts/open-sans"
media-fonts/open-sans
${PYTHON_DEPS}
test? ( >=app-text/htmltidy-5.8.0 )"
PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )

@ -17,7 +17,7 @@ else
# "make dist" in devmanual repo
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${PN}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
fi
LICENSE="CC-BY-SA-4.0"

Binary file not shown.

@ -7,6 +7,7 @@ DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7
DIST emacs-25.3-patches-3.tar.xz 2828 BLAKE2B 9a367a545d889d2edf0ee95edb856a7367ec6c10ae6c6fe6b2b452f548184a2a721eb72c448f303a639d5210366c11cf64af33fa322496ff1fd6f7a7e995a154 SHA512 fd65b768be3e3b7b6e280324ff5dd9f790a1279775defea370be5a2555fd64c134c004723e0722331e32117901281dfa2ca2ba42ee4fb33037a3eb83617e222b
DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
DIST emacs-26.3-patches-1.tar.xz 1076 BLAKE2B 1218c9a69deae0e3a55e061bd0cd2ab2b7099c86ebe861cc0b3c61a6d7a0756dce13553c861c41a9d2943b5ae78f3c607f099663e90b504d349d2a0be0f34682 SHA512 0e989e760e08675fdedb2cfca39ce63255dd092af38e0dd7febebb54aba10f5a186e1d360edecec3a4dd0ccc480dcc4430b3b9a73bdc84f8dc977591c3da395e
DIST emacs-26.3-patches-2.tar.xz 1780 BLAKE2B f5dc9d041ea8a07549a817a2b18f84c8a75dce1d53e8de7c6751d48e71e27ee5a3626688252e079917b50473d6b3963f191383050799d199223cdd594be24dbe SHA512 33c91a138e2c9ba3146e66dc03cf05a4baef48019b1ca5c487a56b15f561bf208d58b0f2dc7d250682b86437dce1ce5b050887c4a5ef44194c46fbb7a7346d16
DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e SHA512 a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190
DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
@ -17,6 +18,7 @@ EBUILD emacs-23.4-r21.ebuild 11065 BLAKE2B ec01f02640ccef8349bef30f81c2328465293
EBUILD emacs-24.5-r11.ebuild 10816 BLAKE2B 9968d323497774e9f864ff9f41e54b2cea4ed471836e9644ac675728cc83b955ddcf93d0a94af359beb722da5ec5d7c4e267a732fadc592fc00d740692ed65df SHA512 417cdbef740b8b6b122446547e87e527355208c3894fe88720114b9ec8ae22ce62cf44de5a571997601fa6cb17b208633c18a6017838386285302322ec3c8ea4
EBUILD emacs-25.3-r11.ebuild 11126 BLAKE2B 094e3beb2f13d6f9b16b29b0758eac7aec05e5dd90d90b202fb36c0d8c247487d19cc8614c9c938b81598c0f97ef43f846dc14e3160b06f10d2608b5a517ba58 SHA512 2de603b0688d3648908b86ce0c7737e8f8e31500a07fe84c57a19d53e0b3d8039a949d88ea097d40074ab1eae0780cba164a3e8e03ae94a94e1d90298360cf6a
EBUILD emacs-26.3-r6.ebuild 11825 BLAKE2B 1df12880101fce336ded064f8e91840b9f1a66b213367f46503c0ec19fcd1db45f0fedfe0db895141d44a8d2bfcc506c8683dda949429b5910b8cad360d241c7 SHA512 0608d4f489447e4545c2510a446293cd34a4164e2f6348b143a158df78dc6e362d166cda25177d86daac52fb31c7a85d1519de9b8583b1a2b4fe8782bca4c785
EBUILD emacs-26.3-r7.ebuild 11822 BLAKE2B 7097fe2ada9f2eb01369297c2e2559d58cb749793a3e797179ddfa552f735ec584c4dda46f4d07bae0f61b4c7e9433e238811ba0ff54f10a3af01e4a3d30931c SHA512 1ebad05f4c675a49b4d6da1a03183d4292b0e5637fca71c7b8c716afcee795ebd98e355efb39b8835d353351a13ff1d5ad81ecfd2900fee25d254662b7b30105
EBUILD emacs-27.2-r5.ebuild 14528 BLAKE2B e38deb5d4f19d64279e151ed9a09e3b21010ca6347e9bc898297d048a84e5e2e00639094790e4383c16ab51af98b4e805f7018a3caa2cd6976fd5cfc44dc5cdc SHA512 5f61316ede791cdf52d6952c63da7a458311df49080f1502619477a0453112cbc08f8f2e8eebfa2586775655b50cb0cae1a951b2c47b038cbe54978fc99948e5
EBUILD emacs-28.0.91.ebuild 14952 BLAKE2B 830648e4cd3d0ceeb6bdf7b7f8d9f9e5f41be5266d15bcf124ede1155a11221cf101bbcf8966f606fe50d77728f7e80693dfc7f2237b1570ce16afa30063d812 SHA512 d9c8fa7467e9bc850940b320c0e77dd7ec32a031786e9b3088816f238ac43ed6deb6da3dc43e9b48a9b8e003d44a70febbfee98d9096fd27767699c0d6b7f9fb
EBUILD emacs-28.0.92.ebuild 14952 BLAKE2B 830648e4cd3d0ceeb6bdf7b7f8d9f9e5f41be5266d15bcf124ede1155a11221cf101bbcf8966f606fe50d77728f7e80693dfc7f2237b1570ce16afa30063d812 SHA512 d9c8fa7467e9bc850940b320c0e77dd7ec32a031786e9b3088816f238ac43ed6deb6da3dc43e9b48a9b8e003d44a70febbfee98d9096fd27767699c0d6b7f9fb

@ -0,0 +1,376 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit elisp-common flag-o-matic readme.gentoo-r1
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="https://www.gnu.org/software/emacs/"
SRC_URI="mirror://gnu/emacs/${P}.tar.xz
https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="26"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
sys-libs/ncurses:0=
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
dbus? ( sys-apps/dbus )
games? ( acct-group/gamestat )
gpm? ( sys-libs/gpm )
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
kerberos? ( virtual/krb5 )
lcms? ( media-libs/lcms:2 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
mailutils? ( net-mail/mailutils[clients] )
!mailutils? ( acct-group/mail net-libs/liblockfile )
selinux? ( sys-libs/libselinux )
ssl? ( net-libs/gnutls:0= )
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
gui? ( !aqua? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libxcb
x11-misc/xbitmaps
gconf? ( >=gnome-base/gconf-2.26.2 )
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib:0= )
jpeg? ( virtual/jpeg:0= )
png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff:0 )
xpm? ( x11-libs/libXpm )
imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
xft? (
media-libs/fontconfig
media-libs/freetype
x11-libs/libXft
x11-libs/libXrender
cairo? ( >=x11-libs/cairo-1.12.18 )
m17n-lib? (
>=dev-libs/libotf-0.9.4
>=dev-libs/m17n-lib-1.5.1
)
)
gtk? (
x11-libs/gtk+:3
xwidgets? (
net-libs/webkit-gtk:4=
x11-libs/libXcomposite
)
)
!gtk? (
motif? (
>=x11-libs/motif-2.3:0
x11-libs/libXpm
x11-libs/libXmu
x11-libs/libXt
)
!motif? (
Xaw3d? (
x11-libs/libXaw3d
x11-libs/libXmu
x11-libs/libXt
)
!Xaw3d? ( athena? (
x11-libs/libXaw
x11-libs/libXmu
x11-libs/libXt
) )
)
)
) )"
DEPEND="${RDEPEND}
gui? ( !aqua? ( x11-base/xorg-proto ) )"
BDEPEND="virtual/pkgconfig
gzip-el? ( app-arch/gzip )"
IDEPEND="app-eselect/eselect-emacs"
RDEPEND+=" ${IDEPEND}"
EMACS_SUFFIX="emacs-${SLOT}"
SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
# operations later on
FULL_VERSION="${PV%%_*}"
S="${WORKDIR}/emacs-${FULL_VERSION}"
PATCHES=("${WORKDIR}/patch")
src_prepare() {
default
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
#AT_M4DIR=m4 eautoreconf
}
src_configure() {
strip-flags
filter-flags -pie #526948
if use ia64; then
replace-flags "-O[2-9]" -O1 #325373
else
replace-flags "-O[3-9]" -O2
fi
local myconf
if use alsa; then
use sound || ewarn \
"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
myconf+=" --with-sound=alsa"
else
myconf+=" --with-sound=$(usex sound oss)"
fi
if ! use gui; then
einfo "Configuring to build without window system support"
myconf+=" --without-x --without-ns"
elif use aqua; then
einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
myconf+=" --with-ns --disable-ns-self-contained"
myconf+=" --without-x"
else
myconf+=" --with-x --without-ns"
myconf+=" $(use_with gconf)"
myconf+=" $(use_with gsettings)"
myconf+=" $(use_with toolkit-scroll-bars)"
myconf+=" $(use_with gif)"
myconf+=" $(use_with jpeg)"
myconf+=" $(use_with png)"
myconf+=" $(use_with svg rsvg)"
myconf+=" $(use_with tiff)"
myconf+=" $(use_with xpm)"
myconf+=" $(use_with imagemagick)"
if use xft; then
myconf+=" --with-xft"
myconf+=" $(use_with cairo)"
myconf+=" $(use_with m17n-lib libotf)"
myconf+=" $(use_with m17n-lib m17n-flt)"
else
myconf+=" --without-xft"
myconf+=" --without-cairo"
myconf+=" --without-libotf --without-m17n-flt"
use cairo && ewarn \
"USE flag \"cairo\" has no effect if \"xft\" is not set."
use m17n-lib && ewarn \
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
fi
local f line
if use gtk; then
einfo "Configuring to build with GIMP Toolkit (GTK+)"
while read line; do ewarn "${line}"; done <<-EOF
Your version of GTK+ will have problems with closing open
displays. This is no problem if you just use one display, but
if you use more than one and close one of them Emacs may crash.
See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
If you intend to use more than one display, then it is strongly
recommended that you compile Emacs with the Athena/Lucid or the
Motif toolkit instead.
EOF
myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
for f in motif Xaw3d athena; do
use ${f} && ewarn \
"USE flag \"${f}\" has no effect if \"gtk\" is set."
done
elif use motif; then
einfo "Configuring to build with Motif toolkit"
myconf+=" --with-x-toolkit=motif"
for f in Xaw3d athena; do
use ${f} && ewarn \
"USE flag \"${f}\" has no effect if \"motif\" is set."
done
elif use athena || use Xaw3d; then
einfo "Configuring to build with Athena/Lucid toolkit"
myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
else
einfo "Configuring to build with no toolkit"
myconf+=" --with-x-toolkit=no"
fi
! use gtk && use xwidgets && ewarn \
"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
fi
econf \
--program-suffix="-${EMACS_SUFFIX}" \
--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
--localstatedir="${EPREFIX}"/var \
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--without-compress-install \
--without-hesiod \
--without-pop \
--with-file-notification=$(usev inotify || usev gfile || echo no) \
$(use_enable acl) \
$(use_with dbus) \
$(use_with dynamic-loading modules) \
$(use_with games gameuser ":gamestat") \
$(use_with gpm) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with lcms lcms2) \
$(use_with libxml2 xml2) \
$(use_with mailutils) \
$(use_with selinux) \
$(use_with ssl gnutls) \
$(use_with systemd libsystemd) \
$(use_with threads) \
$(use_with wide-int) \
$(use_with zlib) \
${myconf}
}
src_compile() {
# Disable sandbox when dumping. For the unbelievers, see bug #131505
emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
}
src_install() {
emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
# move info dir to avoid collisions with the dir file generated by portage
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
# movemail must be setgid mail
if ! use mailutils; then
fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
fi
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
rm -rf "${ED}"/usr/share/{applications,icons} || die
rm -rf "${ED}/usr/$(get_libdir)" || die
rm -rf "${ED}"/var || die
# remove unused <version>/site-lisp dir
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
# remove COPYING file (except for etc/COPYING used by describe-copying)
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
if use systemd; then
insinto /usr/lib/systemd/user
sed -e "/^##/d" \
-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
etc/emacs.service | newins - ${EMACS_SUFFIX}.service
assert
fi
if use gzip-el; then
# compress .el files when a corresponding .elc exists
find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
assert "gzip .el failed"
fi
local cdir
if use source; then
cdir="/usr/share/emacs/${FULL_VERSION}/src"
insinto "${cdir}"
# This is not meant to install all the source -- just the
# C source you might find via find-function
doins src/*.{c,h,m}
elif has installsources ${FEATURES}; then
cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
fi
sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
X
;;; ${EMACS_SUFFIX} site-lisp configuration
X
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
Y (setq find-function-C-source-directory
Y "${EPREFIX}${cdir}")
X (let ((path (getenv "INFOPATH"))
X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
X (re "\\\\\`${EPREFIX}/usr/share\\\\>"))
X (and path
X ;; move Emacs Info dir before anything else in /usr/share
X (let* ((p (cons nil (split-string path ":" t))) (q p))
X (while (and (cdr q) (not (string-match re (cadr q))))
X (setq q (cdr q)))
X (setcdr q (cons dir (delete dir (cdr q))))
X (setq Info-directory-list (prune-directory-list (cdr p)))))))
EOF
elisp-site-file-install "${T}/${SITEFILE}" || die
dodoc README BUGS CONTRIBUTE
if use gui && use aqua; then
dodir /Applications/Gentoo
rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
local DOC_CONTENTS="You can set the version to be started by
/usr/bin/emacs through the Emacs eselect module, which also
redirects man and info pages. Therefore, several Emacs versions can
be installed at the same time. \"man emacs.eselect\" for details.
\\n\\nIf you upgrade from a previous major version of Emacs, then
it is strongly recommended that you use app-admin/emacs-updater
to rebuild all byte-compiled elisp files of the installed Emacs
packages."
if use gui; then
DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
Installing media-fonts/font-adobe-{75,100}dpi on the X server's
machine would satisfy basic Emacs requirements under X11.
See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
for how to enable anti-aliased fonts."
use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
symlink it into /Applications by yourself."
fi
readme.gentoo_create_doc
}
pkg_preinst() {
# move Info dir file to correct name
if [[ -d ${ED}/usr/share/info ]]; then
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
fi
}
pkg_postinst() {
elisp-site-regen
readme.gentoo_print_elog
if use livecd; then
# force an update of the emacs symlink for the livecd/dvd,
# because some microemacs packages set it with USE=livecd
eselect emacs update
else
eselect emacs update ifunset
fi
}
pkg_postrm() {
elisp-site-regen
eselect emacs update ifunset
}

@ -1,5 +1,5 @@
DIST zile-2.4.15.tar.gz 1490611 BLAKE2B 3744ab2459edf9b0dc9ca976c5f37625d06e0766e3a1fbb59112fe375af6f6cc5e8c068dcb127b338091f3130d32190ad4bc3a79eac7f9a4f87b46723d5a4a82 SHA512 e2a04c280ae0c0038e6ef18abec0be55063a472f77a511bf31459712be24659edcaa2d1c861d7c00bdab87a1881af03d14eb561047c386cbff5f90b13b1a2575
DIST zile-2.6.2.tar.gz 1152751 BLAKE2B db51b534c8d76e1def91bbfe49cab501ff1bccd6fbeddd5622d8fca3695305c53e480eed1978e880621e09955e2b98519cfa02cf259006a08d1a8722122148ea SHA512 16d5cece403fc215d53b35c31fe6f743d53d7a01cdc7d101cabe6760173539c9c31e092b29c374f28a723708027f6de626fcfee302962848091f85078fa81761
EBUILD zile-2.4.15.ebuild 1093 BLAKE2B 5f94a7c04aeaa447571d806bcf4029d3c6cbdda2d31dcfdbcea2810800c1aa2a7e3b097df3edf923e6e30b223ce450154f2e4923ee501ee7e4b663099b5c072c SHA512 ea016a21bf45f2e2cbfcc09fb23ff25b39d63f8e96b01dcf45f3636c11f24be6cb3130d0b429a6bec4d956e893985228b3757440a1eed5bb5d9c3746962bfd3d
EBUILD zile-2.6.2-r2.ebuild 1162 BLAKE2B 679ec505723e5c4922281172036ec89fafab3c81177d698fa3f27dbfd15fc12a69c61f711d78fcf3af30315e3fa25f8e8d49d2f66c124c3a3c540ac1f8f04a68 SHA512 cb2f0c8adb2ffc46de72ff79286bcaa6888f98a02b85ee82e5912cb4a48dbe5cc29f620c585fd64ec13bcb2ffbd90d9bda6c9455a1d26236158025528197f9ec
EBUILD zile-2.6.2-r2.ebuild 1160 BLAKE2B 168dd8d465845edc1d187949eb292aa1e28c9fdf5a598e6be5421b65438235321431fa599c92b071f167acdefdc82dd6b8fcc828465ede5db2be514e24799da8 SHA512 691b6ea5b039410b8beeec5fd7265dc48c2c154632c18b7506668c022932d2ad4447828edfa40760a4afa317d7f8614ac931bf307913dab60e83dfa89b786f9f
MISC metadata.xml 537 BLAKE2B 3a084218fac3dad29b7a80d6f707e7e8c769eb0e755a1a482814d67b0064c274fc80a50dac09cc6d04e963271fd526f34805dc9c49ffb6d5681dc6178ff43032 SHA512 d1de1757bd448535892b60dd6cc739c9b8cb92affd0c7a1cfffcddbcc1d18a1f17d054e751aa4362e26111e6e59206d086e3afb1552a2061503db6459ec34424

@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~alpha ~amd64 arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
KEYWORDS="~alpha ~amd64 arm ~arm64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
RDEPEND="dev-libs/glib:2
dev-libs/libgee:0.8=

Binary file not shown.

@ -1,4 +1,6 @@
AUX 50ghub-gentoo.el 124 BLAKE2B 84170098bd01bb9f165eaf06f7cb21c56d2caaf964d2658520311757845d053072a7704fcb90cce2a2dfbd2385f357d2e7569061ebe0ca41b575efd752d29fd8 SHA512 596c7e75560f3734b57525bdfb42f3985fb49ab4d86637231361f6673d2431c0a6e73f91f58f003f9027f1143b9be3f4330ef2e1ff6c627ca6057256f4afbfca
DIST ghub-3.5.4.tar.gz 58088 BLAKE2B 5ee6fe56455e8f12e7be8c1ae705a426677fab0b9a5da8f42c4b331bdd635120a2f5475055c9e98c8df01b259f76aa2dd4cad6e8b4562481d261bb7802b826f6 SHA512 df8ba56195ae3773c0c8c8a8f555e562b04de59ce3fb1c17c24ca3b10418299555326f0a9360eb47725310890e31f73221eece3ca1ff83e47d52941e224fc562
DIST ghub-3.5.6.tar.gz 59474 BLAKE2B c27610f24526a40b5f36d2f5154c0eeb9f86e9da676baa82b2866a0bb58de8a78736d56a5d6454666b539774abbf5dfcd260880aa07499616f44a3e2c8315999 SHA512 6c6724978f0809a4977cc7965de4c33eaf29537c13507aabffecae4a7d2b3710074179d819aee1a54fce8f12e20db46b18466c3f1012d3b9c41eae3c2fade58a
EBUILD ghub-3.5.4.ebuild 542 BLAKE2B 76ac0441ebc4245af78c82cb442d1bd892317d9f4fa38f1e7a639c6da8b4dd437684a8c6a44fd55c39bd45d4beca82b1af65485ca974665af7e63f166423f55e SHA512 89ee20bfb781c45717d42ed45cdc06f61d1cca2e9680c9aeb3147f8c116e9b68e447a96d2b220684eabf9f49fbfb7578359486cae46a6f40779e3036acec4010
EBUILD ghub-3.5.6.ebuild 626 BLAKE2B fd0e12967b434a8df6217d1ec726408f384e4923575db794e3b137496bb9a173fc7bf97ed089d688408503b394b87cbc6c82cad3917283c8d553880ea91d35d2 SHA512 0d244905b7bfbf208be32ca9211c11062c22ec33548c5a315dde631c31fa267978c5b018a5283063926c4b1ac2dc54400cd89e14631f1ae41f3dc36e959ba0b9
MISC metadata.xml 1297 BLAKE2B 76a67936c0754ffeba3ca47551417bea6a0996c5197977b2dce2c73bf7acbe421f0c7ac0f8415b529f1ee3109868bc5306d7e714a58f3faec549ddd575cc82b1 SHA512 8cb4ebebcce9526416253b528bd8e2865311a796f10cc176b7d87d0fd06b573a9d7dc094cf3c2ccb916eccffb69dd5a164ad64c8f0310727147bea3804aa79de

@ -0,0 +1,31 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
NEED_EMACS=25
inherit elisp
DESCRIPTION="Minuscule client library for the Git forge APIs"
HOMEPAGE="https://magit.vc/manual/ghub"
SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
SITEFILE="50${PN}-gentoo.el"
ELISP_TEXINFO="docs/ghub.texi"
DOCS="README.md"
RDEPEND="
>=app-emacs/treepy-0.1.1
"
BDEPEND="${RDEPEND}
sys-apps/texinfo"
src_prepare() {
default
mv lisp/*.el . || die
rm ghub-pkg.el || die
}

@ -2,6 +2,8 @@ AUX 50helm-gentoo.el 79 BLAKE2B 7f188281cba0bf1f683977149ffa01f2bf6679cec1d73553
AUX helm-3.8.0-no-autoload-check.patch 629 BLAKE2B 23ae68b3f15b6a7b8bbe1c7c22c897ead11abf6c7ad4280767f69c58edbb9cbe8528968e859d45e4ff76d13ac3ae4016a0818f674cb5b53d69441733343e958b SHA512 cb8192855f474cf43e3f2247f84d00ca6b2b190164c3a50940e09e771650db5860923256cb482cbd4f1d3f0b5bd964c688d6124a129c80850786c39245c034da
DIST helm-3.8.0.tar.gz 3943168 BLAKE2B cee9ed8eafdf01cb2109dcf5289522f4a0d9db9a8626097a1ffc3bdeaee792b072b7b27e635ef360815a354c9796b55fc4b3921784e2fd0d655387507df208b6 SHA512 0aec3d4270205c61cabc991dd39d5bac3b10e827f362819e9fb85880985ce2c7e7c7b8f73d2f0cde5b5c168d4b9857e0379f1e4ca9395dbd8f083c1a707ad3f2
DIST helm-3.8.4.tar.gz 2346120 BLAKE2B 2f554a6a3fc3a42ba2761c267d085ad1e6679f4913bc19cdbbff11130922d93d2fbe75bcae8230748c39148b6e42d45d4c2c711f731ebd4a1984c5927d93d290 SHA512 011cc4eb79a0a6916404428b9f645e4401b8a0b8b473bec88ac4211d4157b78cc673922c1b74dc93d60cf036135a67bd9c174198b63edd63a6d26a40ba9c1b9d
DIST helm-3.8.5.tar.gz 2349290 BLAKE2B 84f0c15c2a9f492246defdf9496e8dcc5265b0c60b50ccaaa3b9f6731285a667da919da7fec80d77a4fd11bc83d9f4ae4c0910e31423b58afbdf00d51b070295 SHA512 af727553c29c9fa0ba6eb6a73b25d62855ea4413eebc57baf3ed94be6a0240e4c558193c898430dc21132ba5e32ead584514910bf98b3b8d82adf7828f953652
EBUILD helm-3.8.0.ebuild 652 BLAKE2B 8daea4061ce9eba2fc25791b412e6605fe5ee76a9b3dd58e34b5d72b4547c68389eab20af5d00c23117a026326c2c6e5f247f33c8b02ecacd2d2fce1901ac588 SHA512 e6f3335e3f0ffbaf6e5e812002daecdeef04fbb74aaef431bee64677fdc2d9b4d12ce36bac356c28c35f1303161cbbdc9f6b2b83ddd67b6750a8608998b501f4
EBUILD helm-3.8.4.ebuild 659 BLAKE2B e3cad45c98c77c77b7b4db89070d84fcc5709fa315e7b8a5e0f6df7054665cd4d380d3a2e2d45a8376d02b368efe9477026fefca855365b425366571083aa1d8 SHA512 414fbc4a5080f8ac17607bf41bc2d84d0fffec6b3c8b3b25462133ab55245ed424995e89f3d1c574280bc6e56386162fba7c2ce7de4ca5243ee8302f4786d841
EBUILD helm-3.8.5.ebuild 661 BLAKE2B d65c558348be095c07eb87c6ffd38cedccd85b53efb410cae71109145d8b73429416f68701f2b0fe080b130052d06d257d1f3dcba84e60c5ed3212d5ded75722 SHA512 ed8b176c6f6c6540304c5b231d7d422fbc81bdd30297f8cef32ac037507bfbcc5ab6d15dbdec83c155e309834c2e63bd7095ce713acdfbb252db46baae1be84f
MISC metadata.xml 822 BLAKE2B 5de057ddb881d67550d3e8cd0be43d3328b8e7a38b98338ffccec147095cd5d8f8bc68695c797a872e2ed7e455859fc1d6170f414231016edab5a8d742ad2a40 SHA512 08367530e4e47577e1812d229b97094b9c012c4c91eb7e69f5724e98d8790327fe35fb9b480cf33eedd105f1fd85133c39397eda0426461d80bdee704a51c55a

@ -0,0 +1,31 @@
# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit elisp
DESCRIPTION="Emacs incremental completion and selection narrowing framework"
HOMEPAGE="https://emacs-helm.github.io/helm/"
SRC_URI="https://github.com/emacs-helm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="app-emacs/async
app-emacs/popup"
BDEPEND="${RDEPEND}"
PATCHES="${FILESDIR}/${PN}-3.8.0-no-autoload-check.patch"
SITEFILE="50${PN}-gentoo.el"
src_compile() {
elisp-compile *.el
elisp-make-autoload-file
}
src_install() {
elisp_src_install
dobin emacs-helm.sh
}

@ -1,4 +1,6 @@
AUX 50hl-todo-gentoo.el 180 BLAKE2B 967e85d2d5738a45f21cc1bb038ac64366a0774d88fda4b542521f76ee204f88b950769eb120d2f537b0a48fdd239d17453263c19aefcbd1f2bf14d886cfcf88 SHA512 9b9b437d6ea14762afac357012a307599677f115bc1659d0c07cfd7db4eefa95b5a7104d03db101cdfefed05a9e510324a11066772e5642891c054675424e533
DIST hl-todo-3.3.0.tar.gz 5688 BLAKE2B 3e644ab68707ff7fb3f846d07ccec9631f0c84eaabe453efe3f36658cb09024fce3bcb299cbfbb911ff3a2e93a0134bb84cf2e9486881c656b0344b28a3dda82 SHA512 361ea9f36abd2a43731252cdcda420da1661b3f60f9673cf9975eff3846367f7f29c787de515c75fb61fd14c1849b5d24a0f91d813ca00d09512d2218a45ffd1
DIST hl-todo-3.4.1.tar.gz 5762 BLAKE2B fbc3e2d1c9e6492f55487e6ffc306588e1d27b758e97a538de77f56743f7717a3596bda072aa6cfb249c67e76f32263e07ca299e20fc635e585af32caef120ff SHA512 4cbde1f5c0697cb6906d355aff879f8a8b2ae1fbcb1a16016c1d6663ad520ba4bbc625d038975501b9deee827e52ac84cf0e8ca38ad538395ca1c9f7f82cba57
EBUILD hl-todo-3.3.0.ebuild 449 BLAKE2B 86f66d1e5d9398cf6d71f3c9a5825af1dec69a07762173cf2bb2a969d385c4925d62122017ac2204ad800ff6c8c1c0ccc204f7becc0d2563aac7d92b964697a2 SHA512 200efe075dadc5a5ceadf1caed92639928dc4460bc23204e00ec9f03fafcb03eaf40ef9305fc6fbbf033d9787c0b13a4a202647b67bd94eeaff96bdbdf7eae7f
EBUILD hl-todo-3.4.1.ebuild 449 BLAKE2B 86f66d1e5d9398cf6d71f3c9a5825af1dec69a07762173cf2bb2a969d385c4925d62122017ac2204ad800ff6c8c1c0ccc204f7becc0d2563aac7d92b964697a2 SHA512 200efe075dadc5a5ceadf1caed92639928dc4460bc23204e00ec9f03fafcb03eaf40ef9305fc6fbbf033d9787c0b13a4a202647b67bd94eeaff96bdbdf7eae7f
MISC metadata.xml 361 BLAKE2B d64dcf7b0a3a4d6fce92bc067d14e85ef5f4124414269aced39eacbce3fe1f2e96a5342886dbc8bcca39a0dfd6b2c2919ef404b106b408e3894f0c6e595971cb SHA512 3b795dfdb6a9c151218874c8a753474ba352e4d8d701de6f08340e9e11456752fcbeefcb715da11a1930ede0a6cb079bbe99c0d77e772413b5db86749d9a5581

@ -0,0 +1,18 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
NEED_EMACS=25
inherit elisp
DESCRIPTION="Highlight TODO and similar keywords in comments and strings"
HOMEPAGE="https://github.com/tarsius/hl-todo"
SRC_URI="https://github.com/tarsius/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
SITEFILE="50${PN}-gentoo.el"
DOCS="README.md"

@ -1,4 +1,6 @@
AUX 50marginalia-gentoo.el 133 BLAKE2B 9924046f0683974aba9bf9bd0939058eab78abc131b0eebd5d2aac17c0653e0a578c062fba7a363797e6455b8bc85149e79778f8abd4185eec68dd61206b8216 SHA512 e5cd461343454dfc9de75f15e5c35337780ecbc96d844a160c3f9cfcfd5382232b4359191b382741839700224493adc6f4d3218c050c3214b49af0dc85feb135
DIST marginalia-0.12.tar.gz 28459 BLAKE2B f18dc11368f181bbf0bd92ba5abefd065181d2f3f2d7c27adab12e0b7baae69e8bf4d74e7e75687805773024fbc06eb0da49de2a14271cda125ffc2d6b01f049 SHA512 c6650f94e45fd82ddbbe0a58a4e816ebe55837ef8102c6a4871952b0c84ee44ab868bde41a864a06d03428a00cabf3a8a5e37addaa8bb81e3ea45271b8ad53ef
DIST marginalia-0.13.tar.gz 28803 BLAKE2B 396656d93ee85d0b4ad216c2b27de5f2415ae0b54198eacf327eb035f4753a74389734353dd19913f6778d4cf9bfd82b1ee359105d7527d95fe9675afa368655 SHA512 08c6fd3ff744c3112e76a44786d5422b04d0fdf3e08342b1903578b80922df28b2fadd8f0af612f32dfd9c607786c12b6508b6996acbc671ba4d542c9a67d52b
EBUILD marginalia-0.12.ebuild 399 BLAKE2B 6b87ae5eddfc9d7e305e5244b279d152718f85dfa210ed451cf1782713b1ecfe2aea8b8e43fa9304f8a4cd7230ff66cffa2bee0e884e3f72d65488107aa8a1e8 SHA512 5659efc316b5a4bdb537b2b05459850e27e006a96612b1ad00a7ccc6f5b4196217bfc0f79c4dacb38029ea7cb91c4a68463d06107cfe233183e79660c69493bd
EBUILD marginalia-0.13.ebuild 399 BLAKE2B 6b87ae5eddfc9d7e305e5244b279d152718f85dfa210ed451cf1782713b1ecfe2aea8b8e43fa9304f8a4cd7230ff66cffa2bee0e884e3f72d65488107aa8a1e8 SHA512 5659efc316b5a4bdb537b2b05459850e27e006a96612b1ad00a7ccc6f5b4196217bfc0f79c4dacb38029ea7cb91c4a68463d06107cfe233183e79660c69493bd
MISC metadata.xml 362 BLAKE2B 170d321c62f5b92b3fda03c4c6a1dc8438023211ae2f9261c997ce1300e4d24fde6588ed57ee766b2637e31c186e11aefdae58b083fd19ec15cbfe2846475bf6 SHA512 99a6cc13efa79095c0fe1bbcd2661fcd56bce0b3cfc9da0af6f90248b8e1ff27e78e0984677df5aba4c383530cc8446c5748296b35e07d6d2d81bda26b5433b4

@ -0,0 +1,17 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
NEED_EMACS=26
inherit elisp
DESCRIPTION="Marginalia in the minibuffer"
HOMEPAGE="https://github.com/minad/marginalia"
SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
SITEFILE="50${PN}-gentoo.el"

Binary file not shown.

@ -1,6 +1,6 @@
AUX Fix-5.11-build.patch 1687 BLAKE2B 04ec945f071a3eca4d4a257340c82e635a1421696dbe538bf4864829ff0e8a7878989fceb63617ffa5b472bfce66ff06b20e57186c79b5477312a2b5c71f6fbb SHA512 5768890607d321a6b23cc13e79f54733d518fc319e1a2953b986113bd79bfeb4076053c8b87bcd9415b889e686945007e30fbd3ce4cc421c9ed30fddc7f4791f
AUX modload.conf 13 BLAKE2B 1e774873c1bf09ca1f3ec2c006b1938e3aa07187dd5a7f926369d6d1bc2c21bfe52f2cbb632f64174485896c8691ac4cbd10e988b7db7a2a9ada7fdccda1a22d SHA512 7a4bf9c95af41bf11e5a720f6258d62822f553c6f349dbe93cf23743b851d830340d268954252d6f058ea2fa823006a63afd45875e7b9108d5d2a6a1a316ff6d
DIST vendor-reset-0.1.0.tar.gz 12718324 BLAKE2B 762ec8bc289b572ab8f8ecc3fa233e3c78c48c48a261c58ce1be9c10356a55957e0bd8fd01e3143443be74236bf9ed540b84d332788c67aa949599ccc5a564d3 SHA512 ed4dcb1a71fa8901732e729d37b501ac105cc2c93d0666e44c08e311d99a244027339d5709a9305ff992ca2acb2f337793cdb1f9369197911985cd20d6f3139f
EBUILD vendor-reset-0.1.0.ebuild 986 BLAKE2B e50771efbbd910627b44206c3c41bf334da12110eb2ebf3649744ec0d0cb427a475b75e816392a5a578026b106e25cd299ac5cb574fac550a1ca22ae798e7a9a SHA512 93ee4bc3e1f435f5a1816180163fcf7c3a2e69534d1130621bb0fc6f418e73bb7440ac51d2fef3d97cc523cef04e339c87682a2d126116ea608f25c97f877fbb
EBUILD vendor-reset-9999.ebuild 938 BLAKE2B b813812d660f5d8a8e3bf338df26b19c11e7a2c8f107a96ed2711a165309a9476c04b74fb196a620e77907e6bed52bedb02a40cbfbf1e01dc0e17556316ba270 SHA512 b87a8e5c4ff7ec4a6fb0629d898b51e82f55bf748c3fc6bb4897c20add7d0e6024195404b9973d601a7c8d6b45425367e0ffe0d5084377f968f0941f5751e0d3
EBUILD vendor-reset-0.1.0.ebuild 939 BLAKE2B c414e22d1530b0c5e7b2d2195851d62c8a395ac78dcbcd84f7408d27a6845c6db885ad6b514654c8dedabd3a4dc5486b998308310bf06de17fd511c0bd6d3dce SHA512 1fd1d2bcb0bfa849f62ba9b085d814ea4fa7d6176f83ce06e782721cea2f82d906e351ef87fb9ef9817161ca73426c9441ab61cbe16a9e8c37d11dbdbd768e99
EBUILD vendor-reset-9999.ebuild 891 BLAKE2B b1557551cb1810ea7a605db2edbcf92b25be0b3123707df9b85c1dbf4b6cafb5e130ae923dedefb8c76fc28af31a24a5214682d001aa18849a2644a1e91ee24d SHA512 e566d40f4590878cd10ddb8c3ffd57decc54ed32c6335ae12ab632f8f41baae70a1f444f4fb8693d733df3fa52ba0805d02d62018325381295391f0eb521f6c3
MISC metadata.xml 327 BLAKE2B 288b1a0df2469ed01bf576308ddc36c5843b4682333d6e42f0c3603d5bf43cbd6dd9b21cb07020476b9de92445611d04b2c1d5dd54624ed096f166607154137e SHA512 4ceef67a10bc25ed93bd76aaf1ac133b92a362ea0cf030bce21a14f921c3afc868e53e876bde2af91615b1142b3113c2e45a0a3c9a0abe1775c553118e5fbc3d

@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@ -31,9 +31,7 @@ pkg_setup() {
src_compile() {
set_arch_to_kernel
emake \
DESTDIR="${ED}" \
INSTALL_MOD_PATH="${ED}"
default
}
src_install() {

@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@ -29,9 +29,7 @@ pkg_setup() {
src_compile() {
set_arch_to_kernel
emake \
DESTDIR="${ED}" \
INSTALL_MOD_PATH="${ED}"
default
}
src_install() {

@ -10,6 +10,6 @@ DIST wine-staging-7.5.tar.gz 9669503 BLAKE2B dbc307bebd50f67ea7718d1409734cc7245
EBUILD wine-staging-7.2.ebuild 20294 BLAKE2B 4ce326c41a7f3c12e506b21d76eaa93c3f946f8afba7d3ab72335eeacec33feea55c098949c0ca5e442baeb7ccf3713f480f6a132fa5bdb986b9f71316e5d165 SHA512 02a5ee87fc0a5c986099daca10c4adf1bfe3f92055bd67809927e3a0ad9a886271504d82a24e9df44855b116cccf4e0b0df848784cb55997e360ea853ce94100
EBUILD wine-staging-7.3.ebuild 20294 BLAKE2B 4ce326c41a7f3c12e506b21d76eaa93c3f946f8afba7d3ab72335eeacec33feea55c098949c0ca5e442baeb7ccf3713f480f6a132fa5bdb986b9f71316e5d165 SHA512 02a5ee87fc0a5c986099daca10c4adf1bfe3f92055bd67809927e3a0ad9a886271504d82a24e9df44855b116cccf4e0b0df848784cb55997e360ea853ce94100
EBUILD wine-staging-7.4.ebuild 20306 BLAKE2B bd60ae94644f733e1f25669f4a1c34026f12debe77a5350f815d238e1e5679b9e234b202913069a3cc5f21655ba4bf0a1f66754d73df400d4bd7afc668f06a64 SHA512 45b1fc5d4322e7e44d5c6e94b98bb4f09eb5b3ad6e1668c97f25557437d1254990bfc2074041455b641f5d5f8c96a9fcc23627704205904f9069c35c4752e4cc
EBUILD wine-staging-7.5.ebuild 20306 BLAKE2B bd60ae94644f733e1f25669f4a1c34026f12debe77a5350f815d238e1e5679b9e234b202913069a3cc5f21655ba4bf0a1f66754d73df400d4bd7afc668f06a64 SHA512 45b1fc5d4322e7e44d5c6e94b98bb4f09eb5b3ad6e1668c97f25557437d1254990bfc2074041455b641f5d5f8c96a9fcc23627704205904f9069c35c4752e4cc
EBUILD wine-staging-9999.ebuild 20274 BLAKE2B 029de88f294f42581de1eca18a75a54322446f65c9041e806be0fffea363a03ece9735849fd5ecc15d9808c2d6b4e2863fe133b18dc25f2167e58427b9335c3d SHA512 f91264b0ab8668eeafb624b3d00d408ab768f40e92a3df74aa63a3953e448b148e4186b8257172505138db0a73f75d8557add4b77f40803fa2211aef90e52016
EBUILD wine-staging-7.5.ebuild 20370 BLAKE2B bb1dfb9f4325e2218fb219c3554509ddbc3353055d981a031e519a9e559c9e6651c45cd5b5aa34e7d82b7667417aa6aae8ed231403cb9cc891340cccf161ea30 SHA512 c705de7e455d038b30d6829fb2500ad994bbc7e7be03f18d35daa446c25a7750614d165abb268769b56dd27bdc190d621cf07f753726bbb8dc5752fd8fa1c92b
EBUILD wine-staging-9999.ebuild 20370 BLAKE2B bb1dfb9f4325e2218fb219c3554509ddbc3353055d981a031e519a9e559c9e6651c45cd5b5aa34e7d82b7667417aa6aae8ed231403cb9cc891340cccf161ea30 SHA512 c705de7e455d038b30d6829fb2500ad994bbc7e7be03f18d35daa446c25a7750614d165abb268769b56dd27bdc190d621cf07f753726bbb8dc5752fd8fa1c92b
MISC metadata.xml 3508 BLAKE2B 9746414e926a61c411904701eb90034e1e883bf69079057d3dcd22e939677afa8b79845e27e319b80ecff3ff64bb900f3a87b64644e8eb93665e8e3e9d6a4a98 SHA512 a903a74c39cbf2788c54af794b8b235e8477b2af9637d9a774bce073181264eb60aae15dfda4009e913fe24831d20c0f8e40a43b61d1e7853a2282315aef98ff

@ -48,7 +48,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="${MY_PV}"
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@ -117,6 +117,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
mono? ( app-emulation/wine-mono:7.1.1 )
perl? (
dev-lang/perl
@ -275,8 +276,8 @@ pkg_pretend() {
# Verify OSS support
if use oss; then
if ! has_version ">=media-sound/oss-4"; then
eerror "You cannot build wine with USE=oss without having support from a"
eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
eerror "You cannot build wine with USE=oss without having support from"
eerror ">=media-sound/oss-4 (only available through external repos)"
eerror
die
fi

@ -117,6 +117,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
mono? ( app-emulation/wine-mono:7.1.1 )
perl? (
dev-lang/perl

@ -11,6 +11,6 @@ EBUILD wine-vanilla-7.0.ebuild 17626 BLAKE2B 6b39ae043d9704dac40066c931bca49835a
EBUILD wine-vanilla-7.2.ebuild 17627 BLAKE2B 3ad8d8aff3e69e8ed4f3f34bae86ebf184d4390983c010c826d8508410d0316829a9f51404bdffb2560c3d4bd5012fb7c003badbdc2cef5d3882b88e4b42068e SHA512 49eebfe34afacef58c8991db34065566c515dabdc54b9935262c5f1533f0a97bb89ef6a1e895a938f21bb67a0eb09b2f36165fe688c885817a82aa72c13e55f5
EBUILD wine-vanilla-7.3.ebuild 17627 BLAKE2B 3ad8d8aff3e69e8ed4f3f34bae86ebf184d4390983c010c826d8508410d0316829a9f51404bdffb2560c3d4bd5012fb7c003badbdc2cef5d3882b88e4b42068e SHA512 49eebfe34afacef58c8991db34065566c515dabdc54b9935262c5f1533f0a97bb89ef6a1e895a938f21bb67a0eb09b2f36165fe688c885817a82aa72c13e55f5
EBUILD wine-vanilla-7.4.ebuild 17639 BLAKE2B 50c4b30cdb46bffb68d0d04c7cd16625e0acc237aacfcb2457af409e480dd23b9e55870961ec5fb54cf3c4b2d55a66dc55479333d143d4ab264c07ef76fedd8f SHA512 c8f59592e0efabdb61299ba5fa093efe69bbf6dad373b68f6f5f9d84227960f153dabb82b3edb6fa6d5291fae0a221b0be5c6cca972f21d87527a5c1ba283e43
EBUILD wine-vanilla-7.5.ebuild 17639 BLAKE2B 50c4b30cdb46bffb68d0d04c7cd16625e0acc237aacfcb2457af409e480dd23b9e55870961ec5fb54cf3c4b2d55a66dc55479333d143d4ab264c07ef76fedd8f SHA512 c8f59592e0efabdb61299ba5fa093efe69bbf6dad373b68f6f5f9d84227960f153dabb82b3edb6fa6d5291fae0a221b0be5c6cca972f21d87527a5c1ba283e43
EBUILD wine-vanilla-9999.ebuild 17607 BLAKE2B 049f3877c3a3477243cfd58594537e376e138b0b61b5a46654dd7e44c3e37368ddd75015566fce57ab1c2927489411e9596a9e339f991c17d839693cac65f312 SHA512 2cd2a176dc3f0ef414626f48165ca638b2e1c2aea4510025c586b29319772d7ffa82585e14517c2c8b1badbee2e16e0e7c07a0ed4954e9b669b08952f0468bb4
EBUILD wine-vanilla-7.5.ebuild 17703 BLAKE2B 65893fb88b0f62918733239d585b479b8b9225f7cea1f9e4313601b27e74e02a2c270e038245bb97968608ba0bae92557c88b418a28285c5b5502df1da515d42 SHA512 27f45a433910f8b2dccc8a5b039f781b117f5f731e9f28d7107086a73c07ea6ce90f079a1b2de3dee3bd708c5ddda3a082ba67621c36c8262db1fd6fe8c5b442
EBUILD wine-vanilla-9999.ebuild 17703 BLAKE2B 65893fb88b0f62918733239d585b479b8b9225f7cea1f9e4313601b27e74e02a2c270e038245bb97968608ba0bae92557c88b418a28285c5b5502df1da515d42 SHA512 27f45a433910f8b2dccc8a5b039f781b117f5f731e9f28d7107086a73c07ea6ce90f079a1b2de3dee3bd708c5ddda3a082ba67621c36c8262db1fd6fe8c5b442
MISC metadata.xml 3322 BLAKE2B 904d6f935560018eb9d46e62a1caac836bcf33cd082a9e77079c8b82350e3b179d2c2f70e2a02b03cede7b813e6478586127708837c1556f7465736b56f5ae7f SHA512 dbb40789ea04e5e5414e1920a0f2223a0491c83a4ecabf553efd8efe5fc5e8ad45259fbc96c6716ec42862c7b35b1b0e9853b89fa6630f19c9a4db3c6cf90a37

@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="${PV}"
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@ -102,6 +102,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
mono? ( app-emulation/wine-mono:7.1.1 )
perl? (
dev-lang/perl
@ -243,8 +244,8 @@ pkg_pretend() {
# Verify OSS support
if use oss; then
if ! has_version ">=media-sound/oss-4"; then
eerror "You cannot build wine with USE=oss without having support from a"
eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
eerror "You cannot build wine with USE=oss without having support from"
eerror ">=media-sound/oss-4 (only available through external repos)"
eerror
die
fi

@ -102,6 +102,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
mono? ( app-emulation/wine-mono:7.1.1 )
perl? (
dev-lang/perl

Binary file not shown.

@ -1,7 +1,6 @@
AUX mysqld_exporter-0.12.1-skip-tests.patch 545 BLAKE2B 02e01f23cb302dd128d47f48f9b20ded113ff37f2053e932b3d0ab510a22b14be6cb80779d2d545e774285d9772f8a6f7313c5a0c251d734e194fac992994185 SHA512 c4c808bae622797e47261824c8bfca7f7f8b04771c047440eb9ea923f45517ccc49f53cf71c7b51e3af8cd5b9c99911d80fce66e12487d87dc9d242381550cbc
AUX mysqld_exporter-r1.confd 893 BLAKE2B bebec4ba675a5f7bfec52f0c1ad3b824f032258397dc9386892daa4d93ca1f7134c85e92c7662f9bd5b34d86478e2b3be2fc5b4adfb6fa1ece8d901ae530ec3e SHA512 3291e96479ece4f99de2c26e127469349f6197bc2764691fb4bffe5729fc9ce625fa84e2859649f0495260b339afa20edaa7bd2af99e6f161e6e6bbb153eee39
AUX mysqld_exporter-r1.initd 2053 BLAKE2B 46542a80ac4c894c0cf4f50b8e8a616a019f1c2d7c6846b524b626859bf521d6f5b15336537c6fb06c5f876dd0d8adcd592363a678bc6779bfb5352a93dca06b SHA512 3a7c91492a2533cbdb2846cb5f3a03e66caf332ff931d10227c32332aaf210e74f2dd56977c5146a59042529dfb14eebd0c78e8dc63675d4884958bdc81f5252
AUX mysqld_exporter.confd 891 BLAKE2B 340b8d6b5f3fdc0a52851197cfd94b1d9d20fa3cda349c581a016c6cc7edd53cb7d86b634487551f916fd5c84294add402397cb9bf0fc2efb211b589dd571dd2 SHA512 ed4f949c8f5f88ad54c536342adf90be5d74922b54c383735a957e571aba341057830c7e8cdc0e45b53e439c5297d3ad70ba7bd178f77d10615787ed51bcc03f
AUX mysqld_exporter.logrotate 68 BLAKE2B 04a9a0df5dae2a2afd3374cd6f6fd5d04df7629bc85ed63792ecc9e2b4772668d1f5b1fe4baf14b17c26a495ffa1ed3a7d748719db9a72f427587243505158d1 SHA512 3eb2e6bfa0eae0847c0b1e2e7fd990068cb0ad570d14463c88a8860d70ebc378b2e3bc4141f0a98e95304c972c765ae48dbff726b208ba825fe1f4e58765e462
DIST mysqld_exporter-0.12.1_p20200622.tar.gz 1640334 BLAKE2B fa52fd7474af548bc9429026d7c92bc543cff7f2e2f5e17007a52adc647d6d022a4ec9d099376cc469b4fdc8bab285e0e699a1b10938fc6b7a6704dcc1466a50 SHA512 ccac9a718214c9ab82362deeb81949cecaa6c2fc6567ef7e3d099ca2dbf8385cb9c498837e41ad0bcdf5ec2c9d82fd159792245b97e53c182a30917e80a20cf1
EBUILD mysqld_exporter-0.12.1_p20200622.ebuild 2070 BLAKE2B 83dd4d2a98364c49a7857dfb52e5268227cd16f03c947db5f1a26aba17134edafd788ab00b5d0a2d9c4ca696a5e80d30b8282c333f483a4166f02b107567f1a7 SHA512 fb65fd1f3b1109f47e8877dfe2a15ee3649439c2e17473497befb5aee1cf55901a4333ed262eef18d9564b016753e916f7355c7361ad0c55d1e48b9fb9da8395

@ -1,26 +0,0 @@
# /etc/conf.d/mysqld_exporter
# PID file
#EXPORTER_PIDFILE="/run/${RC_SVCNAME}.pid"
# The termination timeout (start-stop-daemon parameter "retry") ensures
# that the service will be terminated within a given time (60 + 5 seconds
# per default) when you are stopping the service.
#EXPORTER_TERMTIMEOUT="TERM/60/KILL/5"
# User to run exporter as
#EXPORTER_USER="mysqld_exporter"
# User group to run exporter as
#EXPORTER_GROUP="mysqld_exporter"
# You can use this configuration option to pass additional options to the
# start-stop-daemon, see start-stop-daemon(8) for more details.
# Per default we wait 1000ms after we have started the service to ensure
# that the daemon is really up and running.
#EXPORTER_SSDARGS="--wait 1000"
# Exporter flags
# See `mysqld_exporter --help` for more details
EXPORTER_FLAGS="-log.level=info"
#EXPORTER_FLAGS="${EXPORTER_FLAGS} -yourAdditionalFlag"

Binary file not shown.

@ -1,5 +1,7 @@
AUX mc-4.8.26-ncurses-mouse.patch 612 BLAKE2B ba3324dfee320a6c08c65ec8bf7784075f8a36c111ffa75129251674152cea68cde87844d5849c82111d4fad779c1d13992a7d765c4bc48b39d865ab1f89cbb6 SHA512 f97025ad7b3719b372368028ad9428e0cac67069d04e70b2e2923dd998a9f687f0807254bdc859218869e1666db80807fd53c19291e2921b420bc357e79d9406
DIST mc-4.8.27.tar.xz 2510296 BLAKE2B efb0f3a8beb7285a793085a8e3b3a49619d0f8a4babff7de90f7a462cf6c013bbc08b92bc48e2c2e2204799332cd0160a86e201d9368cabde78e653b4306763f SHA512 c955d66cee06e3a0e0c795f2f6b98b184762363390a903cf8ef83dc5e98e6e94d5a9c06c4788d9ff4b3ae111541df8c7dc0b864a5c21c40421a81cd8690e9a69
DIST mc-4.8.28.tar.xz 2333072 BLAKE2B f4218e6c166df85b7b3736f0fd1414c9507c72074f06001f12b114ce6c6fbbf3688ab850aa70f5063eb3920736f878e113eb39a5d261ccfc3ffa9dab473a8436 SHA512 ca3b3a57281e9387cb52bf1fcfc3f39a4d5f438aafc256dc492c192678824f67c983a852c759664efc5bc6d0de471c9b3929834f8301f6302ca1ebeee513fdfd
EBUILD mc-4.8.27.ebuild 3277 BLAKE2B f0ad166643a2f22cac89583cb6793e47462a96a9d5acef7870fec3598403cd356e2bdedab092601371f3aa18a3e76596caaae3fa48a454051aa5af39c6bbe6c3 SHA512 282ac6d42a7de75cc3973ffa4259d33ce32eb0b7f1714f136f2dd349f09481fbe6aad7086d0f5bb4d6a0a24389bae4bd7b0962c5c573718bd5019750d676b605
EBUILD mc-9999.ebuild 3561 BLAKE2B 81d6dbc9ea9033e235a980b2d7a384eb52a76246d6c3cf63bd1cf742e54a46856f3e3c5f84824ad68f351b83c78cc14c76d8e6da0732a480ff38788713267349 SHA512 8b023194bb6d2054d2d5856d6f1c9c2b6df1b6c50c31681310d8489dc59f3ec4a81c8a06e22d055d2866fd06641cfa7e4d66d531557e5660e897f14ae87b94ac
EBUILD mc-4.8.28.ebuild 3236 BLAKE2B 369d2786eb82bcbaf2151ef8c6ab3e4a8dfed8558f37b0ddc5839096d64c474a23f3b34495725b487830b6ea2355f171ea115687a0caee1e1ef3faf4e32d499d SHA512 66c24fddb327cc7c0e6ad317124f3ce169b9856706ce59e0172e3e4a50bcc35e1b4b15c88222c8839712f79b33f42d5977dab0f9a3b7e3a4f15904f3a48e4554
EBUILD mc-9999.ebuild 3561 BLAKE2B 4c7bd6ec644bfbccd2585244d683edfeb4c5bdf023c6eb866424ae11bd9138a99af2ce4dad7bd512853f6ebf18520319019c213b1036d9935563c29de24820c8 SHA512 93485a23e82d8584de49c2b8abbd8bf1ddbf3c2d722742d01b820b31befef9829c6f3de0eb69d3005109ea7f03d5ace7eee0eece5ad89862030faadb2bfbd908
MISC metadata.xml 771 BLAKE2B 9680a9a9c9cdd9dd6c7972947f8d62eab08e14c8c1285009f4f55a90409bca51ea9bf72be913eb5812db7723230fa469acbc731a959b7caaa9473136b68115e4 SHA512 5c4dd207f8f3fc8c33bf571c78f50e51a4331ddddaa1b0cfdee93601b86d34a234482a1168ba021440fde04bcc4e034e223e89413a034ddf21faca08a112a9e9

@ -0,0 +1,124 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit autotools flag-o-matic
MY_P="${P/_/-}"
SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
DESCRIPTION="GNU Midnight Commander is a text based file manager"
HOMEPAGE="https://midnight-commander.org"
LICENSE="GPL-3"
SLOT="0"
IUSE="+edit gpm nls sftp +slang spell test unicode X"
REQUIRED_USE="spell? ( edit )"
RDEPEND="
>=dev-libs/glib-2.30.0:2
gpm? ( sys-libs/gpm )
kernel_linux? ( sys-fs/e2fsprogs )
sftp? ( net-libs/libssh2 )
slang? ( >=sys-libs/slang-2 )
!slang? ( sys-libs/ncurses:=[unicode(+)?] )
spell? ( app-text/aspell )
X? (
x11-libs/libX11
x11-libs/libICE
x11-libs/libXau
x11-libs/libXdmcp
x11-libs/libSM
)
"
DEPEND="${RDEPEND}"
BDEPEND="
app-arch/xz-utils
virtual/pkgconfig
nls? ( sys-devel/gettext )
test? ( dev-libs/check )
"
RESTRICT="!test? ( test )"
S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
)
pkg_pretend() {
if use slang && use unicode ; then
ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
fi
}
src_prepare() {
default
# patch touches configure.ac
eautoreconf
}
src_configure() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
local myeconfargs=(
--enable-charset
--enable-vfs
--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
$(use_enable kernel_linux vfs-undelfs)
# Today mclib does not expose any headers and is linked to
# single 'mc' binary. Thus there is no advantage of having
# a library. Let's avoid shared library altogether
# as it also conflicts with sci-libs/mc: bug #685938
--disable-mclib
$(use_enable nls)
$(use_enable sftp vfs-sftp)
$(use_enable spell aspell)
$(use_enable test tests)
$(use_with gpm gpm-mouse)
$(use_with X x)
$(use_with edit internal-edit)
)
econf "${myeconfargs[@]}"
}
src_test() {
# Bug #759466
if [[ ${EUID} == 0 ]] ; then
ewarn "You are emerging ${PN} as root with 'userpriv' disabled."
ewarn "Expect some test failures, or emerge with 'FEATURES=userpriv'!"
fi
# CK_FORK=no to avoid using fork() in check library
# as mc mocks fork() itself: bug #644462.
#
# VERBOSE=1 to make test failures contain detailed
# information.
CK_FORK=no emake check VERBOSE=1
}
src_install() {
emake DESTDIR="${D}" install
dodoc AUTHORS NEWS README
# fix bug #334383
if use kernel_linux && [[ ${EUID} == 0 ]] ; then
fowners root:tty /usr/libexec/mc/cons.saver
fperms g+s /usr/libexec/mc/cons.saver
fi
}
pkg_postinst() {
if use spell && ! has_version app-dicts/aspell-en ; then
elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed."
elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini"
elog "It has to be set to one of your installed aspell dictionaries or 'NONE'"
elog
fi
elog "To enable exiting to latest working directory,"
elog "put this into your ~/.bashrc:"
elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
}

@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@ -23,7 +23,7 @@ IUSE="+edit gpm nls sftp +slang spell test unicode X"
REQUIRED_USE="spell? ( edit )"
RDEPEND=">=dev-libs/glib-2.26.0:2
RDEPEND=">=dev-libs/glib-2.30.0:2
gpm? ( sys-libs/gpm )
kernel_linux? ( sys-fs/e2fsprogs )
sftp? ( net-libs/libssh2 )

Binary file not shown.

@ -1,16 +1,11 @@
AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
AUX scribus-1.5.5-findhyphen-1.patch 1118 BLAKE2B c542a292601b43f12ee2b682225064bd650f2017466aed4aa3a256610dfe1aaa662857cf60682b3c8f1a0dd1b22b34b8c058967bc4879412e8599a641e254b18 SHA512 d536cce91eb161e2d8ead619f932111bcfe661bae9e0706567a0a789ef80eef28e6f81c357bd7bdaaeb97f8c6a872deb7147fea7fef84e279b7e8e812a821cef
AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06
AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9
AUX scribus-1.5.7-osg-cpp17.patch 11762 BLAKE2B 4f83dd7de919025606068ca5c05d2dd234b0d21d35cb7f784b1cebccc068f638730b7527ea07ed9a2bee16dd1524fa99e0e0ae10db5e98148066c882c00853fb SHA512 1e1e18967ce764d0b228d667d1673f6f7a03a7cba6fe07371435a6c7b9dcb0900fe73974a3a06ff22c87b35f27434bb44a3ec0b264914b8329c92b7e8d857c2c
AUX scribus-1.5.8-findhyphen-1.patch 1264 BLAKE2B e35c561c275ef945aca9a7cc34e9ac9732450d7a2d15f5766c2a637f296d026fbc1d777266634b98cc5e8ad09364019f8eeeffd63f634e0836144cb6dacd3f5d SHA512 c0db1a12698b2e9770049b20c73b33e3cd5f56d8a69486a42955949f37216c0347df32e6acbdd7567075f98450dd59e9ef2f6a42f82ce38699fa704d77fbc60d
AUX scribus-1.5.8-harfbuzz-3.patch 2703 BLAKE2B c870a6be1a9e2921ff3336852782bb1fbeb51c0fd797de1a59605723810279e4c48ac65bc8abce5a71cdad16a9c62c7d2f0759fa7593bc3ddc70f5f22a6e0d5b SHA512 589e87973d316d8a96d731e649becfe63b24f26bab9e81da57cf8d049b9a0da78a659c089ab71439232fa56019c0cfaea6fbdce3081eb90c2cd07c6c995d740e
AUX scribus-1.5.8-poppler-22.03.0.patch 2176 BLAKE2B 72f636999677cb166b96ba35896887daa71e1302081698c8b6a70ecc0d4a6e5c6a5dba41ff911d2bbad76ae17b20483050ba71595948e3d3097026506390e67c SHA512 86ea87f3a31ba5729e7c3f18ddcfcbe706d824c80d3fad85d6ea296ca6468e8f19964d6b6a771b5a8bc9deb1ed0b0baf4a0d2253aa562acad0c65e71c3f2e448
AUX scribus-1.5.8-poppler-22.2.0-1.patch 3899 BLAKE2B 616ded940828b14309b1dca597b5b209da3374e41aad01ed3a204888c3ad3ff25fce61bdfa69c947ead67b0a9cbe11f2e4fbdb6054f02bd251477830ddafd375 SHA512 7a5e21cc98bb7d87c326a8576e6ccf368d5fc64538896f5aedcb13598f2aa11cc6f999011e6920f0bf6116e46f5469a713bb7f04fa8c2ca308b0dd07f2c088af
AUX scribus-1.5.8-poppler-22.2.0-2.patch 1190 BLAKE2B 5eb29f6246d157f14af0a12bf2234f5981bbd012253ac867a499d2fa3c96221724c060af5549731d00ab96ee67dfd18a26662d601d59a5458fd39c69f022c73e SHA512 826f671ae67e157a6a71befaac77b6fa1888fbbd3c708a3d412d01bfe28a9d3b268ecf33b05fa94390904a140b0eba1e46e712024a02e0ec33933df2a711a611
DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01
DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B 6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686 SHA512 eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d
EBUILD scribus-1.5.7.ebuild 4100 BLAKE2B b2006dbed58cbb72a90c7956d7fc6b270ba309279117a073a004c7ce14645e3bb7a67176ff351a252c131c1dbc56632433002dd8bba01b5bdda6523f907cb8a7 SHA512 b1a23ef9be8fd537072537c2a80710019c0cd0f85d2ed333c0b44cfb3deb7eb4cfbfd50ba8afc9165f4ee4e8791ba91a2d4ac8e98272003e4b4b8a17e2103d48
EBUILD scribus-1.5.8.ebuild 4147 BLAKE2B f641545877dcf0459d89fa846f253c044deb3028d8b557610e6b79c5d1cb9bebb03f4abfdd033b35806e054d144d841583ab4114fe87958eafba366cd847add0 SHA512 87759327320e136225d2748ec03401416268c1ba8ec3c96d80baefdb6cf80b60b0c443fd66aab274baffb13ff02705268b2df520ab4d8a7e4ee297f3ba6f8f8d
EBUILD scribus-1.5.8.ebuild 4146 BLAKE2B e32ad027e529fd267c4b37de0dbd91c1d4c53855ceb6b8f691f06f112125a765b7395b7f4114a23a699ffcd34fbc522a050b921c44575f683e6b2c21c6f0d0f0 SHA512 21a0d6772d46005f6191e812b2b8e58d94bad4cf7a23d6fd926325f1bd82960a28013a70c4b5951082c3ce67f7d78be14bef5218b4519b3edc468f54e86dc398
EBUILD scribus-9999.ebuild 3964 BLAKE2B 8152771bbcb2b632c8b691b441613103147eb2cdb4bb50765940c20342f33308f01967d7b929ed076cb3be2a012fba00fb47d49040eb1220e2a20e28b76e5d28 SHA512 e3d4884e9f265257a33941eaec56d20cbf0bd0fc0155ca8852db23e54766285d19e4b74017faba3824aeb843e08906dee2387949bdcef73fa5191b16def49499
MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91

@ -1,51 +0,0 @@
--- a/scribus/CMakeLists.txt 2019-10-02 00:25:01.194386515 +0200
+++ b/scribus/CMakeLists.txt 2019-10-02 00:26:23.584392213 +0200
@@ -1069,7 +1069,9 @@
${SCRIBUS_GMAGICK_SRC}
)
-if(NOT HAVE_HYPHEN)
+if(HAVE_HYPHEN)
+ include_directories(${HYPHEN_INCLUDE_DIR})
+else()
include_directories(third_party/hyphen)
set(SCRIBUS_SOURCES
${SCRIBUS_SOURCES}
@@ -1180,13 +1182,6 @@
endif()
-if(HAVE_HYPHEN)
- target_link_libraries(${EXE_NAME}
- ${HYPHEN_LIBRARY}
- )
-endif()
-
-
if(GESTURE_FRAME_PREVIEW)
message(STATUS "Enable gesture frame preview [experimental]")
set(GESTURE_FRAME_PREVIEW_SOURCES pageitempreview.cpp)
@@ -1234,6 +1229,12 @@
)
endif ()
+if(HAVE_HYPHEN)
+ target_link_libraries(${EXE_NAME}
+ ${HYPHEN_LIBRARY}
+ )
+endif()
+
if(WIN32)
set_target_properties(${EXE_NAME}
PROPERTIES
--- a/scribus/hyphenator.h 2019-07-31 00:35:05.000000000 +0200
+++ b/scribus/hyphenator.h 2019-10-02 00:00:42.497285638 +0200
@@ -13,7 +13,7 @@
#include <QSet>
#include "scribusapi.h"
-#include "third_party/hyphen/hyphen.h"
+#include <hyphen.h>
class ScribusDoc;
class ScribusMainWindow;

@ -1,219 +0,0 @@
https://bugs.gentoo.org/831161
Backport of https://github.com/scribusproject/scribus/commit/80405ce
From: Jean Ghali <jghali@libertysurf.fr>
Date: Mon, 10 Jan 2022 20:38:51 +0000
Subject: [PATCH] Rename byte() to to_byte() in order to avoid potential
conflict with std::byte in c++17 mode
--- a/scribus/third_party/prc/oPRCFile.cc
+++ b/scribus/third_party/prc/oPRCFile.cc
@@ -76,3 +76,3 @@
// Map [0,1] to [0,255]
-inline uint8_t byte(double r)
+inline uint8_t to_byte(double r)
{
@@ -451,5 +451,5 @@
{
- tess->rgba_vertices.push_back(byte(lit->color.red));
- tess->rgba_vertices.push_back(byte(lit->color.green));
- tess->rgba_vertices.push_back(byte(lit->color.blue));
+ tess->rgba_vertices.push_back(to_byte(lit->color.red));
+ tess->rgba_vertices.push_back(to_byte(lit->color.green));
+ tess->rgba_vertices.push_back(to_byte(lit->color.blue));
}
@@ -595,19 +595,19 @@
{
- tessFace->rgba_vertices.push_back(byte(C[1].R));
- tessFace->rgba_vertices.push_back(byte(C[1].G));
- tessFace->rgba_vertices.push_back(byte(C[1].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[1].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[1].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[1].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[1].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[1].A));
- tessFace->rgba_vertices.push_back(byte(C[2].R));
- tessFace->rgba_vertices.push_back(byte(C[2].G));
- tessFace->rgba_vertices.push_back(byte(C[2].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[2].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[2].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[2].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[2].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[2].A));
- tessFace->rgba_vertices.push_back(byte(C[3].R));
- tessFace->rgba_vertices.push_back(byte(C[3].G));
- tessFace->rgba_vertices.push_back(byte(C[3].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[3].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].A));
}
@@ -622,19 +622,19 @@
{
- tessFace->rgba_vertices.push_back(byte(C[0].R));
- tessFace->rgba_vertices.push_back(byte(C[0].G));
- tessFace->rgba_vertices.push_back(byte(C[0].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[0].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[0].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[0].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[0].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[0].A));
- tessFace->rgba_vertices.push_back(byte(C[2].R));
- tessFace->rgba_vertices.push_back(byte(C[2].G));
- tessFace->rgba_vertices.push_back(byte(C[2].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[2].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[2].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[2].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[2].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[2].A));
- tessFace->rgba_vertices.push_back(byte(C[3].R));
- tessFace->rgba_vertices.push_back(byte(C[3].G));
- tessFace->rgba_vertices.push_back(byte(C[3].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[3].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].A));
}
@@ -646,19 +646,19 @@
{
- tessFace->rgba_vertices.push_back(byte(C[3].R));
- tessFace->rgba_vertices.push_back(byte(C[3].G));
- tessFace->rgba_vertices.push_back(byte(C[3].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[3].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].A));
- tessFace->rgba_vertices.push_back(byte(C[1].R));
- tessFace->rgba_vertices.push_back(byte(C[1].G));
- tessFace->rgba_vertices.push_back(byte(C[1].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[1].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[1].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[1].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[1].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[1].A));
- tessFace->rgba_vertices.push_back(byte(C[0].R));
- tessFace->rgba_vertices.push_back(byte(C[0].G));
- tessFace->rgba_vertices.push_back(byte(C[0].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[0].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[0].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[0].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[0].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[0].A));
}
@@ -1650,17 +1650,17 @@
{
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].A));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].A));
}
@@ -1794,33 +1794,33 @@
// first triangle
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].A));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].A));
// second triangle
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].A));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].A));
}
@@ -1912,7 +1912,7 @@
{
- tess->rgba_vertices.push_back(byte(C[CI[i]].R));
- tess->rgba_vertices.push_back(byte(C[CI[i]].G));
- tess->rgba_vertices.push_back(byte(C[CI[i]].B));
+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].R));
+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].G));
+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].B));
if(tess->is_rgba)
- tess->rgba_vertices.push_back(byte(C[CI[i]].A));
+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].A));
}

@ -1,68 +0,0 @@
https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch
https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch
https://bugs.scribus.net/view.php?id=16635
https://bugs.gentoo.org/817281
https://bugs.gentoo.org/813711
From 1b546978bc4ea0b2a73fbe4d7cf947887e865162 Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@libertysurf.fr>
Date: Sat, 21 Aug 2021 20:05:43 +0000
Subject: [PATCH] Use new hb-subset api with harfbuzz >= 2.9.0 in order to
prepeare for removal of legacy API in 3.0
git-svn-id: svn://scribus.net/trunk/Scribus@24696 11d20701-8431-0410-a711-e3c959e3b870
---
scribus/fonts/sfnt.cpp | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp
index 50777f66e3..fca8b39158 100644
--- a/scribus/fonts/sfnt.cpp
+++ b/scribus/fonts/sfnt.cpp
@@ -1256,11 +1256,19 @@ namespace sfnt {
for (int i = 0; i < cids.count(); ++i)
hb_set_add(glyphSet, cids.at(i));
-
+
+#if HB_VERSION_ATLEAST(2, 9, 0)
+ uint32_t subsetFlags = (uint32_t) hb_subset_input_get_flags(hbSubsetInput.get());
+ subsetFlags |= HB_SUBSET_FLAGS_RETAIN_GIDS;
+ subsetFlags &= ~HB_SUBSET_FLAGS_NO_HINTING;
+ subsetFlags |= HB_SUBSET_FLAGS_NAME_LEGACY;
+ hb_subset_input_set_flags(hbSubsetInput.get(), subsetFlags);
+#else
hb_subset_input_set_retain_gids(hbSubsetInput.get(), true);
hb_subset_input_set_drop_hints(hbSubsetInput.get(), false);
#if HB_VERSION_ATLEAST(2, 6, 5)
hb_subset_input_set_name_legacy(hbSubsetInput.get(), true);
+#endif
#endif
QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@libertysurf.fr>
Date: Sun, 19 Sep 2021 11:59:50 +0000
Subject: [PATCH] #16635: Replace hb_subset, removed in harfbuzz 3.0, by
hb_subset_or_fail
git-svn-id: svn://scribus.net/trunk/Scribus@24707 11d20701-8431-0410-a711-e3c959e3b870
--- a/scribus/fonts/sfnt.cpp
+++ b/scribus/fonts/sfnt.cpp
@@ -1271,9 +1271,15 @@ namespace sfnt {
#endif
#endif
+#if HB_VERSION_ATLEAST(2, 9, 0)
+ QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get()));
+ if (hbSubsetFace.isNull())
+ return QByteArray();
+#else
QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
if (hbSubsetFace.isNull())
return QByteArray();
+#endif
QScopedPointer<hb_blob_t, HbBlobDeleter> hbSubsetBlob(hb_face_reference_blob(hbSubsetFace.get()));
if (hbSubsetBlob.isNull())

@ -1,162 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="tk?"
inherit cmake desktop flag-o-matic python-single-r1 xdg
DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="https://www.scribus.net/"
SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
tk? ( scripts )"
# osg
# couple of third_party libs bundled
DEPEND="${PYTHON_DEPS}
app-text/libmspub
app-text/libqxp
app-text/poppler:=
dev-libs/hyphen
dev-libs/icu:0=
dev-libs/librevenge
dev-libs/libxml2
dev-qt/qtcore:5
dev-qt/qtgui:5[-gles2-only]
dev-qt/qtnetwork:5
dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
media-libs/fontconfig
media-libs/freetype:2
media-libs/harfbuzz:0=[icu]
media-libs/lcms:2
media-libs/libcdr
media-libs/libfreehand
media-libs/libpagemaker
media-libs/libpng:0=
media-libs/libvisio
media-libs/libzmf
media-libs/tiff:0
net-print/cups
sys-libs/zlib[minizip]
virtual/jpeg:0=
x11-libs/cairo[X,svg]
boost? ( dev-libs/boost:= )
graphicsmagick? ( media-gfx/graphicsmagick:= )
hunspell? ( app-text/hunspell:= )
osg? ( dev-games/openscenegraph:= )
pdf? ( app-text/podofo:0= )
scripts? (
$(python_gen_cond_dep '
dev-python/pillow[tk?,${PYTHON_USEDEP}]
')
)
"
RDEPEND="${DEPEND}
app-text/ghostscript-gpl
"
BDEPEND="
dev-qt/linguist-tools:5
virtual/pkgconfig
"
PATCHES=(
# non(?)-upstreamable
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
"${FILESDIR}"/${PN}-1.5.6-docdir.patch
"${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch
"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
# upstream
"${FILESDIR}"/${PN}-1.5.8-harfbuzz-3.patch
"${FILESDIR}"/${PN}-1.5.7-osg-cpp17.patch
)
CMAKE_BUILD_TYPE="Release"
S="${WORKDIR}/${P}"
src_prepare() {
cmake_src_prepare
rm -r codegen/cheetah scribus/third_party/hyphen || die
sed \
-e "/^\s*unzip\.[ch]/d" \
-e "/^\s*ioapi\.[ch]/d" \
-i scribus/CMakeLists.txt Scribus.pro || die
rm scribus/ioapi.[ch] || die
sed \
-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-i resources/templates/CMakeLists.txt || die
sed \
-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
}
src_configure() {
# bug #550818
append-cppflags -DHAVE_MEMRCHR
local mycmakeargs=(
-DHAVE_PYTHON=ON
-DWANT_DISTROBUILD=ON
-DWANT_CPP17=ON
-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
-DPython3_EXECUTABLE="${PYTHON}"
-DWITH_BOOST=$(usex boost)
-DWANT_DEBUG=$(usex debug)
-DWANT_NOEXAMPLES=$(usex !examples)
-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
-DWANT_HUNSPELL=$(usex hunspell)
-DWANT_HEADERINSTALL=$(usex !minimal)
-DWANT_NOOSG=$(usex !osg)
-DWITH_PODOFO=$(usex pdf)
-DWANT_NOTEMPLATES=$(usex !templates)
)
cmake_src_configure
}
src_install() {
cmake_src_install
if ! use tk; then
rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
fi
if use scripts; then
python_fix_shebang "${ED}"/usr/share/scribus/scripts
python_optimize "${ED}"/usr/share/scribus/scripts
else
rm "${ED}"/usr/share/scribus/scripts/*.py || die
fi
mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
# These files are parsed to populate the help/about window.
cat >> "${T}"/COPYING <<- EOF || die
${PN} is licensed under the "${LICENSE}".
Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
EOF
dodoc "${T}"/COPYING
docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
local size
for size in 16 32 128 256 512; do
newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
done
newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
doicon resources/iconsets/*/scribus.png
domenu scribus.desktop
}

@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ~ppc64 x86"
KEYWORDS="amd64 ppc ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}

Binary file not shown.

@ -6,7 +6,7 @@ DIST fish-3.3.1.tar.xz 3489152 BLAKE2B 61b2bf96526d957d3f9706df5a76d4d9b4ccf55a1
DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3 SHA512 463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
DIST fish-3.4.1.tar.xz 3293068 BLAKE2B 5edcd59445e6d928fb2183deb68fb0a305f6f80c134fef48ea79d91b79af1da6b31a1e870a9df963bb27dfc5985f326d9b6d53d64b16c79f9c303aa8edfa4423 SHA512 20a2892ec0c413c4c3fcfe5fbf52fb2398de35a9172758728bd2ccdccc5fb6e0e18712a664d02db67543d47180a4d04f3998a6297d23088926b6d03baefdf981
EBUILD fish-3.3.1-r1.ebuild 2457 BLAKE2B 5a530482f82025a5488895402b2f7612f29033db93c1f9521396a2941fa40250f512e12a40cfde123a27b9b9cbb4a6b4b1e82f981e7ae9deabf206793e0a8a15 SHA512 b0b5718ff2c16ebd4ac66446419c6efc28da139abbd229b625d888dc6c32d00e834d3a1052433302aa659c1106d1f4a5026e071f285f91814d9dc8a1daba8d04
EBUILD fish-3.4.0.ebuild 2347 BLAKE2B 18527dae9c7afcefaf421248cb8eb8372c5224624223f89fc4181acd2796693dd592c01e04926d38d5babfb2efef68b7bfd8f6a7d33559614e0d43ed7e9bec40 SHA512 be7feaa768a0e1fa1515032e1456b863fbec0f9b62f698940e3eb3773288c2faf3e8b0cea78eefb1f8983d4c0775baec70f9196105d4b159f8d4abc1a288dee3
EBUILD fish-3.4.0.ebuild 2345 BLAKE2B 038e2f6ca9e1cfe106a55a26b1b58979420dc680595dc70a66469976174685fcae448b145963ebaf90a31c3b66aef38d6133b3b276f97eeac834332b1084f3f9 SHA512 05f040d1d5a96ec5f3e297c491d46932e5cd77b75ac3fcacbab5f7dc1a819848efe7fcb2f2c2003563bc5dcbb2e5f953a518b0d6aaa2ef016813316a840954bd
EBUILD fish-3.4.1.ebuild 2349 BLAKE2B 4e212e82dedfed6c979b47b6b2b2c5d3dd66cb9d094b5fd5e60167fceadec22659c5c28c6669794567f96a57ab0ddee698b9f4be7360f65cc2095b44bbb276c1 SHA512 7add0d8184d0c4a23dc6798437c438aab7e6ee7bde898474c601471d85387e8e94ba13f9ff1c4e8841382179836385109ec62d6671ef202ee1d195733b672c94
EBUILD fish-9999.ebuild 2349 BLAKE2B 4e212e82dedfed6c979b47b6b2b2c5d3dd66cb9d094b5fd5e60167fceadec22659c5c28c6669794567f96a57ab0ddee698b9f4be7360f65cc2095b44bbb276c1 SHA512 7add0d8184d0c4a23dc6798437c438aab7e6ee7bde898474c601471d85387e8e94ba13f9ff1c4e8841382179836385109ec62d6671ef202ee1d195733b672c94
MISC metadata.xml 740 BLAKE2B 8f383c1f0b775432795ac55d8c4dd4e7b28f418fe3fe4d05221b3daf8f5c872c698cfff748f0c210ac13b87d84664a7b3333e837966f4d9df98e9474e737a48d SHA512 f551a872a95868d682641941a012cc8e08c53c8ad66bf31e3a4ee1b266244ac011cfdb6ffafb94910af0371274e94e4785507932d6fa0b1735e3bc7562fcbed1

@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
else
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
fi
LICENSE="GPL-2"

Binary file not shown.

@ -1,6 +1,5 @@
AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad748110399cf09a404b4a905d3f723bac1827787e4749f464ba026700b6e5b3cc0ee646a92de00f1f58d10cf12dc9bc91195ee8b6 SHA512 9663b95ed64bdc2bc40692922384d1c6073177eee58a49c412883c4d2ae098e4e0b4ea51b80443108b7c0c3e4f3fda60c00fc3be4d0b62a5d79d982697927235
AUX calibre-5.16.1-zeroconf.patch 1457 BLAKE2B 104ba007fbb051cf07bf55fcc30f58469e989dc842a4a046c8e212a2f971b27c497346466a15b380080fd54cc8c561bdbad5bbaa5b1917d7f8a748bb289d1b2d SHA512 e15a2659f1663e77a80b9148180b0636228d483cef7395aa0e7a45eb41e57b541bc91c1a87ed1439e3a3e43a167882af5ce6d493e4723220c8665c1d1341e302
AUX calibre-5.31.0-jxr-test.patch 943 BLAKE2B 39742add85bfb6abbc7d3a01b2018e6c47279ecc3e78d46f70c6e661b77304f2b739a5d44b9b106a0089559043691a3c751c020685abc53ba08a9a8b52fbc76e SHA512 aa1efc13bbbce430832ef20e41634c1f5d833544dc566d102314d80b4f3ce1fb838ca9916c559fcde4401531434bf2095647ee3dc79bcf87cddd56ddb9f347d9
AUX calibre-5.31.0-qt-image-test.patch 691 BLAKE2B b0eb6e3a5f74277b967d2002ad1090107a4a131fa2c1107fdb9ea0ca8593e7872e73a4c6d657670b5de1a1296567fa87f5a891514e379b83925a8d0c55154bdc SHA512 29a86e8416eff1f47f49790472480ebf6dc4c0dc771d045b0c3ea632e0df6d05f5fe23adac9510135b944757dc84c1f96cae55ef4860dc68bd68ee6a3ab3902b
AUX calibre-5.35.0-jxr-test.patch 827 BLAKE2B 0a94ac5b12ee2ec732d3ff68979c2060b0b218eee27409b3c351a9cc0b6bccce2260b8b387b442ae10f31483b20bd6d672f7d5424f7d9a8297a1bd14af2f7793 SHA512 259a3b4882bf0fbb01cb22974e219a621a2b337d6f638234a806148b11142fdbf9ac36ae38e71fcb7e18bd61362b34cf3c221ba1df317ec6ea8668591ad2d3ff
AUX calibre-disable_plugins.patch 709 BLAKE2B bfc3fb85203fd64296793d58099e9d43bd173d3545954960fb72c16d42f5e09d4a99205339012cdcab512d46f0fcb08aa6c9410e848c83782a776accfd654710 SHA512 deaf4ad84aa1d688ae67ba4bd09ab7f163a7a33d498d9e9fe1e6d24f3fb9599757f9d6cb7c3d14953b6a0cda482d1427fc6fb6343d5cfe94223ff6b6e2f4b507

@ -1,26 +0,0 @@
Avoid calling libjxr's JxrDecApp as we currently don't package it.
--- a/src/calibre/utils/img.py
+++ b/src/calibre/utils/img.py
@@ -119,8 +119,6 @@ def image_from_data(data):
i = QImage()
if not i.loadFromData(data):
q = what(None, data)
- if q == 'jxr':
- return load_jxr_data(data)
raise NotImage('Not a valid image (detected type: {})'.format(q))
return i
--- a/src/calibre/utils/img.py
+++ b/src/calibre/utils/img.py
@@ -644,11 +644,6 @@ def test(): # {{{
despeckle_image(img)
remove_borders_from_image(img)
image_to_data(img, fmt='GIF')
- raw = subprocess.Popen([get_exe_path('JxrDecApp'), '-h'],
- creationflags=subprocess.DETACHED_PROCESS if iswindows else 0,
- stdout=subprocess.PIPE).stdout.read()
- if b'JPEG XR Decoder Utility' not in raw:
- raise SystemExit('Failed to run JxrDecApp')
# }}}

@ -1,5 +1,3 @@
DIST foliate-2.6.3.tar.gz 4822251 BLAKE2B c6cedf4f5ae4e728ab2a7fc35a9fa1e9c69f9d2f8af92060b5363675d5e3fc5cb90698f4b184e792852d66a51e90c361b14d38034149304d10cdacc94100dda7 SHA512 b3dd5bc5a02d3f2210b0c7376426a7ea1668a81fa64fea179da2ab1d852778414cce45171143814d2010d6c03b0287dbbc512884107774ec211e24c6ed8127cb
DIST foliate-2.6.4.tar.gz 4824560 BLAKE2B fd109d76a7cd0cfbff3fb7273b232a7c749922c5e4d782ed4b7dcb63e914a7cc0bd6e7623a509c3117e45ead5c1d7538c57f322742e4e826b88bddc6182abdf1 SHA512 af58efa2c33451617dbf7327b56551557d762ac80f1b489d5da1c5a46ebbfe329052149deb8b2f4c7729a7fd46deccd5500fd96c0a662b731c871c1ad8061cd3
EBUILD foliate-2.6.3.ebuild 1202 BLAKE2B c3e662e2218eb04cb4be8090eedeea2325c49d586e52040f5dcf976cfbdd9f029e0c9d41fd5b9165d9d760d46d3afcba116b85063b76187e816017f81148f9c9 SHA512 4e2c3de331b47ae613dd90d5fba956a4c7ed80788737a321e9a91612004328cf1f6cb6c286964431bbf8d88712c98fc219aa91efad5fa6ca358a5f4a70c5d6b7
EBUILD foliate-2.6.4-r1.ebuild 1209 BLAKE2B a7fe923d57fa27a16801b79bf2df542e433f1468b23d0b3fc5c8d5fea1cac01f58e49cf39965c22ea210c0a1e4943b82a59378af7b553a276469fb5b5c32e2d6 SHA512 50a32d65c494b6f490dec3d3e0bbc3278ad32fae499e3194668422989de622cfc1d15c6ffd01ea2a82b52fa3e54a0642cb204884f6369b23647461d1d907c058
MISC metadata.xml 607 BLAKE2B ab5cffaca496e55fe6c7cce465104fe2c0010d4ef6110c816575944d7f48ae94d834ac61430e1c722daca0ceb739fdb4e2ad35b2afef010675726aea967d2ea2 SHA512 7e1d53bcd78408d6ef3803871d131beced46b118555d7daf0ccc0abf6233d3892568ca3264f1b123f20524d56600cb162c53057fb38a0811571a98ca0051573b

@ -1,51 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PLOCALES="cs de es eu fr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
inherit meson plocale xdg-utils gnome2-utils
SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
DESCRIPTION="gtk ebook reader built with gjs"
HOMEPAGE="https://github.com/johnfactotum/foliate/"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64"
IUSE="handy spell"
BDEPEND="${MESON_DEPEND}
sys-devel/gettext"
RDEPEND="dev-libs/gjs
x11-libs/gtk+:3[introspection]
x11-libs/pango[introspection]
x11-libs/gdk-pixbuf:2[introspection]
net-libs/webkit-gtk:4[introspection]
handy? ( gui-libs/libhandy:=[introspection] )
spell? ( app-text/gspell[introspection] )"
src_prepare() {
default
plocale_find_changes "${S}"/po '' '.po'
rm_po() {
rm po/${1}.po
sed -e "/^${1}/d" -i po/LINGUAS
}
plocale_for_each_disabled_locale rm_po
}
pkg_postinst() {
xdg_desktop_database_update
xdg_mimeinfo_database_update
xdg_icon_cache_update
gnome2_schemas_update
}
pkg_postrm() {
xdg_desktop_database_update
xdg_mimeinfo_database_update
xdg_icon_cache_update
gnome2_schemas_update
}

@ -1,13 +1,9 @@
AUX zathura-0.4.8-meson-0.61-build.patch 814 BLAKE2B 692fa4e525d8ca5bad33e1e36a288832509da06399db895f53235709db2367e4011a58d6b6632ee8850677619e6cf8a8d419989737af4cbfc6b6ed04ed8ea83e SHA512 ebf7769d5775f60e57521bdbfbc5a749c584ed706dc0f28d63ec2b6de6e5324a1835ad6f66827301a8ccedb3f2e4b6d60822c0176d63a52173b37fbf36e8f5ce
DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb SHA512 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
DIST zathura-0.4.4.tar.gz 194105 BLAKE2B dc99005c6e967a46af0db0001193d1b1551e9adb78acc88343096407ed4a61b889be600acaf83b45bd603e3b7c4b93402f619e06e7146089d4990309d3301d5f SHA512 8d1e5969cc2f9502d7d966d3341c8f7437422f2dcf952bc2567a5061e611c6fe90c2bc6670963d81b608aa621d70f77ec513d6ab9f03304894bd9ac648aaa6e7
DIST zathura-0.4.5.tar.gz 195275 BLAKE2B c50793fac6e473c7ccc4cccf15674dd8f33c504675e95501d05dc396dc4803f327e0144c72e6182671118ec1234cbd5a75ad8b6ea129bc7d471e683ff90ad392 SHA512 9ce6c7745d83d7e21fcbbc6a7c799a4223cf77afbe1c933b710c1c7920c98ae1edcf683ae42433f448a091eb317f2b71b3bde9d1b27c8089d1adbc9aa0ab4e78
DIST zathura-0.4.7.tar.gz 199857 BLAKE2B c4fd99049ed81c7965cc474f0c543ebd1aef55ff63312c21a33ce9161afb78da1c9f0a13ff86d5d69b2ce6b17965632de282a9c8bd60b0a8297d96528b5f2c5f SHA512 adfe69cbef6088a6fa7d49686194a0a3dc13757535974476742c733076dc5bb5ad95ed447d50cd1efdfb23fe2fb1f64452d5d8aeb27a80c3101f2ab5c68f9b60
DIST zathura-0.4.8.tar.gz 202264 BLAKE2B 70916ac23624b8e55b39bc2b9329fc5d992d3e2e3989b17bebf0f8b1bcb26ed943c15866c0b37e0a4a29fee7c264d6309bf1d036d770817e13a14a13af7499d7 SHA512 00d7b735154ff0e857f8a0a21c24b3fbbff8c166d93a34bee725072ee00f2870adecb956e9445334be2a84827778bd874cc1d4bda7f8b32e4468ea3784834b86
EBUILD zathura-0.4.3.ebuild 1334 BLAKE2B b8887cbbf8b755c44d79bf4c517ea4c6669566b5576584cf5f6b20fd918ef53ca36ec8918608070548556978a776fa80873716c108e32be0e252f9acc350ea1b SHA512 c9a38f2029607e41eac29b14446028eb6969317360039add7b3d7d8fa9add0c3fbba40d900053db498c7d0e6e83af67f6aec774259a2bb7613f6901631b7bb39
EBUILD zathura-0.4.4.ebuild 1347 BLAKE2B 48da5928fb897cb42e2d76dfe24b4d6b55aefd8fd336d41af466b00a01dd75d59566f0b1d9a57d982ed94d543f8862f8205979e2bb2c084b162c77219b9dbe2e SHA512 58a2e7db42b483c922412a74bd47e938355ce828b9aa172c1a2bfd4a10690892101641fada3ff080cbdd0ca9dc8e491768ac114ab36a7cb560061b830b393d2a
EBUILD zathura-0.4.5.ebuild 1350 BLAKE2B 8f4d976a62b7ab8ec19e300a85742aa270c965ab2dcdcb3a43aa81b2db3faceaf7cee4a5dc41870edd96b6180487026f965743e4fcc2cdc2b0221be1e33241e9 SHA512 195dcff04cd249ab9860f0468e9df0f3470256d52a03bd37d982f1469ad6a6fdf2539bce2afa47996fe5316c7f173b851cb343d51e75545333236ad91dd4b281
DIST zathura-0.4.9.tar.gz 206194 BLAKE2B 0dd4b153cf7f8e3ddd4ede5514389b2c5e4aa88e2c416646acc38f7e19419e11165c2a5b51548a05d69a1b947e661b885f7c9d8c100179d0d23d8754cb441d97 SHA512 fbab65cba7ac37e4021233a4ae0356a85f4a88d2c1a2d8337cd627eae389856b6b4e692904233332d2fa14ad0300e8c52732059a75314a0ef147a02ca9f8db10
EBUILD zathura-0.4.7.ebuild 1355 BLAKE2B f5e59096beb3e8cc13dde9cb887a1ceea87c7ee22f28f1599e235240c4e065da858ffadb96c3c702602684b6c0f6c6ed9018cf039ad16077f6f6b041d1c4f3fa SHA512 a1996b203c933b5e6e3661151bdba217ef131cd1e895ad2328c6cc6207b7f841434671671f7cc49af97bc6554fa366c9cc16f8eb38eafbb6bbf584b41632c3c4
EBUILD zathura-0.4.8.ebuild 1414 BLAKE2B c9e53786f10e0bcdd9057124a365b050881a640e7dd42e87a962b71aaa0702d7090a43b360dc92976456ccaaa1af84160bbae95a9a21a3fc315b116303a3aaf7 SHA512 fc53625f6057cc6433c61e30b8beb9e37c83772ee6eae7ad3177e4f00d8de56223ebcdd728a9773b9fadc93746295cb99e1331a1c6763c6fbb9108539987f95e
EBUILD zathura-0.4.9.ebuild 1358 BLAKE2B fa5a04a11ded704fdf8ba5bbb0e6992f2070666c694e4a3358d2ecb3e2759f81e2b33b1a730ced52f3c8a331a400a8e4d6d092330eeaf9976a5d21543e654bc8 SHA512 a640afa679ac3ca691d9ce4e15a12e86fa9384059f2e9cccf6fe70b56676432e4e7d8d7f0c8a47a3ac14dfc110808d5be74f9bee121c73065d6021f7a36f3fe7
EBUILD zathura-9999.ebuild 1358 BLAKE2B e7b0c718a45053c4221a28533fbee7cf6b782521aa27ef78677abaeab8478948a889a525e3afae27eacef51551c60c6b67960c4208813b0576a92b61803c5309 SHA512 df6e72ede3828f94b783f1bbd5caa7907b6be8c261f1f249474744d6cc199b4d472de23a59e0c35a07200928cd35e406a332f0f722f989c519a5d4a2695f7695
MISC metadata.xml 769 BLAKE2B 417d92ddfcbc7c2352a79c4275022515fa0bf31b7c06058bb29452f7e15882b59ad3d2b92a2aa8063bb54120377e028449c0e253cd2aeab719a92e4853a3eea7 SHA512 9f7284f67e9bb6b454670393431546685ede815937bb06f7a73ebf25c9cbecca734a8e09753ffc803f8f44ce3a67002c59e31d98bce6185b4237e5d499e3165f

@ -1,57 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit meson virtualx
DESCRIPTION="A highly customizable and functional document viewer"
HOMEPAGE="https://pwmt.org/projects/zathura/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
EGIT_BRANCH="develop"
else
SRC_URI="https://pwmt.org/projects/zathura/download/${P}.tar.xz"
KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
fi
LICENSE="ZLIB"
SLOT="0"
IUSE="doc +magic seccomp sqlite synctex test"
RESTRICT="!test? ( test )"
DEPEND=">=dev-libs/girara-0.3.2
>=dev-libs/glib-2.50:2
>=sys-devel/gettext-0.19.8
x11-libs/cairo[X]
>=x11-libs/gtk+-3.22:3
magic? ( sys-apps/file )
seccomp? ( sys-libs/libseccomp )
sqlite? ( >=dev-db/sqlite-3.5.9:3 )
synctex? ( app-text/texlive-core )"
RDEPEND="${DEPEND}"
BDEPEND="doc? ( dev-python/sphinx )
test? ( dev-libs/appstream-glib
dev-libs/check )
virtual/pkgconfig"
src_configure() {
local emesonargs=(
-Dconvert-icon=disabled
-Dmagic=$(usex magic enabled disabled)
-Dmanpages=$(usex doc enabled disabled)
-Dseccomp=$(usex seccomp enabled disabled)
-Dsqlite=$(usex sqlite enabled disabled)
-Dsynctex=$(usex synctex enabled disabled)
)
meson_src_configure
}
src_test() {
virtx meson_src_test
}

@ -1,57 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit meson virtualx
DESCRIPTION="A highly customizable and functional document viewer"
HOMEPAGE="https://pwmt.org/projects/zathura/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
EGIT_BRANCH="develop"
else
SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
fi
LICENSE="ZLIB"
SLOT="0"
IUSE="doc +magic seccomp sqlite synctex test"
RESTRICT="!test? ( test )"
DEPEND=">=dev-libs/girara-0.3.3
>=dev-libs/glib-2.50:2
>=sys-devel/gettext-0.19.8
x11-libs/cairo[X]
>=x11-libs/gtk+-3.22:3
magic? ( sys-apps/file )
seccomp? ( sys-libs/libseccomp )
sqlite? ( >=dev-db/sqlite-3.5.9:3 )
synctex? ( app-text/texlive-core )"
RDEPEND="${DEPEND}"
BDEPEND="doc? ( dev-python/sphinx )
test? ( dev-libs/appstream-glib
dev-libs/check )
virtual/pkgconfig"
src_configure() {
local emesonargs=(
-Dconvert-icon=disabled
-Dmagic=$(usex magic enabled disabled)
-Dmanpages=$(usex doc enabled disabled)
-Dseccomp=$(usex seccomp enabled disabled)
-Dsqlite=$(usex sqlite enabled disabled)
-Dsynctex=$(usex synctex enabled disabled)
)
meson_src_configure
}
src_test() {
virtx meson_src_test
}

@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit meson virtualx
inherit meson virtualx xdg
DESCRIPTION="A highly customizable and functional document viewer"
HOMEPAGE="https://pwmt.org/projects/zathura/"
@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_BRANCH="develop"
else
SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
fi
LICENSE="ZLIB"
@ -23,10 +23,10 @@ IUSE="doc +magic seccomp sqlite synctex test"
RESTRICT="!test? ( test )"
DEPEND=">=dev-libs/girara-0.3.3
DEPEND=">=dev-libs/girara-0.3.7
>=dev-libs/glib-2.50:2
>=sys-devel/gettext-0.19.8
x11-libs/cairo[X]
x11-libs/cairo
>=x11-libs/gtk+-3.22:3
magic? ( sys-apps/file )
seccomp? ( sys-libs/libseccomp )

Binary file not shown.

@ -1,4 +1,4 @@
DIST highway-0.16.0.tar.gz 1639388 BLAKE2B 660b0079b25a12a2e982b4ba16147b923d167989a7dc1c0cb65ebe5219577f2f02c8774a554fd3fe9e1c10ef7b1cf5db747500bd8acf454e26952722f7b5ac9e SHA512 c08e66f43d9d0b307737b016cfa6c3d3a1df9bd528de435d193388104f34c264866c5ff0da633fc0a6f8c50f21df1ac653e9dd3f6fbfaf227d636411ac14cd47
EBUILD highway-0.16.0.ebuild 827 BLAKE2B 5086672711f1f60342b6f77ddcd850d845c499d34c13f1f181721bf677c3cc21cdbc6967e6203e084c1cf697b4dd053580efbfb6ca5362369ba0b81577a2dbc6 SHA512 c4f183d1abe116d4994e90044ae957d631e57d2efe95644c650a899de70be366ce683e1332d87c2123e46a6c13a18c44de95fc6ce638ac0272309355aeed5f1e
EBUILD highway-9999.ebuild 827 BLAKE2B 5086672711f1f60342b6f77ddcd850d845c499d34c13f1f181721bf677c3cc21cdbc6967e6203e084c1cf697b4dd053580efbfb6ca5362369ba0b81577a2dbc6 SHA512 c4f183d1abe116d4994e90044ae957d631e57d2efe95644c650a899de70be366ce683e1332d87c2123e46a6c13a18c44de95fc6ce638ac0272309355aeed5f1e
EBUILD highway-0.16.0.ebuild 834 BLAKE2B bb10c9e76cac9a5149824c3f7def1928cbb19db5f7612aa22b8d5aace561483cb7d391e95a21be12edb73c87b3ce5e2a0ae4bb652ea8cfc2f9976b9afecdad8c SHA512 68cf57994bbed31f0ecc10e876ab78edef1af6c1af5be91e2d6ee7758b962799104873795d7c6ce443a2b4cc68c2324823b4e0d8233ca95eeeeb61b042bb5487
EBUILD highway-9999.ebuild 834 BLAKE2B bb10c9e76cac9a5149824c3f7def1928cbb19db5f7612aa22b8d5aace561483cb7d391e95a21be12edb73c87b3ce5e2a0ae4bb652ea8cfc2f9976b9afecdad8c SHA512 68cf57994bbed31f0ecc10e876ab78edef1af6c1af5be91e2d6ee7758b962799104873795d7c6ce443a2b4cc68c2324823b4e0d8233ca95eeeeb61b042bb5487
MISC metadata.xml 616 BLAKE2B d7aed88bf99a4e1370c0007e2eeb0d9e8a64c888cf1ef428f5096e40d75497a7255ceeeb73b68d7bb3afe44f65073811759dbb61f2270d4a8fdbc0721c7b27dd SHA512 855f548c51686530649f9eb1d5a8f4441f8dca8377622acc3cd32562b58556000dec77ba7c162e8f00443e85b75fde81d2cc900c1741ed76f815e3521d2602e4

@ -14,7 +14,7 @@ if [[ "${PV}" == *9999* ]]; then
EGIT_REPO_URI="https://github.com/google/highway.git"
else
SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 ~riscv ~x86"
fi
LICENSE="Apache-2.0"

@ -14,7 +14,7 @@ if [[ "${PV}" == *9999* ]]; then
EGIT_REPO_URI="https://github.com/google/highway.git"
else
SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 ~riscv ~x86"
fi
LICENSE="Apache-2.0"

@ -1,5 +1,9 @@
AUX build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch 912 BLAKE2B e3e90530c8593be5a6853542299081d795c0ae1719d68fb9c68e1bb7007aa6e43c7311721be5fb7886c5e67f3151a4fa0dbb244a6ee1916f17d6f29f5ce7990c SHA512 262feeffe5cbe9dade81d903c4d07bd1526f7942e42febdf84017d8190d4abcae0e39a8a1799db63018cb62dab0cb9c94f1a8de330aef96549a242f6da54a4cf
AUX build2-0.13.0_alpha0_pre20200710-nousrlocal.patch 1931 BLAKE2B 5faca35d7501cd0348910719286bcab2736cd94166db626bd77a62b90512ed6d99fbc2548a6ff30b0f5badecdcaa67a462a6ff11f51af8f9b9faba24fd8edefd SHA512 f57de10af06aa138a7c153e56d35b173a4804324557611baabb38ac00cfde0c8db2b59b57d5ad23a3f76877168745f1d40be1b7527241b47a163df4cc5879967
DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33 SHA512 0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c SHA512 d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef
DIST libodb-sqlite-2.5.0-b.19.tar.gz 74822 BLAKE2B e9a5d3be8b453bcdc026b6349572c3bd88eb468329216bee535f4e1ac72bfe6c88b485efe2476303600209df42023099fdda88b410d9295e8cab73ed9dd03fc0 SHA512 be6dbc731d9f45dfc7e9246f404edad78d59c9d38cff6599aed56d60d4f0e8391336e2da3608f66d74559f0a8d34243eb38e7e6a1221188959321810193ae901
EBUILD libodb-sqlite-2.5.0_beta19.ebuild 2944 BLAKE2B 5e06df184bd2b51956fb050e88fa602f6dcccb393fd833f24776d03c5e544214bdea9b633e7731786e7b4e1cdf6d4ffbd74af02b415fb6dfc47ca62203b0f443 SHA512 7a7ef9fe5545fdf0d575226cd7185ccf8539d6773944400655cf410e7d00bc6f2150e748fb869d47f4cb22c94b17efabfaea086cb9f55365d710a1ab9caa78d6
DIST libodb-sqlite-2.5.0-b.21.tar.gz 79975 BLAKE2B f9dca03ba909276ed137c15cbe32a8227b688f8b1c2d3e98b7040f3463359400fd5116088ae77722651589788e2d8e1367bc135ed2104dbc2d624ff4910f3fce SHA512 a84ea3847c64e5beffcb1f3958583bc02d371a4eb354ad32d0083b01e27362905bdcf09913c9b4cd6fc977eeaba95fd46cf953332e4fd0d673ca2f7521c71a1f
EBUILD libodb-sqlite-2.5.0_beta19.ebuild 3047 BLAKE2B d8f3ad6f4a660578ef18be3f424070fc0b76506deacf615fd0fb3a6bf06bf53a506b0a61193dbe1b21d8fd72add63ea131b1bd78e04bb9eeb500817622aed443 SHA512 c9dadbb3dbc3fa009ac4fc6b9779955011acdfca6792bf8d853cd789ca6d1aa25f813e52a4a11138d734f24e694b51055996c77397efd7b7a24ae878306a9909
EBUILD libodb-sqlite-2.5.0_beta21.ebuild 2944 BLAKE2B 3f1b342dcbd02217e0433c2a957d4219636a9e2e47f805aaf902db6c6bf43941641a6ce1a034356ae22681755881af1501df7448950a442d33725fa83a4806d5 SHA512 3e5a3b7dc5b12e254f0faf216c00a049bf192e996943f4cdabfa2adcbc24a3230a37214f89608328e83a4b5194272efb68ef9dc3c13833874f4736b8678a429d
MISC metadata.xml 910 BLAKE2B 7063501aac969fa79938ca8d91e000811d48b00d14424a48cf57a4ba46e74c1100cae9c0c4fc7e2707ea4bf1e2e21e9f1eca254dbb665d7931b606ead8281cda SHA512 20edccf9e1907a0b154ab8c517b9b440a65206664432a725a764288822fb56dcdbd1fb04ad20b138d488e53164adde2296af799859871663c03acefe6d9f4d80

@ -0,0 +1,38 @@
--- build2-toolchain-0.13.0-orig/build2/libbuild2/script/regex.cxx 2020-06-10 19:25:37.000000000 +1000
+++ build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx 2020-08-10 14:00:05.698012838 +1000
@@ -5,6 +5,35 @@
#include <libbuild2/script/regex.hxx>
+#if defined(_LIBCPP_VERSION)
+template <>
+void
+std::__1::__match_any_but_newline<build2::script::regex::line_char>::__exec(__state& __s) const
+{
+ if (__s.__current_ != __s.__last_)
+ {
+ switch (*__s.__current_)
+ {
+ case '\r':
+ case '\n':
+ __s.__do_ = __state::__reject;
+ __s.__node_ = nullptr;
+ break;
+ default:
+ __s.__do_ = __state::__accept_and_consume;
+ ++__s.__current_;
+ __s.__node_ = this->first();
+ break;
+ }
+ }
+ else
+ {
+ __s.__do_ = __state::__reject;
+ __s.__node_ = nullptr;
+ }
+}
+#endif
+
using namespace std;
namespace build2

@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@ -56,6 +56,7 @@ src_prepare() {
cd "${BS}" || die
eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
eapply "${FILESDIR}"/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
sed \
-e 's:libsqlite3[/]\?::' \
-i buildfile build/bootstrap.build \
@ -97,7 +98,6 @@ src_configure() {
config.bin.ar="$(tc-getAR)" \
config.bin.ranlib="$(tc-getRANLIB)" \
config.bin.lib=shared \
config.install.chroot="${D}" \
config.install.root="${EPREFIX}"/usr \
config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
@ -113,5 +113,6 @@ src_test() {
}
src_install() {
b install
b install \
config.install.chroot="${D}"
}

@ -0,0 +1,117 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
BUILD2_PN=build2-toolchain
BUILD2_PV="0.14.0"
BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
inherit toolchain-funcs multiprocessing
SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz"
KEYWORDS="~amd64 ~x86"
DESCRIPTION="Common ODB runtime library"
HOMEPAGE="https://codesynthesis.com/products/odb/"
LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
DEPEND="
dev-cpp/libodb
dev-db/sqlite:3
"
BDEPEND="virtual/pkgconfig"
RDEPEND="${DEPEND}
!<dev-util/build2-0.14.0
"
BS="${WORKDIR}/${BUILD2_P}"
S="${WORKDIR}/${MY_P}"
b() {
local myargs=(
--jobs $(makeopts_jobs)
--verbose 3
)
export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}"
echo "${@}"
"${@}" || die "${@} failed"
}
src_prepare() {
cd "${WORKDIR}" || die
for i in ${BUILD2_P}/libodb-sqlite/buildfile ${MY_P}/buildfile; do
printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
${i} \
|| die
done
cd "${BS}" || die
eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
sed \
-e 's:libsqlite3[/]\?::' \
-i buildfile build/bootstrap.build \
|| die
if has_version dev-util/pkgconf; then
for i in build2/build2/buildfile build2/libbuild2/buildfile; do
printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
"$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
"$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
"${i}" \
|| die
done
sed \
-e 's:libpkgconf[/]\?::' \
-i buildfile build/bootstrap.build \
|| die
fi
cd "${S}" || die
default
}
src_configure() {
pushd ${BS} || die
emake -C build2 -f bootstrap.gmake \
CXX=$(tc-getCXX) \
CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}"
popd || die
b configure \
config.cxx="$(tc-getCXX)" \
config.cxx.coptions="${CXXFLAGS}" \
config.cxx.loptions="${LDFLAGS}" \
config.c="$(tc-getCC)" \
config.cc.coptions="${CFLAGS}" \
config.cc.loptions="${LDFLAGS}" \
config.bin.ar="$(tc-getAR)" \
config.bin.ranlib="$(tc-getRANLIB)" \
config.bin.lib=shared \
config.install.root="${EPREFIX}"/usr \
config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
}
src_compile() {
b update-for-install
use test && b update-for-test
}
src_test() {
b test
}
src_install() {
b install \
config.install.chroot="${D}"
}

@ -1,5 +1,9 @@
AUX build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch 912 BLAKE2B e3e90530c8593be5a6853542299081d795c0ae1719d68fb9c68e1bb7007aa6e43c7311721be5fb7886c5e67f3151a4fa0dbb244a6ee1916f17d6f29f5ce7990c SHA512 262feeffe5cbe9dade81d903c4d07bd1526f7942e42febdf84017d8190d4abcae0e39a8a1799db63018cb62dab0cb9c94f1a8de330aef96549a242f6da54a4cf
AUX build2-0.13.0_alpha0_pre20200710-nousrlocal.patch 1931 BLAKE2B 5faca35d7501cd0348910719286bcab2736cd94166db626bd77a62b90512ed6d99fbc2548a6ff30b0f5badecdcaa67a462a6ff11f51af8f9b9faba24fd8edefd SHA512 f57de10af06aa138a7c153e56d35b173a4804324557611baabb38ac00cfde0c8db2b59b57d5ad23a3f76877168745f1d40be1b7527241b47a163df4cc5879967
DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33 SHA512 0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c SHA512 d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef
DIST libodb-2.5.0-b.19.tar.gz 101239 BLAKE2B d6c32e4e5bbacafbecf9e992f91604dac4bb50359d41709b81116f09ce805cd2a3388cf14b47acc60d9b5a52867de0725c1dbbc7603dda8ffaf64589b3057ecb SHA512 0a3e70afd2c2ba573676e1a2630986215b4c8e57a004f7d2f2227f301b6c58f739397a0efc8877902baf88b93aff83c9b67c9f5b5e87cc570d64bb76b7b8f66b
EBUILD libodb-2.5.0_beta19.ebuild 2826 BLAKE2B 4f21893d66bda9d7d9ac96c2e76c58a8efb7efeb9642202365b0560e346661a454fd665a04211b8a35e688cdc2b5ca8ae894aa5c1628ffa4187c6b1911431bde SHA512 74cfb4919661dadce3f740279f871f14f50928ead36772a2f59b61344e4022fb77520135409762d910b32cac29213f8314a833672284ce6bed374ef65e817615
DIST libodb-2.5.0-b.21.tar.gz 101775 BLAKE2B 5417c5dd4540ab6014005803ec505e9dfc8f30125f573bac045306470eb8947fe800717fc02d8af138f7dd50bb82d19f01099f28421733809ccd1858bdc0f941 SHA512 68fa486b3a6f1254fb57e480bdf8e1d008fe38f29c47d5a4648ff44dc964dd7f3ee9d07510d742db15120f272aa6152bf08ca9d7689e4b34b0f5e5910ea71c0e
EBUILD libodb-2.5.0_beta19.ebuild 2929 BLAKE2B 3876b91e9ec8420acf48d7cf9e30099b6ae3966a9613d563d8c720b383b73f829fe626bee93e74201954461f891223510e49efaeb7c604c7caae4960760eadad SHA512 53c399515584df75ba9b1e5b73220dd22f46a3d1a133e225f2f8f3869ed035655bf7a55bc901948ac34475577463d30dc31890ab5862fee627601b19145f9dd4
EBUILD libodb-2.5.0_beta21.ebuild 2826 BLAKE2B 8581864e1a30971f89439fc823d85e7d7c3c7b31788edb3af7827c4333f417285ef211256f4279ac0e34bdfe680dec9914461f4c7223741ddbf039298651cbc6 SHA512 54bda0a50b2d9f8c25890ac33c1b8543325a4577fa16e13f0b7c5ff10d216f50a74cfab305b87b946c0a8db68d1c435fe9d629b69e738466b3bfa2bfda7298c8
MISC metadata.xml 910 BLAKE2B 7063501aac969fa79938ca8d91e000811d48b00d14424a48cf57a4ba46e74c1100cae9c0c4fc7e2707ea4bf1e2e21e9f1eca254dbb665d7931b606ead8281cda SHA512 20edccf9e1907a0b154ab8c517b9b440a65206664432a725a764288822fb56dcdbd1fb04ad20b138d488e53164adde2296af799859871663c03acefe6d9f4d80

@ -0,0 +1,38 @@
--- build2-toolchain-0.13.0-orig/build2/libbuild2/script/regex.cxx 2020-06-10 19:25:37.000000000 +1000
+++ build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx 2020-08-10 14:00:05.698012838 +1000
@@ -5,6 +5,35 @@
#include <libbuild2/script/regex.hxx>
+#if defined(_LIBCPP_VERSION)
+template <>
+void
+std::__1::__match_any_but_newline<build2::script::regex::line_char>::__exec(__state& __s) const
+{
+ if (__s.__current_ != __s.__last_)
+ {
+ switch (*__s.__current_)
+ {
+ case '\r':
+ case '\n':
+ __s.__do_ = __state::__reject;
+ __s.__node_ = nullptr;
+ break;
+ default:
+ __s.__do_ = __state::__accept_and_consume;
+ ++__s.__current_;
+ __s.__node_ = this->first();
+ break;
+ }
+ }
+ else
+ {
+ __s.__do_ = __state::__reject;
+ __s.__node_ = nullptr;
+ }
+}
+#endif
+
using namespace std;
namespace build2

@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@ -45,6 +45,7 @@ b() {
src_prepare() {
pushd "${BS}" || die
eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
eapply "${FILESDIR}"/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
@ -91,7 +92,6 @@ src_configure() {
config.bin.ar="$(tc-getAR)" \
config.bin.ranlib="$(tc-getRANLIB)" \
config.bin.lib=shared \
config.install.chroot="${D}" \
config.install.root="${EPREFIX}"/usr \
config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
@ -107,5 +107,6 @@ src_test() {
}
src_install() {
b install
b install \
config.install.chroot="${D}"
}

@ -0,0 +1,111 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
BUILD2_PN=build2-toolchain
BUILD2_PV="0.14.0"
BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
inherit toolchain-funcs multiprocessing
SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz"
KEYWORDS="~amd64 ~x86"
DESCRIPTION="Common ODB runtime library"
HOMEPAGE="https://codesynthesis.com/products/odb/"
LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
DEPEND="
"
BDEPEND="virtual/pkgconfig"
RDEPEND="${DEPEND}
!<dev-util/build2-0.14.0
"
BS="${WORKDIR}/${BUILD2_P}"
S="${WORKDIR}/${MY_P}"
b() {
local myargs=(
--jobs $(makeopts_jobs)
--verbose 3
)
export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}"
echo "${@}"
"${@}" || die "${@} failed"
}
src_prepare() {
pushd "${BS}" || die
eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
libodb-sqlite/buildfile \
|| die
sed \
-e 's:libsqlite3[/]\?::' \
-i buildfile build/bootstrap.build \
|| die
if has_version dev-util/pkgconf; then
for i in build2/build2/buildfile build2/libbuild2/buildfile; do
printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
"$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
"$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
"${i}" \
|| die
done
sed \
-e 's:libpkgconf[/]\?::' \
-i buildfile build/bootstrap.build \
|| die
fi
popd || die
default
}
src_configure() {
pushd "${BS}" || die
emake -C build2 -f bootstrap.gmake \
CXX=$(tc-getCXX) \
CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}"
popd || die
b configure \
config.cxx="$(tc-getCXX)" \
config.cxx.coptions="${CXXFLAGS}" \
config.cxx.loptions="${LDFLAGS}" \
config.c="$(tc-getCC)" \
config.cc.coptions="${CFLAGS}" \
config.cc.loptions="${LDFLAGS}" \
config.bin.ar="$(tc-getAR)" \
config.bin.ranlib="$(tc-getRANLIB)" \
config.bin.lib=shared \
config.install.root="${EPREFIX}"/usr \
config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
}
src_compile() {
b update-for-install
use test && b update-for-test
}
src_test() {
b test
}
src_install() {
b install \
config.install.chroot="${D}"
}

Binary file not shown.

@ -1,13 +1,15 @@
DIST citus-10.0.6.tar.gz 5186554 BLAKE2B b7f4c46cf202bcc1a0d62d797056d5dbee625c4d00f6c0507e95201698bd9d0eceddaf2dd524e0a954a75013fcfb5f42531975ae157d1aa015a27f8adc8d9f25 SHA512 2a839eb2cc907a8294b974ec4f698042546e84757d209ce5e7c52d122f3f2af5036b3a1147d26b50170192649a19cf38d3c2bccfa445e213f604bb21ef84d478
DIST citus-10.1.3.tar.gz 5281581 BLAKE2B cf119c550174a8b64bfee6497288a10030db7ff8d40e48d4751799d4268618afe9b7dcd72bfbd5b01dc073f6f4af55e8dc338071e3be224d15ded423885bbebd SHA512 2ad9665c5de3214a5ebc08d5df663caa634912dd9db433a43bea96d3932213786d1650a695531a4d00ab8dff7d53078848466d7a6e803bff3ab26f4df3990c91
DIST citus-10.1.4.tar.gz 5283715 BLAKE2B e19b35734b32541678538b963f1c03a259fa404f373b759a4c08e867325e106689ff711a5db9ba9231e1f9b42e303a49e6d58c8fb18b5ab7d75e19aea4741a0e SHA512 36a19b30d63ea53a8be6a77946d54558f7fd92f2e91b356395f9273e907f24444500c31d77e9693186fc2bd8df7c7e5f62a11ddfbc8795fbde8d700ebe7a9e76
DIST citus-10.2.3.tar.gz 5531853 BLAKE2B ed8804f699203ab3e9e6f7f03213b38e3477cdb989338dcc364e079c830bcbcb05d3fbbfa5507a306a9433ec0aa783f150cb0c8ea038265efc40f7a37fd33410 SHA512 544d47093878c4ba02502f52dd4ac23cecd67c75635d825ad43f24ef19aa5de97b1d34e1e4e86f2f23028de363cb4979244ea3639caa8f142891d247d0187322
DIST citus-10.2.4.tar.gz 5535944 BLAKE2B 3820622ec7f60aad5989536fe6dd53b8db75c51dc31ae3a0d023058afaa369f2de29fe49369d7846ad3bd17242fb6ce7784f2832263ba79ca045c75e558e14d7 SHA512 f9d6853333984c23b3f6aaeec156719c8564958e4d446781506f95fd56e48b8df27f1ddfa1cddb085791dccd6a17c07f3df87d84a89e137ba5a6972a656222f2
DIST citus-10.2.5.tar.gz 5538309 BLAKE2B c8e06b356728a68a948ffd3dd6d3c56c2972ad094922ce03e049999c450cac0c62ebe45f4ecc489d2cb521530b9f1bf566ac9732227646247a7eebd03f3f88cb SHA512 95ee1225c850bc986025f6960cb5784b02f2ac5af8f312f5dd4a270c4ebf46dd60388ba604a9cd4cf2e22f8b7a855bd18654cbe9f701ba7cd35c1576414d185f
DIST citus-11.0.0_beta0.tar.gz 5785689 BLAKE2B 249a396ec8171d12ae33234e5044d2ee75a2f3bf41bddfc528609fadc23b8d7da20049a8a2aaf3841db08f5343ccdf6f4206377bcfa4c1f2466c1b6677e398c0 SHA512 7dc15db0126b809c6dfb80e62a16b9009a248e4fefb0bd8a55b9b3d860426644238970cc2bdf4b27c0a09c30acb2ecf19d07b5ffcafb65d6da1215482876a2ba
DIST citus-9.5.10.tar.gz 4744848 BLAKE2B e6d9595fe30cb93508007cb4f39933ae57b6f0f1c5ee084ac83b0f5edea0d32dc0e8fd71737e396eb9b77fd5601ae647e29dea5b13e2e7a53a59f96365773466 SHA512 24683c7607de115d1d7fc355b56ff732e5e5f2adcdbebac7ee0d71b8878de3f335f3824be9e02ae9554850c68d7e21bc6d95d581e02ba4fef9da27b2f67f2987
EBUILD citus-10.0.6.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
EBUILD citus-10.1.3.ebuild 573 BLAKE2B a5572761f51a81157e42dc6d860cd0a8b91857102aa027b0e23d9aaff092798ebc3efa4fa560b5e52b3e7ddb37be79c7bb26c181e6f87c544862e47583bca25e SHA512 dede570d1b403a461bd9ded53857dcec565c52d11b1475074e40e0ad2ab74fe34bad726857025087152aaf7be7e53f00f89b068a51ca1f9dd58e6447a5d809fd
EBUILD citus-10.1.4.ebuild 573 BLAKE2B b64e0f2c3946099fac52b87264e0b441d88784c311ddc4cc6e0d298cc7ce2c3502b330639b1c33f767798cad2545705dccd74646edd21fdddd915cd139a546e2 SHA512 71d83fb2933c2068aa1e8ff3e57f5334ae3dce066e1d85a3a2da8a6dfa8e1cb63e269e2d6024befe8eac44405aed34d8bf48b833431935e063d8888f82856ef4
EBUILD citus-10.2.3.ebuild 576 BLAKE2B 2139c10495f8b7c23e0fbc6be85012c24ffce7481f614e2f6134efeab79780b6b8bb7d5f8e7ed1866021fd577dbd8cd8400aa250c37bf568829b55879ef85ddc SHA512 25e3cb723a51b31bf85722098a40e31ecb3f4852dd2806fb91f73d52b2cfeb20159722c3a01d3d17238fb9d9e3ac754def12782c9bd64fe1d0f36f5e94a6ec05
EBUILD citus-10.2.4.ebuild 576 BLAKE2B 2139c10495f8b7c23e0fbc6be85012c24ffce7481f614e2f6134efeab79780b6b8bb7d5f8e7ed1866021fd577dbd8cd8400aa250c37bf568829b55879ef85ddc SHA512 25e3cb723a51b31bf85722098a40e31ecb3f4852dd2806fb91f73d52b2cfeb20159722c3a01d3d17238fb9d9e3ac754def12782c9bd64fe1d0f36f5e94a6ec05
EBUILD citus-10.2.5.ebuild 576 BLAKE2B 2139c10495f8b7c23e0fbc6be85012c24ffce7481f614e2f6134efeab79780b6b8bb7d5f8e7ed1866021fd577dbd8cd8400aa250c37bf568829b55879ef85ddc SHA512 25e3cb723a51b31bf85722098a40e31ecb3f4852dd2806fb91f73d52b2cfeb20159722c3a01d3d17238fb9d9e3ac754def12782c9bd64fe1d0f36f5e94a6ec05
EBUILD citus-11.0.0_beta0.ebuild 637 BLAKE2B d0f6aeef1ecd63da22ade5ae652a08563bf25f5c7a9e8d9b039d819187cbe84640691ac3c8d41b23c4aa92eb3a94757ef73ef9455f6df30b42a21510aac19fc9 SHA512 3b7479bc670ca340ea3e0c6d1d47f96ee5b9f159b4a8a5136bbcfc8a170f6387429a0bbbb5f8d183ebd9648ec35b69480fcfffdbc5b694ee46e0ad27bff72c8f
EBUILD citus-9.5.10.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
MISC metadata.xml 281 BLAKE2B 85a0d31b886497ac44662bb58420de2f6af5444882f008f902287c6a8265f6e76afa7513b0edeca5b34a26d69d9aa61832c5fb3287c577a7f047180aa3fb242e SHA512 9e9007a37a7acc9948a6eb15bd1bdfea46c95eacc88e96a878237baaf01298b1f849d6e170f04638bbfb68f2c8b8a3bf227e563b5309f859cfcd23d43bc5dd85

@ -0,0 +1,35 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
POSTGRES_COMPAT=( 13 14 )
inherit postgres-multi
DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
HOMEPAGE="https://www.citusdata.com/"
MY_PV="${PV/beta0/beta}"
SRC_URI="https://github.com/citusdata/citus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-${MY_PV}"
IUSE=""
LICENSE="POSTGRESQL AGPL-3"
KEYWORDS=""
SLOT=0
RESTRICT="test"
DEPEND="${POSTGRES_DEP}
app-arch/lz4
app-arch/zstd
"
RDEPEND="${DEPEND}"
src_configure() {
postgres-multi_foreach econf
}

@ -1,5 +1,4 @@
AUX gentoo-layout-3.0.patch 311 BLAKE2B 4c2f0ae8aa53d605bcaf134274d3b549ec970b43cc68eed1ac71cf089c9fa32a1343d7ebfdf428e7f25032f5782aecfb86fb8f78528ffc708ab15dc7285a24e7 SHA512 4d5a48b4dd66aab04ba597b30e96b4601c6745acca21be1daf051ba6ce1e8fef1a0efa46d8e81da1ecdc893a8ee471bd8c7ed0c5436ee33b8b4f7cd18fdca1a5
AUX mariadb-connector-c-3.1.11-fix-flow-control-statement.patch 401 BLAKE2B b5b2a418ffd3ab03304bd9dd8914aa3673f24b9ebc4dc53e9082d3a979fa5858b1431f88c0cd51d23450fe798047a3844774bb89cb0b3c4785e0575ceadfe5e6 SHA512 f052eccae09d6aedc1ed47578a102e72984b39be8fa903421e285eba18eed5d449d1c82262c54ffcec39af044a014edf0dc1102bed1384d575557372ae974d88
AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3d0095a823917704d52a5f16c349ce7017b93b1bebfec01287929470a89a2e4aec2f9f7cd5135368e43f2a2e89257c0d7042b878e1806ede8aa SHA512 fe621abedaf81d1fa367c52f69ccce1765757db8d9f412aa40b440d7e51d4de3785a90150e76893f7066b1ba656eb1bad020465e58adae13f08245b839bde4de
DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01 SHA512 a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32
DIST mariadb-connector-c-3.2.5-src.tar.gz 992580 BLAKE2B c850dfbb2241e78475b5f9e9aa0fcb69bc9cc0d17a9092da36e720ec63e3fbdb0add32e6c4508a136fcb43d0825bea7346c0d6ce8a40ae10357ef3d3b6b7bea0 SHA512 5068c95ff15969c6b1d0e2e095fe0bdca3382f478012c852a9745a9bbbfc7586b1eeaa93a55fbadb236499a336133667f4638082814c97ff6b3bbc750c5e59dc

@ -1,14 +0,0 @@
https://github.com/mariadb-corporation/mariadb-connector-c/pull/158
--- a/cmake/ConnectorName.cmake
+++ b/cmake/ConnectorName.cmake
@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
SET(MACHINE_NAME "x64")
ELSE()
SET(MACHINE_NAME "32")
- END()
+ ENDIF()
ENDIF()
SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")

@ -1,8 +1,5 @@
AUX pgagent-4.0.0-pthreads-linking.patch 806 BLAKE2B 771541db654044bc7de240a9b1df3a0d14fbedfbd396b887fb252c83b105cce3431f74913faf07f9c638f2b7a046d5aeb7f944692f03efb0b097c5d683133632 SHA512 7693f63555dc817caa41ed5052f2548c06f6ab87da3ef0267e07ff99bda9e1aac6c20dee5628bbc9ed79adc0183da726f9e256bd658c0283046b6d41f8cb7905
AUX pgagent.confd 292 BLAKE2B e40e12a1a915653ffa62b113733db93cc7b1c3fc7200ef476a91080fdc054fdb64b6ee9b838583b93b27827a7858e905df8fbe0084dedd8d70deee6887469005 SHA512 a7346ae4dc7231efb8c29d3b7a1d7d377a2b1dabe01b0be9b090e070bec927b29d8e8c20ce30d437cab2ab5c119af89dfcdc6f75fecaca7366b2c10c5e48ed11
AUX pgagent.initd-r1 837 BLAKE2B 27bd762c0fd56cf63d1c31c2c0d94b6d8ed62dbfeaed42e260294604a5059c55dc9d204a526bfd5725831c99f712f1e5812a8bb7ee80cb745fc9bebfa06d7359 SHA512 ec6843ad55a7b2800c146ce7ee0551c5ede319d1fca1cfd700acd2245c6fcbaa36a87ad6cda04f33e124b479e6ca6b040cb57d0f78e40d335276e29c800f6627
DIST pgAgent-4.0.0-Source.tar.gz 63561 BLAKE2B 1731e748a6a5e76cd8b177162eb5b82ae633d1b507739e3193a8857a0eee0fe775fdaadb871eb5d708c0f7e80558680b5d7d246f4cb5d2bc1c10955bdf9cc09e SHA512 df2d6f5817d83d4cf60f0f1106718225870bcfd2f5b882765e5fd459e1614208225f90b29de492bec5284f3727f3d4be9f724b92ef503fea08029fab22a8fbb4
DIST pgAgent-4.2.1-Source.tar.gz 65583 BLAKE2B ee75803475dfbb751f1a81da5c3a6bec82aee80e9ce7d0413f94395069b5c0cbb6ff8770083078ce0e3a571a4c1b6d2e6adf6af8f0bfa9e8adfc862fff38d0d3 SHA512 778ca020ec23b3d042760cdcf84d3c2da8da48c8a648a9999812c2e79edfcc8912ab23cc1a1c29f379d6a56960cdd876164397b8fe6b21dd386a917a80eaa71c
EBUILD pgagent-4.0.0-r1.ebuild 1239 BLAKE2B 765398f1d00a72a30ab9b676d5688ddd9370b4e29324938fff1b85694c8732d64302ab0d3b6b7e91f3d44ef5f7c42492553b5581aa7422e0a9f6c617db6eb72e SHA512 b2054c28cd377fd4b69e895ae8a5494cf78fd15f23d67171f91f15c7369ae9ba51a0bd832ab8a889b50e7ab5debad98e9a5a21f693460404052f4ced3a98e236
EBUILD pgagent-4.2.1.ebuild 997 BLAKE2B 617f7af8b9ecae9b605f11a42a75aff2b734ba622e2dcdecf30a79ddf52f5015962a9be34927a5ce5bbfe603fcb26fcdaf3cec82cf1828280ea7632e458cc7f7 SHA512 5ad50c6b3be485966f7d131ddbae74f0929330dbeac42a0a7d92ac2732ca77b59a3a47b91f594ec15b9acd33e4f5e6411529190b0c0f8df3ef003488b53e2f78
MISC metadata.xml 299 BLAKE2B 8a9e141d133ba835d7cc3b57fd23fb87809747ddc080ccb6f62901c37efb805ce9cd76f975137085a7a2cc3360b7273c8520e3e9d5a44cd049035432c808950c SHA512 08ed9516733ab595f4c68d25aa24dceb31661d60acdc1e2bc44d0b397052c761aee80857a47eb62b37cbf3bb38e4619c1ef4fe5caddcce2137b6a8bb73baa4ac

@ -1,33 +0,0 @@
From 5b79460bdda286ca988b39e93e446176e8a781d1 Mon Sep 17 00:00:00 2001
From: Neel Patel <neel.patel@enterprisedb.com>
Date: Fri, 20 Jul 2018 13:35:35 +0100
Subject: [PATCH] Link with pthreads on non-Windows and non-macOS platforms.
Patch based on feedback and initial work by Christoph Berg.
---
CMakeLists.txt | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1be24da..6f1eaa0 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,9 +134,15 @@ IF(WIN32)
ENDIF(WIN32)
ADD_EXECUTABLE(pgagent ${_srcs})
+IF(UNIX AND NOT APPLE)
+TARGET_LINK_LIBRARIES(
+ pgagent ${PG_LIBRARIES} ${Boost_LIBRARIES} -pthread
+)
+ELSE()
TARGET_LINK_LIBRARIES(
pgagent ${PG_LIBRARIES} ${Boost_LIBRARIES}
)
+ENDIF()
# Installation
IF (WIN32)
--
2.24.1

@ -1,55 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
CMAKE_IN_SOURCE_BUILD=1
inherit cmake-utils user
MY_PN=${PN/a/A}
KEYWORDS="amd64 x86"
DESCRIPTION="${MY_PN} is a job scheduler for PostgreSQL"
HOMEPAGE="https://www.pgadmin.org/download/pgagent-source-code/"
SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/${MY_PN}-${PV}-Source.tar.gz"
LICENSE="POSTGRESQL GPL-2"
SLOT="0"
RDEPEND="dev-db/postgresql:*
dev-libs/boost
"
DEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_PN}-${PV}-Source"
PATCHES=( "${FILESDIR}"/pgagent-4.0.0-pthreads-linking.patch )
src_prepare() {
cmake-utils_src_prepare
sed -e "s:share):share/${P}):" \
-i CMakeLists.txt || die "failed to patch CMakeLists.txt"
}
src_configure() {
mycmakeargs=( "-DSTATIC_BUILD:BOOLEAN=FALSE"
)
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
newinitd "${FILESDIR}/pgagent.initd-r1" "${PN}"
newconfd "${FILESDIR}/pgagent.confd" "${PN}"
rm "${ED}"/usr/{LICENSE,README} || die "failed to remove useless docs"
}
pkg_preinst() {
# This user needs a real shell, and the daemon will use the
# ~/.pgpass file from its home directory.
enewuser pgagent -1 /bin/bash /home/pgagent
}

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save