[gentoo-commits] proj/java:master commit in: dev-java/icedtea/

[James Le Cuirot]

commit:     9b0eb52b86467be92377863e0625021fcfb92ca9
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 22:16:37 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 22:16:37 2016 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=9b0eb52b

dev-java/icedtea: The icedtea-web symlinks are no longer needed

Fixes bug #515850.

Package-Manager: portage-2.3.0

 dev-java/icedtea/icedtea-3.1.0.ebuild         | 9 ---------
 dev-java/icedtea/icedtea-6.1.13.11.ebuild     | 9 ---------
 dev-java/icedtea/icedtea-6.9999.ebuild        | 9 ---------
 dev-java/icedtea/icedtea-7.2.6.7.ebuild       | 9 ---------
 dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild | 9 ---------
 5 files changed, 45 deletions(-)

diff --git a/dev-java/icedtea/icedtea-3.1.0.ebuild 
b/dev-java/icedtea/icedtea-3.1.0.ebuild
index 4a8c2e4..675dc95 100644
--- a/dev-java/icedtea/icedtea-3.1.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.1.0.ebuild
@@ -347,15 +347,6 @@ src_install() {
                rm -v "${ddest}"/src.zip || die
        fi
 
-       # provided by icedtea-web but we need it in JAVA_HOME to work with 
run-java-tool
-       if use webstart || use nsplugin; then
-               dosym /usr/libexec/icedtea-web/itweb-settings 
${dest}/bin/itweb-settings
-               dosym /usr/libexec/icedtea-web/itweb-settings 
${dest}/jre/bin/itweb-settings
-       fi
-       if use webstart; then
-               dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
-               dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
-       fi
        dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
 
        # Fix the permissions.

diff --git a/dev-java/icedtea/icedtea-6.1.13.11.ebuild 
b/dev-java/icedtea/icedtea-6.1.13.11.ebuild
index b4cfba7..4e90f1f 100644
--- a/dev-java/icedtea/icedtea-6.1.13.11.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.11.ebuild
@@ -325,15 +325,6 @@ src_install() {
                cp src.zip "${ddest}" || die
        fi
 
-       # provided by icedtea-web but we need it in JAVA_HOME to work with 
run-java-tool
-       if use webstart || use nsplugin; then
-               dosym /usr/libexec/icedtea-web/itweb-settings 
${dest}/bin/itweb-settings
-               dosym /usr/libexec/icedtea-web/itweb-settings 
${dest}/jre/bin/itweb-settings
-       fi
-       if use webstart; then
-               dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
-               dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
-       fi
        dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
 
        # Fix the permissions.

diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild 
b/dev-java/icedtea/icedtea-6.9999.ebuild
index 83ee5e2..7bd3197 100644
--- a/dev-java/icedtea/icedtea-6.9999.ebuild
+++ b/dev-java/icedtea/icedtea-6.9999.ebuild
@@ -325,15 +325,6 @@ src_install() {
                cp src.zip "${ddest}" || die
        fi
 
-       # provided by icedtea-web but we need it in JAVA_HOME to work with 
run-java-tool
-       if use webstart || use nsplugin; then
-               dosym /usr/libexec/icedtea-web/itweb-settings 
${dest}/bin/itweb-settings
-               dosym /usr/libexec/icedtea-web/itweb-settings 
${dest}/jre/bin/itweb-settings
-       fi
-       if use webstart; then
-               dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
-               dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
-       fi
        dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
 
        # Fix the permissions.

diff --git a/dev-java/icedtea/icedtea-7.2.6.7.ebuild 
b/dev-java/icedtea/icedtea-7.2.6.7.ebuild
index c5fd25d..19f400d 100644
--- a/dev-java/icedtea/icedtea-7.2.6.7.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.7.ebuild
@@ -354,15 +354,6 @@ src_install() {
                rm -v "${ddest}"/src.zip || die
        fi
 
-       # provided by icedtea-web but we need it in JAVA_HOME to work with 
run-java-tool
-       if use webstart || use nsplugin; then
-               dosym /usr/libexec/icedtea-web/itweb-settings 
${dest}/bin/itweb-settings
-               dosym /usr/libexec/icedtea-web/itweb-settings 
${dest}/jre/bin/itweb-settings
-       fi
-       if use webstart; then
-               dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
-               dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
-       fi
        dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
 
        # Fix the permissions.

diff --git a/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild 
b/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild
index c4c2275..2e80c20 100644
--- a/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild
@@ -357,15 +357,6 @@ src_install() {
                rm -v "${ddest}"/src.zip || die
        fi
 
-       # provided by icedtea-web but we need it in JAVA_HOME to work with 
run-java-tool
-       if use webstart || use nsplugin; then
-               dosym /usr/libexec/icedtea-web/itweb-settings 
${dest}/bin/itweb-settings
-               dosym /usr/libexec/icedtea-web/itweb-settings 
${dest}/jre/bin/itweb-settings
-       fi
-       if use webstart; then
-               dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
-               dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
-       fi
        dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
 
        # Fix the permissions.