Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/raster3d/files/
Date: Tue, 31 Jan 2017 08:42:53
Message-Id: 1485852095.f8e03698bd3eb4e2a62da1f7fefa4999586420de.soap@gentoo
1 commit: f8e03698bd3eb4e2a62da1f7fefa4999586420de
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Jan 30 17:54:43 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 31 08:41:35 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8e03698
7
8 sci-chemistry/raster3d: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3730
11
12 sci-chemistry/raster3d/files/2.9.1-as-needed.patch | 41 ------------
13 .../raster3d/files/raster3d-gcc-4.1-gentoo.patch | 74 ----------------------
14 2 files changed, 115 deletions(-)
15
16 diff --git a/sci-chemistry/raster3d/files/2.9.1-as-needed.patch b/sci-chemistry/raster3d/files/2.9.1-as-needed.patch
17 deleted file mode 100644
18 index 2139804..00000000
19 --- a/sci-chemistry/raster3d/files/2.9.1-as-needed.patch
20 +++ /dev/null
21 @@ -1,41 +0,0 @@
22 -diff --git a/Makefile b/Makefile
23 -index e75ffcf..bcdd05c 100644
24 ---- a/Makefile
25 -+++ b/Makefile
26 -@@ -188,7 +188,7 @@ avs2ps: avs2ps.c
27 - $(CC) $(CFLAGS) $(FLAGS) $(LDFLAGS) -o avs2ps avs2ps.c -lm
28 -
29 - balls: balls.f
30 -- $(FC) $(FFLAGS) -o balls balls.f
31 -+ $(FC) $(LDFLAGS) $(FFLAGS) -o balls balls.f
32 -
33 - local.o: Makefile.incl local.c
34 - $(CC) $(CFLAGS) $(FLAGS) -c local.c
35 -@@ -201,21 +201,18 @@ ribbon: ribbon.f ribbon1.f modsubs.f
36 - ribbon.f ribbon1.f modsubs.f -o ribbon
37 -
38 - rastep: rastep.f quadric.o suv.o
39 -- $(FC) $(FFLAGS) \
40 -- rastep.f quadric.o suv.o $(LDFLAGS) \
41 -- -o rastep
42 -+ $(FC) $(FFLAGS) $(LDFLAGS) -o rastep \
43 -+ rastep.f quadric.o suv.o
44 -
45 - render: render.o local.o quadric.o parse.o r3dtops.o ungz.o qinp.o
46 -- $(FC) $(FFLAGS) \
47 -+ $(FC) $(FFLAGS) $(LDFLAGS) -o render \
48 - render.o local.o quadric.o parse.o r3dtops.o ungz.o \
49 - qinp.o \
50 -- $(LIBS) $(LDFLAGS) \
51 -- -o render
52 -+ $(LIBS)
53 -
54 - normal3d: normal3d.o quadric.o qinp.o ungz.o parameters.incl
55 -- $(FC) $(FFLAGS) \
56 -- normal3d.o quadric.o ungz.o qinp.o $(LDFLAGS) \
57 -- -o normal3d
58 -+ $(FC) $(FFLAGS) $(LDFLAGS) -o normal3d \
59 -+ normal3d.o quadric.o ungz.o qinp.o
60 -
61 - stereo3d:
62 -
63
64 diff --git a/sci-chemistry/raster3d/files/raster3d-gcc-4.1-gentoo.patch b/sci-chemistry/raster3d/files/raster3d-gcc-4.1-gentoo.patch
65 deleted file mode 100644
66 index 4525f5f..00000000
67 --- a/sci-chemistry/raster3d/files/raster3d-gcc-4.1-gentoo.patch
68 +++ /dev/null
69 @@ -1,74 +0,0 @@
70 -diff -Naur Raster3D_2.7c/normal3d.f Raster3D_2.7c.new/normal3d.f
71 ---- Raster3D_2.7c/normal3d.f 2003-10-20 18:50:11.000000000 -0400
72 -+++ Raster3D_2.7c.new/normal3d.f 2007-09-08 10:23:08.000000000 -0400
73 -@@ -443,7 +443,8 @@
74 - READ (INPUT,'(A)',ERR=101) TITLE
75 - IF (TITLE(1:1).EQ.'#') GOTO 100
76 - GOTO 102
77 -- 101 WRITE (NOISE,'(A,A)') ' >> Cannot open or read file ',TITLE(2:132)
78 -+ 101 WRITE (NOISE,'(A,A)') ' >> Cannot open or read file ',
79 -+ * TITLE(2:132)
80 - CALL EXIT(-1)
81 - 102 CONTINUE
82 - ENDIF
83 -diff -Naur Raster3D_2.7c/parse.f Raster3D_2.7c.new/parse.f
84 ---- Raster3D_2.7c/parse.f 2003-10-20 18:50:11.000000000 -0400
85 -+++ Raster3D_2.7c.new/parse.f 2007-09-08 10:23:48.000000000 -0400
86 -@@ -4,7 +4,8 @@
87 - COMMON /OPTIONS/ FONTSCALE, GAMMA, ZOOM, NSCHEME, SHADOWFLAG, XBG,
88 - & NAX, NAY, OTMODE, QUALITY, INVERT, LFLAG
89 - REAL FONTSCALE, GAMMA, ZOOM
90 -- INTEGER NSCHEME, SHADOWFLAG, XBG
91 -+ INTEGER NSCHEME, SHADOWFLAG
92 -+ INTEGER*8 XBG
93 - INTEGER*2 NAX, NAY, OTMODE, QUALITY
94 - LOGICAL*2 INVERT, LFLAG
95 - c
96 -diff -Naur Raster3D_2.7c/rastep.f Raster3D_2.7c.new/rastep.f
97 ---- Raster3D_2.7c/rastep.f 2004-02-12 12:01:31.000000000 -0500
98 -+++ Raster3D_2.7c.new/rastep.f 2007-09-08 10:23:08.000000000 -0400
99 -@@ -133,7 +133,7 @@
100 - c
101 - c Support for validation of similarity of bonded atoms
102 - logical suvflag
103 -- integer suvlun, suvbad
104 -+ integer suvlun, suvbad, defcols
105 - real anisov(6)
106 - c
107 - c Default to CPK colors and VDW radii
108 -diff -Naur Raster3D_2.7c/render.f Raster3D_2.7c.new/render.f
109 ---- Raster3D_2.7c/render.f 2003-10-20 18:50:11.000000000 -0400
110 -+++ Raster3D_2.7c.new/render.f 2007-09-08 10:23:08.000000000 -0400
111 -@@ -792,9 +792,9 @@
112 - * Get background colour
113 - READ (INPUT,*,ERR=104) BKGND
114 - if (XBG.NE.0) then
115 -- BKGND(3) = FLOAT(iand(XBG,'00FF'X)) / 255.
116 -- BKGND(2) = FLOAT(iand(XBG,'FF00'X)/256) / 255.
117 -- BKGND(1) = FLOAT(iand(XBG,'FF0000'X)/65536) / 255.
118 -+ BKGND(3) = REAL(iand(XBG,'00FF'X)) / 255.
119 -+ BKGND(2) = REAL(iand(XBG,'FF00'X)/256) / 255.
120 -+ BKGND(1) = REAL(iand(XBG,'FF0000'X)/65536) / 255.
121 - BKGND(3) = BKGND(3)**2
122 - BKGND(2) = BKGND(2)**2
123 - BKGND(1) = BKGND(1)**2
124 -@@ -3679,7 +3679,7 @@
125 - FRAC = DETAIL(K+8)
126 - INEXT = INDTOP + 1
127 - IF (TYPE(INEXT).EQ.VERTEXRGB) INEXT = INEXT + 1
128 -- CALL ASSERT(TYPE(INEXT).EQ.VERTRANSP,'lost vertex transp')
129 -+ CALL ASSERT(TYPE(INEXT).EQ.VERTRANSP,'lost vertex transp')
130 - K = LIST(INEXT)
131 - CLRITY = FRAC*DETAIL(K+1) + (1.-FRAC)*DETAIL(K+2)
132 - ELSE IF (TYPE(INDTOP).EQ.TRIANG) THEN
133 -diff -Naur Raster3D_2.7c/rings3d.f Raster3D_2.7c.new/rings3d.f
134 ---- Raster3D_2.7c/rings3d.f 2003-10-20 18:50:11.000000000 -0400
135 -+++ Raster3D_2.7c.new/rings3d.f 2007-09-08 10:23:08.000000000 -0400
136 -@@ -16,7 +16,6 @@
137 - integer input, output, noise
138 - parameter (input=5, output=6, noise=0)
139 - integer iargc, narg
140 -- external iargc
141 - character*64 options
142 - logical bflag, pflag, sflag
143 - c