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-libs/rosetta-fragments/files/
Date: Tue, 31 Jan 2017 08:42:36
Message-Id: 1485852120.818302cf458db807d47ab01c43d99271a5b9a8d4.soap@gentoo
1 commit: 818302cf458db807d47ab01c43d99271a5b9a8d4
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Jan 30 18:01:14 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 31 08:42:00 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=818302cf
7
8 sci-libs/rosetta-fragments: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3730
11
12 .../rosetta-fragments/files/3.1-chemshift.patch | 33 -------
13 sci-libs/rosetta-fragments/files/3.1-nnmake.patch | 107 ---------------------
14 2 files changed, 140 deletions(-)
15
16 diff --git a/sci-libs/rosetta-fragments/files/3.1-chemshift.patch b/sci-libs/rosetta-fragments/files/3.1-chemshift.patch
17 deleted file mode 100644
18 index 6ea69b2..00000000
19 --- a/sci-libs/rosetta-fragments/files/3.1-chemshift.patch
20 +++ /dev/null
21 @@ -1,33 +0,0 @@
22 ---- chemshift/makefile 2009-01-09 16:08:00.000000000 +0100
23 -+++ chemshift/makefile.new 2009-04-09 11:30:34.179824057 +0200
24 -@@ -64,7 +64,7 @@
25 - # rule to compile executable
26 - compile: $(BASE_NAME).$(COMPILER)
27 - $(BASE_NAME).$(COMPILER) : print ${OBJS}
28 -- $(F77) $(FFLAGS) -o $@ $(OBJS) $(LINKFLAGS)
29 -+ $(F77) $(FFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LINKFLAGS)
30 -
31 - # rule to compile object files:
32 - .$(COMPILER).%.o: %.f
33 ---- chemshift/make.system 2009-01-09 16:08:00.000000000 +0100
34 -+++ chemshift/make.system.new 2009-04-09 11:35:16.126466293 +0200
35 -@@ -61,16 +61,14 @@
36 -
37 - # defaults
38 - F77=f77
39 --FFLAGS=
40 - FOPTIMFLAGS=-O
41 - FDEBUGFLAGS=-g
42 - FPROFILEFLAGS=-P
43 -
44 - ifeq ($(COMPILER),gnu)
45 -- F77 = g77
46 -- FFLAGS = -finline-functions -funroll-loops -W -ffixed-line-length-132 -Wimplicit
47 -- FOPTIMFLAGS = -O -ffast-math -malign-double
48 -- FDEBUGFLAGS = -g -Wall -Wimplicit -Wsurprising -Wformat -W
49 -+ F77 = $(FORTRANC)
50 -+ FOPTIMFLAGS =
51 -+ FDEBUGFLAGS =
52 - FPROFILEFLAGS = -pg
53 - endif
54 -
55
56 diff --git a/sci-libs/rosetta-fragments/files/3.1-nnmake.patch b/sci-libs/rosetta-fragments/files/3.1-nnmake.patch
57 deleted file mode 100644
58 index 35568bb..00000000
59 --- a/sci-libs/rosetta-fragments/files/3.1-nnmake.patch
60 +++ /dev/null
61 @@ -1,107 +0,0 @@
62 ---- nnmake/make.system 2009-01-09 16:07:59.000000000 +0100
63 -+++ nnmake/make.system.new 2009-04-09 10:54:50.000000000 +0200
64 -@@ -62,10 +62,9 @@
65 - FPROFILEFLAGS=-P
66 -
67 - ifeq ($(COMPILER),gnu)
68 -- F77 = g77
69 -- FFLAGS = -finline-functions -funroll-loops -W -ffixed-line-length-132 -Wimplicit
70 -- FOPTIMFLAGS = -O -ffast-math -malign-double
71 -- FDEBUGFLAGS = -g -Wall -Wimplicit -Wsurprising -Wformat -W
72 -+ F77 = $(FORTRANC)
73 -+ FOPTIMFLAGS =
74 -+ FDEBUGFLAGS =
75 - FPROFILEFLAGS = -pg
76 - endif
77 -
78 ---- nnmake/dipolar_nn.f 2009-01-09 16:08:00.000000000 +0100
79 -+++ nnmake/dipolar_nn.f.new 2009-04-09 11:06:24.923302302 +0200
80 -@@ -1396,7 +1396,7 @@
81 - write(0,*)'rejected'
82 - write(0,*)x(1,iset),x(2,iset),x(3,iset),x(4,iset),x(5,iset)
83 - do i=1,maplength(iset)
84 -- write(0,'(i,6f6.3)')i,A(i,1),A(i,2),A(i,3),A(i,4),A(i,5),
85 -+ write(0,'(i6,6f6.3)')i,A(i,1),A(i,2),A(i,3),A(i,4),A(i,5),
86 - # b(i)
87 - enddo
88 - goto 300
89 ---- nnmake/make.system 2009-04-09 11:10:34.399945087 +0200
90 -+++ nnmake/make.system.new 2009-04-09 11:19:41.287390259 +0200
91 -@@ -55,7 +55,6 @@
92 -
93 - # defaults
94 - F77=f77
95 --FFLAGS=
96 - FOPTIMFLAGS=-O
97 - FDEBUGFLAGS=-g
98 - FPROFILEFLAGS=-P
99 ---- nnmake/makefile 2009-01-09 16:08:00.000000000 +0100
100 -+++ nnmake/makefile.new 2009-04-09 11:22:43.454037887 +0200
101 -@@ -102,7 +102,7 @@
102 - # rule to compile executable
103 - compile: print $(BASE_NAME).$(COMPILER)
104 - $(BASE_NAME).$(COMPILER) : ${OBJS}
105 -- $(F77) $(FFLAGS) -o $@ $(OBJS) $(LINKFLAGS)
106 -+ $(F77) $(FFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LINKFLAGS)
107 -
108 - coord_compile: print $(COORD_BASE_NAME).$(COMPILER)
109 - $(COORD_BASE_NAME).$(COMPILER) : ${COORD_OBJS}
110 ---- nnmake/make_fragments.pl 2009-01-09 15:53:33.000000000 +0100
111 -+++ nnmake/make_fragments.pl.new 2009-04-09 13:01:52.987174602 +0200
112 -@@ -19,38 +19,38 @@
113 -
114 - my $TAIL = "_v1_3";
115 -
116 --$src_dir = '/work/chu/rosetta/rosetta_C++/rosetta-2.2.0/rosetta_fragments';
117 --$shareware_dir = '/work/chu/src/shareware';
118 --$scratch = "/scratch/shared";
119 -+$src_dir = '/';
120 -+$shareware_dir = '$src_dir/usr/share';
121 -+$scratch = "$src_dir/scratch/shared";
122 -
123 - # psi-blast
124 - #my $BLAST_BIN_DIR = "$shareware_dir/new_blast/blast-2.2.12/bin";
125 --my $PSIBLAST = "$shareware_dir/blast/bin/blastpgp"; # PSI-BLAST (duh.)
126 --my $NR = "/$scratch/genomes/nr"; # nr blast database filename
127 --my $VALL_BLAST_DB = "/$scratch/nnmake_database/vall.blast.2006-05-05"; # vall blast database filename (cvs respository 'nnmake_database')
128 --my $BLOSUM = "$scratch/nnmake_database/"; # BLOSUM score matrices directory (cvs repository 'nnmake_database')
129 -+my $PSIBLAST = "$src_dir/usr/bin/blastpgp"; # PSI-BLAST (duh.)
130 -+my $NR = "$shareware_dir/blast-db/nr"; # nr blast database filename
131 -+my $VALL_BLAST_DB = "$shareware_dir/rosetta-fragments/nnmake_database/vall.blast.2006-05-05"; # vall blast database filename (cvs respository 'nnmake_database')
132 -+my $BLOSUM = "$shareware_dir/rosetta-fragments/nnmake_database/"; # BLOSUM score matrices directory (cvs repository 'nnmake_database')
133 -
134 - # psipred
135 --my $FILTNR = "$scratch/genomes/filtnr"; # filtnr blast database filename
136 --my $MAKEMAT = "$shareware_dir/blast/bin/makemat"; # makemat utility (part of NCBI tools)
137 --my $PSIPRED = "$shareware_dir/psipred/bin/psipred"; # psipred
138 --my $PSIPASS2 = "$shareware_dir/psipred/bin/psipass2"; # psipass2 (part of psipred pkg)
139 -+my $FILTNR = "$src_dir/tmp/filtnr"; # filtnr blast database filename
140 -+my $MAKEMAT = "$src_dir/usr/bin/makemat"; # makemat utility (part of NCBI tools)
141 -+my $PSIPRED = "$src_dir/usr/bin/psipred"; # psipred
142 -+my $PSIPASS2 = "$src_dir/usr/bin/psipass2"; # psipass2 (part of psipred pkg)
143 - my $PSIPRED_DATA = "$shareware_dir/psipred/data"; # dir containing psipred data files.
144 -
145 - # prof
146 - #my $PROF = "$shareware_dir/prof/run_prof.py";
147 --my $PROF = "$src_dir/nnmake/run_prof.py"; # remember to change prof executable location in run_prof.py
148 -+my $PROF = "$src_dir/usr/bin/run_prof.py"; # remember to change prof executable location in run_prof.py
149 -
150 - # nnmake
151 --my $VALL = "$scratch/nnmake_database"; # dir containing vall database (cvs repository 'nnmake_database')
152 --my $VALL2 = "$scratch/nnmake_database"; # alt dir containing vall database (cvs repository 'nnmake_database')
153 -+my $VALL = "$shareware_dir/rosetta-fragments/nnmake_database"; # dir containing vall database (cvs repository 'nnmake_database')
154 -+my $VALL2 = "$shareware_dir/rosetta-fragments/nnmake_database"; # alt dir containing vall database (cvs repository 'nnmake_database')
155 - my $VALL_NAME = "vall.dat.2006-05-05"; # filename of vall (vall.dat.<id> and vall_cst_coord.dat.<id> must exist)
156 --my $NNMAKE = "$src_dir/nnmake/pNNMAKE.gnu"; # nnmake binary (cvs respository 'nnmake')
157 --my $TRIMLOOPS = "$src_dir/nnmake/trimLoopLibrary.pl"; # trimLoopLibrary.pl (cvs respository 'nnmake')
158 -+my $NNMAKE = "$src_dir/usr/bin/pNNMAKE"; # nnmake binary (cvs respository 'nnmake')
159 -+my $TRIMLOOPS = "$src_dir/usr/bin/trimLoopLibrary.pl"; # trimLoopLibrary.pl (cvs respository 'nnmake')
160 -
161 - # chemshift
162 --my $CHEMSHIFT = "$src_dir/chemshift/pCHEMSHIFT.gnu"; # chemshift binary (cvs repository 'chemshift')
163 --my $TALOS_DB = "$scratch/chemshift_database"; # TALOS databases directory (cvs respository 'chemshift_database')
164 -+my $CHEMSHIFT = "$src_dir/usr/bin/pCHEMSHIFT"; # chemshift binary (cvs repository 'chemshift')
165 -+my $TALOS_DB = "$shareware_dir/rosetta-fragments/chemshift_database"; # TALOS databases directory (cvs respository 'chemshift_database')
166 -
167 - # jufo (secondary structure prediction software)
168 - my $JUFO = "$shareware_dir/jufo/molecule.exe"; # jufo executable