Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/obconf/PKGBUILD
	community/obconf/obconf.install
	community/qstardict/PKGBUILD
	core/binutils/PKGBUILD
	core/gcc/PKGBUILD.mips64el
	extra/cups/PKGBUILD
	extra/eject/PKGBUILD
	extra/emacs/PKGBUILD
	extra/evilwm/PKGBUILD
	extra/fbset/PKGBUILD
	extra/gmpc/PKGBUILD
	extra/gnome-alsamixer/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kile/PKGBUILD
	extra/libvpx/PKGBUILD
	extra/php-apc/PKGBUILD
	extra/php-suhosin/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/potrace/PKGBUILD
	extra/racket/PKGBUILD
	extra/soundtouch/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xpdf/PKGBUILD
	multilib/binutils-multilib/PKGBUILD
	multilib/lib32-acl/PKGBUILD
	multilib/lib32-attr/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-udev/PKGBUILD
	~xihh/abiword/PKGBUILD

1 files changed, 156 insertions, 0 deletions

diff --git a/community/java6-oracle/PKGBUILD b/community/java6-oracle/PKGBUILD
new file mode 100644
index 000000000..b273b9b1b
--- /dev/null
+++ b/community/java6-oracle/PKGBUILD
@@ -0,0 +1,156 @@
+# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
+# Contributor: Jason Chu <jason@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Guillaume ALAUX <Guillaume at alaux dot net>
+
+pkgname=('jre6' 'jdk6')
+pkgbase=java6-oracle
+pkgver=6u27
+pkgrel=1
+pkgdesc="Sun/Oracle's implementation of tha Java 6 specification"
+arch=('i686' 'x86_64')
+  [ "${CARCH}" = 'i686' ]   && _arch=i586
+  [ "${CARCH}" = 'x86_64' ] && _arch=x64
+url='http://java.sun.com'
+license=('custom')
+# oracle moved it ...
+#        'https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh'
+source=("http://download.oracle.com/otn-pub/java/jdk/${pkgver}-b07/jdk-${pkgver}-linux-${_arch}.bin"
+        'construct.sh::http://java.net/projects/jdk-distros/sources/svn/content/trunk/utils/construct.sh?raw=true'
+        'java-control-panel.desktop'
+        'java-monitoring-and-management-console.desktop'
+        'java-policy-settings.desktop'
+        'java-visualvm.desktop'
+        'java-web-start.desktop'
+        'jre.profile'
+        'jre.profile.csh'
+        'jdk.profile'
+        'jdk.profile.csh'
+        'derby-network-server'
+        'derby-network-server.conf'
+        'javaws-launcher')
+
+[ "${CARCH}" = 'i686' ] && md5sums=('bdb5f05bd20c6aa9a4729726191bf6fd')
+[ "${CARCH}" = 'x86_64' ] && md5sums=('94f93a3ff03f824a238ecd79ad90433e')
+md5sums+=('94065b612df0046d9ae758943f9f6a75'
+         'e4d814c0f310d77ed6990c731bccd0fb'
+         '4bc2b0be93f76ed07b471e3c89eb5a8a'
+         '8e3cec7ab641ec449cabd068be583f5c'
+         '9ba148ebabce8ed3351b813a9a66b6e5'
+         '619ec32235dcfe454234ef4316f8a7cc'
+         '7cd3dc10e7a37468cad4053a067dcd01'
+         'cc90df2df6fe80fab885a80036d420a1'
+         'b83ab5742651b4234b7d2e20785c6693'
+         '6f4cbf332816d2c4e9578ecd1d0dce7f'
+         'a279e195e249000646895d93e199860d'
+         '4bdff6982c66d24a879c424aaac3d04d'
+         '45c15a6b4767288f2f745598455ea2bf')
+
+build() {
+  mkdir unbundle-jdk
+  cd unbundle-jdk
+  sh ../jdk-${pkgver}-linux-$_arch.bin --accept-license
+  cd ..
+  sh construct.sh unbundle-jdk linux-jdk linux-jre
+}
+
+package_jre6() {
+  pkgdesc="Oracle's Java Runtime Environment"
+  depends=('glibc' 'libxtst')
+  provides=('j2re' 'java-runtime=6')
+  conflicts=('j2re' 'java-runtime' 'jre')
+  replaces=('j2re')
+  install='jre.install'
+
+  # main files
+  mkdir -p ${pkgdir}/opt/java
+  cp -R linux-jdk/jre ${pkgdir}/opt/java
+
+  # profiles
+  install -D ${srcdir}/jre.profile \
+    ${pkgdir}/etc/profile.d/jre.sh
+  install -D ${srcdir}/jre.profile.csh \
+    ${pkgdir}/etc/profile.d/jre.csh
+
+  mkdir -p ${pkgdir}/usr/lib/mozilla/plugins
+
+  if [ "$CARCH" = "i686" ]; then
+    ln -s /opt/java/jre/lib/i386/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins
+  else ln -s /opt/java/jre/lib/amd64/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins
+  fi
+
+  # licenses
+  install -d ${pkgdir}/usr/share/licenses/jre
+  install -m644 ${pkgdir}/opt/java/jre/COPYRIGHT \
+    ${pkgdir}/usr/share/licenses/jre
+  install -m644 ${pkgdir}/opt/java/jre/LICENSE \
+    ${pkgdir}/usr/share/licenses/jre
+  install -m644 ${pkgdir}/opt/java/jre/THIRDPARTYLICENSEREADME.txt \
+    ${pkgdir}/usr/share/licenses/jre
+
+  # Fix system prefs folder (FS#18872)
+  install -d ${pkgdir}/etc/.java/.systemPrefs
+
+  # Fix FS#22509 - [jre] Clicking a .jnlp file does not launch that file but launch javaws -viewer instead 
+  install ${srcdir}/javaws-launcher \
+    ${pkgdir}/opt/java/jre/bin
+}
+
+package_jdk6() {
+  pkgdesc="Oracle's Java Development Kit"
+  depends=('glibc' 'jre6')
+  provides=('java-environment=6' 'j2sdk')
+  conflicts=('java-environment' 'j2sdk' 'jdk')
+  replaces=('j2sdk')
+  install='jdk.install'
+
+  #copy icon
+  install -D -m644 ${srcdir}/linux-jdk/jre/lib/desktop/icons/hicolor/48x48/apps/sun-java.png \
+    ${pkgdir}/usr/share/pixmaps/java.png
+
+  # main files
+  rm -rf linux-jdk/jre
+  install -d ${pkgdir}/opt
+  mv linux-jdk ${pkgdir}/opt/java
+
+  # profiles
+  install -D ${srcdir}/jdk.profile \
+    ${pkgdir}/etc/profile.d/jdk.sh
+  install -D ${srcdir}/jdk.profile.csh \
+    ${pkgdir}/etc/profile.d/jdk.csh
+
+  # licenses
+  install -d ${pkgdir}/usr/share/licenses/jdk
+  install -m644 ${pkgdir}/opt/java/COPYRIGHT \
+    ${pkgdir}/usr/share/licenses/jdk
+  install -m644 ${pkgdir}/opt/java/LICENSE \
+    ${pkgdir}/usr/share/licenses/jdk
+  install -m644 ${pkgdir}/opt/java/THIRDPARTYLICENSEREADME.txt \
+    ${pkgdir}/usr/share/licenses/jdk
+
+  # desktop entries
+  install -Dm644 ${srcdir}/java-control-panel.desktop \
+    ${pkgdir}/usr/share/applications/java-control-panel.desktop
+  install -Dm644 ${srcdir}/java-monitoring-and-management-console.desktop \
+    ${pkgdir}/usr/share/applications/java-monitoring-and-management-console.desktop
+  install -Dm644 ${srcdir}/java-policy-settings.desktop \
+    ${pkgdir}/usr/share/applications/java-policy-settings.desktop
+  install -Dm644 ${srcdir}/java-visualvm.desktop \
+    ${pkgdir}/usr/share/applications/java-visualvm.desktop
+  install -Dm644 ${srcdir}/java-web-start.desktop \
+    ${pkgdir}/usr/share/applications/java-web-start.desktop
+
+  # javadb (apache derby) daemon files
+  install -D ${srcdir}/derby-network-server \
+    ${pkgdir}/etc/rc.d/derby-network-server
+  install -D -m644 ${srcdir}/derby-network-server.conf \
+    ${pkgdir}/etc/conf.d/derby-network-server
+
+  # remove dangling links, probably need to find out more about them
+  for i in kinit ktab klist; do
+    rm ${pkgdir}/opt/java/bin/${i}
+    rm ${pkgdir}/opt/java/man/ja_JP.eucJP/man1/${i}.1
+    rm ${pkgdir}/opt/java/man/man1/${i}.1
+  done
+}