From db37a14e0ce7bf209ff95d5fc173567510235b00 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Sun, 10 Mar 2019 14:28:02 +0100
Subject: [PATCH] mozc: fix install paths

---
 srcpkgs/mozc/template | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template
index b8dd904f326..63a86321c4e 100644
--- a/srcpkgs/mozc/template
+++ b/srcpkgs/mozc/template
@@ -1,7 +1,7 @@
 # Template file for 'mozc'
 pkgname=mozc
 version=2.23.2815.102
-revision=4
+revision=5
 create_wrksrc=yes
 build_wrksrc=mozc/src
 hostmakedepends="ninja pkg-config protobuf protobuf-devel python"
@@ -74,8 +74,8 @@ do_build() {
 }
 
 do_install() {
-	vinstall out_linux/Release/mozc_server 755 usr/lib/mozc/mozc_server
-	vinstall out_linux/Release/mozc_tool 755 usr/lib/mozc_tool
+	vinstall out_linux/Release/mozc_server 755 usr/lib/mozc
+	vinstall out_linux/Release/mozc_tool 755 usr/lib/mozc
 
 	head -n 29 server/mozc_server.cc > LICENSE
 	for i in LICENSE data/installer/*.html; do
@@ -87,13 +87,13 @@ ibus-mozc_package() {
 	short_desc="Mozc engine for IBus - Client of the Mozc input method"
 	depends="${sourcepkg}-${version}_${revision} ibus>=1.5.14"
 	pkg_install() {
-		vinstall out_linux/Release/ibus_mozc 755 usr/lib/ivus/mozc/ibus-engine-mozc
-		vinstall out_linux/Release/gen/unix/ibus/mozc.xml 644 usr/share/ibus/component/mozc.xml
-		vinstall data/images/unix/ime_product_icon_opensource-32.png 644 usr/share/ibus-mozc/product_icon.png
+		vinstall out_linux/Release/ibus_mozc 755 usr/lib/ibus-mozc ibus-engine-mozc
+		vinstall out_linux/Release/gen/unix/ibus/mozc.xml 644 usr/share/ibus/component
+		vinstall data/images/unix/ime_product_icon_opensource-32.png 644 usr/share/ibus-mozc product_icon.png
 		for i in data/images/unix/ui-*.png; do
-			vinstall "${i}" 644 usr/share/ibus/mozc/"${i##/ui-}"
+			vinstall "${i}" 644 usr/share/ibus-mozc "${i##*/ui-}"
 		done
-		vinstall out_linux/Release/mozc_renderer 755 usr/lib/mozc/mozc_renderer
+		vinstall out_linux/Release/mozc_renderer 755 usr/lib/mozc
 	}
 }
 
@@ -102,7 +102,7 @@ emacs-mozc_package() {
 	depends="${sourcepkg}-${version}_${revision} emacs"
 	pkg_install() {
 		vbin out_linux/Release/mozc_emacs_helper
-		vinstall unix/emacs/mozc.el 644 usr/share/emacs/site-list/emacs-mozc/mozc.el
+		vinstall unix/emacs/mozc.el 644 usr/share/emacs/site-lisp/emacs-mozc
 	}
 }
 
@@ -110,10 +110,10 @@ fcitx-mozc_package() {
 	short_desc="Mozc engine for fcitx - Client of the Mozc input method"
 	depends="${sourcepkg}-${version}_${revision} fcitx>=4.2.9"
 	homepage="https://fcitx-im.org/"
-	license="GPL-2"
+	license="GPL-2.0-or-later"
 	pkg_install() {
-		vinstall out_linux/Release/fcitx-mozc.so 644 usr/lib/fcitx/fcitx-mozc.so
-		vinstall unix/fcitx/fcitx-mozc.conf 644 usr/share/fcitx/addon/fcitx-mozc.conf
-		vinstall unix/fcitx/mozc.conf 644 usr/share/fcitx/inputmethod/mozc.conf
+		vinstall out_linux/Release/fcitx-mozc.so 644 usr/lib/fcitx
+		vinstall unix/fcitx/fcitx-mozc.conf 644 usr/share/fcitx/addon
+		vinstall unix/fcitx/mozc.conf 644 usr/share/fcitx/inputmethod
 	}
 }