From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A5F00138BD3 for ; Mon, 3 Nov 2014 01:01:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0396DE081D; Mon, 3 Nov 2014 01:01:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6D822E081D for ; Mon, 3 Nov 2014 01:01:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F110A33F8DF for ; Mon, 3 Nov 2014 01:01:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9DE3494FB for ; Mon, 3 Nov 2014 01:01:00 +0000 (UTC) From: "Andrew John Hughes" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew John Hughes" Message-ID: <1414976099.a91cc65d8c01d76a591b4679bedf6fc52372e874.gnu_andrew@gentoo> Subject: [gentoo-commits] proj/java:master commit in: dev-java/icedtea/ X-VCS-Repository: proj/java X-VCS-Files: dev-java/icedtea/ChangeLog dev-java/icedtea/Manifest dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild dev-java/icedtea/icedtea-6.9999.ebuild dev-java/icedtea/icedtea-7.2.5.3.ebuild dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild X-VCS-Directories: dev-java/icedtea/ X-VCS-Committer: gnu_andrew X-VCS-Committer-Name: Andrew John Hughes X-VCS-Revision: a91cc65d8c01d76a591b4679bedf6fc52372e874 X-VCS-Branch: master Date: Mon, 3 Nov 2014 01:01:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 44eea04f-21e3-4cec-8bbc-afc739797d53 X-Archives-Hash: c9dfda218e39ade681d902e52cd3b620 commit: a91cc65d8c01d76a591b4679bedf6fc52372e874 Author: Andrew John Hughes member fsf org> AuthorDate: Mon Nov 3 00:54:59 2014 +0000 Commit: Andrew John Hughes member fsf org> CommitDate: Mon Nov 3 00:54:59 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=a91cc65d Sync IcedTea-Web changes with main tree version. Package-Manager: portage-2.2.14_rc1 Manifest-Sign-Key: 248BDC07 --- dev-java/icedtea/ChangeLog | 5 +++++ dev-java/icedtea/Manifest | 30 ++++++++++++++++++++++----- dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild | 27 ++++++++++++++++-------- dev-java/icedtea/icedtea-6.9999.ebuild | 27 ++++++++++++++++-------- dev-java/icedtea/icedtea-7.2.5.3.ebuild | 25 +++++++++++++++------- dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild | 23 +++++++++++++------- 6 files changed, 99 insertions(+), 38 deletions(-) diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index afcdd4b..4daf1c4 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 03 Nov 2014; Andrew John Hughes + icedtea-6.1.13.5-r1.ebuild, icedtea-6.9999.ebuild, icedtea-7.2.5.3.ebuild, + icedtea-7.2.6.0_pre09.ebuild: + Sync IcedTea-Web changes with main tree version. + 01 Nov 2014; Vlastimil Babka icedtea-3.9999.ebuild, icedtea-6.1.13.5-r1.ebuild, icedtea-6.9999.ebuild, icedtea-7.2.5.3.ebuild, icedtea-7.2.6.0_pre09.ebuild: diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index 08144ea..4ebc2b1 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX fontconfig.Gentoo.properties.src 15602 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647 SHA512 eac3fd310bf0757284a4a0c3c72759a8516bd2d9b8f9d9c7df10ff15fd291833d5adb5429b166175c6f333c883974d56fe7d0339cc16db3a5786a77780217a39 WHIRLPOOL f9f702848c38ef9cca0577f1db5a7c4cd6847e79d205b8e855c14b3a80070328b12fdcd854f5bd2dcf07c7cb9bd2aaf433a770a0752ec01a4e8b308dedf3bf19 AUX generate-cacerts.pl 11051 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97 WHIRLPOOL ad0e7946b1f055542f8a76b1050ae841bc7b6498305def9881d2f5d2177a82b77d25bf20e97488e2c84bbe0c3834421caea7e5bf4ea990c783908bc19133e619 AUX icedtea.env 1074 SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8 SHA512 933c5d96e1cd36badf9c467b5ac06e8cf5d842915662f6744fb641bba64bdbf024685011f48d2742fadf5a3d82ca2e7f3cc555e51079297f5962e22be3afd03a WHIRLPOOL 57ec8849e93bdd595006515c2cbd6e554ee0e84fa74b80fa2a29106e85f000bf5cd8d9e583f6e60974880b250cbb7d6271ac5d53edcbd2765a4dc0babd571258 @@ -37,9 +40,26 @@ DIST icedtea7-openjdk-7faf56bdd783.tar.bz2 126716 SHA256 301bcd38fa62237e62e9ec2 DIST openjdk-6-src-b30-21_jan_2014.tar.xz 33106516 SHA256 ebd9fdf39c8590cd620cb78c481ca233f5919f2819237b5d2b440666f1dd3475 SHA512 3d040f9dc99b38babda3dce3a0dbc0de0dd91c5a2a0bb4bad7caa5acbb42923d0b26926aca836157d50124811f6c4c743f48ae996481d216c6158c21686e1c55 WHIRLPOOL 4a07dca91ad6bbf004fe40f12225a836c8cb634ce05b5974c51c389d235a6aca6a2532b3818fd975b1dd83ee117e08e17e22fcbb1bedff4caaabf50f941afd6f DIST openjdk-6-src-b33-14_oct_2014.tar.xz 33476800 SHA256 cabc35587a90fa81edd8ba8537c0454348c37456de27e407bbb66d52031a1293 SHA512 e3e195b069101c352ae8ed8f59558a464ba61c9966add815cb58c9151c8fefda721dd1650ebd335350af95cbebdd3fedb1b4ac2736fb2625bb83f13b94a85c8c WHIRLPOOL bcd51fe1ce52ec275ef24d03914f0d151a8765c432713a9bfef39618c01587dc7f9ff9a58b86785761c4b69130afa643964c6cf5caad13d7778baa0a346ea291 EBUILD icedtea-3.9999.ebuild 10711 SHA256 2d8dc222afaf87340eaaee7819eb801e41a950f66588b2a9a315a2a8fc431e16 SHA512 01926338aba58abf42259166412391e29e60845733ad5b0d69bf1b16ded55e1f361caaec9cde5db915bfab1747a2b3966e499dfc034c6f498bbf06da1e5c39d3 WHIRLPOOL dcf621eb1a2353ebd31e11fc625b38df397337641b8b82b92c38513cd0a7adfd40c5dc8d0318cd59d6ab7bcee662dd4be0273d3886d5810d3934b562a996b830 -EBUILD icedtea-6.1.13.5-r1.ebuild 9969 SHA256 8c2d43fc8b4e4ce41432c8ef3a10c4d382a9cdf5daaeb7018685d8e602823e67 SHA512 2fcc61068986a55a446da4e875d091352a775bef224090ec1bce4c88b0719ef1b3dba8de7f5dfa908ee2b85b02a325599a5d52bdf28f9d4378b45f2f6c380a51 WHIRLPOOL 72e175db2495506c5243ad8494a9deb70b79f9fd8d0b76cab04573e11f9ee97bada192e7f975f2963325899461eb9df04d528d55ba1da017b0101df75baecff5 -EBUILD icedtea-6.9999.ebuild 9682 SHA256 a35513f4a6395539bfbdf7c772e26f0de4cb86bbcf21b56e4aae9d138531eb39 SHA512 5c4e52f04d8b0e98e0c6a4e367edfa74e164507ad00afc9ee98842445e630c05fa1136fac93e3ac877860e9f73f3aaee65d414346c4a96198268355312707b1c WHIRLPOOL 446a712af77eed8c51d1cd769bc47acaf37732b0f23f6137886773b4c2c41a0a0d201c25248fe248864e8493fb63962839315de932e4b48a0bac50d81bace6b0 -EBUILD icedtea-7.2.5.3.ebuild 11932 SHA256 c14baa3e16c8269609ba1abbeb9b48628bd7b21ca8ec535c6f7c0ecf4825a4dd SHA512 ccb7d6baeaa770e195156fa271da2300c169ed7b3e23d4a514b08c21121f17d010a3a4d9d371af25088351fde89859e05fade4117ff18d9880b3f2bbb958849a WHIRLPOOL d215fdce3fd627578eac0d72d84802594bfba39a103d29c46999a59d526595ed0db3e2347fa1ca81f7ba5932a770086345bd1995f330f3a5a3e5efaf67e524d2 -EBUILD icedtea-7.2.6.0_pre09.ebuild 11866 SHA256 9c0182714340db009586e4a6bc93f918c9a462fee80da81a6659fa3c798fe342 SHA512 5b8044303684bce316bdb78a6af9c1fc0009d06e30e66c4b173b1b59736a4cc7c11173be3e604225291fff20d98be793fd6a42be57e84673384c8875a743e039 WHIRLPOOL 7a23ea0a89c7d723bda69bcb1ae3eed1fe2f3e1e64ceccbebfe6ec214be38bdfa9dee8bddd4fad8e944ebfedbc8bc1750b39a4d3c87724ae6a208433e99369da -MISC ChangeLog 86554 SHA256 a535307c51127529dda718d37a038437a74449996b6eedf369f2d4c9f69ac1ae SHA512 b00eb66e77086cb1281540f77279bc6e14d820679dc10104ac7ffeba771e1208ef3d44458a346a7c812f08c635189a391e20978152f703dff016610c2e5738f1 WHIRLPOOL 3d66956042e433e017abe63400d1577bca53390bb9cde7a5968deb20568efcd5a57d4f227ad03e8c7fcba3992df67519f1af3ac945c3dea683df3020388cd8f5 +EBUILD icedtea-6.1.13.5-r1.ebuild 10311 SHA256 640e70a047e7a22bc8ca8a99672bb7c82ed6baada94e61235312b2cc886b8f51 SHA512 d6a6779965fd31f20a3bb2817c4777cc1b85fffffce3f8cb32b648f04d1de56c3d2a51d514ceb4fc7af2675f0a48c0c4295db36356882baf0e26180570b99595 WHIRLPOOL d4d6fe4ed8706a5d80e76b786668e719177888786c342b333c44aea7e0c97cecfa4e901f77e667d9f82258bf2e3100254baa8a708eb5a26beeffe0aa1061b914 +EBUILD icedtea-6.9999.ebuild 10014 SHA256 0e4bcdd81929f92b4182f64a2b1be0704c3415df0ebda66d01d7745fc6301fd2 SHA512 2f170738137249460a649269e8c07af156f01bb01b57dbb2d3a3a3270fd1496e354764dd8131508f31111b3317825c086354d320f0c5f2f6955bc5b37f22605a WHIRLPOOL 78fe6146b01c61977b54cba5bdc6ab6403e15925bb90814918d9a1f6d78b5aa538a8856757b7c02d0503c9c688b88ee9f7c1d2c6dc8a5de780ad0e13ef97e9e7 +EBUILD icedtea-7.2.5.3.ebuild 12295 SHA256 59d61292e81e14b3896b945122af1c76f23baf2c104715aabbd3f55408c40815 SHA512 736319b4c6ce02bda9e73ddbdf1be8155599b58e9ccfbd4d43f059029db5641678865ece2f72fe963ce9cf1b6a1994ba55063ef89e3831987f5afadca53e5459 WHIRLPOOL 6a275bc7f36689f46d0623b60ce9c56a3f597f65051b316cd0bccce325cc81a5e988b09b70cddf376e722c6fb51aff3a0ea786d739a54a565ddab28965a3da0f +EBUILD icedtea-7.2.6.0_pre09.ebuild 12228 SHA256 4748062ba8302a024965818246a8dce0ca6e7edf58cc891e361de02e41d85394 SHA512 7c1a051aab5a841d55ce23dda70a5f3ed2430a1f8d7057578511b4f19e1e164479caecc614afb86103a26f2a3fc240750498ca2b40a68530b20e59eb3a67b97a WHIRLPOOL 3d702ca4aaebcca097ca9fd28103d675bb44df72fe9de24fdb8aa03debbc605277e7c810103e7558bde6308fb842aca86679ec2c8a468ccdad1ae5432455409a +MISC ChangeLog 86777 SHA256 096b6efc947e402af92f8e1c3bee1371a6efcce9027814a70bda0f88ac8a03c9 SHA512 6842303a9f90aea797a8a1f8c1dd2b3176df53ac9d1da117a06fc6e4e20e0e8dc87356cfda10e134e4a95325478e929d1d1323720e6aea00ca6f022020446c85 WHIRLPOOL e83ad7f20da568d77ff8cc5b097e91be3477ff10e2ebc1c7c24e97e45b0b3c3a0e230719e1897169af858920ba2bb4a8f7d04eb22284a9be2c2e2a454e521776 MISC metadata.xml 1680 SHA256 41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512 5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c WHIRLPOOL 5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAEBCAAGBQJUVtJjAAoJEDuWpXgki9wH39wP/3kx3L0xZWa3cs/VpFUp1Irm +9L5mdACOEHDDtZ+T7wwqf6z1mDqQLnlD2d2gsPzlv8pf9n+4H8lKP/9oPQQeglBV +yXhE1odgi4IFC5ITM8nHtmLldJFqleEffTNO4eCIpXlJWr4yV6OjkfeX3H9CBFkI +0wz73Q5mgrNNtFM31gWbKsETSYqAsLOitdrIhV5ZjZwnjfkUhcs5maYjSl4mudb6 +i3wlgkQ0z8HwnTpRoWBhsiOZecC3DfjGE7r1yR1WbVkvjrZBJUTOTAxVRMswcMuD +uogMZALX3eTLgPPukNbVQ9iakO9YVf7PJQMJRDQSTw4GCDZBFoP5JdrJeRTEah9T +HGBTGtDK/V/OempkFq+3mnLmteZiZyxEO48jO/eesHchsZ5CCyJgDhBhr4pYAQsE +YGBhSNrwC1GnO2JjDZX4J8mecKUKvax2V0MCTbDcjjdUBKDlX3wQQrwtE1OEEB7s +8j6JcQ3iveQUvMxDH5eARAAMa0TfFz0aEdn/jBB+2ZSS7Ri9hS8Ii/e8tGSj8E/H +trELabGs5pjiqK2NKypop2Rc3PfMBlKcHXgp7/g6YDsbkDVsaivBcuCBkzoI6ses +QCyHo0VwswP5cMNCMROIN4itHrl0fVEyDyDeGjXxxPq4wxK3xfsqAqAZbgudNFG0 +oq9BZT9q8qVR4MKsc9wR +=A2iM +-----END PGP SIGNATURE----- diff --git a/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild b/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild index 2dc7e20..03fea07 100644 --- a/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild +++ b/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.5.ebuild,v 1.1 2014/10/19 06:46:41 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild,v 1.1 2014/11/01 17:59:37 caster Exp $ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -34,7 +34,7 @@ SRC_URI=" LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" SLOT="6" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~x86" IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio selinux +source systemtap test +webstart" @@ -74,7 +74,8 @@ COMMON_DEP=" nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= ) selinux? ( sec-policy/selinux-java ) - systemtap? ( >=dev-util/systemtap-1 )" + systemtap? ( >=dev-util/systemtap-1 ) + !dev-java/icedtea-web:6" # media-fonts/lklug needs ppc ppc64 keywords RDEPEND="${COMMON_DEP} @@ -117,14 +118,12 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND} pax_kernel? ( sys-apps/elfix )" -PDEPEND="webstart? ( || ( +PDEPEND="webstart? ( dev-java/icedtea-web:0 - >=dev-java/icedtea-web-1.3.2:6 - ) ) - nsplugin? ( || ( + ) + nsplugin? ( dev-java/icedtea-web:0[nsplugin] - >=dev-java/icedtea-web-1.3.2:6[nsplugin] - ) )" + )" S="${WORKDIR}"/${ICEDTEA_PKG} @@ -297,6 +296,16 @@ 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 + # Fix the permissions. find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild index 7412510..a1ab190 100644 --- a/dev-java/icedtea/icedtea-6.9999.ebuild +++ b/dev-java/icedtea/icedtea-6.9999.ebuild @@ -7,7 +7,7 @@ # * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL * # ********************************************************* -EAPI="4" +EAPI="5" inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial multiprocessing pax-utils prefix versionator virtualx @@ -33,7 +33,7 @@ EHG_REPO_URI="http://icedtea.classpath.org/hg/icedtea6" LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" SLOT="6" -#KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" +KEYWORDS="" IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap +nsplugin +nss pax_kernel pulseaudio selinux +source systemtap test +webstart" @@ -72,7 +72,8 @@ COMMON_DEP=" nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) selinux? ( sec-policy/selinux-java ) - systemtap? ( >=dev-util/systemtap-1 )" + systemtap? ( >=dev-util/systemtap-1 ) + !dev-java/icedtea-web:6" # media-fonts/lklug needs ppc ppc64 keywords RDEPEND="${COMMON_DEP} @@ -115,14 +116,12 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND} pax_kernel? ( sys-apps/paxctl )" -PDEPEND="webstart? ( || ( +PDEPEND="webstart? ( dev-java/icedtea-web:0 - >=dev-java/icedtea-web-1.3.2:6 - ) ) - nsplugin? ( || ( + ) + nsplugin? ( dev-java/icedtea-web:0[nsplugin] - >=dev-java/icedtea-web-1.3.2:6[nsplugin] - ) )" + )" S="${WORKDIR}"/${ICEDTEA_PKG} @@ -293,6 +292,16 @@ 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 + # Fix the permissions. find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die diff --git a/dev-java/icedtea/icedtea-7.2.5.3.ebuild b/dev-java/icedtea/icedtea-7.2.5.3.ebuild index a72836a..e252119 100644 --- a/dev-java/icedtea/icedtea-7.2.5.3.ebuild +++ b/dev-java/icedtea/icedtea-7.2.5.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r3.ebuild,v 1.1 2011/12/02 12:27:17 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.5.3.ebuild,v 1.1 2014/11/01 21:43:06 caster Exp $ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -100,7 +100,8 @@ COMMON_DEP=" kerberos? ( virtual/krb5 ) >=dev-util/systemtap-1 smartcard? ( sys-apps/pcsc-lite ) - sunec? ( >=dev-libs/nss-3.16.1-r1 )" + sunec? ( >=dev-libs/nss-3.16.1-r1 ) + !dev-java/icedtea-web:7" # cups is needed for X. #390945 #390975 RDEPEND="${COMMON_DEP} @@ -146,14 +147,12 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND} pax_kernel? ( sys-apps/elfix )" -PDEPEND="webstart? ( || ( +PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] - >=dev-java/icedtea-web-1.3.2:7 - ) ) - nsplugin? ( || ( + ) + nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] - >=dev-java/icedtea-web-1.3.2:7[nsplugin] - ) ) + ) pulseaudio? ( dev-java/icedtea-sound )" S="${WORKDIR}"/${ICEDTEA_PKG} @@ -347,6 +346,16 @@ 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 + # Fix the permissions. find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die diff --git a/dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild b/dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild index e8976c6..ed62b7f 100644 --- a/dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild +++ b/dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild @@ -100,7 +100,8 @@ COMMON_DEP=" kerberos? ( virtual/krb5 ) >=dev-util/systemtap-1 smartcard? ( sys-apps/pcsc-lite ) - sunec? ( >=dev-libs/nss-3.16.1-r1 )" + sunec? ( >=dev-libs/nss-3.16.1-r1 ) + !dev-java/icedtea-web:7" # cups is needed for X. #390945 #390975 RDEPEND="${COMMON_DEP} @@ -146,14 +147,12 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND} pax_kernel? ( sys-apps/elfix )" -PDEPEND="webstart? ( || ( +PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] - >=dev-java/icedtea-web-1.3.2:7 - ) ) - nsplugin? ( || ( + ) + nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] - >=dev-java/icedtea-web-1.3.2:7[nsplugin] - ) ) + ) pulseaudio? ( dev-java/icedtea-sound )" S="${WORKDIR}"/${ICEDTEA_PKG} @@ -349,6 +348,16 @@ 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 + # Fix the permissions. find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die