Date: Thursday, December 22, 2016 @ 03:47:09 Author: heftig Revision: 284417
archrelease: copy trunk to extra-i686, extra-x86_64 Added: eclipse/repos/extra-i686/PKGBUILD (from rev 284416, eclipse/trunk/PKGBUILD) eclipse/repos/extra-i686/commonify (from rev 284416, eclipse/trunk/commonify) eclipse/repos/extra-i686/eclipse.desktop (from rev 284416, eclipse/trunk/eclipse.desktop) eclipse/repos/extra-i686/eclipse.install (from rev 284416, eclipse/trunk/eclipse.install) eclipse/repos/extra-i686/eclipse.sh (from rev 284416, eclipse/trunk/eclipse.sh) eclipse/repos/extra-x86_64/PKGBUILD (from rev 284416, eclipse/trunk/PKGBUILD) eclipse/repos/extra-x86_64/commonify (from rev 284416, eclipse/trunk/commonify) eclipse/repos/extra-x86_64/eclipse.desktop (from rev 284416, eclipse/trunk/eclipse.desktop) eclipse/repos/extra-x86_64/eclipse.install (from rev 284416, eclipse/trunk/eclipse.install) eclipse/repos/extra-x86_64/eclipse.sh (from rev 284416, eclipse/trunk/eclipse.sh) Deleted: eclipse/repos/extra-i686/PKGBUILD eclipse/repos/extra-i686/commonify eclipse/repos/extra-i686/eclipse.desktop eclipse/repos/extra-i686/eclipse.install eclipse/repos/extra-i686/eclipse.sh eclipse/repos/extra-x86_64/PKGBUILD eclipse/repos/extra-x86_64/commonify eclipse/repos/extra-x86_64/eclipse.desktop eclipse/repos/extra-x86_64/eclipse.install eclipse/repos/extra-x86_64/eclipse.sh ------------------------------+ /PKGBUILD | 198 +++++++++++++++++++++++++++++++++++++++++ /commonify | 82 ++++++++++++++++ /eclipse.desktop | 18 +++ /eclipse.install | 22 ++++ /eclipse.sh | 6 + extra-i686/PKGBUILD | 99 -------------------- extra-i686/commonify | 41 -------- extra-i686/eclipse.desktop | 9 - extra-i686/eclipse.install | 11 -- extra-i686/eclipse.sh | 3 extra-x86_64/PKGBUILD | 99 -------------------- extra-x86_64/commonify | 41 -------- extra-x86_64/eclipse.desktop | 9 - extra-x86_64/eclipse.install | 11 -- extra-x86_64/eclipse.sh | 3 15 files changed, 326 insertions(+), 326 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-12-22 02:12:45 UTC (rev 284416) +++ extra-i686/PKGBUILD 2016-12-22 03:47:09 UTC (rev 284417) @@ -1,99 +0,0 @@ -# $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.1.a -pkgrel=1 -_release=neon-1a -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=('45bfc03c8e8afe114f2f557286d70066193a020d1dcaf71787405f6abd08d1c6' - '48f4945410461cadb265212419c4b8de2e5bc025b1e0c3545e2b81f9ea52f3db' - 'c7802f58d8e740b2f707c18afe46bf061752130b4bff8fdfea5791c1f29fe989' - '89259ca766214901589f10b5e558cff53d9f8dda5eced07975cdd64fe5075432') -sha256sums_x86_64=('cd22d953dee2db30d86c51a50189dd062c8ac68c5776cbe525a7f852986f23b5' - 'edadd11440d94436665ca0435e8e1a371cef3b187e9d85a17be301e1ee1fc807' - '7b7e720035cd5269882cc6be4ea9c7cde6190a574a5e3d6faee86e03a0752217' - '28dadc855f0baf02f579630ebc9ad1cc1dfe1ef58315b2f1813a7cc35ae59dac') - -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>=8" 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/extra-i686/PKGBUILD (from rev 284416, eclipse/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-12-22 03:47:09 UTC (rev 284417) @@ -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.2 +pkgrel=1 +_release=neon-2 +pkgdesc="Highly extensible IDE" +license=(EPL) +arch=(i686 x86_64) +url="https://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=('44b8c068a9a199817852b58325b90add3905e27ed33f4eb89197f6eb4c7c3be0' + '5ce5a860385ed1cf7fc1ce16c7eec47b30b531bdecd9ab20db1496addd484cab' + 'a38a2133cb7edad8944fdadeee9e0ea60742c74db3c1eeb98b2659eb12be5771' + '6476a76a5e7cf98fd3610d11b7b53fd6305071357aba06c658d6c8be027bfa04') +sha256sums_x86_64=('b276ee8af940d37b9339ecb639c23953a25584af8564526be06e0cc95f2f6a60' + '264b353a94a98d122aaa83b04957391cdd31b71782b2f83a2ef52a32cc5d75c5' + '31f6a535c818a39ff7b622fe90943b35e8fbf2b647fd9188e7b19c36584d9bc9' + 'b71f696f9c7645aefdc2b1f03e0c819e2152094203ecd0b04ea220cb17a6d2cd') + +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>=8" 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: extra-i686/commonify =================================================================== --- extra-i686/commonify 2016-12-22 02:12:45 UTC (rev 284416) +++ extra-i686/commonify 2016-12-22 03:47:09 UTC (rev 284417) @@ -1,41 +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 - else - puts "Divergent common file: #{file}" - end -end - -puts "#{common}: #{samefiles} identical common files" Copied: eclipse/repos/extra-i686/commonify (from rev 284416, eclipse/trunk/commonify) =================================================================== --- extra-i686/commonify (rev 0) +++ extra-i686/commonify 2016-12-22 03:47:09 UTC (rev 284417) @@ -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" Deleted: extra-i686/eclipse.desktop =================================================================== --- extra-i686/eclipse.desktop 2016-12-22 02:12:45 UTC (rev 284416) +++ extra-i686/eclipse.desktop 2016-12-22 03:47:09 UTC (rev 284417) @@ -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/extra-i686/eclipse.desktop (from rev 284416, eclipse/trunk/eclipse.desktop) =================================================================== --- extra-i686/eclipse.desktop (rev 0) +++ extra-i686/eclipse.desktop 2016-12-22 03:47:09 UTC (rev 284417) @@ -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: extra-i686/eclipse.install =================================================================== --- extra-i686/eclipse.install 2016-12-22 02:12:45 UTC (rev 284416) +++ extra-i686/eclipse.install 2016-12-22 03:47:09 UTC (rev 284417) @@ -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/extra-i686/eclipse.install (from rev 284416, eclipse/trunk/eclipse.install) =================================================================== --- extra-i686/eclipse.install (rev 0) +++ extra-i686/eclipse.install 2016-12-22 03:47:09 UTC (rev 284417) @@ -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: extra-i686/eclipse.sh =================================================================== --- extra-i686/eclipse.sh 2016-12-22 02:12:45 UTC (rev 284416) +++ extra-i686/eclipse.sh 2016-12-22 03:47:09 UTC (rev 284417) @@ -1,3 +0,0 @@ -#!/bin/bash -export ECLIPSE_HOME=/usr/lib/eclipse -exec ${ECLIPSE_HOME}/eclipse "$@" Copied: eclipse/repos/extra-i686/eclipse.sh (from rev 284416, eclipse/trunk/eclipse.sh) =================================================================== --- extra-i686/eclipse.sh (rev 0) +++ extra-i686/eclipse.sh 2016-12-22 03:47:09 UTC (rev 284417) @@ -0,0 +1,3 @@ +#!/bin/bash +export ECLIPSE_HOME=/usr/lib/eclipse +exec ${ECLIPSE_HOME}/eclipse "$@" Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2016-12-22 02:12:45 UTC (rev 284416) +++ extra-x86_64/PKGBUILD 2016-12-22 03:47:09 UTC (rev 284417) @@ -1,99 +0,0 @@ -# $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.1.a -pkgrel=1 -_release=neon-1a -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=('45bfc03c8e8afe114f2f557286d70066193a020d1dcaf71787405f6abd08d1c6' - '48f4945410461cadb265212419c4b8de2e5bc025b1e0c3545e2b81f9ea52f3db' - 'c7802f58d8e740b2f707c18afe46bf061752130b4bff8fdfea5791c1f29fe989' - '89259ca766214901589f10b5e558cff53d9f8dda5eced07975cdd64fe5075432') -sha256sums_x86_64=('cd22d953dee2db30d86c51a50189dd062c8ac68c5776cbe525a7f852986f23b5' - 'edadd11440d94436665ca0435e8e1a371cef3b187e9d85a17be301e1ee1fc807' - '7b7e720035cd5269882cc6be4ea9c7cde6190a574a5e3d6faee86e03a0752217' - '28dadc855f0baf02f579630ebc9ad1cc1dfe1ef58315b2f1813a7cc35ae59dac') - -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>=8" 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/extra-x86_64/PKGBUILD (from rev 284416, eclipse/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-12-22 03:47:09 UTC (rev 284417) @@ -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.2 +pkgrel=1 +_release=neon-2 +pkgdesc="Highly extensible IDE" +license=(EPL) +arch=(i686 x86_64) +url="https://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=('44b8c068a9a199817852b58325b90add3905e27ed33f4eb89197f6eb4c7c3be0' + '5ce5a860385ed1cf7fc1ce16c7eec47b30b531bdecd9ab20db1496addd484cab' + 'a38a2133cb7edad8944fdadeee9e0ea60742c74db3c1eeb98b2659eb12be5771' + '6476a76a5e7cf98fd3610d11b7b53fd6305071357aba06c658d6c8be027bfa04') +sha256sums_x86_64=('b276ee8af940d37b9339ecb639c23953a25584af8564526be06e0cc95f2f6a60' + '264b353a94a98d122aaa83b04957391cdd31b71782b2f83a2ef52a32cc5d75c5' + '31f6a535c818a39ff7b622fe90943b35e8fbf2b647fd9188e7b19c36584d9bc9' + 'b71f696f9c7645aefdc2b1f03e0c819e2152094203ecd0b04ea220cb17a6d2cd') + +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>=8" 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: extra-x86_64/commonify =================================================================== --- extra-x86_64/commonify 2016-12-22 02:12:45 UTC (rev 284416) +++ extra-x86_64/commonify 2016-12-22 03:47:09 UTC (rev 284417) @@ -1,41 +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 - else - puts "Divergent common file: #{file}" - end -end - -puts "#{common}: #{samefiles} identical common files" Copied: eclipse/repos/extra-x86_64/commonify (from rev 284416, eclipse/trunk/commonify) =================================================================== --- extra-x86_64/commonify (rev 0) +++ extra-x86_64/commonify 2016-12-22 03:47:09 UTC (rev 284417) @@ -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" Deleted: extra-x86_64/eclipse.desktop =================================================================== --- extra-x86_64/eclipse.desktop 2016-12-22 02:12:45 UTC (rev 284416) +++ extra-x86_64/eclipse.desktop 2016-12-22 03:47:09 UTC (rev 284417) @@ -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/extra-x86_64/eclipse.desktop (from rev 284416, eclipse/trunk/eclipse.desktop) =================================================================== --- extra-x86_64/eclipse.desktop (rev 0) +++ extra-x86_64/eclipse.desktop 2016-12-22 03:47:09 UTC (rev 284417) @@ -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: extra-x86_64/eclipse.install =================================================================== --- extra-x86_64/eclipse.install 2016-12-22 02:12:45 UTC (rev 284416) +++ extra-x86_64/eclipse.install 2016-12-22 03:47:09 UTC (rev 284417) @@ -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/extra-x86_64/eclipse.install (from rev 284416, eclipse/trunk/eclipse.install) =================================================================== --- extra-x86_64/eclipse.install (rev 0) +++ extra-x86_64/eclipse.install 2016-12-22 03:47:09 UTC (rev 284417) @@ -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: extra-x86_64/eclipse.sh =================================================================== --- extra-x86_64/eclipse.sh 2016-12-22 02:12:45 UTC (rev 284416) +++ extra-x86_64/eclipse.sh 2016-12-22 03:47:09 UTC (rev 284417) @@ -1,3 +0,0 @@ -#!/bin/bash -export ECLIPSE_HOME=/usr/lib/eclipse -exec ${ECLIPSE_HOME}/eclipse "$@" Copied: eclipse/repos/extra-x86_64/eclipse.sh (from rev 284416, eclipse/trunk/eclipse.sh) =================================================================== --- extra-x86_64/eclipse.sh (rev 0) +++ extra-x86_64/eclipse.sh 2016-12-22 03:47:09 UTC (rev 284417) @@ -0,0 +1,3 @@ +#!/bin/bash +export ECLIPSE_HOME=/usr/lib/eclipse +exec ${ECLIPSE_HOME}/eclipse "$@"