* [gentoo-commits] proj/sci:master commit in: sci-biology/SEECER/files/
@ 2017-11-21 13:51 Martin Mokrejs
0 siblings, 0 replies; 3+ messages in thread
From: Martin Mokrejs @ 2017-11-21 13:51 UTC (permalink / raw
To: gentoo-commits
commit: a3a57382876fcf7675ad8865da9a4fc18122d5ac
Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Tue Nov 21 13:50:40 2017 +0000
Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Tue Nov 21 13:50:40 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a3a57382
sci-biology/SEECER: adjust paths to work with patch -p1
With bump to EAPI=6 the patch does not apply anymore
due to extraneous 'SEECER-0.1.3/SEECER/'.
Package-Manager: Portage-2.3.14, Repoman-2.3.6
sci-biology/SEECER/files/remove-hardcoded-paths.patch | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-biology/SEECER/files/remove-hardcoded-paths.patch b/sci-biology/SEECER/files/remove-hardcoded-paths.patch
index 4e317e6b0..a04ee6759 100644
--- a/sci-biology/SEECER/files/remove-hardcoded-paths.patch
+++ b/sci-biology/SEECER/files/remove-hardcoded-paths.patch
@@ -1,5 +1,5 @@
---- SEECER-0.1.3/SEECER/bin/run_jellyfish.sh.ori 2015-11-13 18:40:01.595807104 +0100
-+++ SEECER-0.1.3/SEECER/bin/run_jellyfish.sh 2015-11-13 18:51:45.655818838 +0100
+--- bin/run_jellyfish.sh.ori 2015-11-13 18:40:01.595807104 +0100
++++ bin/run_jellyfish.sh 2015-11-13 18:51:45.655818838 +0100
@@ -3,22 +3,27 @@
LCOUNT=$4
TMPDIR=$5
@@ -33,8 +33,8 @@
-$JF dump --lower-count=$LCOUNT -o $2 -c $TMPDIR/jf_merged_$3
+$JF dump --lower-count=$LCOUNT -o $2 -c $TMPDIR/jf_merged_$3 || exit 255
rm $TMPDIR/jf_merged_$3
---- SEECER-0.1.3/SEECER/bin/run_seecer.sh.ori 2015-11-13 18:40:16.215807347 +0100
-+++ SEECER-0.1.3/SEECER/bin/run_seecer.sh 2015-11-13 18:53:03.695820138 +0100
+--- bin/run_seecer.sh.ori 2015-11-13 18:40:16.215807347 +0100
++++ bin/run_seecer.sh 2015-11-13 18:53:03.695820138 +0100
@@ -25,8 +25,8 @@
#
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-biology/SEECER/files/
@ 2017-11-21 14:06 Martin Mokrejs
0 siblings, 0 replies; 3+ messages in thread
From: Martin Mokrejs @ 2017-11-21 14:06 UTC (permalink / raw
To: gentoo-commits
commit: a6b2257d10e785afb2c8045af72d4eb24ceaa55f
Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Tue Nov 21 14:06:46 2017 +0000
Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Tue Nov 21 14:06:46 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a6b2257d
sci-biology/SEECER: drop trailing .ori from filenames
Package-Manager: Portage-2.3.14, Repoman-2.3.6
sci-biology/SEECER/files/remove-hardcoded-paths.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-biology/SEECER/files/remove-hardcoded-paths.patch b/sci-biology/SEECER/files/remove-hardcoded-paths.patch
index a04ee6759..d8120e396 100644
--- a/sci-biology/SEECER/files/remove-hardcoded-paths.patch
+++ b/sci-biology/SEECER/files/remove-hardcoded-paths.patch
@@ -1,4 +1,4 @@
---- bin/run_jellyfish.sh.ori 2015-11-13 18:40:01.595807104 +0100
+--- bin/run_jellyfish.sh 2015-11-13 18:40:01.595807104 +0100
+++ bin/run_jellyfish.sh 2015-11-13 18:51:45.655818838 +0100
@@ -3,22 +3,27 @@
LCOUNT=$4
@@ -33,7 +33,7 @@
-$JF dump --lower-count=$LCOUNT -o $2 -c $TMPDIR/jf_merged_$3
+$JF dump --lower-count=$LCOUNT -o $2 -c $TMPDIR/jf_merged_$3 || exit 255
rm $TMPDIR/jf_merged_$3
---- bin/run_seecer.sh.ori 2015-11-13 18:40:16.215807347 +0100
+--- bin/run_seecer.sh 2015-11-13 18:40:16.215807347 +0100
+++ bin/run_seecer.sh 2015-11-13 18:53:03.695820138 +0100
@@ -25,8 +25,8 @@
#
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-biology/SEECER/files/
@ 2017-11-21 14:16 Martin Mokrejs
0 siblings, 0 replies; 3+ messages in thread
From: Martin Mokrejs @ 2017-11-21 14:16 UTC (permalink / raw
To: gentoo-commits
commit: 6283a774209756751880212d783863da56b9f80e
Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Tue Nov 21 14:15:55 2017 +0000
Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Tue Nov 21 14:15:55 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=6283a774
sci-biology/SEECER: 'patch -p1' and not 'patch -p0' is used
Package-Manager: Portage-2.3.14, Repoman-2.3.6
sci-biology/SEECER/files/remove-hardcoded-paths.patch | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-biology/SEECER/files/remove-hardcoded-paths.patch b/sci-biology/SEECER/files/remove-hardcoded-paths.patch
index d8120e396..bb46f6a30 100644
--- a/sci-biology/SEECER/files/remove-hardcoded-paths.patch
+++ b/sci-biology/SEECER/files/remove-hardcoded-paths.patch
@@ -1,5 +1,5 @@
---- bin/run_jellyfish.sh 2015-11-13 18:40:01.595807104 +0100
-+++ bin/run_jellyfish.sh 2015-11-13 18:51:45.655818838 +0100
+--- SEECER-0.1.3/bin/run_jellyfish.sh 2015-11-13 18:40:01.595807104 +0100
++++ SEECER-0.1.3/bin/run_jellyfish.sh 2015-11-13 18:51:45.655818838 +0100
@@ -3,22 +3,27 @@
LCOUNT=$4
TMPDIR=$5
@@ -33,8 +33,8 @@
-$JF dump --lower-count=$LCOUNT -o $2 -c $TMPDIR/jf_merged_$3
+$JF dump --lower-count=$LCOUNT -o $2 -c $TMPDIR/jf_merged_$3 || exit 255
rm $TMPDIR/jf_merged_$3
---- bin/run_seecer.sh 2015-11-13 18:40:16.215807347 +0100
-+++ bin/run_seecer.sh 2015-11-13 18:53:03.695820138 +0100
+--- SEECER-0.1.3/bin/run_seecer.sh 2015-11-13 18:40:16.215807347 +0100
++++ SEECER-0.1.3/bin/run_seecer.sh 2015-11-13 18:53:03.695820138 +0100
@@ -25,8 +25,8 @@
#
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-21 14:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-21 13:51 [gentoo-commits] proj/sci:master commit in: sci-biology/SEECER/files/ Martin Mokrejs
-- strict thread matches above, loose matches on Subject: below --
2017-11-21 14:06 Martin Mokrejs
2017-11-21 14:16 Martin Mokrejs
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox