7u79-3: Merge with jre7/jdk + use CPU (7u79) release

7u79-3:
- Merge changes with jre7/jdk
- Mention end of public updates: http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html
- Use proper versioning (7u79, instead of 7.80)
- Use CPU (7u79) release

1 files changed, 18 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4eafda1b4dfc..9eb5feb9893f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = jdk7
-	pkgdesc = Oracle Java 7 Development Kit
-	pkgver = 7.80
-	pkgrel = 2
-	url = http://www.oracle.com/technetwork/java/javase/downloads/index.html
-	install = jdk.install
+	pkgdesc = Oracle Java 7 Development Kit (public release - end of support)
+	pkgver = 7u79
+	pkgrel = 3
+	url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html
+	install = jdk7.install
 	arch = i686
 	arch = x86_64
 	license = custom
+	makedepends = pacman>=4.2.0
 	depends = ca-certificates-java
 	depends = desktop-file-utils
 	depends = hicolor-icon-theme
@@ -19,13 +20,9 @@ pkgbase = jdk7
 	depends = shared-mime-info
 	depends = xdg-utils
 	optdepends = alsa-lib: for basic sound support
-	optdepends = derby: for Oracle Apache Derby Java database (AUR)
-	optdepends = eclipse: "Oracle Java Mission Control" plugins for Eclipse
+	optdepends = eclipse: to use "Oracle Java Mission Control" plugins in Eclipse
 	optdepends = gtk2: for Gtk+ look and feel (desktop)
 	optdepends = ttf-font: fonts
-	optdepends = visualvm: for lightweight profiling capabilities
-	optdepends = jdk7-docs: Oracle JDK 7 documentation
-	optdepends = java7-jce_ustrength: Unrestricted cryptographic libraries
 	provides = java-runtime=7
 	provides = java-runtime-headless=7
 	provides = java-web-start=7
@@ -34,37 +31,36 @@ pkgbase = jdk7
 	provides = java-runtime-headless-jre=7
 	provides = java-web-start-jre=7
 	provides = java-environment-jdk=7
+	options = !strip
 	backup = etc/java-jdk7/amd64/jvm.cfg
-	backup = etc/java-jdk7/amd64/server/Xusage.txt
 	backup = etc/java-jdk7/images/cursors/cursors.properties
 	backup = etc/java-jdk7/management/jmxremote.access
-	backup = etc/java-jdk7/management/jmxremote.password.template
 	backup = etc/java-jdk7/management/management.properties
-	backup = etc/java-jdk7/management/snmp.acl.template
 	backup = etc/java-jdk7/security/java.policy
 	backup = etc/java-jdk7/security/java.security
 	backup = etc/java-jdk7/security/javaws.policy
-	backup = etc/java-jdk7/calendars.properties
 	backup = etc/java-jdk7/content-types.properties
 	backup = etc/java-jdk7/flavormap.properties
 	backup = etc/java-jdk7/fontconfig.properties.src
-	backup = etc/java-jdk7/javafx.properties
-	backup = etc/java-jdk7/jvm.hprof.txt
 	backup = etc/java-jdk7/logging.properties
 	backup = etc/java-jdk7/net.properties
 	backup = etc/java-jdk7/psfont.properties.ja
 	backup = etc/java-jdk7/psfontj2d.properties
 	backup = etc/java-jdk7/sound.properties
-	source = http://download.oracle.com/otn-pub/java/jdk/7u80-b15/jdk-7u80-linux-x64.tar.gz
+	source = http://download.oracle.com/otn-pub/java/jce/7/UnlimitedJCEPolicyJDK7.zip
 	source = jconsole-jdk7.desktop
 	source = jmc-jdk7.desktop
 	source = jvisualvm-jdk7.desktop
 	source = policytool-jdk7.desktop
-	sha256sums = bad9a731639655118740bee119139c1ed019737ec802a630dd7ad7aab4309623
-	sha256sums = ab4a2e49825df4e6055e90283f9d0b432e28a6d66f0f7ed659985e7c53847751
-	sha256sums = 535d86adeb183340442c307e0ba579d0f7718b30fe6ed319bdc91bb2cee47763
-	sha256sums = cf20cdf39583e1a992a85ab366437b80217951aeb9dec6b2ee54b77b4d0af6be
-	sha256sums = af15efe8b471d0ab147f4a88215aed3fc50b1a605ce31100dfa7a404f29e85b1
+	md5sums = c47e997b90ddfd0d813a37ccc97fb933
+	md5sums = c72336327d7cefadf4ffd74c014c7c2e
+	md5sums = ac3f149795f62cdf5bdfdd6061fb8184
+	md5sums = 1b692eac219a0b34fd7ec13f09cea078
+	md5sums = daf7f23efea899b8c575145d1eb73aab
+	source_i686 = http://download.oracle.com/otn-pub/java/jdk/7u79-b15/jdk-7u79-linux-i586.tar.gz
+	md5sums_i686 = b0ed59147c77a6d3e63a7b340e4e1d28
+	source_x86_64 = http://download.oracle.com/otn-pub/java/jdk/7u79-b15/jdk-7u79-linux-x64.tar.gz
+	md5sums_x86_64 = 9222e097e624800fdd9bfb568169ccad
 
 pkgname = jdk7