1 |
commit: e0e9910db038c8293a0c817be7300ef6be338ffa |
2 |
Author: William L. Thomson Jr <wlt <AT> o-sinc <DOT> com> |
3 |
AuthorDate: Fri Sep 18 00:14:54 2015 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 29 21:19:52 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0e9910d |
7 |
|
8 |
sci-biology/beast-mcmc: Updated dev-java/jdom slot from 1.0 -> 0 for v1 |
9 |
|
10 |
Also removed old version. |
11 |
|
12 |
sci-biology/beast-mcmc/Manifest | 1 - |
13 |
sci-biology/beast-mcmc/beast-mcmc-1.5.2.ebuild | 82 ---------------------- |
14 |
...cmc-1.7.5.ebuild => beast-mcmc-1.7.5-r1.ebuild} | 6 +- |
15 |
sci-biology/beast-mcmc/beast-mcmc-9999.ebuild | 6 +- |
16 |
4 files changed, 6 insertions(+), 89 deletions(-) |
17 |
|
18 |
diff --git a/sci-biology/beast-mcmc/Manifest b/sci-biology/beast-mcmc/Manifest |
19 |
index 7fd843d..56293f2 100644 |
20 |
--- a/sci-biology/beast-mcmc/Manifest |
21 |
+++ b/sci-biology/beast-mcmc/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST beast-mcmc-1.5.2.tar.bz2 38834702 SHA256 f7312c6a7a14f6b32e9701a6386ff87728574460b7861880aa2cb87290756ea1 SHA512 8549db6cb49d64eb3a97fa6478bdbabfecd44ccc6236c474a1961ec5d6fc8326072fb961035df70982a9f1c08a36572529a07b88e2d33a43fa0fd5c07df3a414 WHIRLPOOL 595f606640daa32c79373c9003ddbc1f80dcbbf01e9e9c18191328b80eb50b45ac70032027dd1efb0e256d78b88bfe1742151a16f6f333938099943a7b2cd16a |
24 |
DIST beast-mcmc-1.7.5.tar.xz 40516312 SHA256 905248cbf07513a0d11375656391d86e310d28f07b6fe78de6b9768eb2548f4f SHA512 9b2ab98fdc5a173e8d9fc74d27cdfd8105e9685fdcbe69a373666e77b6865b74fdd87dfa404fc4ab5bea927728d5b6b35fabd5e376a66e5f014e978952797937 WHIRLPOOL 2daded22cfd59b3b44908ce27f4ef61178f5d174de02080a7e94ba311462f482e381556d4b81bc053e33e1c4bb193d172f2c23f331659b3548f7900d3fc297d5 |
25 |
|
26 |
diff --git a/sci-biology/beast-mcmc/beast-mcmc-1.5.2.ebuild b/sci-biology/beast-mcmc/beast-mcmc-1.5.2.ebuild |
27 |
deleted file mode 100644 |
28 |
index e356691..0000000 |
29 |
--- a/sci-biology/beast-mcmc/beast-mcmc-1.5.2.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,82 +0,0 @@ |
32 |
-# Copyright 1999-2009 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
-# $Id$ |
35 |
- |
36 |
-EAPI="2" |
37 |
- |
38 |
-ESVN_REPO_URI="https://beast-mcmc.googlecode.com/svn/trunk/" |
39 |
- |
40 |
-WANT_ANT_TASKS="ant-junit4" |
41 |
-EANT_GENTOO_CLASSPATH="colt,jdom-1.0,itext,junit-4,jebl,matrix-toolkits-java,commons-math-2,jdom-jaxen-1.0" |
42 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
43 |
-JAVA_ANT_ENCODING="latin1" |
44 |
-JAVA_PKG_BSFIX_NAME="build.xml build_BEAST_MCMC.xml build_coalsim.xml build_development.xml build_pathogen.xml build_release.xml build_treestat.xml build_vcs.xml" |
45 |
- |
46 |
-#inherit java-pkg-2 java-ant-2 eutils subversion |
47 |
-inherit java-pkg-2 java-ant-2 eutils |
48 |
- |
49 |
-DESCRIPTION="Bayesian MCMC of Evolution & Phylogenetics using Molecular Sequences" |
50 |
-HOMEPAGE="https://github.com/beast-dev/beast-mcmc" |
51 |
-#SRC_URI="" |
52 |
-SRC_URI="mirror://gentoo/${P}.tar.bz2" |
53 |
- |
54 |
-LICENSE="LGPL-3" |
55 |
-SLOT="0" |
56 |
-KEYWORDS="~amd64 ~x86" |
57 |
-IUSE="" |
58 |
- |
59 |
-# TODO: sys-cluster/mpijava |
60 |
-COMMON_DEPS="dev-java/colt:0 |
61 |
- dev-java/jdom:1.0 |
62 |
- dev-java/itext:0 |
63 |
- dev-java/junit:4 |
64 |
- dev-java/jebl:0 |
65 |
- dev-java/matrix-toolkits-java |
66 |
- dev-java/commons-math:2 |
67 |
- dev-java/jdom-jaxen:1.0" |
68 |
-DEPEND=">=virtual/jdk-1.5 |
69 |
- ${COMMON_DEPS}" |
70 |
-RDEPEND=">=virtual/jre-1.5 |
71 |
- ${COMMON_DEPS}" |
72 |
- |
73 |
-S="${WORKDIR}/beast_release_${PV//./_}" |
74 |
- |
75 |
-src_prepare() { |
76 |
- sed -i '/BEAST_LIB/ s|$BEAST|/usr/share/beast|' "${S}"/scripts/* || die |
77 |
- cd lib |
78 |
- rm -v colt.jar junit-*.jar itext-*.jar jdom.jar jebl.jar mtj.jar commons-math-*.jar || die |
79 |
- java-pkg_jar-from jdom-1.0 |
80 |
- java-pkg_jar-from colt |
81 |
- java-pkg_jar-from itext |
82 |
- java-pkg_jar-from jebl |
83 |
- java-pkg_jar-from matrix-toolkits-java |
84 |
- java-pkg_jar-from commons-math-1 |
85 |
- java-pkg-2_src_prepare |
86 |
-} |
87 |
- |
88 |
-src_compile() { |
89 |
- eant dist_all_BEAST -f build_BEAST_MCMC.xml \ |
90 |
- -Dgentoo.classpath=$(java-pkg_getjars ${EANT_GENTOO_CLASSPATH}):$(for i in lib/*.jar; do echo -n "$i:"; done) || die |
91 |
- eant dist -f build_pathogen.xml \ |
92 |
- -Dgentoo.classpath=$(java-pkg_getjars ${EANT_GENTOO_CLASSPATH}):$(for i in lib/*.jar; do echo -n "$i:"; done) || die |
93 |
-} |
94 |
- |
95 |
-src_install() { |
96 |
- java-pkg_dojar build/dist/*.jar dist/*.jar |
97 |
- |
98 |
- java-pkg_dolauncher beauti --jar beauti.jar --java_args '-Xms64m -Xmx256m' |
99 |
-# java-pkg_dolauncher beauti --main dr.app.beauti.BeautiApp --java_args '-Xms64m -Xmx256m' |
100 |
- java-pkg_dolauncher beast --main dr.app.beast.BeastMain --java_args '-Xms64m -Xmx256m' |
101 |
- java-pkg_dolauncher loganalyser --main dr.app.tools.LogAnalyser --java_args '-Xms64m -Xmx256m' |
102 |
- java-pkg_dolauncher logcombiner --main dr.app.tools.LogCombiner --java_args '-Xms64m -Xmx256m' |
103 |
- java-pkg_dolauncher treeannotator --main dr.app.tools.TreeAnnotator --java_args '-Xms64m -Xmx256m' |
104 |
- |
105 |
- insinto /usr/share/${PN} |
106 |
- doins -r examples || die |
107 |
- dodoc NOTIFY doc/*.pdf |
108 |
-} |
109 |
- |
110 |
-src_test() { |
111 |
- eant junit -f build_BEAST_MCMC.xml \ |
112 |
- -Dgentoo.classpath=$(java-pkg_getjars ${EANT_GENTOO_CLASSPATH}):$(for i in lib/*.jar; do echo -n "$i:"; done) || die |
113 |
-} |
114 |
|
115 |
diff --git a/sci-biology/beast-mcmc/beast-mcmc-1.7.5.ebuild b/sci-biology/beast-mcmc/beast-mcmc-1.7.5-r1.ebuild |
116 |
similarity index 94% |
117 |
rename from sci-biology/beast-mcmc/beast-mcmc-1.7.5.ebuild |
118 |
rename to sci-biology/beast-mcmc/beast-mcmc-1.7.5-r1.ebuild |
119 |
index 5a66f59..8e59912 100644 |
120 |
--- a/sci-biology/beast-mcmc/beast-mcmc-1.7.5.ebuild |
121 |
+++ b/sci-biology/beast-mcmc/beast-mcmc-1.7.5-r1.ebuild |
122 |
@@ -7,7 +7,7 @@ EAPI=5 |
123 |
ESVN_REPO_URI="https://beast-mcmc.googlecode.com/svn/trunk/" |
124 |
|
125 |
WANT_ANT_TASKS="ant-junit4" |
126 |
-EANT_GENTOO_CLASSPATH="colt,jdom-1.0,itext,junit-4,jebl,matrix-toolkits-java,commons-math-2,jdom-jaxen-1.0" |
127 |
+EANT_GENTOO_CLASSPATH="colt,jdom,itext,junit-4,jebl,matrix-toolkits-java,commons-math-2,jdom-jaxen-1.0" |
128 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
129 |
JAVA_ANT_ENCODING="latin1" |
130 |
JAVA_PKG_BSFIX_NAME="build.xml build_BEAST_MCMC.xml build_coalsim.xml build_development.xml build_pathogen.xml build_release.xml build_treestat.xml build_vcs.xml" |
131 |
@@ -30,7 +30,7 @@ IUSE="" |
132 |
# TODO: sys-cluster/mpijava |
133 |
COMMON_DEPS=" |
134 |
dev-java/colt:0 |
135 |
- dev-java/jdom:1.0 |
136 |
+ dev-java/jdom:0 |
137 |
dev-java/itext:0 |
138 |
dev-java/junit:4 |
139 |
dev-java/jebl:0 |
140 |
@@ -49,7 +49,7 @@ src_prepare() { |
141 |
cd lib |
142 |
rm -v colt.jar junit-*.jar itext-*.jar jdom.jar mtj.jar commons-math-*.jar || die |
143 |
#rm -v colt.jar junit-*.jar itext-*.jar jdom.jar jebl.jar mtj.jar commons-math-*.jar || die |
144 |
- java-pkg_jar-from jdom-1.0 |
145 |
+ java-pkg_jar-from jdom |
146 |
java-pkg_jar-from colt |
147 |
java-pkg_jar-from itext |
148 |
# java-pkg_jar-from jebl |
149 |
|
150 |
diff --git a/sci-biology/beast-mcmc/beast-mcmc-9999.ebuild b/sci-biology/beast-mcmc/beast-mcmc-9999.ebuild |
151 |
index 768799c..7bb1f0f 100644 |
152 |
--- a/sci-biology/beast-mcmc/beast-mcmc-9999.ebuild |
153 |
+++ b/sci-biology/beast-mcmc/beast-mcmc-9999.ebuild |
154 |
@@ -7,7 +7,7 @@ EAPI="2" |
155 |
ESVN_REPO_URI="https://beast-mcmc.googlecode.com/svn/trunk/" |
156 |
|
157 |
WANT_ANT_TASKS="ant-junit4" |
158 |
-EANT_GENTOO_CLASSPATH="colt,jdom-1.0,itext,junit-4,jebl,matrix-toolkits-java,commons-math-2,jdom-jaxen-1.0" |
159 |
+EANT_GENTOO_CLASSPATH="colt,jdom,itext,junit-4,jebl,matrix-toolkits-java,commons-math-2,jdom-jaxen-1.0" |
160 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
161 |
JAVA_ANT_ENCODING="latin1" |
162 |
JAVA_PKG_BSFIX_NAME="build.xml build_BEAST_MCMC.xml build_coalsim.xml build_development.xml build_pathogen.xml build_release.xml build_treestat.xml build_vcs.xml" |
163 |
@@ -26,7 +26,7 @@ IUSE="" |
164 |
|
165 |
# TODO: sys-cluster/mpijava |
166 |
COMMON_DEPS="dev-java/colt:0 |
167 |
- dev-java/jdom:1.0 |
168 |
+ dev-java/jdom:0 |
169 |
dev-java/itext:0 |
170 |
dev-java/junit:4 |
171 |
dev-java/jebl:0 |
172 |
@@ -44,7 +44,7 @@ src_prepare() { |
173 |
sed -i '/BEAST_LIB/ s|$BEAST|/usr/share/beast|' "${S}"/scripts/* || die |
174 |
cd lib |
175 |
rm -v colt.jar junit-*.jar itext-*.jar jdom.jar jebl.jar mtj.jar commons-math-*.jar || die |
176 |
- java-pkg_jar-from jdom-1.0 |
177 |
+ java-pkg_jar-from jdom |
178 |
java-pkg_jar-from colt |
179 |
java-pkg_jar-from itext |
180 |
java-pkg_jar-from jebl |