[arch-commits] Commit in zeroc-ice/repos/community-x86_64 (4 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Sat Dec 30 06:46:51 UTC 2017


    Date: Saturday, December 30, 2017 @ 06:46:48
  Author: svenstaro
Revision: 276945

archrelease: copy trunk to community-x86_64

Added:
  zeroc-ice/repos/community-x86_64/PKGBUILD
    (from rev 276944, zeroc-ice/trunk/PKGBUILD)
  zeroc-ice/repos/community-x86_64/zeroc-ice.sysusers
    (from rev 276944, zeroc-ice/trunk/zeroc-ice.sysusers)
Deleted:
  zeroc-ice/repos/community-x86_64/PKGBUILD
  zeroc-ice/repos/community-x86_64/ice.install

--------------------+
 PKGBUILD           |  174 ++++++++++++++++++++++++++-------------------------
 ice.install        |   22 ------
 zeroc-ice.sysusers |    1 
 3 files changed, 91 insertions(+), 106 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-30 06:46:28 UTC (rev 276944)
+++ PKGBUILD	2017-12-30 06:46:48 UTC (rev 276945)
@@ -1,84 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Joe George <joe at externl dot com>
-# Contributor: Daniel Spies <ds20150201aur at pskx dot net>
-# Contributor: Otto Allmendinger <otto.allmendinger at gmail.com>
-
-pkgname=(zeroc-ice zeroc-ice-java)
-pkgbase=(zeroc-ice)
-pkgver=3.7.0
-pkgrel=2
-pkgdesc="An object-oriented middleware that provides RPC functionality"
-arch=(i686 x86_64)
-url="https://zeroc.com"
-license=(GPL custom:ice)
-makedepends=(bzip2 gradle 'java-environment=8')
-depends=(mcpp lmdb)
-install=ice.install
-source=(
-    "ice-${pkgver}.tar.gz::https://github.com/zeroc-ice/ice/archive/v${pkgver}.tar.gz"
-    "ice-packaging-${pkgver}.tar.gz::https://github.com/zeroc-ice/ice-packaging/archive/v${pkgver}.tar.gz"
-)
-sha256sums=('809fff14a88a7de1364c846cec771d0d12c72572914e6cc4fb0b2c1861c4a1ee'
-            '096bcfb74b9a281ad9bccf3eaa360b912cb96e88735d5b18b96198f657b323cb')
-
-_make_args=(
-    "OPTIMIZE=yes"
-    "USR_DIR_INSTALL=yes"
-    "prefix=/usr"
-    "CONFIGS=shared cpp11-shared"
-    "SKIP=slice2py"
-)
-
-build() {
-  cd ${srcdir}/ice-${pkgver}
-  GRADLE=gradle make srcs -j$(nproc) "${_make_args[@]}" "LANGUAGES=cpp java"
-}
-
-package_zeroc-ice() {
-  backup=("etc/glacier2router.conf"
-          "etc/icegridnode.conf"
-          "etc/icegridregistry.conf"
-  )
-
-  cd ${srcdir}/ice-${pkgver}
-
-  make install "${_make_args[@]}" DESTDIR="${pkgdir}" "LANGUAGES=cpp"
-  install -Dm644 ${srcdir}/ice-${pkgver}/ICE_LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  rm -f ${pkgdir}/usr/share/Ice-${pkgver}/LICENSE
-  rm -f ${pkgdir}/usr/share/Ice-${pkgver}/ICE_LICENSE
-
-  if [ $CARCH = "x86_64" ]; then
-      rm -df ${pkgdir}/usr/lib/
-      mv ${pkgdir}/usr/lib64/ ${pkgdir}/usr/lib/
-  fi
-
-  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/glacier2router.conf ${pkgdir}/etc/glacier2router.conf
-  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/icegridnode.conf ${pkgdir}/etc/icegridnode.conf
-  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/icegridregistry.conf ${pkgdir}/etc/icegridregistry.conf
-
-  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/glacier2router.service \
-                 ${pkgdir}/usr/lib/systemd/system/glacier2router.service
-  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/icegridnode.service \
-                 ${pkgdir}/usr/lib/systemd/system/icegridnode.service
-  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/icegridregistry.service \
-                 ${pkgdir}/usr/lib/systemd/system/icegridregistry.service
-}
-
-package_zeroc-ice-java() {
-  makedepends=(gradle 'java-environment=8')
-  depends=(zeroc-ice java-environment)
-
-  for d in ${srcdir}/ice-${pkgver}/java ${srcdir}/ice-${pkgver}/java-compat; do
-      cd $d
-      gradle \
-          --gradle-user-home=/tmp/zeroc-ice-java \
-          --no-daemon \
-          -PdbHome=/usr/share/java/berkeleydb \
-          -Pprefix=${pkgdir}/usr/share/java/zeroc-ice install
-
-  done
-
-  mv ${pkgdir}/usr/share/java/zeroc-ice/lib/* ${pkgdir}/usr/share/java/zeroc-ice/
-  rmdir ${pkgdir}/usr/share/java/zeroc-ice/lib
-}

Copied: zeroc-ice/repos/community-x86_64/PKGBUILD (from rev 276944, zeroc-ice/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-12-30 06:46:48 UTC (rev 276945)
@@ -0,0 +1,90 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Joe George <joe at externl dot com>
+# Contributor: Daniel Spies <ds20150201aur at pskx dot net>
+# Contributor: Otto Allmendinger <otto.allmendinger at gmail.com>
+
+pkgname=(zeroc-ice zeroc-ice-java)
+pkgbase=(zeroc-ice)
+pkgver=3.7.0
+pkgrel=3
+pkgdesc="An object-oriented middleware that provides RPC functionality"
+arch=(x86_64)
+url="https://zeroc.com"
+license=(GPL custom:ice)
+makedepends=(bzip2 gradle 'java-environment=8')
+depends=(mcpp lmdb)
+source=(
+    "ice-${pkgver}.tar.gz::https://github.com/zeroc-ice/ice/archive/v${pkgver}.tar.gz"
+    "ice-packaging-${pkgver}.tar.gz::https://github.com/zeroc-ice/ice-packaging/archive/v${pkgver}.tar.gz"
+    zeroc-ice.sysusers
+)
+sha256sums=('809fff14a88a7de1364c846cec771d0d12c72572914e6cc4fb0b2c1861c4a1ee'
+            '096bcfb74b9a281ad9bccf3eaa360b912cb96e88735d5b18b96198f657b323cb'
+            '5fdbb1ed753e84e6b49c529e171af848e74a8890fe485dfe1d2bbec3c198dd90')
+
+_make_args=(
+    "OPTIMIZE=yes"
+    "USR_DIR_INSTALL=yes"
+    "prefix=/usr"
+    "CONFIGS=shared cpp11-shared"
+    "SKIP=slice2py"
+)
+
+build() {
+  cd ${srcdir}/ice-${pkgver}
+  GRADLE=gradle make srcs -j$(nproc) "${_make_args[@]}" "LANGUAGES=cpp java"
+}
+
+package_zeroc-ice() {
+  backup=("etc/glacier2router.conf"
+          "etc/icegridnode.conf"
+          "etc/icegridregistry.conf"
+  )
+
+  cd ${srcdir}/ice-${pkgver}
+
+  make install "${_make_args[@]}" DESTDIR="${pkgdir}" "LANGUAGES=cpp"
+  install -Dm644 ${srcdir}/ice-${pkgver}/ICE_LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+  rm -f ${pkgdir}/usr/share/Ice-${pkgver}/LICENSE
+  rm -f ${pkgdir}/usr/share/Ice-${pkgver}/ICE_LICENSE
+
+  if [ $CARCH = "x86_64" ]; then
+      rm -df ${pkgdir}/usr/lib/
+      mv ${pkgdir}/usr/lib64/ ${pkgdir}/usr/lib/
+  fi
+
+  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/glacier2router.conf ${pkgdir}/etc/glacier2router.conf
+  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/icegridnode.conf ${pkgdir}/etc/icegridnode.conf
+  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/icegridregistry.conf ${pkgdir}/etc/icegridregistry.conf
+
+  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/glacier2router.service \
+                 ${pkgdir}/usr/lib/systemd/system/glacier2router.service
+  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/icegridnode.service \
+                 ${pkgdir}/usr/lib/systemd/system/icegridnode.service
+  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/icegridregistry.service \
+                 ${pkgdir}/usr/lib/systemd/system/icegridregistry.service
+
+  mkdir -p ${pkgdir}/var/lib/ice/icegrid/{node1,registry}
+  chown -R 101:101 ${pkgdir}/var/lib/ice
+
+  install -Dm644 ${srcdir}/zeroc-ice.sysusers ${pkgdir}/usr/lib/sysusers.d/$pkgname.conf
+}
+
+package_zeroc-ice-java() {
+  makedepends=(gradle 'java-environment=8')
+  depends=(zeroc-ice java-environment)
+
+  for d in ${srcdir}/ice-${pkgver}/java ${srcdir}/ice-${pkgver}/java-compat; do
+      cd $d
+      gradle \
+          --gradle-user-home=/tmp/zeroc-ice-java \
+          --no-daemon \
+          -PdbHome=/usr/share/java/berkeleydb \
+          -Pprefix=${pkgdir}/usr/share/java/zeroc-ice install
+
+  done
+
+  mv ${pkgdir}/usr/share/java/zeroc-ice/lib/* ${pkgdir}/usr/share/java/zeroc-ice/
+  rmdir ${pkgdir}/usr/share/java/zeroc-ice/lib
+}

Deleted: ice.install
===================================================================
--- ice.install	2017-12-30 06:46:28 UTC (rev 276944)
+++ ice.install	2017-12-30 06:46:48 UTC (rev 276945)
@@ -1,22 +0,0 @@
-post_install() {
-  getent group ice >/dev/null || groupadd --system -g 101 ice &>/dev/null
-  getent passwd ice >/dev/null || useradd --system -g 101 -u 101 -d /var/lib/ice -s /bin/false ice &>/dev/null
-
-  #if type -P systemd-tmpfiles &> /dev/null; then
-  #  systemd-tmpfiles --create ice.conf
-  #fi
-
-  #if [ -d /var/lib/ice ]; then
-    #echo "Ice directory '/var/lib/ice' already exists. If you want to recreate default database then delete the directory and run 'rethinkdb create -d /var/lib/rethinkdb/default'."
-  #fi
-
-  if [ ! -d /var/lib/ice ]; then
-    mkdir -p /var/lib/ice/icegrid/node1
-    mkdir -p /var/lib/ice/icegrid/registry
-  fi
-  chown -R ice:ice /var/lib/ice
-}
-
-post_remove() {
-  echo "Ice data directory '/var/lib/ice' is left untouched. Remove it if you really sure you won't need your data in the future."
-}

Copied: zeroc-ice/repos/community-x86_64/zeroc-ice.sysusers (from rev 276944, zeroc-ice/trunk/zeroc-ice.sysusers)
===================================================================
--- zeroc-ice.sysusers	                        (rev 0)
+++ zeroc-ice.sysusers	2017-12-30 06:46:48 UTC (rev 276945)
@@ -0,0 +1 @@
+u ice 101 "Ice User" /var/lib/ice



More information about the arch-commits mailing list