| 1 |
mrueg 14/06/03 00:11:07 |
| 2 |
|
| 3 |
Modified: oracle-jdk-bin-1.7.0.60.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Re-add ~arm keyword to Slot 1.7 |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key ) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: oracle-jdk-bin-1.7.0.60.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- oracle-jdk-bin-1.7.0.60.ebuild 28 May 2014 19:07:20 -0000 1.1 |
| 23 |
+++ oracle-jdk-bin-1.7.0.60.ebuild 3 Jun 2014 00:11:07 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
|
| 32 |
@@ -11,10 +11,10 @@ |
| 33 |
JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html" |
| 34 |
# This is a list of archs supported by this update. |
| 35 |
# Currently arm comes and goes. |
| 36 |
-AT_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos ) # arm |
| 37 |
+AT_AVAILABLE=( amd64 arm x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos ) |
| 38 |
# Sometimes some or all of the demos are missing, this is to not have to rewrite half |
| 39 |
# the ebuild when it happens. |
| 40 |
-DEMOS_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos ) # arm |
| 41 |
+DEMOS_AVAILABLE=( amd64 arm x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos ) |
| 42 |
FX_VERSION="2_2_60" |
| 43 |
|
| 44 |
MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" |
| 45 |
@@ -60,7 +60,7 @@ |
| 46 |
|
| 47 |
LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" |
| 48 |
SLOT="1.7" |
| 49 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 50 |
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 51 |
IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel source" |
| 52 |
|
| 53 |
RESTRICT="fetch strip" |
| 54 |
@@ -237,7 +237,7 @@ |
| 55 |
cp src.zip "${ddest}" || die |
| 56 |
fi |
| 57 |
|
| 58 |
- if use !x86-macos && use !x64-macos ; then |
| 59 |
+ if use !arm && use !x86-macos && use !x64-macos ; then |
| 60 |
# Install desktop file for the Java Control Panel. |
| 61 |
# Using ${PN}-${SLOT} to prevent file collision with jre and or |
| 62 |
# other slots. make_desktop_entry can't be used as ${P} would |
| 63 |
|
| 64 |
|
| 65 |
|
| 66 |
1.62 dev-java/oracle-jdk-bin/ChangeLog |
| 67 |
|
| 68 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?rev=1.62&view=markup |
| 69 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?rev=1.62&content-type=text/plain |
| 70 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?r1=1.61&r2=1.62 |
| 71 |
|
| 72 |
Index: ChangeLog |
| 73 |
=================================================================== |
| 74 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v |
| 75 |
retrieving revision 1.61 |
| 76 |
retrieving revision 1.62 |
| 77 |
diff -u -r1.61 -r1.62 |
| 78 |
--- ChangeLog 28 May 2014 19:07:20 -0000 1.61 |
| 79 |
+++ ChangeLog 3 Jun 2014 00:11:07 -0000 1.62 |
| 80 |
@@ -1,6 +1,9 @@ |
| 81 |
# ChangeLog for dev-java/oracle-jdk-bin |
| 82 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 83 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.61 2014/05/28 19:07:20 tomwij Exp $ |
| 84 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.62 2014/06/03 00:11:07 mrueg Exp $ |
| 85 |
+ |
| 86 |
+ 03 Jun 2014; Manuel Rüger <mrueg@g.o> oracle-jdk-bin-1.7.0.60.ebuild: |
| 87 |
+ Re-add ~arm keyword to Slot 1.7 |
| 88 |
|
| 89 |
*oracle-jdk-bin-1.7.0.60 (28 May 2014) |
Archives