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

Jan Steffens heftig at archlinux.org
Wed Oct 11 22:42:11 UTC 2017


    Date: Wednesday, October 11, 2017 @ 22:42:10
  Author: heftig
Revision: 307520

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

Added:
  eclipse/repos/extra-i686/PKGBUILD
    (from rev 307519, eclipse/trunk/PKGBUILD)
  eclipse/repos/extra-i686/commonify
    (from rev 307519, eclipse/trunk/commonify)
  eclipse/repos/extra-i686/eclipse.desktop
    (from rev 307519, eclipse/trunk/eclipse.desktop)
  eclipse/repos/extra-i686/eclipse.sh
    (from rev 307519, eclipse/trunk/eclipse.sh)
  eclipse/repos/extra-x86_64/PKGBUILD
    (from rev 307519, eclipse/trunk/PKGBUILD)
  eclipse/repos/extra-x86_64/commonify
    (from rev 307519, eclipse/trunk/commonify)
  eclipse/repos/extra-x86_64/eclipse.desktop
    (from rev 307519, eclipse/trunk/eclipse.desktop)
  eclipse/repos/extra-x86_64/eclipse.sh
    (from rev 307519, 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.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.sh

------------------------------+
 /PKGBUILD                    |  200 ++++++++++++++++++++++++++++++++
 /commonify                   |  250 +++++++++++++++++++++++++++++++++++++++++
 /eclipse.desktop             |   18 ++
 /eclipse.sh                  |    6 
 extra-i686/PKGBUILD          |  100 ----------------
 extra-i686/commonify         |  126 --------------------
 extra-i686/eclipse.desktop   |    9 -
 extra-i686/eclipse.sh        |    3 
 extra-x86_64/PKGBUILD        |  100 ----------------
 extra-x86_64/commonify       |  126 --------------------
 extra-x86_64/eclipse.desktop |    9 -
 extra-x86_64/eclipse.sh      |    3 
 12 files changed, 474 insertions(+), 476 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-10-11 20:44:07 UTC (rev 307519)
+++ extra-i686/PKGBUILD	2017-10-11 22:42:10 UTC (rev 307520)
@@ -1,100 +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,jee,cpp,php,javascript})
-pkgver=4.7.1
-pkgrel=1
-_release=oxygen-1
-pkgdesc="Highly extensible IDE"
-license=(EPL)
-arch=(i686 x86_64)
-url="https://eclipse.org"
-makedepends=(python3)
-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=('a5a5cb8a8b86bd8bb98692c4553abd84592aac2438621d8273c43715a115e2ac'
-            '04e789fb695d5f95d09ddb994ae30397b39aee35f11997465dd91d129c41b2ed'
-            '57559c2548ae463089acb3c2825ebc002ed83067ddc953b23d36a7b5a02deaf3')
-sha256sums_i686=('b118ab3186ace6e2b2ff27bfe9cc3dd183fff65d67968e45fd202f4fc9309c90'
-                 '9fbe5d8986bfcd9764456b2f47acea3fb90ee7e68e736725dedf054778fac0e9'
-                 'e58286ead68458c5f8476377ff313f7dff058499305097e6a69de5796b0531e2'
-                 '918a80302fe35787df1a17df7165b25fe66f27ce5af55510cb581aa099665706'
-                 'b5606c483612111d019e411fc472645477f077939c3261d4f2e6015eb3924f7f')
-sha256sums_x86_64=('b569d1b7d5dd57c752272ef4d3455d740ec93d012dddfbd2fad841d6c4eb81b9'
-                   'c2435e8f52fbe94859e8786d3c631c3c3b592c5f58d4c49de615fc414f6dfe3c'
-                   '1c8f20798afc6027913d49ff1cda836b9943b56e38bfdcd507e96232f34f0ae6'
-                   '465caf1a55d0486d68d5a6a280342adebad3bc4ec31dc7e045b8056b46dd0695'
-                   '7523a965e18e6fba195fe0d463a33b44ed7682ff7c9d58a1e906a570ba205e5a')
-
-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 --identical ${pkgname[@]}
-
-  mkdir -p eclipse-common/dropins
-  touch eclipse-common/dropins/.keep
-}
-
-package_eclipse-common() {
-  pkgdesc+=" (common files)"
-  depends=("java-environment>=8" webkit2gtk unzip)
-
-  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 307519, eclipse/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-10-11 22:42:10 UTC (rev 307520)
@@ -0,0 +1,100 @@
+# $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,jee,cpp,php,javascript})
+pkgver=4.7.1.a
+pkgrel=1
+_release=oxygen-1a
+pkgdesc="Highly extensible IDE"
+license=(EPL)
+arch=(i686 x86_64)
+url="https://eclipse.org"
+makedepends=(python3)
+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=('9e5573f7b951774be3f98c69f9d391ddafbe8a3a727ce81c08dfd67d42cee503'
+            '04e789fb695d5f95d09ddb994ae30397b39aee35f11997465dd91d129c41b2ed'
+            '57559c2548ae463089acb3c2825ebc002ed83067ddc953b23d36a7b5a02deaf3')
+sha256sums_i686=('9ffb8980f1f5e68ee6779c9f02376040ace2dec76d8be6407e0d2c77c1c3100b'
+                 '9752f15435a417c03bb75313ee94a4dc3b35adcdd300af055a6f7aa9311225a5'
+                 'eb8462e778034dd4c8e5fcb538d271300730fd7584fe7c2c5e2d53541ee453c8'
+                 'ac6d167124aaad5fb8629802ce5e7acfa57848fc5c7854d068ecd9cd19719ca8'
+                 '65a536d0ce3b41a0c8471167085757eee49b4ebeb04b68929af6475ac465aa5b')
+sha256sums_x86_64=('f1b8205abec2dc9cc769941fbde96bb83007050841d7f094dcb3cb07b1696446'
+                   '7c6bf1640c2ed9db3717cf2c65cecd5f18c3736b46151caa09cd28397516f08b'
+                   'a155afe0b305a1206efb463123f68f48be3900e694f4c7fffa0643e1424511cf'
+                   '6b90524ec4f075ed382f14c598c817df1764f31bebbf4b1ba9bdd4056033eaf3'
+                   'af546dd94f7376dced761970ab0a0f31508fc0ec06e51282a02f5df96748918c')
+
+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 --identical ${pkgname[@]}
+
+  mkdir -p eclipse-common/dropins
+  touch eclipse-common/dropins/.keep
+}
+
+package_eclipse-common() {
+  pkgdesc+=" (common files)"
+  depends=("java-environment>=8" webkit2gtk unzip)
+
+  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	2017-10-11 20:44:07 UTC (rev 307519)
+++ extra-i686/commonify	2017-10-11 22:42:10 UTC (rev 307520)
@@ -1,126 +0,0 @@
-#!/usr/bin/env python3
-from argparse import ArgumentParser
-from asyncio.subprocess import DEVNULL
-from asyncio import get_event_loop, gather, BoundedSemaphore, create_subprocess_exec
-from enum import Enum, auto
-from logging import getLogger, basicConfig, INFO
-from os import cpu_count
-from pathlib import Path
-from sys import exit
-
-
-logger = getLogger(__name__)
-
-
-class Mode(Enum):
-    identical = auto()
-    nonconflicting = auto()
-
-
-def parse_args(args=None):
-    parser = ArgumentParser(description="Extract common files.")
-
-    modes = parser.add_mutually_exclusive_group(required=True)
-    for m in Mode:
-        modes.add_argument(f"--{m.name}", dest="mode", action="store_const", const=m,
-                           help=f"extract {m.name} common files")
-
-    parser.add_argument("common_dir", metavar="COMMON_DIR",
-                        help="common files directory to move to")
-    parser.add_argument("targets", nargs="+", metavar="INPUT_DIR", help="directory to move from")
-
-    return parser.parse_args(args)
-
-
-diff_semaphore = BoundedSemaphore(value=cpu_count())
-
-
-class DiffError(RuntimeError):
-    def __init__(self, file1, file2):
-        self.file1 = file1
-        self.file2 = file2
-
-
-async def diff(file1, file2):
-    async with diff_semaphore:
-        p = await create_subprocess_exec("diff", "-q", str(file1), str(file2),
-                                         stdin=DEVNULL, stdout=DEVNULL, stderr=DEVNULL)
-        try:
-            ret = await p.wait()
-        except:
-            try:
-                p.kill()
-            except:
-                pass
-
-    if ret != 0:
-        raise DiffError(file1, file2)
-
-
-async def identical(files):
-    if len(files) < 2:
-        return True
-    first, *rest = files
-    fut = gather(*[diff(first, f) for f in rest])
-    try:
-        await fut
-    except DiffError as e:
-        logger.info("Divergent files: %s <> %s", e.file1, e.file2)
-        return False
-    else:
-        return True
-    finally:
-        fut.cancel()
-
-def commonify_file(common_file, files):
-    common_file.parent.mkdir(parents=True, exist_ok=True)
-    first, *rest = files
-    first.rename(common_file)
-    for f in rest:
-        f.unlink()
-
-
-async def commonify_identical(common_file, files):
-    if await identical(files):
-        commonify_file(common_file, files)
-        return 1
-    return 0
-
-
-def arg_dir(s):
-    p = Path(s)
-    if not p.is_dir():
-        raise ValueError(f"{s!r} is not a directory")
-    return p
-
-
-async def main(settings):
-    ignore_len = settings.mode == Mode.nonconflicting
-    common_dir = arg_dir(settings.common_dir)
-    targets = [arg_dir(t) for t in settings.targets]
-
-    d = {}
-    for t in targets:
-        n = 0
-        for f in t.glob("**/*"):
-            if f.is_file():
-                d.setdefault(f.relative_to(t), []).append(f)
-                n += 1
-        logger.info("%s: Found %d files", t, n)
-
-    results = await gather(*[
-        commonify_identical(common_dir / f, tf)
-        for f, tf in d.items()
-        if ignore_len or len(tf) == len(targets)
-    ])
-
-    logger.info("%s: %d %s files",
-                common_dir, sum(results), settings.mode.name)
-    return 0
-
-
-if __name__ == "__main__":
-    basicConfig(level=INFO)
-    settings = parse_args()
-    loop = get_event_loop()
-    exit(loop.run_until_complete(main(settings)))

Copied: eclipse/repos/extra-i686/commonify (from rev 307519, eclipse/trunk/commonify)
===================================================================
--- extra-i686/commonify	                        (rev 0)
+++ extra-i686/commonify	2017-10-11 22:42:10 UTC (rev 307520)
@@ -0,0 +1,125 @@
+#!/usr/bin/env python3
+from argparse import ArgumentParser
+from asyncio.subprocess import DEVNULL
+from asyncio import get_event_loop, gather, BoundedSemaphore, create_subprocess_exec
+from enum import Enum, auto
+from logging import getLogger, basicConfig, INFO
+from os import cpu_count
+from pathlib import Path
+from sys import exit
+
+
+logger = getLogger(__name__)
+
+
+class Mode(Enum):
+    identical = auto()
+    nonconflicting = auto()
+
+
+def parse_args(args=None):
+    parser = ArgumentParser(description="Extract common files.")
+
+    modes = parser.add_mutually_exclusive_group(required=True)
+    for m in Mode:
+        modes.add_argument(f"--{m.name}", dest="mode", action="store_const", const=m,
+                           help=f"extract {m.name} common files")
+
+    parser.add_argument("common_dir", metavar="COMMON_DIR",
+                        help="common files directory to move to")
+    parser.add_argument("targets", nargs="+", metavar="INPUT_DIR", help="directory to move from")
+
+    return parser.parse_args(args)
+
+
+diff_semaphore = BoundedSemaphore(value=cpu_count())
+
+
+class DiffError(RuntimeError):
+    pass
+
+
+async def diff(file1, file2):
+    async with diff_semaphore:
+        p = await create_subprocess_exec("diff", "-q", str(file1), str(file2),
+                                         stdin=DEVNULL, stdout=DEVNULL, stderr=DEVNULL)
+        try:
+            ret = await p.wait()
+        except:
+            try:
+                p.kill()
+            except:
+                pass
+
+    if ret != 0:
+        raise DiffError()
+
+
+async def identical(files):
+    if len(files) < 2:
+        return True
+    first, *rest = files
+    fut = gather(*[diff(first, f) for f in rest])
+    try:
+        await fut
+    except DiffError as e:
+        return False
+    else:
+        return True
+    finally:
+        fut.cancel()
+
+def commonify_file(common_file, files):
+    common_file.parent.mkdir(parents=True, exist_ok=True)
+    first, *rest = files
+    first.rename(common_file)
+    for f in rest:
+        f.unlink()
+
+
+async def commonify_identical(common_file, files):
+    if await identical(files):
+        commonify_file(common_file, files)
+        return 1
+    else:
+        logger.info("Divergent file: %s", common_file)
+        return 0
+
+
+def arg_dir(s):
+    p = Path(s)
+    if not p.is_dir():
+        raise ValueError(f"{s!r} is not a directory")
+    return p
+
+
+async def main(settings):
+    ignore_len = settings.mode == Mode.nonconflicting
+    common_dir = arg_dir(settings.common_dir)
+    targets = [arg_dir(t) for t in settings.targets]
+
+    d = {}
+    for t in targets:
+        n = 0
+        for f in t.glob("**/*"):
+            if f.is_file():
+                d.setdefault(f.relative_to(t), []).append(f)
+                n += 1
+        logger.info("%s: Found %d files", t, n)
+
+    results = await gather(*[
+        commonify_identical(common_dir / f, tf)
+        for f, tf in d.items()
+        if ignore_len or len(tf) == len(targets)
+    ])
+
+    logger.info("%s: %d %s files",
+                common_dir, sum(results), settings.mode.name)
+    return 0
+
+
+if __name__ == "__main__":
+    basicConfig(level=INFO)
+    settings = parse_args()
+    loop = get_event_loop()
+    exit(loop.run_until_complete(main(settings)))

Deleted: extra-i686/eclipse.desktop
===================================================================
--- extra-i686/eclipse.desktop	2017-10-11 20:44:07 UTC (rev 307519)
+++ extra-i686/eclipse.desktop	2017-10-11 22:42:10 UTC (rev 307520)
@@ -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 307519, eclipse/trunk/eclipse.desktop)
===================================================================
--- extra-i686/eclipse.desktop	                        (rev 0)
+++ extra-i686/eclipse.desktop	2017-10-11 22:42:10 UTC (rev 307520)
@@ -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.sh
===================================================================
--- extra-i686/eclipse.sh	2017-10-11 20:44:07 UTC (rev 307519)
+++ extra-i686/eclipse.sh	2017-10-11 22:42:10 UTC (rev 307520)
@@ -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 307519, eclipse/trunk/eclipse.sh)
===================================================================
--- extra-i686/eclipse.sh	                        (rev 0)
+++ extra-i686/eclipse.sh	2017-10-11 22:42:10 UTC (rev 307520)
@@ -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	2017-10-11 20:44:07 UTC (rev 307519)
+++ extra-x86_64/PKGBUILD	2017-10-11 22:42:10 UTC (rev 307520)
@@ -1,100 +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,jee,cpp,php,javascript})
-pkgver=4.7.1
-pkgrel=1
-_release=oxygen-1
-pkgdesc="Highly extensible IDE"
-license=(EPL)
-arch=(i686 x86_64)
-url="https://eclipse.org"
-makedepends=(python3)
-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=('a5a5cb8a8b86bd8bb98692c4553abd84592aac2438621d8273c43715a115e2ac'
-            '04e789fb695d5f95d09ddb994ae30397b39aee35f11997465dd91d129c41b2ed'
-            '57559c2548ae463089acb3c2825ebc002ed83067ddc953b23d36a7b5a02deaf3')
-sha256sums_i686=('b118ab3186ace6e2b2ff27bfe9cc3dd183fff65d67968e45fd202f4fc9309c90'
-                 '9fbe5d8986bfcd9764456b2f47acea3fb90ee7e68e736725dedf054778fac0e9'
-                 'e58286ead68458c5f8476377ff313f7dff058499305097e6a69de5796b0531e2'
-                 '918a80302fe35787df1a17df7165b25fe66f27ce5af55510cb581aa099665706'
-                 'b5606c483612111d019e411fc472645477f077939c3261d4f2e6015eb3924f7f')
-sha256sums_x86_64=('b569d1b7d5dd57c752272ef4d3455d740ec93d012dddfbd2fad841d6c4eb81b9'
-                   'c2435e8f52fbe94859e8786d3c631c3c3b592c5f58d4c49de615fc414f6dfe3c'
-                   '1c8f20798afc6027913d49ff1cda836b9943b56e38bfdcd507e96232f34f0ae6'
-                   '465caf1a55d0486d68d5a6a280342adebad3bc4ec31dc7e045b8056b46dd0695'
-                   '7523a965e18e6fba195fe0d463a33b44ed7682ff7c9d58a1e906a570ba205e5a')
-
-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 --identical ${pkgname[@]}
-
-  mkdir -p eclipse-common/dropins
-  touch eclipse-common/dropins/.keep
-}
-
-package_eclipse-common() {
-  pkgdesc+=" (common files)"
-  depends=("java-environment>=8" webkit2gtk unzip)
-
-  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 307519, eclipse/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-10-11 22:42:10 UTC (rev 307520)
@@ -0,0 +1,100 @@
+# $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,jee,cpp,php,javascript})
+pkgver=4.7.1.a
+pkgrel=1
+_release=oxygen-1a
+pkgdesc="Highly extensible IDE"
+license=(EPL)
+arch=(i686 x86_64)
+url="https://eclipse.org"
+makedepends=(python3)
+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=('9e5573f7b951774be3f98c69f9d391ddafbe8a3a727ce81c08dfd67d42cee503'
+            '04e789fb695d5f95d09ddb994ae30397b39aee35f11997465dd91d129c41b2ed'
+            '57559c2548ae463089acb3c2825ebc002ed83067ddc953b23d36a7b5a02deaf3')
+sha256sums_i686=('9ffb8980f1f5e68ee6779c9f02376040ace2dec76d8be6407e0d2c77c1c3100b'
+                 '9752f15435a417c03bb75313ee94a4dc3b35adcdd300af055a6f7aa9311225a5'
+                 'eb8462e778034dd4c8e5fcb538d271300730fd7584fe7c2c5e2d53541ee453c8'
+                 'ac6d167124aaad5fb8629802ce5e7acfa57848fc5c7854d068ecd9cd19719ca8'
+                 '65a536d0ce3b41a0c8471167085757eee49b4ebeb04b68929af6475ac465aa5b')
+sha256sums_x86_64=('f1b8205abec2dc9cc769941fbde96bb83007050841d7f094dcb3cb07b1696446'
+                   '7c6bf1640c2ed9db3717cf2c65cecd5f18c3736b46151caa09cd28397516f08b'
+                   'a155afe0b305a1206efb463123f68f48be3900e694f4c7fffa0643e1424511cf'
+                   '6b90524ec4f075ed382f14c598c817df1764f31bebbf4b1ba9bdd4056033eaf3'
+                   'af546dd94f7376dced761970ab0a0f31508fc0ec06e51282a02f5df96748918c')
+
+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 --identical ${pkgname[@]}
+
+  mkdir -p eclipse-common/dropins
+  touch eclipse-common/dropins/.keep
+}
+
+package_eclipse-common() {
+  pkgdesc+=" (common files)"
+  depends=("java-environment>=8" webkit2gtk unzip)
+
+  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	2017-10-11 20:44:07 UTC (rev 307519)
+++ extra-x86_64/commonify	2017-10-11 22:42:10 UTC (rev 307520)
@@ -1,126 +0,0 @@
-#!/usr/bin/env python3
-from argparse import ArgumentParser
-from asyncio.subprocess import DEVNULL
-from asyncio import get_event_loop, gather, BoundedSemaphore, create_subprocess_exec
-from enum import Enum, auto
-from logging import getLogger, basicConfig, INFO
-from os import cpu_count
-from pathlib import Path
-from sys import exit
-
-
-logger = getLogger(__name__)
-
-
-class Mode(Enum):
-    identical = auto()
-    nonconflicting = auto()
-
-
-def parse_args(args=None):
-    parser = ArgumentParser(description="Extract common files.")
-
-    modes = parser.add_mutually_exclusive_group(required=True)
-    for m in Mode:
-        modes.add_argument(f"--{m.name}", dest="mode", action="store_const", const=m,
-                           help=f"extract {m.name} common files")
-
-    parser.add_argument("common_dir", metavar="COMMON_DIR",
-                        help="common files directory to move to")
-    parser.add_argument("targets", nargs="+", metavar="INPUT_DIR", help="directory to move from")
-
-    return parser.parse_args(args)
-
-
-diff_semaphore = BoundedSemaphore(value=cpu_count())
-
-
-class DiffError(RuntimeError):
-    def __init__(self, file1, file2):
-        self.file1 = file1
-        self.file2 = file2
-
-
-async def diff(file1, file2):
-    async with diff_semaphore:
-        p = await create_subprocess_exec("diff", "-q", str(file1), str(file2),
-                                         stdin=DEVNULL, stdout=DEVNULL, stderr=DEVNULL)
-        try:
-            ret = await p.wait()
-        except:
-            try:
-                p.kill()
-            except:
-                pass
-
-    if ret != 0:
-        raise DiffError(file1, file2)
-
-
-async def identical(files):
-    if len(files) < 2:
-        return True
-    first, *rest = files
-    fut = gather(*[diff(first, f) for f in rest])
-    try:
-        await fut
-    except DiffError as e:
-        logger.info("Divergent files: %s <> %s", e.file1, e.file2)
-        return False
-    else:
-        return True
-    finally:
-        fut.cancel()
-
-def commonify_file(common_file, files):
-    common_file.parent.mkdir(parents=True, exist_ok=True)
-    first, *rest = files
-    first.rename(common_file)
-    for f in rest:
-        f.unlink()
-
-
-async def commonify_identical(common_file, files):
-    if await identical(files):
-        commonify_file(common_file, files)
-        return 1
-    return 0
-
-
-def arg_dir(s):
-    p = Path(s)
-    if not p.is_dir():
-        raise ValueError(f"{s!r} is not a directory")
-    return p
-
-
-async def main(settings):
-    ignore_len = settings.mode == Mode.nonconflicting
-    common_dir = arg_dir(settings.common_dir)
-    targets = [arg_dir(t) for t in settings.targets]
-
-    d = {}
-    for t in targets:
-        n = 0
-        for f in t.glob("**/*"):
-            if f.is_file():
-                d.setdefault(f.relative_to(t), []).append(f)
-                n += 1
-        logger.info("%s: Found %d files", t, n)
-
-    results = await gather(*[
-        commonify_identical(common_dir / f, tf)
-        for f, tf in d.items()
-        if ignore_len or len(tf) == len(targets)
-    ])
-
-    logger.info("%s: %d %s files",
-                common_dir, sum(results), settings.mode.name)
-    return 0
-
-
-if __name__ == "__main__":
-    basicConfig(level=INFO)
-    settings = parse_args()
-    loop = get_event_loop()
-    exit(loop.run_until_complete(main(settings)))

Copied: eclipse/repos/extra-x86_64/commonify (from rev 307519, eclipse/trunk/commonify)
===================================================================
--- extra-x86_64/commonify	                        (rev 0)
+++ extra-x86_64/commonify	2017-10-11 22:42:10 UTC (rev 307520)
@@ -0,0 +1,125 @@
+#!/usr/bin/env python3
+from argparse import ArgumentParser
+from asyncio.subprocess import DEVNULL
+from asyncio import get_event_loop, gather, BoundedSemaphore, create_subprocess_exec
+from enum import Enum, auto
+from logging import getLogger, basicConfig, INFO
+from os import cpu_count
+from pathlib import Path
+from sys import exit
+
+
+logger = getLogger(__name__)
+
+
+class Mode(Enum):
+    identical = auto()
+    nonconflicting = auto()
+
+
+def parse_args(args=None):
+    parser = ArgumentParser(description="Extract common files.")
+
+    modes = parser.add_mutually_exclusive_group(required=True)
+    for m in Mode:
+        modes.add_argument(f"--{m.name}", dest="mode", action="store_const", const=m,
+                           help=f"extract {m.name} common files")
+
+    parser.add_argument("common_dir", metavar="COMMON_DIR",
+                        help="common files directory to move to")
+    parser.add_argument("targets", nargs="+", metavar="INPUT_DIR", help="directory to move from")
+
+    return parser.parse_args(args)
+
+
+diff_semaphore = BoundedSemaphore(value=cpu_count())
+
+
+class DiffError(RuntimeError):
+    pass
+
+
+async def diff(file1, file2):
+    async with diff_semaphore:
+        p = await create_subprocess_exec("diff", "-q", str(file1), str(file2),
+                                         stdin=DEVNULL, stdout=DEVNULL, stderr=DEVNULL)
+        try:
+            ret = await p.wait()
+        except:
+            try:
+                p.kill()
+            except:
+                pass
+
+    if ret != 0:
+        raise DiffError()
+
+
+async def identical(files):
+    if len(files) < 2:
+        return True
+    first, *rest = files
+    fut = gather(*[diff(first, f) for f in rest])
+    try:
+        await fut
+    except DiffError as e:
+        return False
+    else:
+        return True
+    finally:
+        fut.cancel()
+
+def commonify_file(common_file, files):
+    common_file.parent.mkdir(parents=True, exist_ok=True)
+    first, *rest = files
+    first.rename(common_file)
+    for f in rest:
+        f.unlink()
+
+
+async def commonify_identical(common_file, files):
+    if await identical(files):
+        commonify_file(common_file, files)
+        return 1
+    else:
+        logger.info("Divergent file: %s", common_file)
+        return 0
+
+
+def arg_dir(s):
+    p = Path(s)
+    if not p.is_dir():
+        raise ValueError(f"{s!r} is not a directory")
+    return p
+
+
+async def main(settings):
+    ignore_len = settings.mode == Mode.nonconflicting
+    common_dir = arg_dir(settings.common_dir)
+    targets = [arg_dir(t) for t in settings.targets]
+
+    d = {}
+    for t in targets:
+        n = 0
+        for f in t.glob("**/*"):
+            if f.is_file():
+                d.setdefault(f.relative_to(t), []).append(f)
+                n += 1
+        logger.info("%s: Found %d files", t, n)
+
+    results = await gather(*[
+        commonify_identical(common_dir / f, tf)
+        for f, tf in d.items()
+        if ignore_len or len(tf) == len(targets)
+    ])
+
+    logger.info("%s: %d %s files",
+                common_dir, sum(results), settings.mode.name)
+    return 0
+
+
+if __name__ == "__main__":
+    basicConfig(level=INFO)
+    settings = parse_args()
+    loop = get_event_loop()
+    exit(loop.run_until_complete(main(settings)))

Deleted: extra-x86_64/eclipse.desktop
===================================================================
--- extra-x86_64/eclipse.desktop	2017-10-11 20:44:07 UTC (rev 307519)
+++ extra-x86_64/eclipse.desktop	2017-10-11 22:42:10 UTC (rev 307520)
@@ -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 307519, eclipse/trunk/eclipse.desktop)
===================================================================
--- extra-x86_64/eclipse.desktop	                        (rev 0)
+++ extra-x86_64/eclipse.desktop	2017-10-11 22:42:10 UTC (rev 307520)
@@ -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.sh
===================================================================
--- extra-x86_64/eclipse.sh	2017-10-11 20:44:07 UTC (rev 307519)
+++ extra-x86_64/eclipse.sh	2017-10-11 22:42:10 UTC (rev 307520)
@@ -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 307519, eclipse/trunk/eclipse.sh)
===================================================================
--- extra-x86_64/eclipse.sh	                        (rev 0)
+++ extra-x86_64/eclipse.sh	2017-10-11 22:42:10 UTC (rev 307520)
@@ -0,0 +1,3 @@
+#!/bin/bash
+export ECLIPSE_HOME=/usr/lib/eclipse
+exec ${ECLIPSE_HOME}/eclipse "$@"



More information about the arch-commits mailing list