public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download mbox.gz: |
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/PyMca/files/
@ 2017-01-31  8:42 99% David Seifert
  0 siblings, 0 replies; 1+ results
From: David Seifert @ 2017-01-31  8:42 UTC (permalink / raw
  To: gentoo-commits

commit:     f587cccdf1eeedf71a46ea65320e7188d6d7de63
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jan 30 17:53:27 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 08:41:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f587cccd

sci-chemistry/PyMca: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/3730

 sci-chemistry/PyMca/files/4.4.1_p1-gentoo.patch   | 40 -----------------------
 sci-chemistry/PyMca/files/4.4.1_p1-impl-dec.patch | 12 -------
 2 files changed, 52 deletions(-)

diff --git a/sci-chemistry/PyMca/files/4.4.1_p1-gentoo.patch b/sci-chemistry/PyMca/files/4.4.1_p1-gentoo.patch
deleted file mode 100644
index 487a459..00000000
--- a/sci-chemistry/PyMca/files/4.4.1_p1-gentoo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 0b0fa58..a4fdab6 100755
---- a/setup.py
-+++ b/setup.py
-@@ -41,34 +41,8 @@ for line in file(os.path.join('PyMca', 'PyMcaMain.py')).readlines():
- print "PyMca X-Ray Fluorescence Toolkit %s" % __version__
- print 
- 
--print "Type 'L' to view the license."
--print "Type 'yes' to accept the terms of the license."
--print "Type 'no' to decline the terms of the license."
--print
--
--while 1:
--    try:
--        resp = raw_input("Do you accept the terms of the license? ")
--    except KeyboardInterrupt:
--        raise SystemExit
--    except:
--        resp = ""
--
--    resp = string.lower(string.strip(resp))
--
--    if resp == "yes":
--        break
--
--    if resp == "no":
--        sys.exit(1)
--
--    if resp == "l":
--        os.system("more LICENSE.GPL")
--
--
- # Specify all the required PyMca data
--data_files = [('PyMca', ['LICENSE.GPL',
--                         'PyMca/Scofield1973.dict',
-+data_files = [('PyMca', ['PyMca/Scofield1973.dict',
-                          'PyMca/changelog.txt',
-                          'PyMca/McaTheory.cfg',
-                          'PyMca/PyMcaSplashImage.png',

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
deleted file mode 100644
index ea37348..00000000
--- a/sci-chemistry/PyMca/files/4.4.1_p1-impl-dec.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/PyMca/specfile/src/sfwrite.c b/PyMca/specfile/src/sfwrite.c
-index 24df907..93c18e9 100755
---- a/PyMca/specfile/src/sfwrite.c
-+++ b/PyMca/specfile/src/sfwrite.c
-@@ -55,6 +55,7 @@
-  */
- #include <SpecFile.h>
- #include <SpecFileP.h>
-+#include <unistd.h>
- 
- /*
-  * Declarations


^ permalink raw reply related	[relevance 99%]

Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2017-01-31  8:42 99% [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/PyMca/files/ David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox