[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/p9m4/files/, sci-mathematics/p9m4/

[Mikle Kolyada]

commit:     10a3c68f62370378259762b94fb9689231358ece
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 17:47:04 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 17:47:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a3c68f

sci-mathematics/p9m4: remove last-rited pkg

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 sci-mathematics/p9m4/Manifest                      |  2 -
 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, 264 deletions(-)

diff --git a/sci-mathematics/p9m4/Manifest b/sci-mathematics/p9m4/Manifest
deleted file mode 100644
index ec27d132fe6..00000000000
--- a/sci-mathematics/p9m4/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST p9m4-v05-64bit.patch.bz2 5095 BLAKE2B b49ee327ee9f05403d68d61eb162d6a9dd4b5786adb625eebbe7e6d2f47c36e54ec05e0594bc82a4152f7d92f88b8f2ac044732dc3df72c710c0ef3fbde560d7 SHA512 b80ea7ae9b652b55eee2542ba8d45712871e56dfda2e97bae2011a521e732d221a5c6a36ba33269a80f02ddc98a8f3c2470c7e832fc2b79331e7cca551aa7a36
-DIST p9m4-v05.tar.gz 889707 BLAKE2B 09407ba998e72b2b90b96a90e668114c16bd4c15d853354f8e86cc5b1ea0533f99548a35f048f504e40f61702b95de197309f22abd7b3e38fabef6dbfcc06280 SHA512 6ed8f3a5ab6e6b876eee388ab0f1bc535e60432317131657ba518781912f0f851aeab361d0169f96e29538130d691cf2d3798135e2386a7793799f0c4931120e

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 9ca737ce2ff..00000000000
--- 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 70cb006d268..00000000000
--- 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 5b48b94b27b..00000000000
--- 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 a1db72097c3..00000000000
--- a/sci-mathematics/p9m4/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>gienah@g.o</email>
-</maintainer>
-<maintainer type="project">
-  <email>sci-mathematics@g.o</email>
-  <name>Gentoo Mathematics Project</name>
-</maintainer>
-<longdescription lang="en">
-  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.
-</longdescription>
-</pkgmetadata>

diff --git a/sci-mathematics/p9m4/p9m4-05-r1.ebuild b/sci-mathematics/p9m4/p9m4-05-r1.ebuild
deleted file mode 100644
index 29cb679eeb2..00000000000
--- 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
-}