gentoo resync : 30.05.2020

4 files changed, 76 insertions, 27 deletions

diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index 5aced37d4416..d3934175abc4 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,3 +1,5 @@
 DIST ibus-m17n-1.3.4.tar.gz 436687 BLAKE2B 66c1138101b1c3634ebeef4657ef9d4accb30e9db0047d7232d1c25a5d061e705fb1f1bd2800c951baadeddf999a4eb24a581d59e261df4fd68d23b29ef3c530 SHA512 9e9bc290b0f0d68558d408f6e69aa3bd9bb767db827a95839b576b58c7a5056dedcbd9b0bf1aab5e26ab21e601acd67a53404a5fd54b436efaf2a706489f25c4
-EBUILD ibus-m17n-1.3.4.ebuild 754 BLAKE2B 6564070e8d07b4ea14b9272785c12610d061ef05c88c3427fe37b4dbb2a6ff4c0bf6216d77453cc3789d4f7349a7d2a8106d66f4cb9b160aefd84a03492123df SHA512 ee3ae78bc8aede6146d9d5460ee053711927db126f7cdcbf090f73c41bc840aaae455e5be683222a5ec95b50cde3e67125c3a8da6c204c302099efd6e2e2bc46
-MISC metadata.xml 706 BLAKE2B 26b96ef11039182056e63f34f5bfa5f105e3eff9cd996aabaf0fde26bc650b51e1a176f700c7189cc568310c1ea6f8ef15c0316801526b3556142a0473731736 SHA512 b5da8f8cf77fe9028b052e0a546667342116e16c79ef044032443f30ff2814c5e534ee70b99419fbb509db2d4d755d570f8a8900a139594518eb7b6a5971b0f2
+DIST ibus-m17n-1.4.2.tar.gz 488603 BLAKE2B b916e1cc799eca2f042a0496a1184ccf32174eef1399f9ef7e3b7f3fc6ef2177514159706f1f4a4d696df136e7a5e7967af90ce0e1b4a021ac84e44973fe446c SHA512 5f865bd5d6dcd29828b14ea991effa6e883777173c48dd88cf676890dd2a980f95b3859b90fb44fb8cfe84df6da14335d3060605c4ce517f5eb179497a7b146b
+EBUILD ibus-m17n-1.3.4.ebuild 720 BLAKE2B 3298a1d7210d4352da864718e433f8492f7b00f5da58461d11edaccea1ca42791c9b3c3b4beaa22d59d270291367a3127d2b6c62cd69b66658eaa009f6426b53 SHA512 071d3c02802dadf2c135caab8772855de848caeb78ca31d8c6cc7d18fc23e6cdaaf945ec65d09796832266100bf4a4aa29b1ab08994a360a92a83be38323e773
+EBUILD ibus-m17n-1.4.2.ebuild 896 BLAKE2B b93209f806529562d0e9d9ab83eb21951dab9ed8ebdfd594ba0ea4aea0c6f205775b25f3079e3eccbf72418b4cfade4d7707dd5b55f07dff85949b49907abd00 SHA512 7fd515019c35c3e7edb1efc49aa9994e91ef2053635d1d6525171e6f290999aaf3573320fc3c4f7106302adc2121ee4967548a5976d8d101fabb2f062eec6b5f
+MISC metadata.xml 679 BLAKE2B a374aafbf949a9cb71906396787329ea1cd31775b29bf1675b30c98098e1025ee5e96dcdce2e8324bd6d3bfc05e854f89b1120a2e9410834a4dab767db1336b0 SHA512 c07286ebfb6f8bcf82c4fe6b5d02cf0a49287c7609daa42a356b8bfe7b3c074558d39d987decbffd15b10a33d475630b5f7194ff9941c9762c87dbcbefada953
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
index c17acb485e0b..e4d15371acb1 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
@@ -1,30 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 DESCRIPTION="M17N engine for IBus"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
 SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="gtk gtk2 nls"
 REQUIRED_USE="gtk2? ( gtk )"
 
-CDEPEND="app-i18n/ibus
+DEPEND="app-i18n/ibus
 	dev-libs/m17n-lib
 	gtk? (
 		gtk2? ( x11-libs/gtk+:2 )
 		!gtk2? ( x11-libs/gtk+:3 )
 	)
 	nls? ( virtual/libintl )"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	>=dev-db/m17n-db-1.7"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
+BDEPEND="sys-devel/gettext
 	virtual/pkgconfig"
 
 src_configure() {
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.2.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.2.ebuild
new file mode 100644
index 000000000000..ed8610ca2b2e
--- /dev/null
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit gnome2-utils xdg
+
+DESCRIPTION="M17N engine for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk gtk2 nls"
+REQUIRED_USE="gtk2? ( gtk )"
+
+DEPEND="app-i18n/ibus
+	dev-libs/m17n-lib
+	gtk? (
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3 )
+	)
+	nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	>=dev-db/m17n-db-1.7"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with gtk gtk $(usex gtk2 2.0 3.0))
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-m17n/metadata.xml b/app-i18n/ibus-m17n/metadata.xml
index 905cdaedd1a9..481dbcd8c9d1 100644
--- a/app-i18n/ibus-m17n/metadata.xml
+++ b/app-i18n/ibus-m17n/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <longdescription lang="en">
-    The M17N engine for IBus. It allows input of many languages using the input
-    table maps from <pkg>dev-libs/m17n-lib</pkg>.
-  </longdescription>
-  <use>
-    <flag name="gtk2">
-      Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:ibus_project:ibus-m17n</remote-id>
-    <remote-id type="github">ibus/ibus-m17n</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription lang="en">
+		The M17N engine for IBus. It allows input of many languages using the input
+		table maps from <pkg>dev-libs/m17n-lib</pkg>.
+	</longdescription>
+	<use>
+		<flag name="gtk2">
+			Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:ibus_project:ibus-m17n</remote-id>
+		<remote-id type="github">ibus/ibus-m17n</remote-id>
+	</upstream>
 </pkgmetadata>