Ice 3.7.0

2 files changed, 40 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 831e424fcd34..653e1c43379e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Thu Nov 17 14:40:01 UTC 2016
 pkgbase = zeroc-ice
 	pkgdesc = An object-oriented middleware that provides object-oriented Remote Procedure Call functionality
-	pkgver = 3.6.3
-	pkgrel = 2
+	pkgver = 3.7.0
+	pkgrel = 1
 	url = https://zeroc.com
 	install = ice.install
 	arch = i686
@@ -13,12 +11,12 @@ pkgbase = zeroc-ice
 	makedepends = mcpp>=2.7.2
 	makedepends = bzip2
 	makedepends = java-environment
-	makedepends = java-berkeleydb>=5.3
+	makedepends = lmdb
 	depends = mcpp>=2.7.2
-	source = ice-3.6.3.tar.gz::https://github.com/zeroc-ice/ice/archive/v3.6.3.tar.gz
-	source = ice-packaging-3.6.3.tar.gz::https://github.com/zeroc-ice/ice-packaging/archive/v3.6.3.tar.gz
-	sha256sums = 82ff74e6d24d9fa396dbb4d9697dc183b17bc9c3f6f076fecdc05632be80a2dc
-	sha256sums = 36f26dd60e90928e4b8cccfc5b72e572e11d3d987ff513f814001600f76dfa2e
+	source = ice-3.7.0.tar.gz::https://github.com/zeroc-ice/ice/archive/v3.7.0.tar.gz
+	source = ice-packaging-3.7.0.tar.gz::https://github.com/zeroc-ice/ice-packaging/archive/v3.7.0.tar.gz
+	sha256sums = a6bd6faffb29e308ef8f977e27a526ff05dd60d68a72f6377462f9546c1c544a
+	sha256sums = 096bcfb74b9a281ad9bccf3eaa360b912cb96e88735d5b18b96198f657b323cb
 
 pkgname = zeroc-ice
 	backup = etc/glacier2router.conf
diff --git a/PKGBUILD b/PKGBUILD
index 465ed502f18d..5f8baed328b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@ pkgname=(
 )
 
 pkgbase=("zeroc-ice")
-pkgver=3.6.3
-pkgrel=2
+pkgver=3.7.0
+pkgrel=1
 pkgdesc="An object-oriented middleware that provides object-oriented Remote Procedure Call functionality"
 arch=("i686" "x86_64")
 url="https://zeroc.com"
@@ -18,36 +18,41 @@ makedepends=(
     "mcpp>=2.7.2"
     "bzip2"
     "java-environment"
-    "java-berkeleydb>=5.3"
+    "lmdb"
 )
 
 depends=("mcpp>=2.7.2")
-_depends_zeroc_ice_java=("zeroc-ice" "java-environment")
+depends_zeroc_ice_java=("zeroc-ice" "java-environment")
 
 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=('82ff74e6d24d9fa396dbb4d9697dc183b17bc9c3f6f076fecdc05632be80a2dc'
-            '36f26dd60e90928e4b8cccfc5b72e572e11d3d987ff513f814001600f76dfa2e')
+sha256sums=('a6bd6faffb29e308ef8f977e27a526ff05dd60d68a72f6377462f9546c1c544a'
+            '096bcfb74b9a281ad9bccf3eaa360b912cb96e88735d5b18b96198f657b323cb')
 
 install=ice.install
 
-_make_args="OPTIMIZE=yes embedded_runpath=prefix='' prefix=/usr"
-_gradle_args="--gradle-user-home=/tmp/zeroc-ice-java --no-daemon -PdbHome=/usr/share/java/berkeleydb"
-
-build() {
-    cd ${srcdir}/ice-${pkgver}/cpp/src
+make_args=(
+    "OPTIMIZE=yes"
+    "USR_DIR_INSTALL=yes"
+    "prefix=/usr"
+    "CONFIGS=shared cpp11-shared"
+    "LANGUAGES=cpp java"
+    "SKIP=slice2py"
+)
 
-    msg "Building Ice for C++"
-    msg2 "Compiling..."
-    make ${_make_args} -j`nproc`
+gradle_args=(
+    "--gradle-user-home=/tmp/zeroc-ice-java"
+    "--no-daemon"
+    "-PdbHome=/usr/share/java/berkeleydb"
+)
 
-    cd ${srcdir}/ice-${pkgver}/java
-    msg "Building Ice for Java"
-    msg2 "Compiling..."
-    ./gradlew ${_gradle_args} -Pprefix=${pkgdir}/usr/share/java/zeroc-ice assemble
+build() {
+    cd ${srcdir}/ice-${pkgver}
+    msg "Building Ice"
+    make "${make_args[@]}" -j$(nproc) srcs
 }
 
 package_zeroc-ice() {
@@ -60,9 +65,7 @@ package_zeroc-ice() {
     cd ${srcdir}/ice-${pkgver}/cpp
 
     msg "Installing Ice for C++"
-    make DESTDIR="${pkgdir}/" ${_make_args} install
-
-    rm -f ${pkgdir}/usr/bin/slice2py
+    make install "${make_args[@]}" DESTDIR="${pkgdir}"
 
     msg2 "Installing Ice License..."
     install -Dm644 ${srcdir}/ice-${pkgver}/ICE_LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
@@ -73,6 +76,7 @@ package_zeroc-ice() {
         # NOTE: ${pkgdir}/usr/lib/ should already be empty
         #       for x86_64 otherwise something has gone wrong
         rm -df ${pkgdir}/usr/lib/
+        msg2 "Renaming lib64 -> lib"
         mv ${pkgdir}/usr/lib64/ ${pkgdir}/usr/lib/
     fi
 
@@ -81,23 +85,24 @@ package_zeroc-ice() {
     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/common/systemd/glacier2router.service \
+    install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/glacier2router.service \
                    ${pkgdir}/usr/lib/systemd/system/glacier2router.service
-    install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/common/systemd/icegridnode.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/common/systemd/icegridregistry.service \
+    install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/icegridregistry.service \
                    ${pkgdir}/usr/lib/systemd/system/icegridregistry.service
 }
 
 package_zeroc-ice-java() {
-    depends=("${_depends_zeroc_ice_java[@]}")
+    depends=("${depends_zeroc_ice_java[@]}")
     arch=("any")
 
-    cd ${srcdir}/ice-${pkgver}/java
-
     msg "Installing Ice for Java"
 
-    ./gradlew ${_gradle_args} -Pprefix=${pkgdir}/usr/share/java/zeroc-ice install
+    for d in ${srcdir}/ice-${pkgver}/java ${srcdir}/ice-${pkgver}/java-compat; do
+        cd $d
+        ./gradlew "${gradle_args[@]}" -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