[arch-commits] Commit in eclipse/repos (20 files)

Jan Steffens heftig at archlinux.org
Sun Jul 5 16:33:55 UTC 2015


    Date: Sunday, July 5, 2015 @ 18:33:54
  Author: heftig
Revision: 241829

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  eclipse/repos/testing-i686/PKGBUILD
    (from rev 241828, eclipse/trunk/PKGBUILD)
  eclipse/repos/testing-i686/commonify
    (from rev 241828, eclipse/trunk/commonify)
  eclipse/repos/testing-i686/eclipse.desktop
    (from rev 241828, eclipse/trunk/eclipse.desktop)
  eclipse/repos/testing-i686/eclipse.install
    (from rev 241828, eclipse/trunk/eclipse.install)
  eclipse/repos/testing-i686/eclipse.sh
    (from rev 241828, eclipse/trunk/eclipse.sh)
  eclipse/repos/testing-x86_64/PKGBUILD
    (from rev 241828, eclipse/trunk/PKGBUILD)
  eclipse/repos/testing-x86_64/commonify
    (from rev 241828, eclipse/trunk/commonify)
  eclipse/repos/testing-x86_64/eclipse.desktop
    (from rev 241828, eclipse/trunk/eclipse.desktop)
  eclipse/repos/testing-x86_64/eclipse.install
    (from rev 241828, eclipse/trunk/eclipse.install)
  eclipse/repos/testing-x86_64/eclipse.sh
    (from rev 241828, eclipse/trunk/eclipse.sh)
Deleted:
  eclipse/repos/testing-i686/PKGBUILD
  eclipse/repos/testing-i686/commonify
  eclipse/repos/testing-i686/eclipse.desktop
  eclipse/repos/testing-i686/eclipse.install
  eclipse/repos/testing-i686/eclipse.sh
  eclipse/repos/testing-x86_64/PKGBUILD
  eclipse/repos/testing-x86_64/commonify
  eclipse/repos/testing-x86_64/eclipse.desktop
  eclipse/repos/testing-x86_64/eclipse.install
  eclipse/repos/testing-x86_64/eclipse.sh

