Upstream update

2 files changed, 9 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 77cea17c6a7e..e68c738c8f54 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mozc
 	pkgdesc = A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)
-	pkgver = 2.17.2095.102
+	pkgver = 2.17.2111.102
 	pkgrel = 1
 	url = http://code.google.com/p/mozc/
 	arch = i686
@@ -12,24 +12,23 @@ pkgbase = mozc
 	makedepends = git
 	makedepends = ninja
 	makedepends = clang
-	makedepends = emacs
 	depends = qt4
 	depends = ibus>=1.4.1
 	depends = zinnia
-	source = mozc::git+https://github.com/google/mozc.git#commit=321e0656b0f2e233ab1c164bd86c58568c9e92f2
+	source = mozc::git+https://github.com/google/mozc.git#commit=d7b6196aeac52dd908ca051ba65e97b389f4503a
 	source = jsoncpp::git+https://github.com/open-source-parsers/jsoncpp.git#commit=11086dd6a7eba04289944367ca82cea71299ed70
 	source = gyp::git+https://chromium.googlesource.com/external/gyp#commit=cdf037c1edc0ba3b5d25f8e3973661efe00980cc
 	source = protobuf::git+https://github.com/google/protobuf.git#commit=172019c40bf548908ab09bfd276074c929d48415
 	source = japanese_usage_dictionary::svn+http://japanese-usage-dictionary.googlecode.com/svn/trunk#revision=10
-	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/x-ken-all-201505.zip
-	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/jigyosyo-201505.zip
+	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/x-ken-all-201508.zip
+	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/jigyosyo-201508.zip
 	sha1sums = SKIP
 	sha1sums = SKIP
 	sha1sums = SKIP
 	sha1sums = SKIP
 	sha1sums = SKIP
-	sha1sums = 1bef90786e016b94a02b694041010719bcd74ca2
-	sha1sums = ad9cc9bd9e5acb5d6f75741e07f17732f3ff71a8
+	sha1sums = 97627c9e27a273dddf6408d0451855dd5f830eee
+	sha1sums = 927901d45051ec9bfb944e2623c4589456462f03
 
 pkgname = mozc
 	pkgdesc = A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)
@@ -44,22 +43,11 @@ pkgname = mozc
 	replaces = mozc-server
 	replaces = mozc-utils-gui
 
-pkgname = emacs-mozc
-	pkgdesc = Mozc for Emacs
-	install = emacs-mozc.install
-	arch = i686
-	arch = x86_64
-	groups = mozc-im
-	depends = mozc=2.17.2095.102
-	depends = emacs
-	conflicts = emacs-mozc-bin
-	replaces = emacs-mozc-bin
-
 pkgname = ibus-mozc
 	pkgdesc = IBus engine module for Mozc
 	arch = i686
 	arch = x86_64
 	groups = mozc-im
-	depends = mozc=2.17.2095.102
+	depends = mozc=2.17.2111.102
 	depends = ibus>=1.4.1
 
diff --git a/PKGBUILD b/PKGBUILD
index 8a7462ee4505..ddd8dfaf14e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,7 +28,7 @@ _bldtype=Release
 #*************************************************************
 
 _zipcoderel=201508
-_mozcrev=321e0656b0f2e233ab1c164bd86c58568c9e92f2
+_mozcrev=d7b6196aeac52dd908ca051ba65e97b389f4503a
 
 _gyp=cdf037c1edc0ba3b5d25f8e3973661efe00980cc
 _jsc=11086dd6a7eba04289944367ca82cea71299ed70
@@ -38,7 +38,7 @@ _jpusd=10
 pkgbase=mozc
 pkgname=mozc
 true && pkgname=('mozc')
-pkgver=2.17.2095.102
+pkgver=2.17.2111.102
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/mozc/"