| 1 |
commit: 9b0eb52b86467be92377863e0625021fcfb92ca9 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 2 22:16:37 2016 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 2 22:16:37 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=9b0eb52b |
| 7 |
|
| 8 |
dev-java/icedtea: The icedtea-web symlinks are no longer needed |
| 9 |
|
| 10 |
Fixes bug #515850. |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.0 |
| 13 |
|
| 14 |
dev-java/icedtea/icedtea-3.1.0.ebuild | 9 --------- |
| 15 |
dev-java/icedtea/icedtea-6.1.13.11.ebuild | 9 --------- |
| 16 |
dev-java/icedtea/icedtea-6.9999.ebuild | 9 --------- |
| 17 |
dev-java/icedtea/icedtea-7.2.6.7.ebuild | 9 --------- |
| 18 |
dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild | 9 --------- |
| 19 |
5 files changed, 45 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-java/icedtea/icedtea-3.1.0.ebuild b/dev-java/icedtea/icedtea-3.1.0.ebuild |
| 22 |
index 4a8c2e4..675dc95 100644 |
| 23 |
--- a/dev-java/icedtea/icedtea-3.1.0.ebuild |
| 24 |
+++ b/dev-java/icedtea/icedtea-3.1.0.ebuild |
| 25 |
@@ -347,15 +347,6 @@ src_install() { |
| 26 |
rm -v "${ddest}"/src.zip || die |
| 27 |
fi |
| 28 |
|
| 29 |
- # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool |
| 30 |
- if use webstart || use nsplugin; then |
| 31 |
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings |
| 32 |
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings |
| 33 |
- fi |
| 34 |
- if use webstart; then |
| 35 |
- dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws |
| 36 |
- dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws |
| 37 |
- fi |
| 38 |
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} |
| 39 |
|
| 40 |
# Fix the permissions. |
| 41 |
|
| 42 |
diff --git a/dev-java/icedtea/icedtea-6.1.13.11.ebuild b/dev-java/icedtea/icedtea-6.1.13.11.ebuild |
| 43 |
index b4cfba7..4e90f1f 100644 |
| 44 |
--- a/dev-java/icedtea/icedtea-6.1.13.11.ebuild |
| 45 |
+++ b/dev-java/icedtea/icedtea-6.1.13.11.ebuild |
| 46 |
@@ -325,15 +325,6 @@ src_install() { |
| 47 |
cp src.zip "${ddest}" || die |
| 48 |
fi |
| 49 |
|
| 50 |
- # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool |
| 51 |
- if use webstart || use nsplugin; then |
| 52 |
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings |
| 53 |
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings |
| 54 |
- fi |
| 55 |
- if use webstart; then |
| 56 |
- dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws |
| 57 |
- dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws |
| 58 |
- fi |
| 59 |
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} |
| 60 |
|
| 61 |
# Fix the permissions. |
| 62 |
|
| 63 |
diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild |
| 64 |
index 83ee5e2..7bd3197 100644 |
| 65 |
--- a/dev-java/icedtea/icedtea-6.9999.ebuild |
| 66 |
+++ b/dev-java/icedtea/icedtea-6.9999.ebuild |
| 67 |
@@ -325,15 +325,6 @@ src_install() { |
| 68 |
cp src.zip "${ddest}" || die |
| 69 |
fi |
| 70 |
|
| 71 |
- # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool |
| 72 |
- if use webstart || use nsplugin; then |
| 73 |
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings |
| 74 |
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings |
| 75 |
- fi |
| 76 |
- if use webstart; then |
| 77 |
- dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws |
| 78 |
- dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws |
| 79 |
- fi |
| 80 |
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} |
| 81 |
|
| 82 |
# Fix the permissions. |
| 83 |
|
| 84 |
diff --git a/dev-java/icedtea/icedtea-7.2.6.7.ebuild b/dev-java/icedtea/icedtea-7.2.6.7.ebuild |
| 85 |
index c5fd25d..19f400d 100644 |
| 86 |
--- a/dev-java/icedtea/icedtea-7.2.6.7.ebuild |
| 87 |
+++ b/dev-java/icedtea/icedtea-7.2.6.7.ebuild |
| 88 |
@@ -354,15 +354,6 @@ src_install() { |
| 89 |
rm -v "${ddest}"/src.zip || die |
| 90 |
fi |
| 91 |
|
| 92 |
- # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool |
| 93 |
- if use webstart || use nsplugin; then |
| 94 |
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings |
| 95 |
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings |
| 96 |
- fi |
| 97 |
- if use webstart; then |
| 98 |
- dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws |
| 99 |
- dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws |
| 100 |
- fi |
| 101 |
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} |
| 102 |
|
| 103 |
# Fix the permissions. |
| 104 |
|
| 105 |
diff --git a/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild b/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild |
| 106 |
index c4c2275..2e80c20 100644 |
| 107 |
--- a/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild |
| 108 |
+++ b/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild |
| 109 |
@@ -357,15 +357,6 @@ src_install() { |
| 110 |
rm -v "${ddest}"/src.zip || die |
| 111 |
fi |
| 112 |
|
| 113 |
- # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool |
| 114 |
- if use webstart || use nsplugin; then |
| 115 |
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings |
| 116 |
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings |
| 117 |
- fi |
| 118 |
- if use webstart; then |
| 119 |
- dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws |
| 120 |
- dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws |
| 121 |
- fi |
| 122 |
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} |
| 123 |
|
| 124 |
# Fix the permissions. |
Archives