--------------------------------+
 /PKGBUILD                      |  194 +++++++++++++++++++++++++++++++++++++++
 /commonify                     |   78 +++++++++++++++
 /eclipse.desktop               |   18 +++
 /eclipse.install               |   22 ++++
 /eclipse.sh                    |    6 +
 testing-i686/PKGBUILD          |   92 ------------------
 testing-i686/commonify         |   39 -------
 testing-i686/eclipse.desktop   |    9 -
 testing-i686/eclipse.install   |   11 --
 testing-i686/eclipse.sh        |    3 
 testing-x86_64/PKGBUILD        |   92 ------------------
 testing-x86_64/commonify       |   39 -------
 testing-x86_64/eclipse.desktop |    9 -
 testing-x86_64/eclipse.install |   11 --
 testing-x86_64/eclipse.sh      |    3 
 15 files changed, 318 insertions(+), 308 deletions(-)

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2015-07-05 15:19:06 UTC (rev 241828)
+++ testing-i686/PKGBUILD	2015-07-05 16:33:54 UTC (rev 241829)
@@ -1,92 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Paul Mattal <paul at archlinux.org>
-# Contributor: Andrew Wright <andreww at photism.org>
-# Contributor: Andreas W. Hauser <andy-aur at splashground.de>
-# Contributor: Marco Crosio <marco.crosio at gmail.com>
-
-pkgbase=eclipse
-pkgname=(eclipse-{common,java,cpp,php})
-pkgver=4.5.0
-pkgrel=2
-_release=mars-R
-pkgdesc="Highly extensible IDE"
-license=("EPL")
-arch=(i686 x86_64)
-url="http://eclipse.org"
-makedepends=(ruby)
-options=(!emptydirs)
-source=(commonify eclipse.sh eclipse.desktop)
-source_i686=()
-source_x86_64=()
-noextract=()
-
-for _pkg in ${pkgname[@]}; do
-  [[ $_pkg == 'eclipse-common' ]] && continue
-  source_i686+=(http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/${_release/-//}/$_pkg-$_release-linux-gtk.tar.gz)
-  source_x86_64+=(http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/${_release/-//}/$_pkg-$_release-linux-gtk-x86_64.tar.gz)
-  noextract+=($_pkg-$_release-linux-gtk{,-x86_64}.tar.gz)
-  eval "package_$_pkg() { _package $_pkg; }"
-done
-
-sha256sums=('becd292c83556fff2eea889ebe6df075056c6343b88f95abd6abbd04253d82c9'
-            '04e789fb695d5f95d09ddb994ae30397b39aee35f11997465dd91d129c41b2ed'
-            '57559c2548ae463089acb3c2825ebc002ed83067ddc953b23d36a7b5a02deaf3')
-sha256sums_i686=('43089aa4738d05e92fd24cf320336e8ab1cfd2e66ce07de9955a40bf7a08de87'
-                 '1b1d7a9aaf27d7dd6dcb9fd7b04629f687fb43e6db8c3299c092e0f554b174f4'
-                 '93769a4b8a1d12fb95dd1a848339104032a08b3e00dcf0c597bbf471f3359073')
-sha256sums_x86_64=('2eeea5e563001f6812bad97e159befe4152bf8ef49124c98e635fd68104a1727'
-                   'a990130c1529fcd8c3b3904f37fd8fe26c4c024be4863ccc7a9b2f16908ad49f'
-                   'f93d0f6a8fc03077887049080d332b7aa61127641ac2d815e8729f3ff3aa037a')
-
-prepare() {
-  for _pkg in ${pkgname[@]}; do
-    mkdir $_pkg
-
-    [[ $_pkg == 'eclipse-common' ]] && continue
-
-    if [[ $CARCH == x86_64 ]]; then
-      bsdtar -C $_pkg -xf "$_pkg-$_release-linux-gtk-x86_64.tar.gz"
-    else
-      bsdtar -C $_pkg -xf "$_pkg-$_release-linux-gtk.tar.gz"
-    fi
-  done
-}
-
-build() {
-  ./commonify ${pkgname[@]}
-}
-
-package_eclipse-common() {
-  pkgdesc+=" (common files)"
-  depends=(java-environment webkitgtk unzip)
-  install=eclipse.install
-
-  install -d "$pkgdir/usr/lib"
-  cp -a eclipse-common/eclipse "$pkgdir/usr/lib"
-
-  install -D eclipse.sh "$pkgdir/usr/bin/eclipse"
-  install -Dm644 eclipse.desktop "$pkgdir/usr/share/applications/eclipse.desktop"
-
-  for _i in 16 32 48 256; do
-    install -Dm644 eclipse-common/eclipse/plugins/org.eclipse.platform_*/eclipse${_i}.png \
-      "$pkgdir/usr/share/icons/hicolor/${_i}x${_i}/apps/eclipse.png"
-  done
-}
-
-_package() {
-  _variant=${1#eclipse-}
-  pkgdesc+=" (${_variant^^} variant)"
-  depends=(eclipse-common)
-  provides=("eclipse=$pkgver-$pkgrel")
-  conflicts=(eclipse)
-
-  case $_variant in
-    java) replaces=(eclipse) ;;
-    cpp)  replaces=(eclipse-cdt) ;;
-  esac
-
-  install -d "$pkgdir/usr/lib"
-  cp -a $1/eclipse "$pkgdir/usr/lib"
-}

Copied: eclipse/repos/testing-i686/PKGBUILD (from rev 241828, eclipse/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2015-07-05 16:33:54 UTC (rev 241829)
@@ -0,0 +1,97 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+# Contributor: Andrew Wright <andreww at photism.org>
+# Contributor: Andreas W. Hauser <andy-aur at splashground.de>
+# Contributor: Marco Crosio <marco.crosio at gmail.com>
+
+pkgbase=eclipse
+pkgname=(eclipse-{common,java,cpp,php})
+pkgver=4.5.0
+pkgrel=3
+_release=mars-R
+pkgdesc="Highly extensible IDE"
+license=("EPL")
+arch=(i686 x86_64)
+url="http://eclipse.org"
+makedepends=(ruby)
+options=(!emptydirs)
+source=(commonify eclipse.sh eclipse.desktop)
+source_i686=()
+source_x86_64=()
+noextract=()
+
+for _pkg in ${pkgname[@]}; do
+  [[ $_pkg == 'eclipse-common' ]] && continue
+  source_i686+=(http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/${_release/-//}/$_pkg-$_release-linux-gtk.tar.gz)
+  source_x86_64+=(http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/${_release/-//}/$_pkg-$_release-linux-gtk-x86_64.tar.gz)
+  noextract+=($_pkg-$_release-linux-gtk{,-x86_64}.tar.gz)
+  eval "package_$_pkg() { _package $_pkg; }"
+done
+
+sha256sums=('becd292c83556fff2eea889ebe6df075056c6343b88f95abd6abbd04253d82c9'
+            '04e789fb695d5f95d09ddb994ae30397b39aee35f11997465dd91d129c41b2ed'
+            '57559c2548ae463089acb3c2825ebc002ed83067ddc953b23d36a7b5a02deaf3')
+sha256sums_i686=('43089aa4738d05e92fd24cf320336e8ab1cfd2e66ce07de9955a40bf7a08de87'
+                 '1b1d7a9aaf27d7dd6dcb9fd7b04629f687fb43e6db8c3299c092e0f554b174f4'
+                 '93769a4b8a1d12fb95dd1a848339104032a08b3e00dcf0c597bbf471f3359073')
+sha256sums_x86_64=('2eeea5e563001f6812bad97e159befe4152bf8ef49124c98e635fd68104a1727'
+                   'a990130c1529fcd8c3b3904f37fd8fe26c4c024be4863ccc7a9b2f16908ad49f'
+                   'f93d0f6a8fc03077887049080d332b7aa61127641ac2d815e8729f3ff3aa037a')
+
+prepare() {
+  mkdir eclipse-common
+
+  for _pkg in ${pkgname[@]}; do
+    [[ $_pkg == 'eclipse-common' ]] && continue
+
+    if [[ $CARCH == x86_64 ]]; then
+      bsdtar -xf "$_pkg-$_release-linux-gtk-x86_64.tar.gz"
+    else
+      bsdtar -xf "$_pkg-$_release-linux-gtk.tar.gz"
+    fi
+
+    mv eclipse $_pkg
+  done
+}
+
+build() {
+  ./commonify ${pkgname[@]}
+
+  mkdir -p eclipse-common/dropins
+  touch eclipse-common/dropins/.keep
+}
+
+package_eclipse-common() {
+  pkgdesc+=" (common files)"
+  depends=(java-environment webkitgtk unzip)
+  install=eclipse.install
+
+  install -d "$pkgdir/usr/lib"
+  cp -a eclipse-common "$pkgdir/usr/lib/eclipse"
+
+  install -D eclipse.sh "$pkgdir/usr/bin/eclipse"
+  install -Dm644 eclipse.desktop "$pkgdir/usr/share/applications/eclipse.desktop"
+
+  for _i in 16 32 48 256; do
+    install -Dm644 eclipse-common/plugins/org.eclipse.platform_*/eclipse${_i}.png \
+      "$pkgdir/usr/share/icons/hicolor/${_i}x${_i}/apps/eclipse.png"
+  done
+}
+
+_package() {
+  _variant=${1#eclipse-}
+  pkgdesc+=" (${_variant^^} variant)"
+  depends=(eclipse-common)
+  provides=("eclipse=$pkgver-$pkgrel")
+  conflicts=(eclipse)
+
+  case $_variant in
+    java) replaces=(eclipse) ;;
+    cpp)  replaces=(eclipse-cdt) ;;
+  esac
+
+  install -d "$pkgdir/usr/lib"
+  cp -a $1 "$pkgdir/usr/lib/eclipse"
+}

Deleted: testing-i686/commonify
===================================================================
--- testing-i686/commonify	2015-07-05 15:19:06 UTC (rev 241828)
+++ testing-i686/commonify	2015-07-05 16:33:54 UTC (rev 241829)
@@ -1,39 +0,0 @@
-#!/usr/bin/env ruby
-require 'set'
-require 'fileutils'
-
-common = ARGV.shift
-targets = ARGV.dup
-first, *rest = targets
-
-files = targets.map do |dir|
-  Dir.chdir dir
-  g = Dir.glob("**/*").select { |file| test(?f, file) }
-  Dir.chdir ".."
-  puts "#{dir}: Found #{g.size} files"
-  Set.new(g)
-end
-
-commonfiles = files.inject(:&)
-puts "#{commonfiles.size} common files"
-
-samefiles = 0
-commonfiles.each do |file|
-  firstfile = File.join first, file
-  targetfiles = rest.map { |target| File.join target, file }
-
-  is_same = targetfiles.all? do |targetfile|
-    system "diff", "-q", firstfile, targetfile,
-      in: "/dev/null", out: "/dev/null", err: [:child, :out]
-  end
-
-  if is_same
-    commonfile = File.join common, file
-    FileUtils.mkdir_p File.dirname(commonfile)
-    FileUtils.mv firstfile, commonfile
-    FileUtils.rm(targetfiles)
-    samefiles += 1
-  end
-end
-
-puts "#{common}: #{samefiles} identical common files"

Copied: eclipse/repos/testing-i686/commonify (from rev 241828, eclipse/trunk/commonify)
===================================================================
--- testing-i686/commonify	                        (rev 0)
+++ testing-i686/commonify	2015-07-05 16:33:54 UTC (rev 241829)
@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+require 'set'
+require 'fileutils'
+
+common = ARGV.shift
+targets = ARGV.dup
+first, *rest = targets
+
+files = targets.map do |dir|
+  Dir.chdir dir
+  g = Dir.glob("**/*").select { |file| test(?f, file) }
+  Dir.chdir ".."
+  puts "#{dir}: Found #{g.size} files"
+  Set.new(g)
+end
+
+commonfiles = files.inject(:&)
+puts "#{commonfiles.size} common files"
+
+samefiles = 0
+commonfiles.each do |file|
+  firstfile = File.join first, file
+  targetfiles = rest.map { |target| File.join target, file }
+
+  is_same = targetfiles.all? do |targetfile|
+    system "diff", "-q", firstfile, targetfile,
+      in: "/dev/null", out: "/dev/null", err: [:child, :out]
+  end
+
+  if is_same
+    commonfile = File.join common, file
+    FileUtils.mkdir_p File.dirname(commonfile)
+    FileUtils.mv firstfile, commonfile
+    FileUtils.rm(targetfiles)
+    samefiles += 1
+  end
+end
+
+puts "#{common}: #{samefiles} identical common files"

Deleted: testing-i686/eclipse.desktop
===================================================================
--- testing-i686/eclipse.desktop	2015-07-05 15:19:06 UTC (rev 241828)
+++ testing-i686/eclipse.desktop	2015-07-05 16:33:54 UTC (rev 241829)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Eclipse
-Comment=A Java Development Environment
-Icon=eclipse
-Exec=eclipse
-Terminal=false
-Type=Application
-Categories=Development;IDE;Java;
-StartupNotify=true

Copied: eclipse/repos/testing-i686/eclipse.desktop (from rev 241828, eclipse/trunk/eclipse.desktop)
===================================================================
--- testing-i686/eclipse.desktop	                        (rev 0)
+++ testing-i686/eclipse.desktop	2015-07-05 16:33:54 UTC (rev 241829)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Eclipse
+Comment=A Java Development Environment
+Icon=eclipse
+Exec=eclipse
+Terminal=false
+Type=Application
+Categories=Development;IDE;Java;
+StartupNotify=true

Deleted: testing-i686/eclipse.install
===================================================================
--- testing-i686/eclipse.install	2015-07-05 15:19:06 UTC (rev 241828)
+++ testing-i686/eclipse.install	2015-07-05 16:33:54 UTC (rev 241829)
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: eclipse/repos/testing-i686/eclipse.install (from rev 241828, eclipse/trunk/eclipse.install)
===================================================================
--- testing-i686/eclipse.install	                        (rev 0)
+++ testing-i686/eclipse.install	2015-07-05 16:33:54 UTC (rev 241829)
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Deleted: testing-i686/eclipse.sh
===================================================================
--- testing-i686/eclipse.sh	2015-07-05 15:19:06 UTC (rev 241828)
+++ testing-i686/eclipse.sh	2015-07-05 16:33:54 UTC (rev 241829)
@@ -1,3 +0,0 @@
-#!/bin/bash
-export ECLIPSE_HOME=/usr/lib/eclipse
-exec ${ECLIPSE_HOME}/eclipse "$@"

Copied: eclipse/repos/testing-i686/eclipse.sh (from rev 241828, eclipse/trunk/eclipse.sh)
===================================================================
--- testing-i686/eclipse.sh	                        (rev 0)
+++ testing-i686/eclipse.sh	2015-07-05 16:33:54 UTC (rev 241829)
@@ -0,0 +1,3 @@
+#!/bin/bash
+export ECLIPSE_HOME=/usr/lib/eclipse
+exec ${ECLIPSE_HOME}/eclipse "$@"

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2015-07-05 15:19:06 UTC (rev 241828)
+++ testing-x86_64/PKGBUILD	2015-07-05 16:33:54 UTC (rev 241829)
@@ -1,92 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Paul Mattal <paul at archlinux.org>
-# Contributor: Andrew Wright <andreww at photism.org>
-# Contributor: Andreas W. Hauser <andy-aur at splashground.de>
-# Contributor: Marco Crosio <marco.crosio at gmail.com>
-
-pkgbase=eclipse
-pkgname=(eclipse-{common,java,cpp,php})
-pkgver=4.5.0
-pkgrel=2
-_release=mars-R
-pkgdesc="Highly extensible IDE"
-license=("EPL")
-arch=(i686 x86_64)
-url="http://eclipse.org"
-makedepends=(ruby)
-options=(!emptydirs)
-source=(commonify eclipse.sh eclipse.desktop)
-source_i686=()
-source_x86_64=()
-noextract=()
-
-for _pkg in ${pkgname[@]}; do
-  [[ $_pkg == 'eclipse-common' ]] && continue
-  source_i686+=(http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/${_release/-//}/$_pkg-$_release-linux-gtk.tar.gz)
-  source_x86_64+=(http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/${_release/-//}/$_pkg-$_release-linux-gtk-x86_64.tar.gz)
-  noextract+=($_pkg-$_release-linux-gtk{,-x86_64}.tar.gz)
-  eval "package_$_pkg() { _package $_pkg; }"
-done
-
-sha256sums=('becd292c83556fff2eea889ebe6df075056c6343b88f95abd6abbd04253d82c9'
-            '04e789fb695d5f95d09ddb994ae30397b39aee35f11997465dd91d129c41b2ed'
-            '57559c2548ae463089acb3c2825ebc002ed83067ddc953b23d36a7b5a02deaf3')
-sha256sums_i686=('43089aa4738d05e92fd24cf320336e8ab1cfd2e66ce07de9955a40bf7a08de87'
-                 '1b1d7a9aaf27d7dd6dcb9fd7b04629f687fb43e6db8c3299c092e0f554b174f4'
-                 '93769a4b8a1d12fb95dd1a848339104032a08b3e00dcf0c597bbf471f3359073')
-sha256sums_x86_64=('2eeea5e563001f6812bad97e159befe4152bf8ef49124c98e635fd68104a1727'
-                   'a990130c1529fcd8c3b3904f37fd8fe26c4c024be4863ccc7a9b2f16908ad49f'
-                   'f93d0f6a8fc03077887049080d332b7aa61127641ac2d815e8729f3ff3aa037a')
-
-prepare() {
-  for _pkg in ${pkgname[@]}; do
-    mkdir $_pkg
-
-    [[ $_pkg == 'eclipse-common' ]] && continue
-
-    if [[ $CARCH == x86_64 ]]; then
-      bsdtar -C $_pkg -xf "$_pkg-$_release-linux-gtk-x86_64.tar.gz"
-    else
-      bsdtar -C $_pkg -xf "$_pkg-$_release-linux-gtk.tar.gz"
-    fi
-  done
-}
-
-build() {
-  ./commonify ${pkgname[@]}
-}
-
-package_eclipse-common() {
-  pkgdesc+=" (common files)"
-  depends=(java-environment webkitgtk unzip)
-  install=eclipse.install
-
-  install -d "$pkgdir/usr/lib"
-  cp -a eclipse-common/eclipse "$pkgdir/usr/lib"
-
-  install -D eclipse.sh "$pkgdir/usr/bin/eclipse"
-  install -Dm644 eclipse.desktop "$pkgdir/usr/share/applications/eclipse.desktop"
-
-  for _i in 16 32 48 256; do
-    install -Dm644 eclipse-common/eclipse/plugins/org.eclipse.platform_*/eclipse${_i}.png \
-      "$pkgdir/usr/share/icons/hicolor/${_i}x${_i}/apps/eclipse.png"
-  done
-}
-
-_package() {
-  _variant=${1#eclipse-}
-  pkgdesc+=" (${_variant^^} variant)"
-  depends=(eclipse-common)
-  provides=("eclipse=$pkgver-$pkgrel")
-  conflicts=(eclipse)
-
-  case $_variant in
-    java) replaces=(eclipse) ;;
-    cpp)  replaces=(eclipse-cdt) ;;
-  esac
-
-  install -d "$pkgdir/usr/lib"
-  cp -a $1/eclipse "$pkgdir/usr/lib"
-}

Copied: eclipse/repos/testing-x86_64/PKGBUILD (from rev 241828, eclipse/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2015-07-05 16:33:54 UTC (rev 241829)
@@ -0,0 +1,97 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+# Contributor: Andrew Wright <andreww at photism.org>
+# Contributor: Andreas W. Hauser <andy-aur at splashground.de>
+# Contributor: Marco Crosio <marco.crosio at gmail.com>
+
+pkgbase=eclipse
+pkgname=(eclipse-{common,java,cpp,php})
+pkgver=4.5.0
+pkgrel=3
+_release=mars-R
+pkgdesc="Highly extensible IDE"
+license=("EPL")
+arch=(i686 x86_64)
+url="http://eclipse.org"
+makedepends=(ruby)
+options=(!emptydirs)
+source=(commonify eclipse.sh eclipse.desktop)
+source_i686=()
+source_x86_64=()
+noextract=()
+
+for _pkg in ${pkgname[@]}; do
+  [[ $_pkg == 'eclipse-common' ]] && continue
+  source_i686+=(http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/${_release/-//}/$_pkg-$_release-linux-gtk.tar.gz)
+  source_x86_64+=(http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/${_release/-//}/$_pkg-$_release-linux-gtk-x86_64.tar.gz)
+  noextract+=($_pkg-$_release-linux-gtk{,-x86_64}.tar.gz)
+  eval "package_$_pkg() { _package $_pkg; }"
+done
+
+sha256sums=('becd292c83556fff2eea889ebe6df075056c6343b88f95abd6abbd04253d82c9'
+            '04e789fb695d5f95d09ddb994ae30397b39aee35f11997465dd91d129c41b2ed'
+            '57559c2548ae463089acb3c2825ebc002ed83067ddc953b23d36a7b5a02deaf3')
+sha256sums_i686=('43089aa4738d05e92fd24cf320336e8ab1cfd2e66ce07de9955a40bf7a08de87'
+                 '1b1d7a9aaf27d7dd6dcb9fd7b04629f687fb43e6db8c3299c092e0f554b174f4'
+                 '93769a4b8a1d12fb95dd1a848339104032a08b3e00dcf0c597bbf471f3359073')
+sha256sums_x86_64=('2eeea5e563001f6812bad97e159befe4152bf8ef49124c98e635fd68104a1727'
+                   'a990130c1529fcd8c3b3904f37fd8fe26c4c024be4863ccc7a9b2f16908ad49f'
+                   'f93d0f6a8fc03077887049080d332b7aa61127641ac2d815e8729f3ff3aa037a')
+
+prepare() {
+  mkdir eclipse-common
+
+  for _pkg in ${pkgname[@]}; do
+    [[ $_pkg == 'eclipse-common' ]] && continue
+
+    if [[ $CARCH == x86_64 ]]; then
+      bsdtar -xf "$_pkg-$_release-linux-gtk-x86_64.tar.gz"
+    else
+      bsdtar -xf "$_pkg-$_release-linux-gtk.tar.gz"
+    fi
+
+    mv eclipse $_pkg
+  done
+}
+
+build() {
+  ./commonify ${pkgname[@]}
+
+  mkdir -p eclipse-common/dropins
+  touch eclipse-common/dropins/.keep
+}
+
+package_eclipse-common() {
+  pkgdesc+=" (common files)"
+  depends=(java-environment webkitgtk unzip)
+  install=eclipse.install
+
+  install -d "$pkgdir/usr/lib"
+  cp -a eclipse-common "$pkgdir/usr/lib/eclipse"
+
+  install -D eclipse.sh "$pkgdir/usr/bin/eclipse"
+  install -Dm644 eclipse.desktop "$pkgdir/usr/share/applications/eclipse.desktop"
+
+  for _i in 16 32 48 256; do
+    install -Dm644 eclipse-common/plugins/org.eclipse.platform_*/eclipse${_i}.png \
+      "$pkgdir/usr/share/icons/hicolor/${_i}x${_i}/apps/eclipse.png"
+  done
+}
+
+_package() {
+  _variant=${1#eclipse-}
+  pkgdesc+=" (${_variant^^} variant)"
+  depends=(eclipse-common)
+  provides=("eclipse=$pkgver-$pkgrel")
+  conflicts=(eclipse)
+
+  case $_variant in
+    java) replaces=(eclipse) ;;
+    cpp)  replaces=(eclipse-cdt) ;;
+  esac
+
+  install -d "$pkgdir/usr/lib"
+  cp -a $1 "$pkgdir/usr/lib/eclipse"
+}

Deleted: testing-x86_64/commonify
===================================================================
--- testing-x86_64/commonify	2015-07-05 15:19:06 UTC (rev 241828)
+++ testing-x86_64/commonify	2015-07-05 16:33:54 UTC (rev 241829)
@@ -1,39 +0,0 @@
-#!/usr/bin/env ruby
-require 'set'
-require 'fileutils'
-
-common = ARGV.shift
-targets = ARGV.dup
-first, *rest = targets
-
-files = targets.map do |dir|
-  Dir.chdir dir
-  g = Dir.glob("**/*").select { |file| test(?f, file) }
-  Dir.chdir ".."
-  puts "#{dir}: Found #{g.size} files"
-  Set.new(g)
-end
-
-commonfiles = files.inject(:&)
-puts "#{commonfiles.size} common files"
-
-samefiles = 0
-commonfiles.each do |file|
-  firstfile = File.join first, file
-  targetfiles = rest.map { |target| File.join target, file }
-
-  is_same = targetfiles.all? do |targetfile|
-    system "diff", "-q", firstfile, targetfile,
-      in: "/dev/null", out: "/dev/null", err: [:child, :out]
-  end
-
-  if is_same
-    commonfile = File.join common, file
-    FileUtils.mkdir_p File.dirname(commonfile)
-    FileUtils.mv firstfile, commonfile
-    FileUtils.rm(targetfiles)
-    samefiles += 1
-  end
-end
-
-puts "#{common}: #{samefiles} identical common files"

Copied: eclipse/repos/testing-x86_64/commonify (from rev 241828, eclipse/trunk/commonify)
===================================================================
--- testing-x86_64/commonify	                        (rev 0)
+++ testing-x86_64/commonify	2015-07-05 16:33:54 UTC (rev 241829)
@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+require 'set'
+require 'fileutils'
+
+common = ARGV.shift
+targets = ARGV.dup
+first, *rest = targets
+
+files = targets.map do |dir|
+  Dir.chdir dir
+  g = Dir.glob("**/*").select { |file| test(?f, file) }
+  Dir.chdir ".."
+  puts "#{dir}: Found #{g.size} files"
+  Set.new(g)
+end
+
+commonfiles = files.inject(:&)
+puts "#{commonfiles.size} common files"
+
+samefiles = 0
+commonfiles.each do |file|
+  firstfile = File.join first, file
+  targetfiles = rest.map { |target| File.join target, file }
+
+  is_same = targetfiles.all? do |targetfile|
+    system "diff", "-q", firstfile, targetfile,
+      in: "/dev/null", out: "/dev/null", err: [:child, :out]
+  end
+
+  if is_same
+    commonfile = File.join common, file
+    FileUtils.mkdir_p File.dirname(commonfile)
+    FileUtils.mv firstfile, commonfile
+    FileUtils.rm(targetfiles)
+    samefiles += 1
+  end
+end
+
+puts "#{common}: #{samefiles} identical common files"

Deleted: testing-x86_64/eclipse.desktop
===================================================================
--- testing-x86_64/eclipse.desktop	2015-07-05 15:19:06 UTC (rev 241828)
+++ testing-x86_64/eclipse.desktop	2015-07-05 16:33:54 UTC (rev 241829)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Eclipse
-Comment=A Java Development Environment
-Icon=eclipse
-Exec=eclipse
-Terminal=false
-Type=Application
-Categories=Development;IDE;Java;
-StartupNotify=true

Copied: eclipse/repos/testing-x86_64/eclipse.desktop (from rev 241828, eclipse/trunk/eclipse.desktop)
===================================================================
--- testing-x86_64/eclipse.desktop	                        (rev 0)
+++ testing-x86_64/eclipse.desktop	2015-07-05 16:33:54 UTC (rev 241829)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Eclipse
+Comment=A Java Development Environment
+Icon=eclipse
+Exec=eclipse
+Terminal=false
+Type=Application
+Categories=Development;IDE;Java;
+StartupNotify=true

Deleted: testing-x86_64/eclipse.install
===================================================================
--- testing-x86_64/eclipse.install	2015-07-05 15:19:06 UTC (rev 241828)
+++ testing-x86_64/eclipse.install	2015-07-05 16:33:54 UTC (rev 241829)
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: eclipse/repos/testing-x86_64/eclipse.install (from rev 241828, eclipse/trunk/eclipse.install)
===================================================================
--- testing-x86_64/eclipse.install	                        (rev 0)
+++ testing-x86_64/eclipse.install	2015-07-05 16:33:54 UTC (rev 241829)
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Deleted: testing-x86_64/eclipse.sh
===================================================================
--- testing-x86_64/eclipse.sh	2015-07-05 15:19:06 UTC (rev 241828)
+++ testing-x86_64/eclipse.sh	2015-07-05 16:33:54 UTC (rev 241829)
@@ -1,3 +0,0 @@
-#!/bin/bash
-export ECLIPSE_HOME=/usr/lib/eclipse
-exec ${ECLIPSE_HOME}/eclipse "$@"

Copied: eclipse/repos/testing-x86_64/eclipse.sh (from rev 241828, eclipse/trunk/eclipse.sh)
===================================================================
--- testing-x86_64/eclipse.sh	                        (rev 0)
+++ testing-x86_64/eclipse.sh	2015-07-05 16:33:54 UTC (rev 241829)
@@ -0,0 +1,3 @@
+#!/bin/bash
+export ECLIPSE_HOME=/usr/lib/eclipse
+exec ${ECLIPSE_HOME}/eclipse "$@"



More information about the arch-commits mailing list