| 1 |
commit: 173bda9767c874d31218b53a2f640729bec406a6 |
| 2 |
Author: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Jan 3 20:44:41 2014 +0000 |
| 4 |
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Jan 3 20:44:41 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=173bda97 |
| 7 |
|
| 8 |
app-text/jabref: Do not remove unjarlib target yet. |
| 9 |
|
| 10 |
We need to first replace all bundled libs with portage versions. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.7 |
| 13 |
|
| 14 |
--- |
| 15 |
app-text/jabref/ChangeLog | 5 +++++ |
| 16 |
app-text/jabref/jabref-2.10_beta-r1.ebuild | 5 +++-- |
| 17 |
app-text/jabref/jabref-2.10_beta2-r1.ebuild | 6 +++--- |
| 18 |
3 files changed, 11 insertions(+), 5 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog |
| 21 |
index 241894a..1f1a32c 100644 |
| 22 |
--- a/app-text/jabref/ChangeLog |
| 23 |
+++ b/app-text/jabref/ChangeLog |
| 24 |
@@ -4,6 +4,11 @@ |
| 25 |
|
| 26 |
03 Jan 2014; Nicolas Bock <nicolasbock@g.o> jabref-2.10_beta-r1.ebuild, |
| 27 |
jabref-2.10_beta2-r1.ebuild: |
| 28 |
+ app-text/jabref: Do not remove unjarlib target yet. We need to first replace |
| 29 |
+ all bundled libs with portage versions. |
| 30 |
+ |
| 31 |
+ 03 Jan 2014; Nicolas Bock <nicolasbock@g.o> jabref-2.10_beta-r1.ebuild, |
| 32 |
+ jabref-2.10_beta2-r1.ebuild: |
| 33 |
app-text/jabref: Fix bug in java-pkg_getjars; use a '-' instead of ':' to |
| 34 |
specify slot. |
| 35 |
|
| 36 |
|
| 37 |
diff --git a/app-text/jabref/jabref-2.10_beta-r1.ebuild b/app-text/jabref/jabref-2.10_beta-r1.ebuild |
| 38 |
index a69c707..e8cd8a1 100644 |
| 39 |
--- a/app-text/jabref/jabref-2.10_beta-r1.ebuild |
| 40 |
+++ b/app-text/jabref/jabref-2.10_beta-r1.ebuild |
| 41 |
@@ -39,8 +39,9 @@ java_prepare() { |
| 42 |
rm lib/fontbox*.jar || die |
| 43 |
rm lib/spin.jar || die |
| 44 |
|
| 45 |
- # Remove unjarlib target. |
| 46 |
- sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml |
| 47 |
+ # Remove unjarlib target (do this only once we have removed all |
| 48 |
+ # bundled dependencies in lib). |
| 49 |
+ #sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml |
| 50 |
} |
| 51 |
|
| 52 |
src_compile() { |
| 53 |
|
| 54 |
diff --git a/app-text/jabref/jabref-2.10_beta2-r1.ebuild b/app-text/jabref/jabref-2.10_beta2-r1.ebuild |
| 55 |
index c61af74..e8cd8a1 100644 |
| 56 |
--- a/app-text/jabref/jabref-2.10_beta2-r1.ebuild |
| 57 |
+++ b/app-text/jabref/jabref-2.10_beta2-r1.ebuild |
| 58 |
@@ -39,15 +39,15 @@ java_prepare() { |
| 59 |
rm lib/fontbox*.jar || die |
| 60 |
rm lib/spin.jar || die |
| 61 |
|
| 62 |
- # Remove unjarlib target. |
| 63 |
- sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml |
| 64 |
+ # Remove unjarlib target (do this only once we have removed all |
| 65 |
+ # bundled dependencies in lib). |
| 66 |
+ #sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml |
| 67 |
} |
| 68 |
|
| 69 |
src_compile() { |
| 70 |
local EXTERNAL_JARS="fontbox-1.7,spin" |
| 71 |
local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})" |
| 72 |
eant \ |
| 73 |
- -verbose \ |
| 74 |
-Dgentoo.classpath=${CLASSPATH} \ |
| 75 |
jars \ |
| 76 |
$(usex doc docs "") |
Archives