From: James Le Cuirot <chewi@gentoo.org>
Date: Fri, 25 Sep 2015 23:14:24 +0000 (+0100)
Subject: media-tv/tvbrowser: Remove dependency on stax
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8bbab6d75d0596738a9a71b4816a774edb5e1f4d;p=gentoo.git

media-tv/tvbrowser: Remove dependency on stax

It is included in Java 6. The jar wasn't even being included in the
classpath anyway.

Package-Manager: portage-2.2.20.1
---

diff --git a/media-tv/tvbrowser/tvbrowser-3.4.1.0.ebuild b/media-tv/tvbrowser/tvbrowser-3.4.1.0-r1.ebuild
similarity index 97%
rename from media-tv/tvbrowser/tvbrowser-3.4.1.0.ebuild
rename to media-tv/tvbrowser/tvbrowser-3.4.1.0-r1.ebuild
index 207aff66a520..b802f0f7ab13 100644
--- a/media-tv/tvbrowser/tvbrowser-3.4.1.0.ebuild
+++ b/media-tv/tvbrowser/tvbrowser-3.4.1.0-r1.ebuild
@@ -29,7 +29,6 @@ COMMON_DEP="dev-java/bsh:0
 	dev-java/htmlparser-org:0
 	dev-java/log4j:0
 	dev-java/skinlf:0
-	dev-java/stax:0
 	dev-java/xalan:0
 	dev-java/opencsv:0
 	dev-java/texhyphj:0
@@ -51,7 +50,6 @@ RDEPEND="${COMMON_DEP}
 
 java_prepare() {
 	epatch "${FILESDIR}"/${PV}-*.patch
-	#epatch "${FILESDIR}"/${PV}-build.xml.patch
 
 	rm -v lib/{bsh-,commons,jgoodies,l2fprod-common-tasks,skinlf,stax,htmlparser,opencsv,trident,texhyphj,jRegistryKey}*.jar
 
diff --git a/media-tv/tvbrowser/tvbrowser-9999.ebuild b/media-tv/tvbrowser/tvbrowser-9999-r1.ebuild
similarity index 98%
rename from media-tv/tvbrowser/tvbrowser-9999.ebuild
rename to media-tv/tvbrowser/tvbrowser-9999-r1.ebuild
index aef81d7131fb..45c837abc81a 100644
--- a/media-tv/tvbrowser/tvbrowser-9999.ebuild
+++ b/media-tv/tvbrowser/tvbrowser-9999-r1.ebuild
@@ -85,7 +85,6 @@ CDEPEND="dev-java/bsh:0
 	dev-java/l2fprod-common:0
 	dev-java/log4j:0
 	dev-java/skinlf:0
-	dev-java/stax:0
 	dev-java/swt:4.2
 	dev-java/xalan:0
 	x11-libs/libXt:0
@@ -108,7 +107,7 @@ RDEPEND="${CDEPEND}
 src_prepare() {
 	cp "${FILESDIR}"/${P}-build.xml build.xml || die "Failed to replace build.xml."
 
-	# Yes, there are some bundled jars. 
+	# Yes, there are some bundled jars.
 	# Can't help but use them for the time being.
 	local error="Failed to unbundle or remove libraries or classes."
 	pushd lib > /dev/null