diff options
Diffstat (limited to 'dev-vcs/mercurial')
-rw-r--r-- | dev-vcs/mercurial/Manifest | 10 | ||||
-rw-r--r-- | dev-vcs/mercurial/mercurial-6.5.3.ebuild | 10 | ||||
-rw-r--r-- | dev-vcs/mercurial/mercurial-6.6.2.ebuild | 10 | ||||
-rw-r--r-- | dev-vcs/mercurial/mercurial-6.7.4.ebuild | 10 | ||||
-rw-r--r-- | dev-vcs/mercurial/mercurial-6.8.ebuild | 10 | ||||
-rw-r--r-- | dev-vcs/mercurial/mercurial-9999.ebuild | 10 |
6 files changed, 55 insertions, 5 deletions
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index 372130a6f2c4..dc4e803427b5 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -179,9 +179,9 @@ DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b279 DIST zstd-0.12.3+zstd.1.5.2.crate 29693 BLAKE2B 57789ec212f12d3416784d7d8830a197437fd5a7c90ed62dd4b5add87f84039fe7afebb1c37f0973644845129868c0c6009bd39163b6afcc8b218653d2491b98 SHA512 1ee79370e2a7517638e51ea3c5c2f7f9d3f42364eefc5b10e909f52e50bffd141ecf2ac4d3701bd7655c965dd03a608ca5b69743fc2ed877f4dbfcb79715b70f DIST zstd-safe-6.0.4+zstd.1.5.4.crate 20856 BLAKE2B 05ef99fecb0d49c47dda75c23e89b7c5193ea00cee153be1856818ce3cbb97171b631ad27c01bde6fb02cc532a4aa8115ad9c6f2359ae6917e86062d833b75e4 SHA512 db03385ae800053ddb1bb6a2089712f284c21e43a99deeed6367ca8dabbb3f96b12066dfb57f484172a386fc9576c28e38d1a7bbf838debc05877bc68cd5c9cf DIST zstd-sys-2.0.7+zstd.1.5.4.crate 732100 BLAKE2B 1859d1feb7c31d53df56b198b88a391bf09e221d09d449878043dc780ae6e3b3a0ad05fe3fb4980e849ab914f68d281d41f51f7bbceec6e1403d9b4e25572b4c SHA512 dcddc4f0d7486ee144df4e2173536dc02c9714b6f702edb9a9e04b4c02f4d347b5a70fbc020c1d08c079d38a423c4dc8b6b86e7e43ec3ccfcc8e3ff9861be11b -EBUILD mercurial-6.5.3.ebuild 7538 BLAKE2B f14d1928e8edace440c3e5266be0de6842e3e8e59ea1e9cd198f6fdae97880345a4bb3193dc695417bc8a7a93d860e205884c255c6419f4997a2e31163bcce48 SHA512 a6e4b7a93237e79945873326e2730d44a63a78fe3a62d75e31c721948cd465d0cd40529d1b0fdbc155bce8c28414d1b73c821eea26990b02c44773d348bdf898 -EBUILD mercurial-6.6.2.ebuild 7695 BLAKE2B ef5a332da93a99f87d9fa022aae31bbc786020f134edf0a8f814b7964b870388dd93bf161b91d5dfa3d1535230ff90ac673eac3e2d492ee4a087255dfa507d94 SHA512 178d2b6c28a40430a354b2003b8e986298fee2a1561eae0a8b7e11998f65f1cfc92ec05cccbc75baec6bed16a62c9cecb4ac8023eb064af1231b0c9f48a0f981 -EBUILD mercurial-6.7.4.ebuild 7939 BLAKE2B 0e071d4f7445fb187f00a1ae97075b4e342794a74cae7d5094905d88cc66793b07033d7a331e9b817846b03d8a1033d963f44683c3c51eb2420fc74f9faeb3b7 SHA512 12fabb495d59fcbc3da8dd6e32a772bbd0e3e36a1c95eeef65333aa37b0034c12e1bc58e6f2c1e06f77fda57c8886ff1da14620cf1796c69f265310faca0d51c -EBUILD mercurial-6.8.ebuild 7876 BLAKE2B 36b67d529ca74fdc7fd3473b0d40ba35a5d7905f265c293a0de12d2223f4dfddeca087af4dbb01ffe53f15d02b6d618c2840e423d587e892cced666998fd4402 SHA512 0c4eeb755e48982f1fbcfec23fd9752de97797ee30eb27d7c408b1f59d3131c81096e8014a63b6e5d64961cbcdebfcb10f377a81fd121cb5eb3f6d88003407e0 -EBUILD mercurial-9999.ebuild 4380 BLAKE2B 9b961781191708cb67816bc7f889a7ca20051121c75471aa26c3213c544d65467ba20356e36d5dc69d0a3c7959dcafe7c58ce2b81c2fc6900103a26a825bc5f7 SHA512 eb02c74136e729caa2ff52d8dc928bbcf009cb01d396f7155913537cf95e815e39597693c2c9f07b57a3a7c13408fc57906ca580f1fed048dec4b6db6ded92eb +EBUILD mercurial-6.5.3.ebuild 7847 BLAKE2B 90304cbca056149b78079d75e65bb9afe7aac2112f2e9c9ac14d51d4e75f3633080426d6cbfb0775e2722a5165d7667a35aaecc6342aeffdcf306e00aa13b7bf SHA512 8172449ed1e4420df6be0dadd243413005abe071238a4b6cb5038ce7117fc5392df117a4b35a901b018bb338049aa7e8d9ce04ff212bec9e77527b8b020918d8 +EBUILD mercurial-6.6.2.ebuild 8004 BLAKE2B d6acf1ec67c3e97022759a6973a7d4080de210de70afa0930ccb14e0519bbbe3af563c2e339615377a001a797e32ffe7e41acf817aebd589bb4d718051d03375 SHA512 7b01f36347dad2feb53a4ee245d1da175b547b8f3b31e6ed71e86698f3073018177b62ea60c06df6e6c87631c2e8bed369c7f099b27dbb2901d33de9011cd09a +EBUILD mercurial-6.7.4.ebuild 8248 BLAKE2B af3ddcb9f117c20ac2526cc85315892da7e16406c5cc4c6da4f70ec057608d9fada48aed1b67f3423749b5dff19c0fa4cc9784b01590ab72f6468063f97e56fe SHA512 12e719693cea4d721156ac596fb41dc172de393de8ab910342c120a929ae48fb299e00843a3d1b8477cdd308538c0d3db4a736b6fb549cea2c4f386f6551524c +EBUILD mercurial-6.8.ebuild 8185 BLAKE2B 53e23f8af43333f258d9e27939502c71041aeeba7296f3ced69c405da2f8197a4f97d8a941a6139bf1aa84eb9f79ba98e88a3ba63aaae53ea31c7ab21e3968a9 SHA512 9213c9f614d6136c1035abe859e32d68d17fc3a1ccb0bbe2a59c42e011681a40920e0822ef77e72599c0d563378ec2613257bcbb5cf7214622049195402b1f17 +EBUILD mercurial-9999.ebuild 4689 BLAKE2B 1d53deeb550932bce07a2fca83330a5a83b3ccd53b4bd911efa642e38225283243a596d9326286cb2ee6f8a9711928a442475b201fef4d40256d3903867486d0 SHA512 eefa3be078437daca8622b0e150f58ac0e48b374d6203dc8dc8420e303f935064370c5b5752f4284fcb82cb4e9ecc2719d25a7a692465c4eeb8ac28fb4d6092c MISC metadata.xml 543 BLAKE2B 648353ce40bb4e93585e0f34b7bd7eba764b421ae9962835d2e00ae6e893e1b0c9f7e94e1e3548f098a57f5901840986784e5c7e163679b41f6475ff9ba190ce SHA512 e6850e1b5088298ad42f2a9ce5313a4c974562242ee77e7af5c53bcb91bddb1676a24690a14d67dbac911735aaef462d70019b6fb764e1e17556df29b0ac7e1b diff --git a/dev-vcs/mercurial/mercurial-6.5.3.ebuild b/dev-vcs/mercurial/mercurial-6.5.3.ebuild index ab3945e86821..8c1137cfcd01 100644 --- a/dev-vcs/mercurial/mercurial-6.5.3.ebuild +++ b/dev-vcs/mercurial/mercurial-6.5.3.ebuild @@ -197,6 +197,9 @@ src_unpack() { if use rust; then local S="${S}/rust/hg-cpython" cargo_src_unpack + else + # Needed because distutils-r1 install under cargo_env if cargo is inherited + cargo_gen_config fi } @@ -206,6 +209,13 @@ python_prepare_all() { sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die + # Build assumes the Rust target directory, which is wrong for us. + sed -i -r "s:\brust[/,' ]+target[/,' ]+release\b:rust/$(cargo_target_dir):g" \ + Makefile \ + setup.py \ + tests/run-tests.py \ + || die + distutils-r1_python_prepare_all } diff --git a/dev-vcs/mercurial/mercurial-6.6.2.ebuild b/dev-vcs/mercurial/mercurial-6.6.2.ebuild index 6e0daef5f51e..ed79e2235c03 100644 --- a/dev-vcs/mercurial/mercurial-6.6.2.ebuild +++ b/dev-vcs/mercurial/mercurial-6.6.2.ebuild @@ -207,6 +207,9 @@ src_unpack() { if use rust; then local S="${S}/rust/hg-cpython" cargo_src_unpack + else + # Needed because distutils-r1 install under cargo_env if cargo is inherited + cargo_gen_config fi } @@ -216,6 +219,13 @@ python_prepare_all() { sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die + # Build assumes the Rust target directory, which is wrong for us. + sed -i -r "s:\brust[/,' ]+target[/,' ]+release\b:rust/$(cargo_target_dir):g" \ + Makefile \ + setup.py \ + tests/run-tests.py \ + || die + distutils-r1_python_prepare_all } diff --git a/dev-vcs/mercurial/mercurial-6.7.4.ebuild b/dev-vcs/mercurial/mercurial-6.7.4.ebuild index 90e4f7551850..6207efb0c49b 100644 --- a/dev-vcs/mercurial/mercurial-6.7.4.ebuild +++ b/dev-vcs/mercurial/mercurial-6.7.4.ebuild @@ -218,6 +218,9 @@ src_unpack() { if use rust; then local S="${S}/rust/hg-cpython" cargo_src_unpack + else + # Needed because distutils-r1 install under cargo_env if cargo is inherited + cargo_gen_config fi } @@ -227,6 +230,13 @@ python_prepare_all() { sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die + # Build assumes the Rust target directory, which is wrong for us. + sed -i -r "s:\brust[/,' ]+target[/,' ]+release\b:rust/$(cargo_target_dir):g" \ + Makefile \ + setup.py \ + tests/run-tests.py \ + || die + distutils-r1_python_prepare_all } diff --git a/dev-vcs/mercurial/mercurial-6.8.ebuild b/dev-vcs/mercurial/mercurial-6.8.ebuild index 6131cdb5b538..38d629066192 100644 --- a/dev-vcs/mercurial/mercurial-6.8.ebuild +++ b/dev-vcs/mercurial/mercurial-6.8.ebuild @@ -216,6 +216,9 @@ src_unpack() { if use rust; then local S="${S}/rust/hg-cpython" cargo_src_unpack + else + # Needed because distutils-r1 install under cargo_env if cargo is inherited + cargo_gen_config fi } @@ -225,6 +228,13 @@ python_prepare_all() { sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die + # Build assumes the Rust target directory, which is wrong for us. + sed -i -r "s:\brust[/,' ]+target[/,' ]+release\b:rust/$(cargo_target_dir):g" \ + Makefile \ + setup.py \ + tests/run-tests.py \ + || die + distutils-r1_python_prepare_all } diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild index 86634c6fd33c..45093fbe0880 100644 --- a/dev-vcs/mercurial/mercurial-9999.ebuild +++ b/dev-vcs/mercurial/mercurial-9999.ebuild @@ -43,6 +43,9 @@ src_unpack() { if use rust; then local S="${S}/rust/hg-cpython" cargo_live_src_unpack + else + # Needed because distutils-r1 install under cargo_env if cargo is inherited + cargo_gen_config fi } @@ -52,6 +55,13 @@ python_prepare_all() { sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die + # Build assumes the Rust target directory, which is wrong for us. + sed -i -r "s:\brust[/,' ]+target[/,' ]+release\b:rust/$(cargo_target_dir):g" \ + Makefile \ + setup.py \ + tests/run-tests.py \ + || die + distutils-r1_python_prepare_all } |