gentoo resync : 20.10.2021

5 files changed, 105 insertions, 30 deletions

diff --git a/app-i18n/ibus-unikey/Manifest b/app-i18n/ibus-unikey/Manifest
index fc14cb8ba793..9815c7e3bbe8 100644
--- a/app-i18n/ibus-unikey/Manifest
+++ b/app-i18n/ibus-unikey/Manifest
@@ -1,4 +1,7 @@
+AUX ibus-unikey-slibtool.patch 578 BLAKE2B 97cca9aa00dc520da9850a197bde0065e3579cc8e4df73fbd9bf837ecc4f1df0c34e2c3339e9da8034fa8e4fbb3674ad8549e9917b448228b6a8f19f60ffed3e SHA512 5b609626d19b41186f309b96c55d7303b5ea1380089c27eeb4bc4cc7d7a07f77bdb33e26d7a642db6e83a74631b65eb4422566604f9cd60d662bcf9842602676
 DIST ibus-unikey-0.6.1-gcc6.patch 31686 BLAKE2B 5d04ba5e66b1a128a04d23e73e20a8e6a269240a07604e71f3e232e0087f0a47d9a4ff6aeaa10a001c5be9b113d8cdc2a917ecc5084d576d6f918b4c699f2ab3 SHA512 9e1b172a904076ba817c7bab80cbbf7d736c078d3ea285cb946be23552ff0f571ca8e0187cac4e5bfecc2b0032512d6f09af4435056d6b653a3648d07356d9b2
 DIST ibus-unikey-0.6.1.tar.gz 516250 BLAKE2B edb5e46df983fe54ce84f778a23814ae946c6ace772d262a06f473013b84d87d3b1293e7faa62f070763ea837eccc08dfde51cf4b23353e84ac1ceca79a44d80 SHA512 f8d519802d9b304cdaebfcee3f9fef5f17756cde48aa48b9dd357d714e2eaaba0df8f91218b658fdd1d85343804e054b7987caff2734913b29dc76263c30d4e6
-EBUILD ibus-unikey-0.6.1-r2.ebuild 838 BLAKE2B 26ba780c17d18916dbf7ac754e07b8d34ecd6095d5d4915c3568357edc5308327c377ba95e06b58a8cf2db047f15ac4f9eb4e6eecc667c009e8b5eed7609ccec SHA512 6bdd0b11d6a2e858fbe9d047c1235f0bc780eae844d5bfbd0292288fe8c80cb6a8604e00c81f83547c6a22466a6567f61828851518be24a5001e1832fc95925d
-MISC metadata.xml 633 BLAKE2B 3cbeee1f9c27a0a29f8cb003210783fca7d8c98f36b660f63b92cd40dfb1ae0c072982d52eca359c35cce60577fd52dd5f5f998421b2e42d8824a4e93b741e9f SHA512 037ad33153a13d18081a79a116a712237fef0060823f47995adf3a5ab30c0b9b02a87114607ab790499bd411b1da2e0a72b030322d1c7110bcb024a64ac30395
+DIST ibus-unikey-0.7.0_beta1.tar.gz 90086 BLAKE2B 450968ce10d5a455a9014cbd2cd9e6cbfbf559ae354dca8ca02b3a010edba4ff56caef7d79d5d80becbc51436e2192a8f9be5e936b606bae8ac65d003431188f SHA512 5e0bc188fe720014071c1c563c7bd3e92bc9e00d063c5c0647a9277fe3e05cb6c00a0aabb33e44ac5d31274f0fb03f495107195432bd7b0a89948ed3ba43d363
+EBUILD ibus-unikey-0.6.1-r2.ebuild 833 BLAKE2B f798e9ba64dc853d94a56c8003a0ebf36c379697489355dcf18f364cbcee825adc98a2924bd3e41beec608125ef51bcd7c4bfd244ec13d228bfe23d1a7aad68a SHA512 cf01f65749455c64b2ecb2225ce119da366ad8182e195187e7d28c502fc997b4e8038518c3d991bae66b2e25758aabdf26a011b1d510658186ddf339c4a4387d
+EBUILD ibus-unikey-0.7.0_beta1.ebuild 754 BLAKE2B 2c603b1321ae988cef8c34ac223bd79b5f62818b4dbedfdabe42c615853f8dad04cd6bf0d9b1288fb5aa3d773bcf1cdfa37b22e40dc1b7d564634f2c6239b1f5 SHA512 476014565c3445b6ae6f26b3045f58e85ca0082db74cf70e732dbf476531585d33b0b50e2c212ae6f9fce8d61da13a4ff78e371833a68c21f57457a6a6766cfb
+MISC metadata.xml 521 BLAKE2B e4def0d06f9ba87e61b682c8d18839725d2ee9f5fb51686be6ec5cd5dd9152d95063559ed12c9f4bcd106cc2e2b6aef97dcf51e337b603f3781b343e0072e822 SHA512 a1436b1b0c957a93eccdbf01b34b3f3bfd9772f02e1b646a867dba02beae6cb236a8cd071f42d91dd37160758de7fa139abbc2469600465c65027a04e95904ef
diff --git a/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch b/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch
new file mode 100644
index 000000000000..02551ba608fb
--- /dev/null
+++ b/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch
@@ -0,0 +1,27 @@
+--- a/setup/Makefile.am
++++ b/setup/Makefile.am
+@@ -34,7 +34,8 @@
+ 
+ ibus_setup_unikey_LDFLAGS = \
+     @IBUS_LIBS@ \
+-    @GTK_LIBS@ \
++    @GTK_LIBS@
++
++ibus_setup_unikey_LDADD = \
+     $(top_builddir)/ukengine/libunikey-ibus.la \
+     $(top_builddir)/src/ibus_engine_unikey-utils.o
+-
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -25,8 +25,9 @@
+ 
+ ibus_engine_unikey_LDFLAGS = \
+ 	@IBUS_LIBS@ \
+-	@X11_LIBS@ \
+-	$(top_builddir)/ukengine/libunikey-ibus.la
++	@X11_LIBS@
++
++ibus_engine_unikey_LDADD = $(top_builddir)/ukengine/libunikey-ibus.la
+ 
+ component_DATA = unikey.xml
+ 
diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
index 63c9b7f58158..bbe901807543 100644
--- a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
+++ b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
@@ -1,35 +1,41 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
+
+inherit autotools
 
 DESCRIPTION="Vietnamese UniKey engine for IBus"
