1 |
commit: d1ab4dbc5f579aad217dd801e5796504bfbe81f8 |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Jan 29 09:19:04 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 29 20:09:40 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ab4dbc |
7 |
|
8 |
sci-visualization/epix: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/3709 |
11 |
|
12 |
.../epix/files/epix-1.2.6-automake.patch | 27 ------- |
13 |
.../epix/files/epix-1.2.6-doc-gentoo.patch | 74 ----------------- |
14 |
.../epix/files/epix-1.2.9-autotools.patch | 94 ---------------------- |
15 |
3 files changed, 195 deletions(-) |
16 |
|
17 |
diff --git a/sci-visualization/epix/files/epix-1.2.6-automake.patch b/sci-visualization/epix/files/epix-1.2.6-automake.patch |
18 |
deleted file mode 100644 |
19 |
index 80e9fb2..00000000 |
20 |
--- a/sci-visualization/epix/files/epix-1.2.6-automake.patch |
21 |
+++ /dev/null |
22 |
@@ -1,27 +0,0 @@ |
23 |
- Makefile.am | 6 +++--- |
24 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
25 |
- |
26 |
-diff --git a/Makefile.am b/Makefile.am |
27 |
-index 366c582..2edbfe0 100644 |
28 |
---- a/Makefile.am |
29 |
-+++ b/Makefile.am |
30 |
-@@ -15,7 +15,7 @@ SUBDIRS = . samples doc |
31 |
- bin_SCRIPTS = epix elaps flix laps |
32 |
- |
33 |
- pkglib_LIBRARIES = libepix.a |
34 |
--pkglib_DATA = epix-lib.sh |
35 |
-+pkgdata_DATA = epix-lib.sh |
36 |
- include_HEADERS = epix.h |
37 |
- |
38 |
- libepix_a_CXXSOURCES = active_screen.cc affine.cc angle_units.cc \ |
39 |
-@@ -107,8 +107,8 @@ install-data-local: |
40 |
- $(INSTALL_DATA) $(EPIX_CONFFILES) $(DESTDIR)$(docdir)/config |
41 |
- |
42 |
- # This is being installed by install-exec, but should not be executable |
43 |
--install-exec-local: install-pkglibDATA |
44 |
-- chmod a-x $(DESTDIR)$(pkglibdir)/epix-lib.sh |
45 |
-+install-exec-local: install-pkgdataDATA |
46 |
-+ chmod a-x $(DESTDIR)$(pkgdatadir)/epix-lib.sh |
47 |
- |
48 |
- uninstall-local: |
49 |
- -rm -rf $(DESTDIR)$(docdir)/notes $(DESTDIR)$(docdir)/config |
50 |
|
51 |
diff --git a/sci-visualization/epix/files/epix-1.2.6-doc-gentoo.patch b/sci-visualization/epix/files/epix-1.2.6-doc-gentoo.patch |
52 |
deleted file mode 100644 |
53 |
index ce0ec81..00000000 |
54 |
--- a/sci-visualization/epix/files/epix-1.2.6-doc-gentoo.patch |
55 |
+++ /dev/null |
56 |
@@ -1,74 +0,0 @@ |
57 |
-diff -Nura epix-1.2.6.orig/doc/Makefile.am epix-1.2.6/doc/Makefile.am |
58 |
---- epix-1.2.6.orig/doc/Makefile.am 2009-02-16 02:16:58.000000000 +0000 |
59 |
-+++ epix-1.2.6/doc/Makefile.am 2009-04-13 18:11:18.310702097 +0100 |
60 |
-@@ -1,7 +1,7 @@ |
61 |
- # Makefile.am for ePiX v1.x "doc" directory |
62 |
- # |
63 |
- |
64 |
--EPIXFLAGS = --no-defaults -I.. -L.. -lepix -v |
65 |
-+EPIXFLAGS = --no-defaults -I.. -L.. -lepix -q |
66 |
- |
67 |
- %.eepic: %.xp |
68 |
- ../epix-local $(EPIXFLAGS) $< |
69 |
-@@ -13,13 +13,13 @@ |
70 |
- CLEANFILES = *~ *.aux *.dvi *.log *.out *.toc \ |
71 |
- *.fdx *.flg *.fnd *.idx *.ilg *.ind \ |
72 |
- epix.info epix.info.bz2 manual_src.tar manual.pdf manual.ps \ |
73 |
-- manual_src.tar.gz manual.pdf.gz manual.ps.gz manual-stamp |
74 |
-+ manual_src.tar.gz manual.pdf manual.ps.gz manual-stamp |
75 |
- |
76 |
- MAINTAINERCLEANFILES = *.eepic *.aux *.dvi *.log *.out *.toc \ |
77 |
- *.fdx *.flg *.fnd *.idx *.ilg *.ind |
78 |
- |
79 |
- ## Targets ## |
80 |
--doc_DATA = manual.pdf.gz manual.ps.gz manual_src.tar.gz |
81 |
-+doc_DATA = |
82 |
- |
83 |
- info_TEXINFOS = epix.texi |
84 |
- |
85 |
-@@ -42,8 +42,7 @@ |
86 |
- gzip -9 -c manual.ps > manual.ps.gz |
87 |
- |
88 |
- #PDF |
89 |
--manual.pdf.gz: manual-stamp |
90 |
-- gzip -9 -c manual.pdf > manual.pdf.gz |
91 |
-+manual.pdf: manual-stamp |
92 |
- |
93 |
- epix.info: manual-stamp epix.texi |
94 |
- makeinfo epix.texi 2>&1 >/dev/null |
95 |
-diff -Nura epix-1.2.6.orig/Makefile.am epix-1.2.6/Makefile.am |
96 |
---- epix-1.2.6.orig/Makefile.am 2008-07-01 03:48:22.000000000 +0100 |
97 |
-+++ epix-1.2.6/Makefile.am 2009-04-13 17:58:15.273913638 +0100 |
98 |
-@@ -56,7 +56,7 @@ |
99 |
- |
100 |
- EPIX_CONFFILES = bash_completions $(EPIX_EL) |
101 |
- |
102 |
--EPIX_NOTEFILES = AUTHORS BUGS ChangeLog COPYING INSTALL NEWS POST-INSTALL \ |
103 |
-+EPIX_NOTEFILES = AUTHORS BUGS ChangeLog NEWS POST-INSTALL \ |
104 |
- README THANKS VERSION |
105 |
- |
106 |
- EXTRA_DIST = $(bin_SCRIPTS) $(man_MANS) $(EPIX_CONFFILES) $(EPIX_NOTEFILES) \ |
107 |
-@@ -102,9 +102,8 @@ |
108 |
- # Extra things to install |
109 |
- install-data-local: |
110 |
- @echo; echo "Installing notes and configuration files" |
111 |
-- ./mkinstalldirs $(DESTDIR)$(docdir)/notes $(DESTDIR)$(docdir)/config |
112 |
-- $(INSTALL_DATA) $(EPIX_NOTEFILES) $(DESTDIR)$(docdir)/notes |
113 |
-- $(INSTALL_DATA) $(EPIX_CONFFILES) $(DESTDIR)$(docdir)/config |
114 |
-+ ./mkinstalldirs $(DESTDIR)$(docdir) |
115 |
-+ $(INSTALL_DATA) $(EPIX_NOTEFILES) $(DESTDIR)$(docdir) |
116 |
- |
117 |
- # This is being installed by install-exec, but should not be executable |
118 |
- install-exec-local: install-pkglibDATA |
119 |
-diff -Nura epix-1.2.6.orig/samples/Makefile.am epix-1.2.6/samples/Makefile.am |
120 |
---- epix-1.2.6.orig/samples/Makefile.am 2008-07-01 03:55:14.000000000 +0100 |
121 |
-+++ epix-1.2.6/samples/Makefile.am 2009-04-13 18:11:31.096963306 +0100 |
122 |
-@@ -7,7 +7,7 @@ |
123 |
- CLEANFILES = *~ *.eepic *.eps sample_src.tar sample_src.tar.gz sample-stamp |
124 |
- |
125 |
- ## Targets ## |
126 |
--doc_DATA = sample_src.tar.gz |
127 |
-+doc_DATA = |
128 |
- |
129 |
- |
130 |
- # tar up tex, xp, and eepic files |
131 |
|
132 |
diff --git a/sci-visualization/epix/files/epix-1.2.9-autotools.patch b/sci-visualization/epix/files/epix-1.2.9-autotools.patch |
133 |
deleted file mode 100644 |
134 |
index ebceb98..00000000 |
135 |
--- a/sci-visualization/epix/files/epix-1.2.9-autotools.patch |
136 |
+++ /dev/null |
137 |
@@ -1,94 +0,0 @@ |
138 |
-* disable automatic install of doc and examples |
139 |
-* update for newer autotools |
140 |
-Patch by Sebastien Fabbro |
141 |
- |
142 |
-diff -Nur epix-1.2.9.orig/doc/Makefile.am epix-1.2.9/doc/Makefile.am |
143 |
---- epix-1.2.9.orig/doc/Makefile.am 2009-02-16 02:16:58.000000000 +0000 |
144 |
-+++ epix-1.2.9/doc/Makefile.am 2012-02-19 16:46:02.123782104 +0000 |
145 |
-@@ -1,7 +1,7 @@ |
146 |
- # Makefile.am for ePiX v1.x "doc" directory |
147 |
- # |
148 |
- |
149 |
--EPIXFLAGS = --no-defaults -I.. -L.. -lepix -v |
150 |
-+EPIXFLAGS = --no-defaults -I.. -L.. -lepix -q |
151 |
- |
152 |
- %.eepic: %.xp |
153 |
- ../epix-local $(EPIXFLAGS) $< |
154 |
-@@ -13,13 +13,13 @@ |
155 |
- CLEANFILES = *~ *.aux *.dvi *.log *.out *.toc \ |
156 |
- *.fdx *.flg *.fnd *.idx *.ilg *.ind \ |
157 |
- epix.info epix.info.bz2 manual_src.tar manual.pdf manual.ps \ |
158 |
-- manual_src.tar.gz manual.pdf.gz manual.ps.gz manual-stamp |
159 |
-+ manual_src.tar.gz manual.pdf manual.ps.gz manual-stamp |
160 |
- |
161 |
- MAINTAINERCLEANFILES = *.eepic *.aux *.dvi *.log *.out *.toc \ |
162 |
- *.fdx *.flg *.fnd *.idx *.ilg *.ind |
163 |
- |
164 |
- ## Targets ## |
165 |
--doc_DATA = manual.pdf.gz manual.ps.gz manual_src.tar.gz |
166 |
-+doc_DATA = |
167 |
- |
168 |
- info_TEXINFOS = epix.texi |
169 |
- |
170 |
-@@ -42,8 +42,7 @@ |
171 |
- gzip -9 -c manual.ps > manual.ps.gz |
172 |
- |
173 |
- #PDF |
174 |
--manual.pdf.gz: manual-stamp |
175 |
-- gzip -9 -c manual.pdf > manual.pdf.gz |
176 |
-+manual.pdf: manual-stamp |
177 |
- |
178 |
- epix.info: manual-stamp epix.texi |
179 |
- makeinfo epix.texi 2>&1 >/dev/null |
180 |
-diff -Nur epix-1.2.9.orig/Makefile.am epix-1.2.9/Makefile.am |
181 |
---- epix-1.2.9.orig/Makefile.am 2010-01-25 02:42:26.000000000 +0000 |
182 |
-+++ epix-1.2.9/Makefile.am 2012-02-19 16:50:24.890671835 +0000 |
183 |
-@@ -15,7 +15,8 @@ |
184 |
- bin_SCRIPTS = epix elaps flix laps |
185 |
- |
186 |
- pkglib_LIBRARIES = libepix.a |
187 |
--pkglib_DATA = epix-lib.sh |
188 |
-+pkgepixdir = $(pkglibdir) |
189 |
-+pkgepix_DATA = epix-lib.sh |
190 |
- include_HEADERS = epix.h |
191 |
- |
192 |
- libepix_a_CXXSOURCES = active_screen.cc affine.cc angle_units.cc \ |
193 |
-@@ -56,7 +57,7 @@ |
194 |
- |
195 |
- EPIX_CONFFILES = bash_completions $(EPIX_EL) |
196 |
- |
197 |
--EPIX_NOTEFILES = AUTHORS BUGS ChangeLog COPYING INSTALL NEWS POST-INSTALL \ |
198 |
-+EPIX_NOTEFILES = AUTHORS BUGS ChangeLog NEWS POST-INSTALL \ |
199 |
- README THANKS VERSION |
200 |
- |
201 |
- EXTRA_DIST = $(bin_SCRIPTS) $(man_MANS) $(EPIX_CONFFILES) $(EPIX_NOTEFILES) \ |
202 |
-@@ -102,13 +103,12 @@ |
203 |
- # Extra things to install |
204 |
- install-data-local: |
205 |
- @echo; echo "Installing notes and configuration files" |
206 |
-- $(mkinstalldirs) $(DESTDIR)$(docdir)/notes $(DESTDIR)$(docdir)/config |
207 |
-- $(INSTALL_DATA) $(EPIX_NOTEFILES) $(DESTDIR)$(docdir)/notes |
208 |
-- $(INSTALL_DATA) $(EPIX_CONFFILES) $(DESTDIR)$(docdir)/config |
209 |
-+ $(mkinstalldirs) $(DESTDIR)$(docdir) |
210 |
-+ $(INSTALL_DATA) $(EPIX_NOTEFILES) $(DESTDIR)$(docdir) |
211 |
- |
212 |
- # This is being installed by install-exec, but should not be executable |
213 |
--install-exec-local: install-pkglibDATA |
214 |
-- chmod a-x $(DESTDIR)$(pkglibdir)/epix-lib.sh |
215 |
-+install-exec-local: install-pkgepixDATA |
216 |
-+ chmod a-x $(DESTDIR)$(pkgepixdir)/epix-lib.sh |
217 |
- |
218 |
- uninstall-local: |
219 |
- -rm -rf $(DESTDIR)$(docdir)/notes $(DESTDIR)$(docdir)/config |
220 |
-diff -Nur epix-1.2.9.orig/samples/Makefile.am epix-1.2.9/samples/Makefile.am |
221 |
---- epix-1.2.9.orig/samples/Makefile.am 2008-07-01 03:55:14.000000000 +0100 |
222 |
-+++ epix-1.2.9/samples/Makefile.am 2012-02-19 16:46:02.123782104 +0000 |
223 |
-@@ -7,7 +7,7 @@ |
224 |
- CLEANFILES = *~ *.eepic *.eps sample_src.tar sample_src.tar.gz sample-stamp |
225 |
- |
226 |
- ## Targets ## |
227 |
--doc_DATA = sample_src.tar.gz |
228 |
-+doc_DATA = |
229 |
- |
230 |
- |
231 |
- # tar up tex, xp, and eepic files |