1 |
commit: f587cccdf1eeedf71a46ea65320e7188d6d7de63 |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jan 30 17:53:27 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 31 08:41:30 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f587cccd |
7 |
|
8 |
sci-chemistry/PyMca: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/3730 |
11 |
|
12 |
sci-chemistry/PyMca/files/4.4.1_p1-gentoo.patch | 40 ----------------------- |
13 |
sci-chemistry/PyMca/files/4.4.1_p1-impl-dec.patch | 12 ------- |
14 |
2 files changed, 52 deletions(-) |
15 |
|
16 |
diff --git a/sci-chemistry/PyMca/files/4.4.1_p1-gentoo.patch b/sci-chemistry/PyMca/files/4.4.1_p1-gentoo.patch |
17 |
deleted file mode 100644 |
18 |
index 487a459..00000000 |
19 |
--- a/sci-chemistry/PyMca/files/4.4.1_p1-gentoo.patch |
20 |
+++ /dev/null |
21 |
@@ -1,40 +0,0 @@ |
22 |
-diff --git a/setup.py b/setup.py |
23 |
-index 0b0fa58..a4fdab6 100755 |
24 |
---- a/setup.py |
25 |
-+++ b/setup.py |
26 |
-@@ -41,34 +41,8 @@ for line in file(os.path.join('PyMca', 'PyMcaMain.py')).readlines(): |
27 |
- print "PyMca X-Ray Fluorescence Toolkit %s" % __version__ |
28 |
- print |
29 |
- |
30 |
--print "Type 'L' to view the license." |
31 |
--print "Type 'yes' to accept the terms of the license." |
32 |
--print "Type 'no' to decline the terms of the license." |
33 |
--print |
34 |
-- |
35 |
--while 1: |
36 |
-- try: |
37 |
-- resp = raw_input("Do you accept the terms of the license? ") |
38 |
-- except KeyboardInterrupt: |
39 |
-- raise SystemExit |
40 |
-- except: |
41 |
-- resp = "" |
42 |
-- |
43 |
-- resp = string.lower(string.strip(resp)) |
44 |
-- |
45 |
-- if resp == "yes": |
46 |
-- break |
47 |
-- |
48 |
-- if resp == "no": |
49 |
-- sys.exit(1) |
50 |
-- |
51 |
-- if resp == "l": |
52 |
-- os.system("more LICENSE.GPL") |
53 |
-- |
54 |
-- |
55 |
- # Specify all the required PyMca data |
56 |
--data_files = [('PyMca', ['LICENSE.GPL', |
57 |
-- 'PyMca/Scofield1973.dict', |
58 |
-+data_files = [('PyMca', ['PyMca/Scofield1973.dict', |
59 |
- 'PyMca/changelog.txt', |
60 |
- 'PyMca/McaTheory.cfg', |
61 |
- 'PyMca/PyMcaSplashImage.png', |
62 |
|
63 |
diff --git a/sci-chemistry/PyMca/files/4.4.1_p1-impl-dec.patch b/sci-chemistry/PyMca/files/4.4.1_p1-impl-dec.patch |
64 |
deleted file mode 100644 |
65 |
index ea37348..00000000 |
66 |
--- a/sci-chemistry/PyMca/files/4.4.1_p1-impl-dec.patch |
67 |
+++ /dev/null |
68 |
@@ -1,12 +0,0 @@ |
69 |
-diff --git a/PyMca/specfile/src/sfwrite.c b/PyMca/specfile/src/sfwrite.c |
70 |
-index 24df907..93c18e9 100755 |
71 |
---- a/PyMca/specfile/src/sfwrite.c |
72 |
-+++ b/PyMca/specfile/src/sfwrite.c |
73 |
-@@ -55,6 +55,7 @@ |
74 |
- */ |
75 |
- #include <SpecFile.h> |
76 |
- #include <SpecFileP.h> |
77 |
-+#include <unistd.h> |
78 |
- |
79 |
- /* |
80 |
- * Declarations |