grobian 14/12/31 16:30:33 Modified: oracle-jdk-bin-1.8.0.25.ebuild ChangeLog Log: Solaris tars don't include jre/lib/desktop either (Portage version: 2.2.14-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Revision Changes Path 1.4 dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.25.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.25.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.25.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.25.ebuild?r1=1.3&r2=1.4 Index: oracle-jdk-bin-1.8.0.25.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.25.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- oracle-jdk-bin-1.8.0.25.ebuild 2 Nov 2014 08:24:30 -0000 1.3 +++ oracle-jdk-bin-1.8.0.25.ebuild 31 Dec 2014 16:30:33 -0000 1.4 @@ -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 @@ 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 1.82 dev-java/oracle-jdk-bin/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?rev=1.82&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?rev=1.82&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?r1=1.81&r2=1.82 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- ChangeLog 7 Nov 2014 06:03:49 -0000 1.81 +++ ChangeLog 31 Dec 2014 16:30:33 -0000 1.82 @@ -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 <[email protected]> + oracle-jdk-bin-1.8.0.25.ebuild: + Solaris tars don't include jre/lib/desktop either 07 Nov 2014; Johann Schmitz <[email protected]> oracle-jdk-bin-1.7.0.72.ebuild: Fixed javafx dependency (bug #528414), corrected checksum of demos (bug
