| 1 |
commit: 8bbab6d75d0596738a9a71b4816a774edb5e1f4d |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 25 23:14:24 2015 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 25 23:14:24 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bbab6d7 |
| 7 |
|
| 8 |
media-tv/tvbrowser: Remove dependency on stax |
| 9 |
|
| 10 |
It is included in Java 6. The jar wasn't even being included in the |
| 11 |
classpath anyway. |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.20.1 |
| 14 |
|
| 15 |
.../{tvbrowser-3.4.1.0.ebuild => tvbrowser-3.4.1.0-r1.ebuild} | 2 -- |
| 16 |
media-tv/tvbrowser/{tvbrowser-9999.ebuild => tvbrowser-9999-r1.ebuild} | 3 +-- |
| 17 |
2 files changed, 1 insertion(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-tv/tvbrowser/tvbrowser-3.4.1.0.ebuild b/media-tv/tvbrowser/tvbrowser-3.4.1.0-r1.ebuild |
| 20 |
similarity index 97% |
| 21 |
rename from media-tv/tvbrowser/tvbrowser-3.4.1.0.ebuild |
| 22 |
rename to media-tv/tvbrowser/tvbrowser-3.4.1.0-r1.ebuild |
| 23 |
index 207aff6..b802f0f 100644 |
| 24 |
--- a/media-tv/tvbrowser/tvbrowser-3.4.1.0.ebuild |
| 25 |
+++ b/media-tv/tvbrowser/tvbrowser-3.4.1.0-r1.ebuild |
| 26 |
@@ -29,7 +29,6 @@ COMMON_DEP="dev-java/bsh:0 |
| 27 |
dev-java/htmlparser-org:0 |
| 28 |
dev-java/log4j:0 |
| 29 |
dev-java/skinlf:0 |
| 30 |
- dev-java/stax:0 |
| 31 |
dev-java/xalan:0 |
| 32 |
dev-java/opencsv:0 |
| 33 |
dev-java/texhyphj:0 |
| 34 |
@@ -51,7 +50,6 @@ RDEPEND="${COMMON_DEP} |
| 35 |
|
| 36 |
java_prepare() { |
| 37 |
epatch "${FILESDIR}"/${PV}-*.patch |
| 38 |
- #epatch "${FILESDIR}"/${PV}-build.xml.patch |
| 39 |
|
| 40 |
rm -v lib/{bsh-,commons,jgoodies,l2fprod-common-tasks,skinlf,stax,htmlparser,opencsv,trident,texhyphj,jRegistryKey}*.jar |
| 41 |
|
| 42 |
|
| 43 |
diff --git a/media-tv/tvbrowser/tvbrowser-9999.ebuild b/media-tv/tvbrowser/tvbrowser-9999-r1.ebuild |
| 44 |
similarity index 98% |
| 45 |
rename from media-tv/tvbrowser/tvbrowser-9999.ebuild |
| 46 |
rename to media-tv/tvbrowser/tvbrowser-9999-r1.ebuild |
| 47 |
index aef81d7..45c837a 100644 |
| 48 |
--- a/media-tv/tvbrowser/tvbrowser-9999.ebuild |
| 49 |
+++ b/media-tv/tvbrowser/tvbrowser-9999-r1.ebuild |
| 50 |
@@ -85,7 +85,6 @@ CDEPEND="dev-java/bsh:0 |
| 51 |
dev-java/l2fprod-common:0 |
| 52 |
dev-java/log4j:0 |
| 53 |
dev-java/skinlf:0 |
| 54 |
- dev-java/stax:0 |
| 55 |
dev-java/swt:4.2 |
| 56 |
dev-java/xalan:0 |
| 57 |
x11-libs/libXt:0 |
| 58 |
@@ -108,7 +107,7 @@ RDEPEND="${CDEPEND} |
| 59 |
src_prepare() { |
| 60 |
cp "${FILESDIR}"/${P}-build.xml build.xml || die "Failed to replace build.xml." |
| 61 |
|
| 62 |
- # Yes, there are some bundled jars. |
| 63 |
+ # Yes, there are some bundled jars. |
| 64 |
# Can't help but use them for the time being. |
| 65 |
local error="Failed to unbundle or remove libraries or classes." |
| 66 |
pushd lib > /dev/null |
Archives