diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2014-12-31 16:30:37 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2014-12-31 16:30:37 +0000 |
| commit | 54b363b59adb7880023d2fbbe21f1ba0a19076b5 (patch) | |
| tree | 0f16a8b18e81605a8ed52f51b2b5c873a751fb83 /dev-java | |
| parent | Stable for ppc, wrt bug #533668 (diff) | |
| download | historical-54b363b59adb7880023d2fbbe21f1ba0a19076b5.tar.gz historical-54b363b59adb7880023d2fbbe21f1ba0a19076b5.tar.bz2 historical-54b363b59adb7880023d2fbbe21f1ba0a19076b5.zip | |
Solaris tars don't include jre/lib/desktop either
Package-Manager: portage-2.2.14-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/oracle-jdk-bin/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/oracle-jdk-bin/Manifest | 10 | ||||
| -rw-r--r-- | dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.25.ebuild | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog index 0f519f3da3e3..c3e3f4ad5eb0 100644 --- a/dev-java/oracle-jdk-bin/ChangeLog +++ b/dev-java/oracle-jdk-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/oracle-jdk-bin # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.81 2014/11/07 06:03:49 ercpe Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.82 2014/12/31 16:30:33 grobian Exp $ + + 31 Dec 2014; Fabian Groffen <grobian@gentoo.org> + oracle-jdk-bin-1.8.0.25.ebuild: + Solaris tars don't include jre/lib/desktop either 07 Nov 2014; Johann Schmitz <ercpe@gentoo.org> oracle-jdk-bin-1.7.0.72.ebuild: Fixed javafx dependency (bug #528414), corrected checksum of demos (bug diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest index 651c5e28fb85..c8c1284567c7 100644 --- a/dev-java/oracle-jdk-bin/Manifest +++ b/dev-java/oracle-jdk-bin/Manifest @@ -68,13 +68,13 @@ DIST jdk-8u25-solaris-x64.tar.gz 98821674 SHA256 84b505a841eb1e206fbe6f58dee4247 EBUILD oracle-jdk-bin-1.7.0.60.ebuild 9910 SHA256 ba9f626a5e86a9860fa995debef6c60b5a0842d6bee5384f7bf64112026fa232 SHA512 1261a52e8dfb9112dab4e5f03b47cdb5552a99fa8929db6f527f937110320da535fc97914d4be655b78b64f82c0c477ab6bd5bb273c34e1aa27a0e289d8bcda8 WHIRLPOOL 0a3424b4d9cc3e10c5649bd3e45774b63b9acaec6cf03bf5dfabd49324487d9a3fba9dd6bb572167ccbf5495a391aeff14feb629fc448880e0315ddd91478cf8 EBUILD oracle-jdk-bin-1.7.0.71.ebuild 10543 SHA256 59bad2051cabce6f2586c269cb289ef594ce1067d146fbc0715ce68f1c1fd835 SHA512 a8d0805c57a0824e2ad2022039b9b6ae9058e0d7c81a0b0a939afe2432a71c0696685c0d802756cef9b0e234571bad796c53fb9896eb49c4e633c7871e28fdf0 WHIRLPOOL 983a974ac0a7cb9102e4972f46620a22b774d51fc0915b1da4ec1cd184209cd6a42b504abc38257aa6087bf838cb5e7301b79322fcc4417b9553f0a4b464ee87 EBUILD oracle-jdk-bin-1.7.0.72.ebuild 10577 SHA256 2a12c72320013a779021c0815788999ba81564ef0dc5e4ba76426da1a1de1ff8 SHA512 2c0807f3724e68376d79cbf57352befc0eaaf95780a069cbfe5ef46b29fe74d5636e5c2e7a8c764a1dc45950752fd101c7234241d6ab00647d9461f5d6967020 WHIRLPOOL 268688d1e92890aa9a50e7ed5b14c34a5cb8f08c20413736594c31fb55c8393b6f40d13b00458b8b1d0ea92a7222aea660b985c7af78c61608b9823914cd8411 -EBUILD oracle-jdk-bin-1.8.0.25.ebuild 10360 SHA256 efd2300c5e0479b8a40d05adf4cd5616c64a2bc147a74a4cb5563c4a9d4ddd7c SHA512 3a7b2e7f37f68a8f80400725c9ddd974f858e09203a0ff38fbc2553b113b8d37ca82039fcb285090047ba0bd3cc3cd4c86c418d698f6c1fd9b28a5bb0632257a WHIRLPOOL 84e8a2340bb8211fb71a91e98bc4da7882aed9f43c03f0cc9493684c2c553a3d903dbd7b238db544d6606b6cc40d2f5f706691a38496a2c63c30002456c537f1 -MISC ChangeLog 14395 SHA256 42c70b53e9fe6dcd2e49ffc623be753bb82617fdb2d287309bf9552180615466 SHA512 e529a44d101dfa5ca5c23a280576a2680e39e72899b6e9d9ef9adfef9f7df15023f6ff8af4325936faa7739994f51ce2ae2f147c4f5f3e76cb1f755ef67afc97 WHIRLPOOL ef07e21cee26694a7c01dd96ee7e4d7460a1c1e1db2adf8af03523618c2cc9b49d20d7f3956725044b6224d800058bd38b077d9a2797e886cdc0b1ced611154a +EBUILD oracle-jdk-bin-1.8.0.25.ebuild 10354 SHA256 a7d257142b43b55df693e85a126f162a55fd66e0052d1a0cb630e4eefd7d48af SHA512 95ca17d2cc89b71833abda9e5978b7cfeadb7123c6514732093b513e5e54194e9dc090ca67f484c893d506918bd0fa7ab67060c1aaf825b78588d29840a6df86 WHIRLPOOL 9ff92bc54dd37f8ee3f9939bef1dfbc68b1dbe581a17b7a51d9f8cc7ecdf590a575b2ddcda4f5dcfa1404bb81f922a0350936407c5db781e599f7f5deec50ed5 +MISC ChangeLog 14535 SHA256 71ddbc442fb85a0791732ad7aaca0eaca92ba8d080cc0719c28348897699f8ff SHA512 628f2cdaafa4d843fe3edad35f9fd4e66d3035423128f00571f67340237b2c27f4bf1b5588337fd9406f4a924d1b75cb15f7f4d449f56ba4f12eb984f4376f0c WHIRLPOOL c6732822c3802d33eb2980de665324631aae14f2ed8b93f82cb42358a4ffb0eacc3d1f0682f502393af1869590e06e51813d0585fe6e19dd237fc17ae6142510 MISC metadata.xml 519 SHA256 09f12b427ac321fdbb2a0ae4d54259bf2fea4100abe33062bd65f27364ccf30e SHA512 b9d20b3da530304f3b9996411a7a6df83e60645057aef2c6706534ff238889e7ae771fd42ff37fef797df50033ec14edc594450fce73144f5c05d31c57e2ce7e WHIRLPOOL 2a5251448873eb66f624d227e3b203b74ab5f92672390478d5b36120181982a004af801e98008fdd701f15cfc53bd74334a82fa8f519c727791b4b29920510aa -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlSjCH4ACgkQX3X2B8XHTomygwCgi/j82ko8Tnf9vj1ORSlUAA8o -gSYAnjh4QXhBQI3Z3K7HXEuAmjZRyxqk -=WCWs +iEYEAREIAAYFAlSkJKsACgkQX3X2B8XHTokcaACffUX2lUb2gVt6bbJtW0IJYunl +OnUAmQGh3L77w5J3Q4NG/BA5PB09ZeCZ +=9pXW -----END PGP SIGNATURE----- diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.25.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.25.ebuild index 8ae76710a2c5..f87f01aec5f9 100644 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.25.ebuild +++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.25.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/oracle-jdk-bin/oracle-jdk-bin-1.8.0.25.ebuild,v 1.3 2014/11/02 08:24:30 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.25.ebuild,v 1.4 2014/12/31 16:30:33 grobian Exp $ EAPI="5" @@ -227,7 +227,7 @@ src_install() { cp -p src.zip "${ddest}" || die fi - if use !x86-macos && use !x64-macos ; then + if [[ -d jre/lib/desktop ]] ; then # Install desktop file for the Java Control Panel. # Using ${PN}-${SLOT} to prevent file collision with jre and or # other slots. make_desktop_entry can't be used as ${P} would |