diff options
Diffstat (limited to 'sci-mathematics')
16 files changed, 192 insertions, 22 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz Binary files differindex d71de5d07d91..9ed66c372a37 100644 --- a/sci-mathematics/Manifest.gz +++ b/sci-mathematics/Manifest.gz diff --git a/sci-mathematics/alectryon/Manifest b/sci-mathematics/alectryon/Manifest index f90615f901e1..ea95fb20fdb8 100644 --- a/sci-mathematics/alectryon/Manifest +++ b/sci-mathematics/alectryon/Manifest @@ -1,4 +1,5 @@ AUX 50alectryon-gentoo.el 155 BLAKE2B 6a83a0b6e7116a85d00b20799004eaec08033845661a23368b3340320184f2ea65c6b23db61664dadf2f829cabeabd8933f7f9e31d0971fcf2a0181c6d8ae956 SHA512 65fb668f29ba4737fc374302536c3223a02d45816a79256e425e255f30c134b19c8e88ccd19c13954a562182ad072cd10de08cd5047ae17b1b72efcfdc78f00f +AUX alectryon-1.4.0-setup.cfg-version.patch 402 BLAKE2B 3f9969714ad120457b6a0f52c0a7fd85b3b747a95648b5d2ed5ad49deec7e8277630d98ece242964135b55cc12273d1cee0b1385e690ff9bf9bdcf2339cef106 SHA512 fbda296d11fbc67457448450bf5c752eb4f835f03a4a8e97274ebeab0078fdc08240a5e91824256759b7510bb2aaa6bb9e13403163f821f629527bc068745378 DIST alectryon-1.4.0.tar.gz 312436 BLAKE2B 7f1e58670fbba0b31a4e4bc6502dffa72931ae3495c38b53987406a05aac9d3d1a34d75c89b7b85a6122ee6a7ce30970f8cf3190a5916e416e56854313077d4c SHA512 1310a04c8584147b38af8edb19cc95bd71043f5d00f55cbf4d5649dad9eede5bd01dba6fb23b85acf7cb9e9619fd01e5f83d8d37064f0b43f706589b9ec8aeef -EBUILD alectryon-1.4.0.ebuild 1729 BLAKE2B 3209721c93c4552278ad968e7a43fcbc0f34025a6ae83ae9cdb24e48303caee56217c76d0e59a383ec06527833979eead8783d1911fed9c45db0fac69bda7e90 SHA512 f3184ed6ccd684f04e2e6cb6b70f2275c139ab29e3f016784f0492e966ac8c16de64c8a8d9059b6f723ab76c506d10d5707cd568c3c58dd10927584210044043 +EBUILD alectryon-1.4.0-r1.ebuild 1816 BLAKE2B 96a4e471c01b9d64eb4bea463dba13c50354a0026b9fbcd9cedf5894fe88aede3b7d0e83f4d1670557935b7d1e8823135d2f50c900473fbba92566bc2638a39a SHA512 f801eda13d130dc8c636897cab6aa52d4784b141f490928ed3541ffefd61915e2475ead17ce7c6fd6be96b688d552221f82e301fda0380509f970e3d3ae8ca83 MISC metadata.xml 977 BLAKE2B 929c655f60171ee97c50a711e5ddaa4f5b6e5c7a2ffa2a2e3ff69665fa46a894af8a353e73efa8e43ed18fa87440e77d6a0d2abe7ecf740dcffe315d9bcddffa SHA512 a88e5341ebe5a4f239e73dbe0d843c46bdcc0f24dfa99e554b57ec715455d2a0526b4a157d2a2a2854b6d7e500b921f81cc29b6ab3c54db8ed228d94807d33fd diff --git a/sci-mathematics/alectryon/alectryon-1.4.0.ebuild b/sci-mathematics/alectryon/alectryon-1.4.0-r1.ebuild index bdbf53a0c35b..a15045952615 100644 --- a/sci-mathematics/alectryon/alectryon-1.4.0.ebuild +++ b/sci-mathematics/alectryon/alectryon-1.4.0-r1.ebuild @@ -3,6 +3,7 @@ EAPI=8 +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{8..10} ) inherit elisp-common distutils-r1 @@ -42,6 +43,7 @@ BDEPEND=" " DOCS=( CHANGES.rst CITATION.bib README.rst ) +PATCHES=( "${FILESDIR}"/${P}-setup.cfg-version.patch ) SITEFILE="50${PN}-gentoo.el" src_compile() { diff --git a/sci-mathematics/alectryon/files/alectryon-1.4.0-setup.cfg-version.patch b/sci-mathematics/alectryon/files/alectryon-1.4.0-setup.cfg-version.patch new file mode 100644 index 000000000000..9445c0857f0d --- /dev/null +++ b/sci-mathematics/alectryon/files/alectryon-1.4.0-setup.cfg-version.patch @@ -0,0 +1,11 @@ +index 1a25a92..066089b 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -1,6 +1,6 @@ + [metadata] + name = alectryon +-version = attr: alectryon.__version__ ++version = attr: alectryon.__init__.__version__ + description = A library to process Coq snippets embedded in documents, showing goals and messages for each Coq sentence. + long_description = file: README.rst + url = https://github.com/cpitclaudel/alectryon diff --git a/sci-mathematics/cryptominisat/Manifest b/sci-mathematics/cryptominisat/Manifest index 2fe9f833da46..e9326ae1fa29 100644 --- a/sci-mathematics/cryptominisat/Manifest +++ b/sci-mathematics/cryptominisat/Manifest @@ -1,3 +1,4 @@ +AUX cryptominisat-5.8.0-setup.py.in-sysconfig.patch 678 BLAKE2B b42dd9ebed8076e8c46ddf92107bdd776d078c0869a824b87c27876c49818ca96b1455912c3af3957c507b59fadb5ecbdedbd94404a87f4672295553d40ce612 SHA512 9836faddf2d502af08a15a08611dfcd1e476d4155fe6a6a9a68b4d6ff851fa7dd485e0c08ba23920cda43f8fc72e5ec9f05fce816b7b0ead65144daa38490601 DIST cryptominisat-5.8.0.tar.gz 943785 BLAKE2B 534af88a8432c7e3da63989cad8fd5e1491bd69a80b44977fa681e0356e857a505a82dc860b0d04d07987e3edae2861da67ec9dd781261e03a1120dc342b9759 SHA512 3eb954f01524b189a8de57a05f6060471a083addc4b9077c1e32b769d26393ce3d33468819ba8169deedce43fc3663b0ad8bbad95c6afe5e562e438c57b75496 -EBUILD cryptominisat-5.8.0.ebuild 920 BLAKE2B b22d56c5e175d44acb483b1b684cd0236b7f517337c627fde15aa92ee7cb6e69942751e6e8ff6fe66cd40be83eb1144502b0e9d7b094910dafae3faaf182196b SHA512 209995f8551665b615c3a23b50d59fc2ff41f7b57ffbe5570521a67a06f38ef8a9a9cda4faf3465b05c8b05f4da31337c95c12eeb40fdce1e27e7a6e18f9a6b8 +EBUILD cryptominisat-5.8.0.ebuild 980 BLAKE2B a4e47be2b7f6f9ba2fe6669afbdeeee25ac69586ce1fba042f6f940a0befeaded258f9c855e9d6c6d0dbe10cd996f712174e4fa5cae27d936fb6c0231e5859d9 SHA512 b0e65d01e24fdc3fb938185540594e1bf1dedafebf0f889a4368997d8e5c8b3d0afab8f8e19b93ba81d4af275bf0576d4149b60a3a426fe4a9574f836bc11948 MISC metadata.xml 858 BLAKE2B 4543d51cedd7b5e5e8508c14dfae420360f9d76ada1b969d855ca2b17b2c967036b29a9f2769a2c78e736c1e449e2b079558cd7460a72d402e9f1ce029ba414a SHA512 e1b39d888ab6c09f8707a164c7f683831a908477b2c7f219f4c9f71161ba84c145836ca2b1665e200f15a6e2ff6ca6318bd16fc40d57ad9c64bd1a4e229fbabc diff --git a/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild b/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild index d4517fca935e..8542bea79b7f 100644 --- a/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild +++ b/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild @@ -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 @@ -25,6 +25,8 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}"/${P}-setup.py.in-sysconfig.patch ) + pkg_setup() { use python && python-single-r1_pkg_setup } diff --git a/sci-mathematics/cryptominisat/files/cryptominisat-5.8.0-setup.py.in-sysconfig.patch b/sci-mathematics/cryptominisat/files/cryptominisat-5.8.0-setup.py.in-sysconfig.patch new file mode 100644 index 000000000000..5280f27bbd8f --- /dev/null +++ b/sci-mathematics/cryptominisat/files/cryptominisat-5.8.0-setup.py.in-sysconfig.patch @@ -0,0 +1,23 @@ +index b3ab64af4..293eb1f80 100644 +--- a/python/setup.py.in ++++ b/python/setup.py.in +@@ -27,7 +27,7 @@ import sys + import os + import platform + from distutils.core import setup, Extension +-from distutils import sysconfig ++import sysconfig + from distutils.cmd import Command + + __PACKAGE_VERSION__ = "0.2.0" +@@ -59,8 +59,8 @@ def _init_posix(init): + Forces g++ instead of gcc on most systems + credits to eric jones (eric@enthought.com) (found at Google Groups) + """ +- def wrapper(): +- init() ++ def wrapper(vars): ++ init(vars) + + config_vars = sysconfig.get_config_vars() # by reference + if config_vars["MACHDEP"].startswith("sun"): diff --git a/sci-mathematics/lean/Manifest b/sci-mathematics/lean/Manifest index 18b25a5655e3..1d8093150e1e 100644 --- a/sci-mathematics/lean/Manifest +++ b/sci-mathematics/lean/Manifest @@ -1,11 +1,11 @@ AUX lean-CMakeLists-fix_flags.patch 1285 BLAKE2B 0507e553c1acf2a53c5267932127117d5ae5ba9015a08c88748b3d82c041f8d904d15cd033dd7934ac55c474fa75a5d4a46f680cc887fee37c05c3f5f3832839 SHA512 11a5918847e45aac7bf79e48d8f881ef5cd3e6b09dbb0979f3f0b88fd36458be21ebeb530158da801399a0cdc8fe382444ff338cd793cd9f1bfced90c5d5a71b DIST lean-3.39.1.tar.gz 1878481 BLAKE2B b3d1760594751418d6ebb7754d733e8fdebc5e0eba25e8d4993280325ec9d40e9083af155d388d52b5edfff2e9dffbeff91caa68ccb76500dcd88ebac2af4444 SHA512 5839eb7b5f7cd2d93ab603f1a5121e0a6b55850686677f103c16ec2157dc19479f1909ea056b54e41331c28fd59a4a825741384fa431473924381b72640a04dd -DIST lean-3.40.0.tar.gz 1878547 BLAKE2B 762c12b9fee9ac405730fb4a748326e7c9603c50f44512166f94df51e8cde0096803f11d0201980e1a1c0121a2b278075bf238452254d83e2d8b7b5566355416 SHA512 4daa32b60195a9776019c3c13c3765a1f5a817d78f189c3f92859298118815af4cb47359816ebbb977f35453be358956f3680b06b5930d5cf3a4245599602873 DIST lean-3.41.0.tar.gz 1905966 BLAKE2B 1921ba4a975ed8fc6001695151bb366341e0895989a570bb7fbef1e719685945d0b7c51ed0716ff29daaf81af24ce2e289cab41b251c686a286cd94a0cf708f8 SHA512 855a56812ba5dc7cf431490957570d0fcbc4760faa1602095e708ddcc4e5a3c6aeac42133c210375d4538d97c8ae90df3ab3c7e7840e8896b8d0db439e925fbf DIST lean-3.42.0.tar.gz 1908134 BLAKE2B 7b6403786cc1a3a2b974f8df4c2bf2921e4e374ead4290a0e263c8464a9c009fd2f62e7cf5bdbc5087d0c9bb4c57f798b9d1a4b8ee2d66152714ec2af649e196 SHA512 2f1fc1bf3aff7fa806e1cd4647380d6896d98a9191f2035d5a37cc35938de42b243188984aa2fced37bdbee3b2c3c6ef25d27bf2428bf9a0307cc3237c80560f -EBUILD lean-3.39.1.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c -EBUILD lean-3.40.0.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c +DIST lean-3.42.1.tar.gz 1908398 BLAKE2B 7a83269deb3dc7ee60bf7a09b36df332355d9caf575b8435345956697121e95e1fb44cada1237e44bab04a56af4fb40c0d01e49f4cb3e4896e616f2bc58bf9ef SHA512 ab266e385e3026ce3219eef6ef171e243576e291fb26cef3d97ca4cc5190988e3bd6fe93c37a1192b8d2eec0ae7620131826ee1073a038f5a024e706953242d1 +EBUILD lean-3.39.1.ebuild 1759 BLAKE2B 794af95d6ef36aa5172c60e599c882de1586de2f4efc733d815b86e07bb85c9d1684a56aad6921bd0bc536de962176f0d6fb3b77d2869e74861d91ed509f10a6 SHA512 b81ce77ab0e62e6203b645faadd33ee78bfcdabcf3565bb91cdc3e6cb50d7936628ec029ad1ed349aabd4ab6de910bf5540e7b71f3fd8c6a251f672d0ce55a33 EBUILD lean-3.41.0.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c EBUILD lean-3.42.0.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c +EBUILD lean-3.42.1.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c EBUILD lean-3.9999.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c MISC metadata.xml 606 BLAKE2B 6478d84a762a59082fdea0a11a95b27c093782228c48dba58dc490ea9ac2cecef54cc3101dc98e385f3a29f85d84af21b7d2ae1a9f089ee0313158ecb44eb0e7 SHA512 02d2ac07b155c7a04c857d397d476a39864d02b10dd81c5830db5e21eb86c6dcff26da552a04717f5f587b326ddf8e2e8d27f1a138f88b391f0199d8004d8cb7 diff --git a/sci-mathematics/lean/lean-3.39.1.ebuild b/sci-mathematics/lean/lean-3.39.1.ebuild index 5d8ee8eecd4b..d8b241bcd34b 100644 --- a/sci-mathematics/lean/lean-3.39.1.ebuild +++ b/sci-mathematics/lean/lean-3.39.1.ebuild @@ -16,7 +16,7 @@ if [[ "${PV}" == *9999* ]]; then EGIT_REPO_URI="https://github.com/leanprover-community/lean.git" else SRC_URI="https://github.com/leanprover-community/lean/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi S="${WORKDIR}/lean-${PV}/src" diff --git a/sci-mathematics/lean/lean-3.40.0.ebuild b/sci-mathematics/lean/lean-3.42.1.ebuild index 5d8ee8eecd4b..5d8ee8eecd4b 100644 --- a/sci-mathematics/lean/lean-3.40.0.ebuild +++ b/sci-mathematics/lean/lean-3.42.1.ebuild diff --git a/sci-mathematics/twelf/Manifest b/sci-mathematics/twelf/Manifest index 4e7a9d654384..29ec281c3e91 100644 --- a/sci-mathematics/twelf/Manifest +++ b/sci-mathematics/twelf/Manifest @@ -2,10 +2,14 @@ AUX 50twelf-gentoo.el 104 BLAKE2B 0cff252b443e4b24d0c4e3068f7d4d2d4c5cdd0213d7fe AUX twelf-1.7.1-Makefile.patch 1298 BLAKE2B fcbbb4d80e2d6da7594f3385bc38e4f1bf6be775e544797ccd303c1ccae28087cf92ef5e739ee1075015880461ff28e0c55304e9961f8a727edb2b526a05d162 SHA512 ffc7c147790b180c50eb645b896ad86c35b771ad516d2a85998f8edfd0e1ff1db98d1880b6e8b02e4ddcf8f218761ab26ddfee9bd5ab876b3bd1caa6a3e0e78e AUX twelf-1.7.1-doc-guide-Makefile.patch 498 BLAKE2B 68b3831aefab24bb6b194e640921b24cb05cee3e97351d2284f4aa412ef277d70f41a539991c6c04f0501a0716b96364a33b54ed11d8c5b6186a4fe826912c39 SHA512 240192028c9dd9a953ff9778bc9753a08dffa0f3332b72d4d2cd64a594f32fb183092ce1a4ace9fe9e0123d469be50983e4d081db989165beba33212de74b3d0 AUX twelf-1.7.1-doc-guide-twelf-dot-texi.patch 386 BLAKE2B 3ce663a6c06fc8af04f16cf190d76e0c113e41263fbdc9a74a61d9a4ea9c3067659b417569b0d11d50cf16baca9aa91bac66e74f75a681e2704d2c7fef969d30 SHA512 60741e8df6e2b200f22c435ccf2d092624b601ad71ffc1a3388e9ae1bca6ef0d92092940075d9786efed6218d82cf1a344d3a433eabbdabe2514ff985a6948b7 +AUX twelf-1.7.1-emacs-fix-old-style-backquotes-p1.patch 1629 BLAKE2B 3cd06e6fd5b2739f7a95a028a202a4e241a055bab66ab967a4fe269d68d709b17c7333e011a659758443a42170ec6dcf17b206faf0d81a4848fa5efe5ef49fff SHA512 943df1dee70ff291e60ca3e5ca7215500c78339058f32ac1034a5f7f11a98df1563ab6bfb9303dbc7e0c4fb02b028721c37f37aaa5797c2baa6d74618a5d81b0 +AUX twelf-1.7.1-emacs-fix-old-style-backquotes-p2.patch 1263 BLAKE2B 1526af5385b1543e10ff504f082696e5349a90e8b3acc4b02b0e67e97cc9a77acded3a69d18ed55ec4a797418412518a381b643e93a69c56d2c57675dd6ead93 SHA512 5c5fd3565255ff12147431bd5e7c79b424411fcb09670ceb0fc9afa83675f9c3fb8c869cd7654c440c304cf0bd4b38c11b755fde68ee4f0801fe3a7cc36f5aa8 +AUX twelf-1.7.1-emacs-fix-old-style-backquotes-p3.patch 1169 BLAKE2B bd065c30c9f4b15a4dfca93c30282fbad638fd5926c38291a7afae2eeace59782b0fcdc8e4e06822d85bb7e6ff70808d6234cfcd348e5406ffc50caaff27c303 SHA512 18bf3c8574f93f209b7e666d95e5712e3b3e1e69a441b12513cfdff61276147de39fd0cb1518a02c8e7dbb609745cccb6c5d86c251e7c273133b13f1d8b0dc5f AUX twelf-1.7.1-emacs-twelf-init.patch 813 BLAKE2B ab5708bc5c259ed940eb2d427e190a3f3ed2e0624745aef0f08cb3ba42ae6ed1d37668cff37752480de8e5e42b8ed5f786dc14d2aa6be3a522a51ca4d380d054 SHA512 b45415b57dee44da7a38ea1f40b58526f0f69d012a16c316ebd6c3c9c856bbffd270f034d172b4ddeb083b7289c87eabf805a96fc9475f501038fb6c85a0f571 AUX twelf-1.7.1-emacs-twelf.patch 602 BLAKE2B b4b7572bd3b87013332e26096aa92a698e0a1a7648021b93cf0db2e4443da6fd43a6b8909703e21e748c37b774d5c93cd1bc6bcf342354ee47fc1d8b4c94084a SHA512 e5fd550210b7107fdafc27906dcb22318d1b0b6044d2502cfb968fb3b5d4baca5535cd6ae995638f38395d08641e59f5b87c76eac190653a6dad89bf52eb1a97 AUX twelf-1.7.1-mlton-20180207.patch 310 BLAKE2B b372c7ca65b4bb12983d84e590d4e303e4b41308ad6f6ccb3f28101e78e18a7138cb5a65011eeec8f04ba990e29804ec02d3faf11e4c6ca998f40f419bca3472 SHA512 4d8044248a28d92e961baa1a935de8f6f52751218e65abd2cae9a264c66e446608d73d6a993df07671330b003735d2fee4e75653e9a324844a0042333b28fdd1 AUX twelf-1.7.1-mlton-mlb.patch 11244 BLAKE2B e07adfd1520179a8ca3c292638689c8cc344b8d01ebcf2ba9f668cbf2afa5b5132a88d0521ca4123a9165d8fea49cdbab20b48b791bd3e78610d54b534e9e596 SHA512 2d0f42399e444cbb736f38ad7bdc54f51322c17c010b273c365d9db9a1e6c045c19b872d4b5c1e50444559a981aa5569764ac859c7702c116c97c935fd959bfd +AUX twelf-1.7.1-remove-svnversion.patch 241 BLAKE2B f92db57c82d31fae8518d0a3947fd0ebf24ab06aa51fbf0e3a2b271eb30583904d5487f3f4b2605d5ca168f78ca7eed0fdcb4473604c4ae83a2807416341c99b SHA512 07bb5f88580dcb6ae722d7af98c58c96453871f8ce6eb107fbedafc6939a0d8871e3820e933cdc90aa6ca17d8909717f607e3819c34f5f852b7606a7680e7462 DIST twelf-src-1.7.1.tar.gz 1147610 BLAKE2B 9fbb3c5a4823845a0c721112744330658be0e68784ef209a3d17fb72874ef50d7dbb434a7104704a5540f2f0bc30727bfe1ff602f986570f944454e77c24609d SHA512 1b4baa0f385b6b605583a9da312f23c775aab43e7398c6e151833a6b95c74112492530f44fcb7b14f8288774e9b63e2f9618a5debfbc4d34737bc2588f5850df -EBUILD twelf-1.7.1-r1.ebuild 2431 BLAKE2B 08b4d3eccb106bbced79e7dba62852746ab6ce86ab016660f6236e2dd8d05a0f23df0bc40c64870f4c767cd2e307dfd324401a6bd995b6cc31e8e0bda499de66 SHA512 ebfc0684289e5a605df8588a15a01041c9daa6414e04dc0302726540faf67413b15f1fd7829f5dc972a8706621fb25185d923f34a0f4db36a9cf787cfb246ec9 +EBUILD twelf-1.7.1-r2.ebuild 2717 BLAKE2B 03351db21a04ed6555f7dd9b559d29ad03a10451a29740e92877d447c45da8baefc19256b8b8e0c98b7149dcde41cea25900249086fb460d955b75a5f0f9ef84 SHA512 2188bdc4a8299a0fd4dea45f3a3c9565ec2c546f7c895898190df7dd05545ca143658d6f4a5ec3bcdf4c5d4db6813e6f5a666da2b9f9ca50e320aad94b8ab73a MISC metadata.xml 447 BLAKE2B 1763b7e6e596780d5949b14698c9f6f95c503465b28d9ee9977d51ccc814bb9bfea89efaafb4ed6e605713ad2f22660247baccfcc36b7d1fc5e89454a5e12627 SHA512 db714b8a511dce8010f054d5b0857c17e632d66d08dfffe9f71d9cb8d042b599d5fa5589cd6779431f86e46415c0c114b81d06c98009297f0b95f323805829a3 diff --git a/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p1.patch b/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p1.patch new file mode 100644 index 000000000000..b8d78d97e04e --- /dev/null +++ b/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p1.patch @@ -0,0 +1,45 @@ +commit 141018e777eecc064909c6f5429c8a0d0c048b5a +Author: Kartik Singhal <ks@cs.uchicago.edu> +Date: Sat Feb 27 16:13:35 2021 -0600 + + Fix old-style backquotes, following https://github.com/ProofGeneral/PG/commit/ca601291ddf22739847c629f2d687ab3f68b4786 + +diff --git a/emacs/twelf.el b/emacs/twelf.el +index 1e4d46f..57b9cee 100644 +--- a/emacs/twelf.el ++++ b/emacs/twelf.el +@@ -2884,7 +2884,7 @@ Mode map + (setq twelf-server-display-commands (not twelf-server-display-commands))) + + (defconst twelf-options-menu +- (` ("Options" ++ `("Options" + (, (toggle "Display Commands" '(twelf-toggle-server-display-commands) + 'twelf-server-display-commands)) + ("chatter" +@@ -2922,7 +2922,7 @@ Mode map + ("Table." + ["strategy" (twelf-set-parm "Table.strategy") t] + ["strengthen" (twelf-set-parm "Table.strengthen") t]) +- ["Reset Menubar" twelf-reset-menu t])) ++ ["Reset Menubar" twelf-reset-menu t]) + "Menu to change options in Twelf mode.") + + (defconst twelf-timers-menu +@@ -2939,12 +2939,12 @@ Mode map + "Fontify current buffer using font-lock minor mode.") + + (defconst twelf-syntax-menu +- (` ("Syntax Highlighting" ++ `("Syntax Highlighting" + ["Highlight Declaration" twelf-font-fontify-decl t] + ["Highlight Buffer" twelf-font-fontify-buffer t] +- ;(, (toggle "Immediate Highlighting" 'toggle-twelf-font-immediate +- ;'font-lock-mode)) +- )) ++ ;;(, (toggle "Immediate Highlighting" 'toggle-twelf-font-immediate ++ ;;'font-lock-mode)) ++ ) + "Menu for syntax highlighting in Twelf mode.") + + (easy-menu-define twelf-menu (list twelf-mode-map) diff --git a/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p2.patch b/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p2.patch new file mode 100644 index 000000000000..aae0ef7b75e3 --- /dev/null +++ b/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p2.patch @@ -0,0 +1,36 @@ +commit c1bec0d0b9fa506e36bb364b1765191b159e6c4c +Author: Kartik Singhal <ks@cs.uchicago.edu> +Date: Sat Feb 27 16:24:24 2021 -0600 + + Argh, two more places + +diff --git a/emacs/twelf.el b/emacs/twelf.el +index 57b9cee..0a04a35 100644 +--- a/emacs/twelf.el ++++ b/emacs/twelf.el +@@ -2833,13 +2833,13 @@ Mode map + "Menu for printing commands.") + + (defconst twelf-recon-menu +- (` ("Reconstruction" ++ `("Reconstruction" + (, (toggle "trace" '(twelf-toggle-recon-trace) + '(string-equal twelf-recon-trace "true"))) +- ["traceMode" (twelf-set-parm "Recon.traceMode") t]))) ++ ["traceMode" (twelf-set-parm "Recon.traceMode") t])) + + (defconst twelf-trace-menu +- (` ("Trace" ++ `("Trace" + ("trace" + ["All" twelf-trace-trace-all t] + ["None" twelf-trace-untrace t] +@@ -2852,7 +2852,7 @@ Mode map + ("detail" + (, (radio "0" '(twelf-set "Trace.detail" "0") '(equal twelf-trace-detail "0"))) + (, (radio "1*" '(twelf-set "Trace.detail" "1") '(equal twelf-trace-detail "1"))) +- (, (radio "2" '(twelf-set "Trace.detail" "2") '(equal twelf-trace-detail "2"))))))) ++ (, (radio "2" '(twelf-set "Trace.detail" "2") '(equal twelf-trace-detail "2")))))) + + (defconst twelf-server-state-menu + '("Server State" diff --git a/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p3.patch b/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p3.patch new file mode 100644 index 000000000000..e15d838942e7 --- /dev/null +++ b/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p3.patch @@ -0,0 +1,28 @@ +diff --git a/emacs/auc-menu.el b/emacs/auc-menu.el +index f6483b0..80fe660 100644 +--- a/emacs/auc-menu.el ++++ b/emacs/auc-menu.el +@@ -92,10 +92,10 @@ + (defmacro easy-menu-define (symbol maps doc menu) + "Define SYMBOL to be a menu for keymaps MAPS. + DOC is the documentation string, and MENU is a Lucid style menu." +- (` (progn ++ `(progn + (require 'auc-menu) ;For `easy-menu-do-define'. + (defvar (, symbol) nil (, doc)) +- (easy-menu-do-define (quote (, symbol)) (, maps) (, doc) (, menu))))) ++ (easy-menu-do-define (quote (, symbol)) (, maps) (, doc) (, menu)))) + + (cond + +@@ -212,8 +212,8 @@ DOC is the documentation string, and MENU is a Lucid style menu." + + (defun easy-menu-do-define (symbol maps doc menu) + (set symbol (easy-menu-create-keymaps (car menu) (cdr menu))) +- (fset symbol (` (lambda (event) (, doc) (interactive "@e") +- (easy-popup-menu event (, symbol))))) ++ (fset symbol `(lambda (event) (, doc) (interactive "@e") ++ (easy-popup-menu event (, symbol)))) + (mapcar (function (lambda (map) + (define-key map (vector 'menu-bar (intern (car menu))) + (cons (car menu) (symbol-value symbol))))) diff --git a/sci-mathematics/twelf/files/twelf-1.7.1-remove-svnversion.patch b/sci-mathematics/twelf/files/twelf-1.7.1-remove-svnversion.patch new file mode 100644 index 000000000000..64d29f3cba31 --- /dev/null +++ b/sci-mathematics/twelf/files/twelf-1.7.1-remove-svnversion.patch @@ -0,0 +1,13 @@ +diff --git a/bin/buildid b/bin/buildid +index bb60cd3..5972ac0 100755 +--- a/bin/buildid ++++ b/bin/buildid +@@ -5,7 +5,7 @@ + # William Lovas, 08-27-2010 + # + +-REV=`svnversion` ++REV="1813" + DATE=`date "+%m/%d/%y at %H:%M:%S"` + HOST=`hostname` + diff --git a/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild b/sci-mathematics/twelf/twelf-1.7.1-r2.ebuild index 26846927797b..0a7237065277 100644 --- a/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild +++ b/sci-mathematics/twelf/twelf-1.7.1-r2.ebuild @@ -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="6" +EAPI="8" -inherit elisp-common multilib +inherit elisp-common MY_PN="${PN}-src" MY_P="${MY_PN}-${PV}" @@ -36,22 +36,26 @@ S=${WORKDIR}/${PN} SITEFILE=50${PN}-gentoo.el PATCHES=( - "${FILESDIR}/${PN}-1.7.1-doc-guide-twelf-dot-texi.patch" - "${FILESDIR}/${PN}-1.7.1-doc-guide-Makefile.patch" - "${FILESDIR}/${PN}-1.7.1-emacs-twelf.patch" - "${FILESDIR}/${PN}-1.7.1-emacs-twelf-init.patch" - "${FILESDIR}/${PN}-1.7.1-Makefile.patch" - "${FILESDIR}/${PN}-1.7.1-mlton-mlb.patch" - "${FILESDIR}/${PN}-1.7.1-mlton-20180207.patch" + "${FILESDIR}"/${PN}-1.7.1-doc-guide-twelf-dot-texi.patch + "${FILESDIR}"/${PN}-1.7.1-doc-guide-Makefile.patch + "${FILESDIR}"/${PN}-1.7.1-emacs-twelf.patch + "${FILESDIR}"/${PN}-1.7.1-emacs-twelf-init.patch + "${FILESDIR}"/${PN}-1.7.1-Makefile.patch + "${FILESDIR}"/${PN}-1.7.1-mlton-mlb.patch + "${FILESDIR}"/${PN}-1.7.1-mlton-20180207.patch + "${FILESDIR}"/${PN}-1.7.1-remove-svnversion.patch # 728028 + "${FILESDIR}"/${PN}-1.7.1-emacs-fix-old-style-backquotes-p1.patch # 803296 + "${FILESDIR}"/${PN}-1.7.1-emacs-fix-old-style-backquotes-p2.patch + "${FILESDIR}"/${PN}-1.7.1-emacs-fix-old-style-backquotes-p3.patch ) src_prepare() { default sed \ - -e "s@/usr/bin@${ROOT}usr/bin@g" \ - -e "s@/usr/share@${ROOT}usr/share@" \ + -e "s@/usr/bin@${PREFIX}/usr/bin@g" \ + -e "s@/usr/share@${PREFIIX}/usr/share@" \ -i "${S}"/emacs/twelf-init.el \ - || die "Could not set ROOT in ${S}/emacs/twelf-init.el" + || die "Could not set PREFIX in ${S}/emacs/twelf-init.el" } src_compile() { @@ -68,7 +72,7 @@ src_compile() { fi if use doc; then pushd doc/guide - emake all + emake -j1 popd fi } |