Date: Friday, June 24, 2016 @ 12:07:38 Author: heftig Revision: 270553
archrelease: copy trunk to testing-i686, testing-x86_64 Added: eclipse/repos/testing-i686/ eclipse/repos/testing-i686/PKGBUILD (from rev 270552, eclipse/trunk/PKGBUILD) eclipse/repos/testing-i686/commonify (from rev 270552, eclipse/trunk/commonify) eclipse/repos/testing-i686/eclipse.desktop (from rev 270552, eclipse/trunk/eclipse.desktop) eclipse/repos/testing-i686/eclipse.install (from rev 270552, eclipse/trunk/eclipse.install) eclipse/repos/testing-i686/eclipse.sh (from rev 270552, eclipse/trunk/eclipse.sh) eclipse/repos/testing-x86_64/ eclipse/repos/testing-x86_64/PKGBUILD (from rev 270552, eclipse/trunk/PKGBUILD) eclipse/repos/testing-x86_64/commonify (from rev 270552, eclipse/trunk/commonify) eclipse/repos/testing-x86_64/eclipse.desktop (from rev 270552, eclipse/trunk/eclipse.desktop) eclipse/repos/testing-x86_64/eclipse.install (from rev 270552, eclipse/trunk/eclipse.install) eclipse/repos/testing-x86_64/eclipse.sh (from rev 270552, eclipse/trunk/eclipse.sh) --------------------------------+ testing-i686/PKGBUILD | 99 +++++++++++++++++++++++++++++++++++++++ testing-i686/commonify | 41 ++++++++++++++++ testing-i686/eclipse.desktop | 9 +++ testing-i686/eclipse.install | 11 ++++ testing-i686/eclipse.sh | 3 + testing-x86_64/PKGBUILD | 99 +++++++++++++++++++++++++++++++++++++++ testing-x86_64/commonify | 41 ++++++++++++++++ testing-x86_64/eclipse.desktop | 9 +++ testing-x86_64/eclipse.install | 11 ++++ testing-x86_64/eclipse.sh | 3 + 10 files changed, 326 insertions(+) Copied: eclipse/repos/testing-i686/PKGBUILD (from rev 270552, eclipse/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2016-06-24 12:07:38 UTC (rev 270553) @@ -0,0 +1,99 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Ionut Biru <ib...@archlinux.org> +# Contributor: Paul Mattal <p...@archlinux.org> +# Contributor: Andrew Wright <andr...@photism.org> +# Contributor: Andreas W. Hauser <andy-...@splashground.de> +# Contributor: Marco Crosio <marco.cro...@gmail.com> + +pkgbase=eclipse +pkgname=(eclipse-{common,java,jee,cpp,php}) +pkgver=4.6.0 +pkgrel=1 +_release=neon-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=('9f8980078c97fb3020ba2e9c6c07eac077b932406aba3e2d6a4763a5d299290d' + '04e789fb695d5f95d09ddb994ae30397b39aee35f11997465dd91d129c41b2ed' + '57559c2548ae463089acb3c2825ebc002ed83067ddc953b23d36a7b5a02deaf3') +sha256sums_i686=('3e09e203e0a8682bc3d6ddf218df788e2b9dc064b370a980f63e3e2fa4ae2e3f' + '6689bab833e854b3ef619e181587eaa823b2dc7498fea730bedbf568d0f24391' + 'b0d85ed3612a6928a96c552ae01631b7cecc7ed81206cbebd2670b8171c52228' + '05130e4f1c9f55410f80d1d1e603318550276d7cf19f7d26cd2e6dbed9dd7fd5') +sha256sums_x86_64=('ca06e10df42eab462f130aa89658f9c75f1df61ba79ede02fb7bb748f4544c34' + '3a97e2b9e99b09cb6b18bc22fab05977838618999fe62051e52352ae9f00b8f1' + 'd54430fb0ae4a01591c1e2084fc6d28b7c32629c990df08fddb839b9f6d3d825' + '0fe0d9735816d9106ca800a13c581aae7ad52566a06862f2f2dd92c873859d3c') + +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" +} Copied: eclipse/repos/testing-i686/commonify (from rev 270552, eclipse/trunk/commonify) =================================================================== --- testing-i686/commonify (rev 0) +++ testing-i686/commonify 2016-06-24 12:07:38 UTC (rev 270553) @@ -0,0 +1,41 @@ +#!/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 + else + puts "Divergent common file: #{file}" + end +end + +puts "#{common}: #{samefiles} identical common files" Copied: eclipse/repos/testing-i686/eclipse.desktop (from rev 270552, eclipse/trunk/eclipse.desktop) =================================================================== --- testing-i686/eclipse.desktop (rev 0) +++ testing-i686/eclipse.desktop 2016-06-24 12:07:38 UTC (rev 270553) @@ -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 Copied: eclipse/repos/testing-i686/eclipse.install (from rev 270552, eclipse/trunk/eclipse.install) =================================================================== --- testing-i686/eclipse.install (rev 0) +++ testing-i686/eclipse.install 2016-06-24 12:07:38 UTC (rev 270553) @@ -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 +} Copied: eclipse/repos/testing-i686/eclipse.sh (from rev 270552, eclipse/trunk/eclipse.sh) =================================================================== --- testing-i686/eclipse.sh (rev 0) +++ testing-i686/eclipse.sh 2016-06-24 12:07:38 UTC (rev 270553) @@ -0,0 +1,3 @@ +#!/bin/bash +export ECLIPSE_HOME=/usr/lib/eclipse +exec ${ECLIPSE_HOME}/eclipse "$@" Copied: eclipse/repos/testing-x86_64/PKGBUILD (from rev 270552, eclipse/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2016-06-24 12:07:38 UTC (rev 270553) @@ -0,0 +1,99 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Ionut Biru <ib...@archlinux.org> +# Contributor: Paul Mattal <p...@archlinux.org> +# Contributor: Andrew Wright <andr...@photism.org> +# Contributor: Andreas W. Hauser <andy-...@splashground.de> +# Contributor: Marco Crosio <marco.cro...@gmail.com> + +pkgbase=eclipse +pkgname=(eclipse-{common,java,jee,cpp,php}) +pkgver=4.6.0 +pkgrel=1 +_release=neon-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=('9f8980078c97fb3020ba2e9c6c07eac077b932406aba3e2d6a4763a5d299290d' + '04e789fb695d5f95d09ddb994ae30397b39aee35f11997465dd91d129c41b2ed' + '57559c2548ae463089acb3c2825ebc002ed83067ddc953b23d36a7b5a02deaf3') +sha256sums_i686=('3e09e203e0a8682bc3d6ddf218df788e2b9dc064b370a980f63e3e2fa4ae2e3f' + '6689bab833e854b3ef619e181587eaa823b2dc7498fea730bedbf568d0f24391' + 'b0d85ed3612a6928a96c552ae01631b7cecc7ed81206cbebd2670b8171c52228' + '05130e4f1c9f55410f80d1d1e603318550276d7cf19f7d26cd2e6dbed9dd7fd5') +sha256sums_x86_64=('ca06e10df42eab462f130aa89658f9c75f1df61ba79ede02fb7bb748f4544c34' + '3a97e2b9e99b09cb6b18bc22fab05977838618999fe62051e52352ae9f00b8f1' + 'd54430fb0ae4a01591c1e2084fc6d28b7c32629c990df08fddb839b9f6d3d825' + '0fe0d9735816d9106ca800a13c581aae7ad52566a06862f2f2dd92c873859d3c') + +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" +} Copied: eclipse/repos/testing-x86_64/commonify (from rev 270552, eclipse/trunk/commonify) =================================================================== --- testing-x86_64/commonify (rev 0) +++ testing-x86_64/commonify 2016-06-24 12:07:38 UTC (rev 270553) @@ -0,0 +1,41 @@ +#!/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 + else + puts "Divergent common file: #{file}" + end +end + +puts "#{common}: #{samefiles} identical common files" Copied: eclipse/repos/testing-x86_64/eclipse.desktop (from rev 270552, eclipse/trunk/eclipse.desktop) =================================================================== --- testing-x86_64/eclipse.desktop (rev 0) +++ testing-x86_64/eclipse.desktop 2016-06-24 12:07:38 UTC (rev 270553) @@ -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 Copied: eclipse/repos/testing-x86_64/eclipse.install (from rev 270552, eclipse/trunk/eclipse.install) =================================================================== --- testing-x86_64/eclipse.install (rev 0) +++ testing-x86_64/eclipse.install 2016-06-24 12:07:38 UTC (rev 270553) @@ -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 +} Copied: eclipse/repos/testing-x86_64/eclipse.sh (from rev 270552, eclipse/trunk/eclipse.sh) =================================================================== --- testing-x86_64/eclipse.sh (rev 0) +++ testing-x86_64/eclipse.sh 2016-06-24 12:07:38 UTC (rev 270553) @@ -0,0 +1,3 @@ +#!/bin/bash +export ECLIPSE_HOME=/usr/lib/eclipse +exec ${ECLIPSE_HOME}/eclipse "$@"