--- PKGBUILD	2015-05-30 05:25:27.000000000 +0900
+++ PKGBUILD.new	2015-05-30 04:39:21.000000000 +0900
@@ -1,56 +1,56 @@
 # $Id$
 # Maintainer: Felix Yan <felixonmars@archlinux.org>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
+# Contributor: UTUMI Hirosi <utuhiro78 at yahoo dot co dot jp>
 
 ## Mozc compile option
 _bldtype=Release
 
-_zipcode_rel=201412
+_zipcode_rel=201504
 _protobuf_rev=172019c40bf548908ab09bfd276074c929d48415
-_gyp_rev=2012
+_gyp_rev=cdf037c1edc0ba3b5d25f8e3973661efe00980cc
 _jsoncpp_rev=11086dd6a7eba04289944367ca82cea71299ed70
 _japanese_usage_dictionary_rev=10
-_mozc_rev=510
+_mozc_rev=2ceaee96e4acabb39c45f071fc39df485870da96
 
 _pkgbase=mozc
 pkgname=fcitx-mozc
 pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"
-pkgver=2.16.2037.102
-_patchver=${pkgver}.2
-#_patchver=1.15.1834.102.1
+pkgver=2.17.2097.102
+_fcitx_patchver=2.16.2037.102.2
 pkgrel=1
 arch=('i686' 'x86_64')
-url="http://code.google.com/p/mozc/"
+url="https://github.com/google/mozc"
 license=('custom')
 depends=('qt4' 'fcitx' 'zinnia')
-makedepends=('pkg-config' 'python2' 'gtest' 'curl' 'gtk2' 'mesa' 'subversion' 'ninja' 'git' 'clang')
+makedepends=('pkg-config' 'python2' 'curl' 'gtk2' 'mesa' 'subversion' 'ninja' 'git' 'clang')
 replaces=('mozc-fcitx')
 conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx')
-source=(mozc::svn+http://mozc.googlecode.com/svn/trunk/src#revision=$_mozc_rev
+source=(mozc::git+https://github.com/google/mozc.git#commit=${_mozc_rev}
         jsoncpp::git+https://github.com/open-source-parsers/jsoncpp.git#commit=${_jsoncpp_rev}
         japanese_usage_dictionary::svn+http://japanese-usage-dictionary.googlecode.com/svn/trunk#revision=$_japanese_usage_dictionary_rev
-        gyp::svn+http://gyp.googlecode.com/svn/trunk#revision=$_gyp_rev
-        git+https://github.com/google/protobuf.git#commit=${_protobuf_rev}
+        gyp::git+https://chromium.googlesource.com/external/gyp#commit=${_gyp_rev}
+        protobuf::git+https://github.com/google/protobuf.git#commit=${_protobuf_rev}
         http://downloads.sourceforge.net/pnsft-aur/x-ken-all-${_zipcode_rel}.zip
         http://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcode_rel}.zip
-        http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${_patchver}.patch
+        http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${_fcitx_patchver}.patch
         http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz)
 sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '6718acd4d44ca8a9f84c4a847bf82d6b7c8ea3b8e67c92f3e404f3d7bc7f90148c09043f7eddec7125418315a006fb223d6c8b92cd1d4896c7803f2dc1a15ae4'
-            '56661cd19f46a1211e7c2c104da61e07b0217c7f296917f0a3d8f62e340c279d3567058f9bb56d64c1c05d2a2c457ce2ffe7c730c790870a75b2c2fdebdbab01'
+            '60c053fd3ffec28e0e2eca33834e4cc212127e032b30d0638dcb7ce3faa45c7c87ceae9f98eb03f0ec0e3d1429d2c105f4590e30b39e0818cfcf50646584c459'
+            'fb1ad9d279e34a1e55b6dc182ad503abd250d4773ce488a12c4b07bf67eccda65ae7d83b41db6489afd867e303468448dc13d8797ed3bbc038de60ff744f0b9f'
             '22b885859588bb8e0efd354d153da461a654203729c723156a419bf33fae473e3f7165964aa3cb3b5c969f97c2727f9d87b0d587330e4eeab67f07d4458542a3'
             '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a')
 
 prepare() {
-  cd mozc
+  cd mozc/src
 
   # Apply fcitx patch
   rm unix/fcitx -rf
-  patch -Np2 -i "$srcdir/fcitx-mozc-${_patchver}.patch"
+  patch -Np2 -i "$srcdir/fcitx-mozc-${_fcitx_patchver}.patch"
 
   # Fix qt4 binary path
   sed -i 's|(qt_dir)/bin|(qt_dir)/lib/qt4/bin|' gui/*.gyp{,i}
@@ -69,7 +69,7 @@
   cd "$srcdir"
   for dep in jsoncpp gyp protobuf japanese_usage_dictionary
   do
-    cp -a $dep mozc/third_party/
+    cp -a $dep mozc/src/third_party/
   done
 }
 
@@ -79,7 +79,7 @@
   CFLAGS="${CFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
   CXXFLAGS="${CXXFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
 
-  cd mozc
+  cd mozc/src
 
   _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool unix/fcitx/fcitx.gyp:fcitx-mozc"
 
@@ -91,7 +91,7 @@
 }
 
 package() {
-  cd mozc
+  cd mozc/src
   install -D -m 755 out_linux/${_bldtype}/mozc_server "${pkgdir}/usr/lib/mozc/mozc_server"
   install    -m 755 out_linux/${_bldtype}/mozc_tool   "${pkgdir}/usr/lib/mozc/mozc_tool"