diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2014-12-31 16:30:33 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2014-12-31 16:30:33 +0000 |
| commit | 07cb3bd4227faa3ba0157c79432fc3d35c035992 (patch) | |
| tree | 4cbf4172c37d6fb2d95fe2917049f8181d47f85e /dev-java | |
| parent | Stable for ppc, wrt bug #533668 (diff) | |
| download | gentoo-2-07cb3bd4227faa3ba0157c79432fc3d35c035992.tar.gz gentoo-2-07cb3bd4227faa3ba0157c79432fc3d35c035992.tar.bz2 gentoo-2-07cb3bd4227faa3ba0157c79432fc3d35c035992.zip | |
Solaris tars don't include jre/lib/desktop either
(Portage version: 2.2.14-prefix/cvs/SunOS i386, signed Manifest commit with 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/oracle-jdk-bin-1.8.0.25.ebuild | 4 |
2 files changed, 7 insertions, 3 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/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 |