gentoo resync : 25.08.2020

3 files changed, 84 insertions, 8 deletions

diff --git a/app-i18n/ibus-cangjie/Manifest b/app-i18n/ibus-cangjie/Manifest
index a35a0c2f784d..3b8b0682ea23 100644
--- a/app-i18n/ibus-cangjie/Manifest
+++ b/app-i18n/ibus-cangjie/Manifest
@@ -1,3 +1,4 @@
+AUX ibus-cangjie-2.4-metadata.patch 2227 BLAKE2B 6997c3653224b15722cb17b7f33bb101f18dc443062a793f7c8fc6288c9dfd917c7b8e00a3ba2dc0673041195dd43468cf441edbd89c00615d0691a6f2268e33 SHA512 07cf9d87b0c022f36a8f9c9c59a1ade144a4d1e7804bd95579ae2b4186a7942feeb8c77be3a1e41229c3e56e5c28a603e316e28e0d8609a8c94351676216df8e
 DIST ibus-cangjie-2.4.tar.xz 150616 BLAKE2B 2e59acc1b05ce0dc3dad26ba663440d067bf28a549e79ec9d127de414d715f5e376f426db5b415255eb63aa13677e59643889481f5e39c946399d4d4fe15a468 SHA512 cef9562fc4a5f3b78881c09b43e502f02322148e501022d3f80989caef4ca98ae26903e9a3dcc422feeba7712a8321c731ba229429e52fe919db5144aa0ead47
-EBUILD ibus-cangjie-2.4-r1.ebuild 907 BLAKE2B 88eb239b187d1df15a1214db7ebbca12e14b4830deeebf02b893a085de98c8909fd32a268702c92d28061ff3ef86c3a5790ad3b8ab795452c4aaf9357671ffbe SHA512 9649b8edb49766db2e1794444c36351175b28838cf15c11241076a85f0734190569092b794a2e83278220f2af2b6cc036a8711c2770fa11f13996ba4d434bfcd
+EBUILD ibus-cangjie-2.4-r2.ebuild 1113 BLAKE2B 5f43c01dc419e991fc65be4664ac940ad32b61e3dc1496879dd3835048b3c6bc76ccde72620a7296bf178acaea86c5852e505f0996fe42bd52da0be1eda4889e SHA512 c8827da3c930cfaa6c86986ed65e7ee8fe0c4824014971b453caf56610fa0e6ff6dad0215956e0e202843737bdddb83641834af732fcc3efb86ccc1ae208ead1
 MISC metadata.xml 321 BLAKE2B f6906dfe6babd501643f94145258a76d52aabdf44274f8989d88b513157d178a3e564089e97b694371d85b750214d359213ed7ab00dab78c6262bc23314342ef SHA512 5681abe463968d6ac39a94d5b30428be7bcb9fa5ebb2318223ca9ab4261b303fa37eecb1d506f7131609856eba12deddccf7c8cd4d01954f5bd71a4e327551e7
diff --git a/app-i18n/ibus-cangjie/files/ibus-cangjie-2.4-metadata.patch b/app-i18n/ibus-cangjie/files/ibus-cangjie-2.4-metadata.patch
new file mode 100644
index 000000000000..acc2b0ca9e88
--- /dev/null
+++ b/app-i18n/ibus-cangjie/files/ibus-cangjie-2.4-metadata.patch
@@ -0,0 +1,61 @@
+https://github.com/Cangjians/ibus-cangjie/commit/378f57b9126eb2af7660c45073107ba8f1dac3f8
+
+Author: Boyuan Yang <byang@debian.org>
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -28,7 +28,7 @@ ibus_cangjie_datadir = $(pkgdatadir)
+ @INTLTOOL_XML_RULE@
+ appdata_in_files = data/cangjie.appdata.xml.in data/quick.appdata.xml.in
+ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+-appdatadir = $(datadir)/appdata
++appdatadir = $(datadir)/metainfo
+ 
+ component_in_in_files = data/cangjie.xml.in.in data/quick.xml.in.in
+ component_DATA = $(component_in_in_files:.xml.in.in=.xml)
+--- a/data/cangjie.appdata.xml.in
++++ b/data/cangjie.appdata.xml.in
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<application>
+-  <id type="inputmethod">cangjie.xml</id>
+-  <licence>CC0</licence>
++<component type="inputmethod">
++  <id>cangjie.xml</id>
++  <metadata_license>CC0-1.0</metadata_license>
+   <_name>Cangjie</_name>
+   <_summary>Cangjie input method</_summary>
+   <description>
+@@ -12,6 +12,6 @@
+        experience for people of the SAR by default, but provide useful options
+        for others.</_p>
+   </description>
+-  <url type="homepage">http://cangjians.github.io/ibus-cangjie</url>
+-  <updatecontact>hklug@googlegroups.com</updatecontact>
+-</application>
++  <url type="homepage">https://cangjians.github.io/projects/ibus-cangjie/</url>
++  <update_contact>hklug@googlegroups.com</update_contact>
++</component>
+--- a/data/quick.appdata.xml.in
++++ b/data/quick.appdata.xml.in
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<application>
+-  <id type="inputmethod">quick.xml</id>
+-  <licence>CC0</licence>
++<component type="inputmethod">
++  <id>quick.xml</id>
++  <metadata_license>CC0-1.0</metadata_license>
+   <_name>Quick</_name>
+   <_summary>Quick input method</_summary>
+   <description>
+@@ -13,6 +13,6 @@
+        experience for people of the SAR by default, but provide useful options
+        for others.</_p>
+   </description>
+-  <url type="homepage">http://cangjians.github.io/ibus-cangjie</url>
+-  <updatecontact>hklug@googlegroups.com</updatecontact>
+-</application>
++  <url type="homepage">https://cangjians.github.io/projects/ibus-cangjie/</url>
++  <update_contact>hklug@googlegroups.com</update_contact>
++</component>
diff --git a/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r1.ebuild b/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
index b217f0feaf8c..b5215cf73eb1 100644
--- a/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r1.ebuild
+++ b/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit gnome2-utils python-r1
+inherit autotools gnome2-utils python-r1 xdg
 
 DESCRIPTION="Chinese Cangjie and Quick engines for IBus"
 HOMEPAGE="http://cangjians.github.io/"
@@ -21,10 +21,17 @@ RDEPEND="${PYTHON_DEPS}
 	app-i18n/libcangjie
 	dev-python/cangjie[${PYTHON_USEDEP}]
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
 	nls? ( sys-devel/gettext )"
 
+PATCHES=( "${FILESDIR}"/${P}-metadata.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	python_foreach_impl default
 }
@@ -37,10 +44,17 @@ src_install() {
 	python_foreach_impl default
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
+	gnome2_schemas_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
+	gnome2_schemas_update
 }