-HOMEPAGE="https://github.com/mrlequoctuan/ibus-unikey"
+HOMEPAGE="https://github.com/vn-input/ibus-unikey"
 SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz
 	https://dev.gentoo.org/~dlan/distfiles/${P}-gcc6.patch"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+gtk gtk2 nls"
-REQUIRED_USE="gtk2? ( gtk )"
+IUSE="nls"
 
 RDEPEND="app-i18n/ibus
 	x11-libs/libX11
-	gtk? (
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3 )
-	)
+	x11-libs/gtk+:3
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
 	dev-util/intltool
 	nls? ( sys-devel/gettext )"
 
-PATCHES=( "${DISTDIR}"/${P}-gcc6.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-slibtool.patch
+	"${DISTDIR}"/${P}-gcc6.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		--with-gtk-version=$(usex gtk2 3 2)
+		--with-gtk-version=3
 }
diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild
new file mode 100644
index 000000000000..2aa330c6d61e
--- /dev/null
+++ b/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake gnome2-utils
+
+DESCRIPTION="Vietnamese UniKey engine for IBus"
+HOMEPAGE="https://github.com/vn-input/ibus-unikey"
+SRC_URI="https://github.com/vn-input/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/ibus
+	x11-libs/gtk+:3
+	virtual/libintl"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	sys-devel/gettext"
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGSETTINGS_COMPILE=OFF
+	)
+	cmake_src_configure
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-unikey/metadata.xml b/app-i18n/ibus-unikey/metadata.xml
index 90fe49a86ca3..f0eec6b726a9 100644
--- a/app-i18n/ibus-unikey/metadata.xml
+++ b/app-i18n/ibus-unikey/metadata.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <longdescription lang="en">
-    The UniKey engine for IBus. It provides a Vietnamese input method using
-    UniKey. Support via forum at: http://forum.ubuntu-vn.com/viewforum.php?f=85
-  </longdescription>
-  <use>
-    <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">mrlequoctuan/ibus-unikey</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription lang="en">
+		The UniKey engine for IBus. It provides a Vietnamese input method using
+		UniKey. Support via forum at: http://forum.ubuntu-vn.com/viewforum.php?f=85
+	</longdescription>
+	<upstream>
+		<remote-id type="github">vn-input/ibus-unikey</remote-id>
+	</upstream>
 </pkgmetadata>