[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-cangjie/, app-i18n/ibus-cangjie/files/

[Akinori Hattori]

commit:     553c2ed2679c30adcff4c9444acbad42023acacc
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 12:43:00 2020 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 12:43:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553c2ed2

app-i18n/ibus-cangjie: update metadata location

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 .../files/ibus-cangjie-2.4-metadata.patch          | 61 ++++++++++++++++++++++
 ...ie-2.4-r1.ebuild => ibus-cangjie-2.4-r2.ebuild} |  9 +++-
 2 files changed, 69 insertions(+), 1 deletion(-)

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 00000000000..acc2b0ca9e8
--- /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@××××××.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@××××××××××××.com</updatecontact>
+-</application>
++  <url type="homepage">https://cangjians.github.io/projects/ibus-cangjie/</url>
++  <update_contact>hklug@××××××××××××.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@××××××××××××.com</updatecontact>
+-</application>
++  <url type="homepage">https://cangjians.github.io/projects/ibus-cangjie/</url>
++  <update_contact>hklug@××××××××××××.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
similarity index 88%
rename from app-i18n/ibus-cangjie/ibus-cangjie-2.4-r1.ebuild
rename to app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
index 1f42602a211..b5215cf73eb 100644
--- a/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r1.ebuild
+++ b/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit gnome2-utils python-r1 xdg
+inherit autotools gnome2-utils python-r1 xdg
 
 DESCRIPTION="Chinese Cangjie and Quick engines for IBus"
 HOMEPAGE="http://cangjians.github.io/"
@@ -25,6 +25,13 @@ 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
 }