mrueg 14/06/03 00:11:07 Modified: oracle-jdk-bin-1.7.0.60.ebuild ChangeLog Log: Re-add ~arm keyword to Slot 1.7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key )
Revision Changes Path 1.2 dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild?r1=1.1&r2=1.2 Index: oracle-jdk-bin-1.7.0.60.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- oracle-jdk-bin-1.7.0.60.ebuild 28 May 2014 19:07:20 -0000 1.1 +++ oracle-jdk-bin-1.7.0.60.ebuild 3 Jun 2014 00:11:07 -0000 1.2 @@ -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.7.0.60.ebuild,v 1.1 2014/05/28 19:07:20 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild,v 1.2 2014/06/03 00:11:07 mrueg Exp $ EAPI="5" @@ -11,10 +11,10 @@ JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"; # This is a list of archs supported by this update. # Currently arm comes and goes. -AT_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos ) # arm +AT_AVAILABLE=( amd64 arm x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos ) # Sometimes some or all of the demos are missing, this is to not have to rewrite half # the ebuild when it happens. -DEMOS_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos ) # arm +DEMOS_AVAILABLE=( amd64 arm x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos ) FX_VERSION="2_2_60" MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" @@ -60,7 +60,7 @@ LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" SLOT="1.7" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel source" RESTRICT="fetch strip" @@ -237,7 +237,7 @@ cp src.zip "${ddest}" || die fi - if use !x86-macos && use !x64-macos ; then + if use !arm && use !x86-macos && use !x64-macos ; 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.62 dev-java/oracle-jdk-bin/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?rev=1.62&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?rev=1.62&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?r1=1.61&r2=1.62 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- ChangeLog 28 May 2014 19:07:20 -0000 1.61 +++ ChangeLog 3 Jun 2014 00:11:07 -0000 1.62 @@ -1,6 +1,9 @@ # 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.61 2014/05/28 19:07:20 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.62 2014/06/03 00:11:07 mrueg Exp $ + + 03 Jun 2014; Manuel Rüger <[email protected]> oracle-jdk-bin-1.7.0.60.ebuild: + Re-add ~arm keyword to Slot 1.7 *oracle-jdk-bin-1.7.0.60 (28 May 2014)
