From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- sci-mathematics/p9m4/Manifest | 7 -- sci-mathematics/p9m4/files/p9m4-v05-package.patch | 67 ---------------- .../p9m4/files/p9m4-v05-python2.6.patch | 44 ----------- .../p9m4/files/p9m4-v05-use-inst-paths.patch | 42 ---------- sci-mathematics/p9m4/metadata.xml | 17 ---- sci-mathematics/p9m4/p9m4-05-r1.ebuild | 92 ---------------------- 6 files changed, 269 deletions(-) delete mode 100644 sci-mathematics/p9m4/Manifest delete mode 100644 sci-mathematics/p9m4/files/p9m4-v05-package.patch delete mode 100644 sci-mathematics/p9m4/files/p9m4-v05-python2.6.patch delete mode 100644 sci-mathematics/p9m4/files/p9m4-v05-use-inst-paths.patch delete mode 100644 sci-mathematics/p9m4/metadata.xml delete mode 100644 sci-mathematics/p9m4/p9m4-05-r1.ebuild (limited to 'sci-mathematics/p9m4') diff --git a/sci-mathematics/p9m4/Manifest b/sci-mathematics/p9m4/Manifest deleted file mode 100644 index 70648a1cc698..000000000000 --- a/sci-mathematics/p9m4/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX p9m4-v05-package.patch 1860 BLAKE2B e3701d1922d76f2b403cd950cd28269c5d75127f31757840903dd6c2332cd42984a5553040e217ae9722c529de4e2430fc2ca64847e87a895365dad505f5e57c SHA512 31bbf42c9fc6d266c1bdcc33278dbf2fc7f83c57c302d0af4808a181bcd3f4d64780e02b875c174a7d245c0d3c4ea3703bc8c04d4a70a8543c4d76b2ed3f946f -AUX p9m4-v05-python2.6.patch 1909 BLAKE2B e6c95c8e2e958078f4db1316648c5a92f9e2669bbf6aeb6c6cd8642f2526ec13c6233fb270028f6bef28fee56889aecfaf67427f2f85490f0ce67fb04134a9a5 SHA512 b41da95bff1ea30f45b170383592b8dee78b58592c925ec2979f27810d64e8d9814187b254ff5b005776fe56f00d38b36cfb80c3d5a4abc5a17519a5ebd866a4 -AUX p9m4-v05-use-inst-paths.patch 1151 BLAKE2B 02e55389cab73decb8082d4b0b33e018cf58b8c77157bfce03c92707aa5be84a2432939976c4d631e45e3e56139e2629bff14fe9009bc7f345d4570b65696230 SHA512 285c92ba2d97346408dbea07ecd2047bd67d7b9b0de96c8676d9280e8cce23c93abba8fdb1443c5f1b942b79903d2f11bf8e90591e2ff70b167ad507fb4c6f85 -DIST p9m4-v05-64bit.patch.bz2 5095 BLAKE2B b49ee327ee9f05403d68d61eb162d6a9dd4b5786adb625eebbe7e6d2f47c36e54ec05e0594bc82a4152f7d92f88b8f2ac044732dc3df72c710c0ef3fbde560d7 SHA512 b80ea7ae9b652b55eee2542ba8d45712871e56dfda2e97bae2011a521e732d221a5c6a36ba33269a80f02ddc98a8f3c2470c7e832fc2b79331e7cca551aa7a36 -DIST p9m4-v05.tar.gz 889707 BLAKE2B 09407ba998e72b2b90b96a90e668114c16bd4c15d853354f8e86cc5b1ea0533f99548a35f048f504e40f61702b95de197309f22abd7b3e38fabef6dbfcc06280 SHA512 6ed8f3a5ab6e6b876eee388ab0f1bc535e60432317131657ba518781912f0f851aeab361d0169f96e29538130d691cf2d3798135e2386a7793799f0c4931120e -EBUILD p9m4-05-r1.ebuild 2164 BLAKE2B ec9d979ab08fa8067bb894aa7656377858de0a32f33440cb56cb7b5afed311d90cc34986127e85bee3ea75f97e3fbce3313ef3ad8d0b6e349e0e64745e508f2b SHA512 c68545f2dea7f18688c06d893299771ee3ba39f2ca05399274f6c33875c12d50e39b0bc763e7fa554e1e25636c98038dc0d80ed8efa84d5d3756b6475eff4c65 -MISC metadata.xml 637 BLAKE2B eec457b5486d8dc76a003bdc37e687a7c0e5b7f1f2233550adabd44617e5d4edc6d78780df18ce1c699b3c6c6ae2c0b933d1ecc1895e6a0f60eb42fc8b29518e SHA512 68890672339a213c5309632728ff6ef0f4287c1fe22d217fcd2db8bd453802cbf9ed7ab2c2cbf1004f874e5dfc99b313359f37507eccffeec0297ad0a6ed35e3 diff --git a/sci-mathematics/p9m4/files/p9m4-v05-package.patch b/sci-mathematics/p9m4/files/p9m4-v05-package.patch deleted file mode 100644 index 9ca737ce2ffe..000000000000 --- a/sci-mathematics/p9m4/files/p9m4-v05-package.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- p9m4-v05-orig/setup.py 2007-11-17 09:31:26.000000000 +1100 -+++ p9m4-v05/setup.py 2012-07-02 23:48:21.753760992 +1000 -@@ -26,23 +26,24 @@ - - from setuptools import setup - --APP = ['prover9-mace4.py'] --DATA_FILES = ['platforms.py', -- 'utilities.py', -- 'wx_utilities.py', -- 'files.py', -- 'options.py', -- 'partition_input.py', -- 'my_setup.py', -- 'control.py', -- 'Images', -- 'Samples', -- 'bin-mac'] --OPTIONS = {'argv_emulation': True, 'iconfile': '/Users/mccune/gui/v4/p9.icns'} -+OPTIONS = {'argv_emulation': True, 'iconfile': '/usr/share/p9m4/Images/p9.ico'} - - setup( -- app=APP, -- data_files=DATA_FILES, -- options={'py2app': OPTIONS}, -- setup_requires=['py2app'], -+ name='p9m4', -+ version='05', -+ scripts=['prover9-mace4.py'], -+ package_dir = {'p9m4': 'p9m4'}, -+ py_modules=['p9m4.platforms', -+ 'p9m4.utilities', -+ 'p9m4.wx_utilities', -+ 'p9m4.files', -+ 'p9m4.options', -+ 'p9m4.partition_input', -+ 'p9m4.my_setup', -+ 'p9m4.control'], -+ # remove py2app -+ # https://bugs.gentoo.org/show_bug.cgi?id=423555 -+ # sci-mathematics/p9m4-05: tries to use network during install -+ # options={'py2app': OPTIONS}, -+ # setup_requires=['py2app'], - ) ---- p9m4-v05-orig/prover9-mace4.py 2007-12-08 03:27:13.000000000 +1100 -+++ p9m4-v05/prover9-mace4.py 2012-01-08 18:12:09.970620044 +1100 -@@ -27,13 +27,13 @@ - - # local imports - --import partition_input --import utilities --from files import * --from platforms import * --from wx_utilities import * --from my_setup import * --from control import * -+import p9m4.partition_input -+import p9m4.utilities -+from p9m4.files import * -+from p9m4.platforms import * -+from p9m4.wx_utilities import * -+from p9m4.my_setup import * -+from p9m4.control import * - - Program_name = 'Prover9-Mace4' - Program_version = '0.5' diff --git a/sci-mathematics/p9m4/files/p9m4-v05-python2.6.patch b/sci-mathematics/p9m4/files/p9m4-v05-python2.6.patch deleted file mode 100644 index 70cb006d268e..000000000000 --- a/sci-mathematics/p9m4/files/p9m4-v05-python2.6.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Nur p9m4-0.5/my_setup.py p9m4-0.5.new/my_setup.py ---- p9m4-0.5/my_setup.py 2008-01-14 23:30:55.000000000 +0000 -+++ p9m4-0.5.new/my_setup.py 2008-01-14 23:35:45.000000000 +0000 -@@ -158,7 +158,9 @@ - self.ed.SetStyle(start, end, - wx.TextAttr('RED', - wx.Colour(200,200,255))) -- error_dialog('%s\n%s' % (message,error if error else '')) -+ error_dialog('%s\n%s' % (message,error)) -+ else: -+ error_dialog(message) - else: - frame = Text_frame(self, to_top(self).box_font, - 'Error Output', -diff -Nur p9m4-0.5/partition_input.py p9m4-0.5.new/partition_input.py ---- p9m4-0.5/partition_input.py 2008-01-14 23:30:55.000000000 +0000 -+++ p9m4-0.5.new/partition_input.py 2008-01-14 23:35:45.000000000 +0000 -@@ -63,14 +63,23 @@ - m2 = r2.search(str, m1.end()) - while m2 and in_span(m2.start(), comments): - m2 = r2.search(str, m2.end()) -- match_end = m2.end() if m2 else len(str) -+ if m2: -+ match_end = m2.end() -+ else: -+ match_end = len(str) - other += str[other_start:m1.start()] - if remove_patterns: - keep_start = m1.end() -- keep_end = m2.start() if m2 else len(str) -+ if m2: -+ keep_end = m2.start() -+ else: -+ keep_end = len(str) - else: - keep_start = m1.start() -- keep_end = m2.end() if m2 else len(str) -+ if m2: -+ keep_end = m2.end() -+ else: -+ keep_end = len(str) - matched += str[keep_start:keep_end] - next = other_start = match_end - else: diff --git a/sci-mathematics/p9m4/files/p9m4-v05-use-inst-paths.patch b/sci-mathematics/p9m4/files/p9m4-v05-use-inst-paths.patch deleted file mode 100644 index 5b48b94b27bf..000000000000 --- a/sci-mathematics/p9m4/files/p9m4-v05-use-inst-paths.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Nur p9m4-0.5/files.py p9m4-0.5.new/files.py ---- p9m4-0.5/files.py 2008-01-14 23:31:00.000000000 +0000 -+++ p9m4-0.5.new/files.py 2008-01-14 23:39:51.000000000 +0000 -@@ -51,6 +51,9 @@ - return sys.path[0] - # return os.path.dirname(os.path.abspath(sys.argv[0])) - -+def data_dir(): -+ return '/usr/share/p9m4' -+ - def bin(): - if Win32(): - return 'bin-win32' -@@ -63,13 +66,13 @@ - return 'bin' - - def bin_dir(): -- return os.path.join(program_dir(), bin()) -+ return '/usr/bin' - - def image_dir(): -- return os.path.join(program_dir(), 'Images') -+ return os.path.join(data_dir(), 'Images') - - def sample_dir(): -- return os.path.join(program_dir(), 'Samples') -+ return os.path.join(data_dir(), 'Samples') - - def binary_ok(fullpath): - if not fullpath: -diff -Nur p9m4-0.5/prover9-mace4.py p9m4-0.5.new/prover9-mace4.py ---- p9m4-0.5/prover9-mace4.py 2007-12-07 16:27:13.000000000 +0000 -+++ p9m4-0.5.new/prover9-mace4.py 2008-02-10 22:45:45.000000000 +0000 -@@ -27,6 +27,8 @@ - - # local imports - -+sys.path.append('/usr/share/p9m4/lib') -+ - import partition_input - import utilities - from files import * diff --git a/sci-mathematics/p9m4/metadata.xml b/sci-mathematics/p9m4/metadata.xml deleted file mode 100644 index a1db72097c3a..000000000000 --- a/sci-mathematics/p9m4/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - gienah@gentoo.org - - - sci-mathematics@gentoo.org - Gentoo Mathematics Project - - - This is a Graphical User Interface for Prover9 and Mace4. - Prover9 is an automated theorem prover for first-order and - equational logic, and Mace4 searches for finite models and - counterexamples. Prover9 is the successor of the Otter prover. - - diff --git a/sci-mathematics/p9m4/p9m4-05-r1.ebuild b/sci-mathematics/p9m4/p9m4-05-r1.ebuild deleted file mode 100644 index 29cb679eeb2b..000000000000 --- a/sci-mathematics/p9m4/p9m4-05-r1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -MY_PN="p9m4-v" -MY_P="${MY_PN}${PV}" - -DESCRIPTION="This is a Graphical User Interface for Prover9 and Mace4" -HOMEPAGE="https://www.cs.unm.edu/~mccune/mace4/" -SRC_URI=" - https://www.cs.unm.edu/~mccune/prover9/gui/${MY_P}.tar.gz - https://dev.gentoo.org/~gienah/2big4tree/sci-mathematics/p9m4/p9m4-v05-64bit.patch.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples" - -RDEPEND=" - dev-python/wxpython[${PYTHON_USEDEP}] - sci-mathematics/prover9" -DEPEND=" - ${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -PATCHES=( - "${WORKDIR}"/${MY_PN}05-64bit.patch - "${FILESDIR}"/${MY_PN}05-use-inst-paths.patch - "${FILESDIR}"/${MY_PN}05-package.patch - "${FILESDIR}"/${MY_PN}05-python2.6.patch -) - -S="${WORKDIR}/${MY_P}" - -python_prepare_all() { - distutils-r1_python_prepare_all - - rm -f \ - p9m4-v05/bin/prover9 \ - p9m4-v05/bin/mace4 \ - p9m4-v05/bin/interpformat \ - p9m4-v05/bin/prooftrans \ - p9m4-v05/bin/isofilter \ - p9m4-v05/bin/isofilter2 || die "Could not rm old executables" - - mkdir p9m4 || die "Could not create directory p9m4" - mv Mac-setup.py \ - Win32-setup.py \ - control.py \ - files.py \ - my_setup.py \ - options.py \ - partition_input.py \ - platforms.py \ - utilities.py \ - wx_utilities.py \ - p9m4 \ - || die "Could not move package p9m4 python files to p9m4 directory" - touch p9m4/__init__.py \ - || die "Could not create empty p9m4/__init__.py file" -} - -python_install_all() { - distutils-r1_python_install_all - - dosym prover9-mace4.py /usr/bin/prover9-mace4 - - insinto /usr/share/${PN}/Images - doins Images/*.{gif,ico} - - if use examples; then - insinto /usr/share/${PN}/Samples - doins Samples/*.in - - insinto /usr/share/${PN}/Samples/Equality/Mace4 - doins Samples/Equality/Mace4/*.in - - insinto /usr/share/${PN}/Samples/Equality/Prover9 - doins Samples/Equality/Prover9/*.in - - insinto /usr/share/${PN}/Samples/Non-Equality/Mace4 - doins Samples/Non-Equality/Mace4/*.in - - insinto /usr/share/${PN}/Samples/Non-Equality/Prover9 - doins Samples/Non-Equality/Prover9/*.in - fi -} -- cgit v1.2.3