diff options
author | Johann Schmitz <ercpe@gentoo.org> | 2014-02-08 10:03:59 +0000 |
---|---|---|
committer | Johann Schmitz <ercpe@gentoo.org> | 2014-02-08 10:03:59 +0000 |
commit | 0047736fecfc1c865c849c524470cf77a2fb7a49 (patch) | |
tree | a357cc8866e890c08bfbd57e80da016ab6702066 /sci-biology/readseq | |
parent | Version bump, closing bug 500650. (diff) | |
download | historical-0047736fecfc1c865c849c524470cf77a2fb7a49.tar.gz historical-0047736fecfc1c865c849c524470cf77a2fb7a49.tar.bz2 historical-0047736fecfc1c865c849c524470cf77a2fb7a49.zip |
Dropped unneeded patch files and dropped unneeded dependencies (bug #500488 and #239161)
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED
Diffstat (limited to 'sci-biology/readseq')
-rw-r--r-- | sci-biology/readseq/ChangeLog | 14 | ||||
-rw-r--r-- | sci-biology/readseq/Manifest | 23 | ||||
-rw-r--r-- | sci-biology/readseq/files/19930201-buffer.patch | 13 | ||||
-rw-r--r-- | sci-biology/readseq/files/19930201-getline.patch | 260 | ||||
-rw-r--r-- | sci-biology/readseq/files/19930201-impl-dec.patch | 24 | ||||
-rw-r--r-- | sci-biology/readseq/files/19930201-ldflags.patch | 13 | ||||
-rw-r--r-- | sci-biology/readseq/files/20080420-no-bundling.patch | 14 | ||||
-rw-r--r-- | sci-biology/readseq/readseq-20080420-r1.ebuild (renamed from sci-biology/readseq/readseq-20080420.ebuild) | 26 |
8 files changed, 47 insertions, 340 deletions
diff --git a/sci-biology/readseq/ChangeLog b/sci-biology/readseq/ChangeLog index 748097ff38db..bb09b77767d3 100644 --- a/sci-biology/readseq/ChangeLog +++ b/sci-biology/readseq/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sci-biology/readseq -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/readseq/ChangeLog,v 1.10 2013/02/01 14:55:17 jlec Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-biology/readseq/ChangeLog,v 1.11 2014/02/08 10:03:50 ercpe Exp $ + +*readseq-20080420-r1 (08 Feb 2014) + + 08 Feb 2014; Johann Schmitz <ercpe@gentoo.org> + +files/20080420-no-bundling.patch, +readseq-20080420-r1.ebuild, + -files/19930201-buffer.patch, -files/19930201-getline.patch, + -files/19930201-impl-dec.patch, -files/19930201-ldflags.patch, + -readseq-20080420.ebuild: + Dropped unneeded patch files and dropped unneeded dependencies (bug #500488 + and #239161) 01 Feb 2013; Justin Lecher <jlec@gentoo.org> -readseq-19930201.ebuild, -readseq-19930201-r1.ebuild, readseq-20080420.ebuild, metadata.xml: diff --git a/sci-biology/readseq/Manifest b/sci-biology/readseq/Manifest index c7a8a8af50e5..64abdfd605e1 100644 --- a/sci-biology/readseq/Manifest +++ b/sci-biology/readseq/Manifest @@ -1,18 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX 19930201-buffer.patch 466 SHA256 6718b321adbc3dfab471506b01acd7d0f6d4f0df77a258974333063cc2fbec18 SHA512 182b7db71e272976417d0394a0eefde9dd944bb0ee629dc5da30fba6f4d2a09f4cb54f6316c9caf5b560a7b951df4dfadff42f7f1b518a36db11bd8da7aececb WHIRLPOOL e232c19b9bf8d801fc8421ac380ef1aedfeea812b88cb7bfe5cc506ec3f422eca4b1fed5b1f42005057db7e206802ec0d2f36d80018e130b50be959b8af08b60 -AUX 19930201-getline.patch 7833 SHA256 bc68cd66bf6ff41d00007600b07e6cafddc826db24cd31b896fad2ac17882d76 SHA512 e2a3cdc17b7a78069a5e40b7305cfc52df2ae3c1fc621be8ef525ddfdb32a405b54c481663597e945a2306277f90928b9dfce66f6ec2e777bf04f91a1b4c9b90 WHIRLPOOL e3f2521978bb59cec8635975145c2c49ff387cbbb825918d06fc8db1da01b8e8795bf3555b2ff7847e17acafdfc7cbdbd8cb21f0cae3695595cce0dba26ee5b8 -AUX 19930201-impl-dec.patch 511 SHA256 c7d14b22de4c905b382d897777a2615518c8d386d78636a9151b88e8e49e3f89 SHA512 1f7394f79edc2b357a1b2fceb2bd65631701e9d1d5832de3d6e79dc5d09e865c254466834ca522e4e5696716482e35ef546c026b9f35a4be5c96edcb5515e1f9 WHIRLPOOL 33066b3f1cfe15346068df13fa15568207d174f8f625c4983a5fd6904d019f1c5ec2355f81e4e017e8ab957f5c3336fdcd876c07025a9d63e4755fe944502bb4 -AUX 19930201-ldflags.patch 377 SHA256 ac36fb1c7771f0bfb790cfe6f835b790d2c318c8459d8989734ec218bfcb1e6f SHA512 63735fe67d9392a0f25d6656ce38f34c2cdbaece341bb9fdf76bc74c2b022ed71a5419348f41248fa2037379a051dd9b92ee39c6ea980979548113960a6ba0a5 WHIRLPOOL 6bc2d0e04b796a2d145b468ef226dddd58a7e881182b83ad6bef6f2474cbe4fac729d54c987ce0f79a8a4c0b364374f1e5f17c1de9f76738b0fdb86b35d32742 -DIST readseq-source-20080420.zip 627341 SHA256 d91ccadcbf5fde29525c639ece6ae132e0db863a7e63f96f69647e591617e8dd -EBUILD readseq-20080420.ebuild 1304 SHA256 c52d54b4cf275ddfba42c7a4434374d8cfe0ac09b946f8432d2d04464e4b2360 SHA512 2ad6e6954737cd7949f95dab372f27868ba6651d0cf0cb1e1889c6bad0f8526a97b9cebe14e1535a1738c6c4af22f3d7693c7464ca83ba7f895361b0d935f0ec WHIRLPOOL 722c92cb8d20ab2d209b3d737bd0512a30684d61258d173b77cfda807ab42a025401bbb18e88f0fbe1d8b0941df9c1f7e6a6d834864c7afa6350be99b69a6676 -MISC ChangeLog 2268 SHA256 f9c1fef20cd37646055bacae2adaa725cff90a22f371a3526c1db7fb948f5162 SHA512 f248b550e4bbf13a53f1395ccf38e986888b08b8b8f769f22e14b0271e6dd75bc237621ed83434ff9baefabadb8b5bd52a23efd95193d90d1afed7b1f8cfbd40 WHIRLPOOL 528b3bd505228331385e78c42b2b104cf35eea18a6b2a2a3deeefc0def8316bcf8c30babd96deab829a0ee96fcc96922d81528359c7eab738b3772e31d84d7c3 +AUX 20080420-no-bundling.patch 501 SHA256 a913ea4124c0960bb2145cbaecfe6f7dadaa8baf9087b3c53cd95bfccbf775cb SHA512 4c9437a14d177e5838477c24aca173c3d21ae38adddc627e1df81b6757ddeefdde1b51c7609460305e82b2d4294085f36f511033357a9ec5bcadbb46c117029f WHIRLPOOL 787d5f310c6a1c56d997556944e494f68cb23747700ff725171bad260dbabfd072a06ca809870c927d84dee5fb13330924b743d0723aa3907102b621c65abb41 +DIST readseq-source-20080420.zip 627341 SHA256 d91ccadcbf5fde29525c639ece6ae132e0db863a7e63f96f69647e591617e8dd SHA512 cbc7afa46d2f0cfb30aa75ab88e4942a18ddf46a03a4cfb8d7e07bd23bce3fe015483899d371b947a0f1d6ec464b8c1238df7f7fc89753bb75dbb284f1e07b48 WHIRLPOOL fb180c53cb0555887d5278871498d66840d1d27da47ef6a947f0cd048bfb79762faf9493a645be6909bf41c5627131f3ced8d29b8241372d1e6034dc7524004d +EBUILD readseq-20080420-r1.ebuild 1119 SHA256 b53e2355952eb398aa56d15f63b7b86d114d72e2f6689c48e080bc1542320d90 SHA512 a4670a8a1e7949cf446d768d60c6397663073693fafd807c7c25d4e4bd85234f5dcec149a6175a1a49cd2055cc45c2387ada5a397a6d6afb7b0bf94051d0d138 WHIRLPOOL ddc8030159a45d7fba2edcc9547e667546d93fd56338b603490a86a7e8d4d93664e03cf2f5d8f18d5be206579d788361f8ecdfc5eee7dfd7294282600ee55a40 +MISC ChangeLog 2670 SHA256 d49eca709f6ad8677e677c13bde02836ce3a551051201d4b34d41f3759bee9bb SHA512 cc47725727282824bfde60d283ec19fee851459bed5c24f7be9386e1b4d8613e1754c575b0fee2af9ee729ce7e0f71e51711e092517b6b175b590bda40da9697 WHIRLPOOL 2792090cf39687feee6e1654f94a3b706865c8b9d3b79421dcca9ad368c9d42832b5b9741c69213d12cfc73968bcd02db23ec1d1226266de74c2e288ac3cfdc3 MISC metadata.xml 313 SHA256 3759536b8696911de250a9c55de7f8e0eb6cffd0517de838f0a571a07d7cc8dc SHA512 d831f8104bf7985944abe20b56f222ae1a4910f13f4e4e749c34073e1998f3157ab0432b9620a6fa87b9dd101af4ca7048623593134047e89cd5b75dd8b9aa6b WHIRLPOOL 0cf0092564e381a0d91ec9e6d403f4b5592334c8885a6071bcb0c81b520491f8d25aea2a49d8923dc1838f71f711db9c5acf57664c0024de6a63da4887678cbd -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlEL11YACgkQgAnW8HDreRZ5LwCbBV0kJeCQVxEtBiSjaaHJcrR+ -Rl8AnA9Qh7W8mrw4djFo9Lbhi4509Myi -=RHyV +iQEcBAEBCAAGBQJS9gELAAoJEKCEBkJ3xQHtorEH/2fwSO9dnQ1N8Yhl3W7fGxOt +jy4CmByuz4A1L18YZ4IJkgo+EKlztAF9TLIKs8AV7aTKpQEgzL/Vi+948GKM6BvD +sh/al+XwCvjvFvDid7KdcA8aBViVfOvyzUvOH3NE2IcvVNs8iB4R0dc3Gbqi+22o +g6Qy2pKN3ZiVtJ0t8Fh3ISvH3KEYRLmG63w6NJwc6gCAc/bNEIpaKvKZ4MOGek9j +69I1LXSH2rNYxeus/3sHxvYWXS9Mafw1G/MQm5TAxn6VVDBklSpLDIydm+pqFSrt +QUveWHSx1VDsHqU9IswcntWUqVp3ulKIGK0l3vFoEVObDP8Tm/HKZ54U+6C0/7Y= +=zSxP -----END PGP SIGNATURE----- diff --git a/sci-biology/readseq/files/19930201-buffer.patch b/sci-biology/readseq/files/19930201-buffer.patch deleted file mode 100644 index 8229074dbbc3..000000000000 --- a/sci-biology/readseq/files/19930201-buffer.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ureadseq.c b/ureadseq.c -index 337b16f..3f8e7f6 100644 ---- a/ureadseq.c -+++ b/ureadseq.c -@@ -1578,7 +1578,7 @@ short writeSeq(FILE *outf, const char *seq, const long seqlen, - - short linesout = 0, seqtype = kNucleic; - long i, j, l, l1, ibase; -- char idword[31], endstr[10]; -+ char idword[31], endstr[32]; - char seqnamestore[128], *seqname = seqnamestore; - char s[kMaxseqwidth], *cp; - char nameform[10], numform[10], nocountsymbols[10]; diff --git a/sci-biology/readseq/files/19930201-getline.patch b/sci-biology/readseq/files/19930201-getline.patch deleted file mode 100644 index 34f6339209de..000000000000 --- a/sci-biology/readseq/files/19930201-getline.patch +++ /dev/null @@ -1,260 +0,0 @@ -diff --git a/ureadseq.c b/ureadseq.c -index b11115d..337b16f 100644 ---- a/ureadseq.c -+++ b/ureadseq.c -@@ -136,7 +136,7 @@ Local void readline(FILE *f, char *s, long *linestart) - } - } - --Local void getline(struct ReadSeqVars *V) -+Local void ghettoline(struct ReadSeqVars *V) - { - readline(V->f, V->s, &V->linestart); - } -@@ -215,7 +215,7 @@ Local void readLoop(short margin, boolean addfirst, - - if (addfirst) addseq(V->s, V); - do { -- getline(V); -+ ghettoline(V); - V->done = feof(V->f); - V->done |= (*endTest)( &addend, &ungetend, V); - if (V->addit && (addend || !V->done) && (strlen(V->s) > margin)) { -@@ -246,7 +246,7 @@ Local void readIG(struct ReadSeqVars *V) - - while (!V->allDone) { - do { -- getline(V); -+ ghettoline(V); - for (si= V->s; *si != 0 && *si < ' '; si++) *si= ' '; /* drop controls */ - if (*si == 0) *V->s= 0; /* chop line to empty */ - } while (! (feof(V->f) || ((*V->s != 0) && (*V->s != ';') ) )); -@@ -272,13 +272,13 @@ Local void readStrider(struct ReadSeqVars *V) - { /* ? only 1 seq/file ? */ - - while (!V->allDone) { -- getline(V); -+ ghettoline(V); - if (strstr(V->s,"; DNA sequence ") == V->s) - strcpy(V->seqid, (V->s)+16); - else - strcpy(V->seqid, (V->s)+1); - while ((!feof(V->f)) && (*V->s == ';')) { -- getline(V); -+ ghettoline(V); - } - if (feof(V->f)) V->allDone = true; - else readLoop(0, true, endStrider, V); -@@ -298,16 +298,16 @@ Local void readPIR(struct ReadSeqVars *V) - - while (!V->allDone) { - while (! (feof(V->f) || strstr(V->s,"ENTRY") || strstr(V->s,"SEQUENCE")) ) -- getline(V); -+ ghettoline(V); - strcpy(V->seqid, (V->s)+16); - while (! (feof(V->f) || strstr(V->s,"SEQUENCE") == V->s)) -- getline(V); -+ ghettoline(V); - readLoop(0, false, endPIR, V); - - if (!V->allDone) { - while (! (feof(V->f) || ((*V->s != 0) - && (strstr( V->s,"ENTRY") == V->s)))) -- getline(V); -+ ghettoline(V); - } - if (feof(V->f)) V->allDone = true; - } -@@ -327,13 +327,13 @@ Local void readGenBank(struct ReadSeqVars *V) - while (!V->allDone) { - strcpy(V->seqid, (V->s)+12); - while (! (feof(V->f) || strstr(V->s,"ORIGIN") == V->s)) -- getline(V); -+ ghettoline(V); - readLoop(0, false, endGB, V); - - if (!V->allDone) { - while (! (feof(V->f) || ((*V->s != 0) - && (strstr( V->s,"LOCUS") == V->s)))) -- getline(V); -+ ghettoline(V); - } - if (feof(V->f)) V->allDone = true; - } -@@ -364,11 +364,11 @@ Local void readNBRF(struct ReadSeqVars *V) - { - while (!V->allDone) { - strcpy(V->seqid, (V->s)+4); -- getline(V); /*skip title-junk line*/ -+ ghettoline(V); /*skip title-junk line*/ - readLoop(0, false, endNBRF, V); - if (!V->allDone) { - while (!(feof(V->f) || (*V->s != 0 && *V->s == '>'))) -- getline(V); -+ ghettoline(V); - } - if (feof(V->f)) V->allDone = true; - } -@@ -390,7 +390,7 @@ Local void readPearson(struct ReadSeqVars *V) - readLoop(0, false, endPearson, V); - if (!V->allDone) { - while (!(feof(V->f) || ((*V->s != 0) && (*V->s == '>')))) -- getline(V); -+ ghettoline(V); - } - if (feof(V->f)) V->allDone = true; - } -@@ -410,14 +410,14 @@ Local void readEMBL(struct ReadSeqVars *V) - while (!V->allDone) { - strcpy(V->seqid, (V->s)+5); - do { -- getline(V); -+ ghettoline(V); - } while (!(feof(V->f) | (strstr(V->s,"SQ ") == V->s))); - - readLoop(0, false, endEMBL, V); - if (!V->allDone) { - while (!(feof(V->f) | - ((*V->s != '\0') & (strstr(V->s,"ID ") == V->s)))) -- getline(V); -+ ghettoline(V); - } - if (feof(V->f)) V->allDone = true; - } -@@ -437,13 +437,13 @@ Local void readZuker(struct ReadSeqVars *V) - /*! 1st string is Zuker's Fortran format */ - - while (!V->allDone) { -- getline(V); /*s == "seqLen seqid string..."*/ -+ ghettoline(V); /*s == "seqLen seqid string..."*/ - strcpy(V->seqid, (V->s)+6); - readLoop(0, false, endZuker, V); - if (!V->allDone) { - while (!(feof(V->f) | - ((*V->s != '\0') & (*V->s == '(')))) -- getline(V); -+ ghettoline(V); - } - if (feof(V->f)) V->allDone = true; - } -@@ -486,7 +486,7 @@ Local void readPlain(struct ReadSeqVars *V) - do { - addseq(V->s, V); - V->done = feof(V->f); -- getline(V); -+ ghettoline(V); - } while (!V->done); - if (V->choice == kListSequences) addinfo(V->seqid, V); - V->allDone = true; -@@ -498,7 +498,7 @@ Local void readUWGCG(struct ReadSeqVars *V) - /* - 10nov91: Reading GCG files casued duplication of last line when - EOF followed that line !!! -- fix: getline now sets *V->s = 0 -+ fix: ghettoline now sets *V->s = 0 - */ - char *si; - -@@ -512,7 +512,7 @@ Local void readUWGCG(struct ReadSeqVars *V) - else if (si = strstr(V->seqid,"..")) *si = 0; - do { - V->done = feof(V->f); -- getline(V); -+ ghettoline(V); - if (!V->done) addseq((V->s), V); - } while (!V->done); - if (V->choice == kListSequences) addinfo(V->seqid, V); -@@ -531,7 +531,7 @@ Local void readOlsen(struct ReadSeqVars *V) - if (V->addit) V->seqlen = 0; - rewind(V->f); V->nseq= 0; - do { -- getline(V); -+ ghettoline(V); - V->done = feof(V->f); - - if (V->done && !(*V->s)) break; -@@ -614,7 +614,7 @@ Local void readMSF(struct ReadSeqVars *V) - if (V->addit) V->seqlen = 0; - rewind(V->f); V->nseq= 0; - do { -- getline(V); -+ ghettoline(V); - V->done = feof(V->f); - - if (V->done && !(*V->s)) break; -@@ -685,7 +685,7 @@ Local void readPAUPinterleaved(struct ReadSeqVars *V) - domatch= (V->matchchar > 0); - - do { -- getline(V); -+ ghettoline(V); - V->done = feof(V->f); - - if (V->done && !(*V->s)) break; -@@ -766,7 +766,7 @@ Local void readPAUPsequential(struct ReadSeqVars *V) - /* rewind(V->f); V->nseq= 0; << do in caller !*/ - indata= true; /* call here after we find "matrix" */ - do { -- getline(V); -+ ghettoline(V); - V->done = feof(V->f); - - if (V->done && !(*V->s)) break; -@@ -851,7 +851,7 @@ Local void readPhylipInterleaved(struct ReadSeqVars *V) - /* fprintf(stderr,"Phylip-ileaf: topnseq=%d topseqlen=%d\n",V->topnseq, V->topseqlen); */ - - do { -- getline(V); -+ ghettoline(V); - V->done = feof(V->f); - - if (V->done && !(*V->s)) break; -@@ -904,7 +904,7 @@ Local void readPhylipSequential(struct ReadSeqVars *V) - while (isdigit(*si)) si++; - skipwhitespace(si); - V->topseqlen= atol(si); -- getline(V); -+ ghettoline(V); - while (!V->allDone) { - V->seqlencount= 0; - strncpy(V->seqid, (V->s), 10); -@@ -935,10 +935,10 @@ Local void readSeqMain( - V->err = eFileNotFound; - else { - -- for (l = skiplines_; l > 0; l--) getline( V); -+ for (l = skiplines_; l > 0; l--) ghettoline( V); - - do { -- getline( V); -+ ghettoline( V); - for (l= strlen(V->s); (l > 0) && (V->s[l] == ' '); l--) ; - } while ((l == 0) && !feof(V->f)); - -@@ -963,7 +963,7 @@ Local void readSeqMain( - char *cp; - /* rewind(V->f); V->nseq= 0; ?? assume it is at top ?? skiplines ... */ - while (!done) { -- getline( V); -+ ghettoline( V); - tolowerstr( V->s); - if (strstr( V->s, "matrix")) done= true; - if (strstr( V->s, "interleav")) interleaved= true; -@@ -995,7 +995,7 @@ Local void readSeqMain( - break; - - case kFitch : -- strcpy(V->seqid, V->s); getline(V); -+ strcpy(V->seqid, V->s); ghettoline(V); - readFitch(V); - break; - -@@ -1003,7 +1003,7 @@ Local void readSeqMain( - do { - gotuw = (strstr(V->s,"..") != NULL); - if (gotuw) readUWGCG(V); -- getline(V); -+ ghettoline(V); - } while (!(feof(V->f) || V->allDone)); - break; - } diff --git a/sci-biology/readseq/files/19930201-impl-dec.patch b/sci-biology/readseq/files/19930201-impl-dec.patch deleted file mode 100644 index 8e9448224e2c..000000000000 --- a/sci-biology/readseq/files/19930201-impl-dec.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/readseq.c b/readseq.c -index 305d23a..9b02a17 100644 ---- a/readseq.c -+++ b/readseq.c -@@ -171,6 +171,7 @@ link -w -o readseq -t MPST -c 'MPS ' - #include <stdio.h> - #include <string.h> - #include <ctype.h> -+#include <stdlib.h> - - #include "ureadseq.h" - -diff --git a/ureadseq.c b/ureadseq.c -index 3f8e7f6..799b315 100644 ---- a/ureadseq.c -+++ b/ureadseq.c -@@ -20,6 +20,7 @@ - #include <stdio.h> - #include <ctype.h> - #include <string.h> -+#include <stdlib.h> - - #define UREADSEQ_G - #include "ureadseq.h" diff --git a/sci-biology/readseq/files/19930201-ldflags.patch b/sci-biology/readseq/files/19930201-ldflags.patch deleted file mode 100644 index e1929c634479..000000000000 --- a/sci-biology/readseq/files/19930201-ldflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 40a5a92..f073aaa 100644 ---- a/Makefile -+++ b/Makefile -@@ -40,7 +40,7 @@ all: build test - - build: $(SOURCES) - @echo "Compiling readseq..." -- $(CC) $(CFLAGS) -o readseq readseq.c ureadseq.c -+ $(CC) $(LDFLAGS) $(CFLAGS) -o readseq readseq.c ureadseq.c - - # if using NCBI, uncomment these lines in place of build: above - #build: $(SOURCES) diff --git a/sci-biology/readseq/files/20080420-no-bundling.patch b/sci-biology/readseq/files/20080420-no-bundling.patch new file mode 100644 index 000000000000..f2e1708f8821 --- /dev/null +++ b/sci-biology/readseq/files/20080420-no-bundling.patch @@ -0,0 +1,14 @@ +diff --git a/build.xml b/build.xml +index e3d723c..4b44d6f 100644 +--- a/build.xml ++++ b/build.xml +@@ -229,9 +229,6 @@ + + <!-- for now, unjar xml classes into build/classes and rejar in readseq.jar --> + +- <unjar overwrite="false" src="${orgxml.jar}" dest="${build.home}/classes" /> +- <unjar overwrite="false" src="${xml.jar}" dest="${build.home}/classes" /> +- + <!-- <copy todir="${build.home}/classes""> --> + <!-- <src dir="${basedir}/META-INF"/> --> + <!-- </copy> --> diff --git a/sci-biology/readseq/readseq-20080420.ebuild b/sci-biology/readseq/readseq-20080420-r1.ebuild index 173fc172da18..442e15c71396 100644 --- a/sci-biology/readseq/readseq-20080420.ebuild +++ b/sci-biology/readseq/readseq-20080420-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/readseq/readseq-20080420.ebuild,v 1.4 2013/02/01 14:55:17 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/readseq/readseq-20080420-r1.ebuild,v 1.1 2014/02/08 10:03:50 ercpe Exp $ -EAPI=1 +EAPI=5 inherit java-pkg-2 java-ant-2 @@ -13,34 +13,26 @@ HOMEPAGE="http://iubio.bio.indiana.edu/soft/molbio/readseq/" # http://iubio.bio.indiana.edu/soft/molbio/readseq/java/readseq-source.zip. # Renamed to the date of the modification and mirrored SRC_URI="http://dev.gentoo.org/~dberkholz/distfiles/${MY_P}.zip" -#SRC_URI="mirror://gentoo/${MY_P}.zip" LICENSE="public-domain" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -COMMON=" - dev-java/jaxp - dev-java/xerces:2" -RDEPEND="${COMMON} - !=sci-biology/meme-4.8.1 +RDEPEND="!=sci-biology/meme-4.8.1 >=virtual/jre-1.4" -DEPEND="${COMMON} - >=virtual/jdk-1.4 +DEPEND=">=virtual/jdk-1.4 app-arch/unzip" + S=${WORKDIR} -src_unpack() { - unpack ${A} - cd "${S}" - java-pkg_jar-from xerces-2 xercesImpl.jar lib/ibm-xml4j-min.jar - java-pkg_jar-from jaxp jaxp-ri.jar lib/orgxml.jar +java_prepare() { + rm "${S}"/lib/* || die + epatch "${FILESDIR}"/${PV}-* } src_install() { java-pkg_dojar build/readseq.jar - java-pkg_dolauncher } |