gentoo resync : 03.11.2021

5 files changed, 95 insertions, 29 deletions

diff --git a/app-i18n/imsettings/Manifest b/app-i18n/imsettings/Manifest
index 199180e6fdcb..5d6b6ca72c7a 100644
--- a/app-i18n/imsettings/Manifest
+++ b/app-i18n/imsettings/Manifest
@@ -1,4 +1,6 @@
-AUX imsettings-1.7.2-fno-common.patch 334 BLAKE2B e4ca9b361b2559e808e40db759a2418a5f757e482eb10b2c0fd4ec73b1781eda29982427ec71bf11b4574ff862df4d2c18e01d672e9b5c656aac54e0b67ba4bb SHA512 c3c6445182934b7822f71085f27279b918e16c79f02cec6e3ece3133d891bb3a7aca09c3adc675aabfce34a0ab2e8e7f61eba47b5e76da70ceee0a8f1f86ca69
+AUX imsettings-fno-common.patch 334 BLAKE2B e4ca9b361b2559e808e40db759a2418a5f757e482eb10b2c0fd4ec73b1781eda29982427ec71bf11b4574ff862df4d2c18e01d672e9b5c656aac54e0b67ba4bb SHA512 c3c6445182934b7822f71085f27279b918e16c79f02cec6e3ece3133d891bb3a7aca09c3adc675aabfce34a0ab2e8e7f61eba47b5e76da70ceee0a8f1f86ca69
 DIST imsettings-1.7.2.tar.bz2 595754 BLAKE2B 9964ab7ca842a7e1b9e9c61434275b55d6a58e271dd12058195573aa65c623d5152a04bc893b3ac4d983c4798bd6f4e8cdb486577be45ec43db6600f72c8cc3b SHA512 b28d67705d3d6a0ec95babaca616f750b73cdac5e01ed61e25a6527fd7f816a14654cd7233eca56d7427b9395e7ad75757b95cd7bd55c56bbdc145a3f8bfe1f0
-EBUILD imsettings-1.7.2.ebuild 1787 BLAKE2B a32a55cb94527a601c38b6f40ba47495cc48c385d793682b0d9174875ba9b73edf985ec627249d8ef36f1c62901583655452810e1e320b04eba307d174aee98f SHA512 4283751cff7ab98e639eed3d41d8c7bb9a341ea97c90fa45103242e728a5a5b8bfeac18c2b048e827b6dabbb1317ff148f50f3fab6bd40320b5f17bf71a42811
-MISC metadata.xml 619 BLAKE2B 3263c9e540462808e64248a0574050b8cfb5e38c012ff4d2791293dc30aca4e1da74740d30359d7cbe7a846b9cc635f5c33b976962d24b54cff2cffe997d07f4 SHA512 68b2a2450f15a349062e628106b51ba09258d715f93c121423f36ed7f32fba5013efc21cfb2538a70b9dfcfeb1400a06b7f341a9702019efcb98bb6c0f4ea98f
+DIST imsettings-1.8.2.tar.bz2 705391 BLAKE2B 3b7f3e2ca2c08bc149be95fb97889ab58fc22be828b9801f4c342c1514a7be35644548d6a920fe657e1d85a9d35d8c2a40766f25d6420bb3da8a8f4e7a7ba739 SHA512 600315a20fd61eaa77a0add1e587861ad3ce70175d87639e43105d804cec59bfbc0219f2177c4d9e07d337231eb85514cbfd8af614a113b688ead372075b9ff4
+EBUILD imsettings-1.7.2.ebuild 1662 BLAKE2B c9b2942533d904a6a40c771dfb5ad5c72eb06c3c94acd1eeef1eff52839501949391d8a7081d56983bdecd146124f8e256885fa7d91da8ff6e5abb601fea0469 SHA512 3c4df3f5aa61dff767b8b1b660b045c011d37cbd332641b1f0e78cca58655273bec9f9f0c8f90a19faec129e187286f446e66c1e7c6eb2d80a5e6f2aa984bf68
+EBUILD imsettings-1.8.2.ebuild 1644 BLAKE2B 9df87222a7e61c0f57dfa3a3485509cc235f56131db80e5a53c904efc19cab73d2cefc104182af40c0fc4392072d826d8fe671e64f32bddf160ee6444b26477c SHA512 42eae33bca964dca4e555e11c08d959a8eac1253deb7749d9f9df754600f44c4480860844bbb62baf8875bf1d17b3bc1213faa00b1538ebffb8800149cd06361
+MISC metadata.xml 485 BLAKE2B d88d782384ac82e2fdd3c73821019b2293e27c6883036daa3c4e9477e81b7f82ec7dc47ee779c376ac8462d032a445dd6682a53330ac4acaebb3ec9f94affe6e SHA512 c9d7943e08fded57aa9d13538bd2daca3afe393831f113cf56a7cfda9f4b16324553f029f483cf3c6f1b54827423cd5171bea94d9638046a90f15a2170ab058f
diff --git a/app-i18n/imsettings/files/imsettings-1.7.2-fno-common.patch b/app-i18n/imsettings/files/imsettings-fno-common.patch
index 0845bd31820a..0845bd31820a 100644
--- a/app-i18n/imsettings/files/imsettings-1.7.2-fno-common.patch
+++ b/app-i18n/imsettings/files/imsettings-fno-common.patch
diff --git a/app-i18n/imsettings/imsettings-1.7.2.ebuild b/app-i18n/imsettings/imsettings-1.7.2.ebuild
index 789cc72bb3e2..bd16d48dc80e 100644
--- a/app-i18n/imsettings/imsettings-1.7.2.ebuild
+++ b/app-i18n/imsettings/imsettings-1.7.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 
 inherit autotools
 
@@ -9,40 +9,37 @@ DESCRIPTION="Delivery framework for general Input Method configuration"
 HOMEPAGE="https://tagoh.bitbucket.io/imsettings"
 SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="gconf gtk2 qt5 +introspection xfconf"
+IUSE="gconf qt5 +introspection xfconf"
 RESTRICT="test"
 
 RDEPEND="dev-libs/glib:2
 	sys-apps/dbus
 	virtual/libintl
+	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libgxim
 	x11-libs/libnotify
 	gconf? ( gnome-base/gconf )
-	gtk2? ( x11-libs/gtk+:2 )
-	!gtk2? ( x11-libs/gtk+:3 )
 	introspection? ( dev-libs/gobject-introspection )
 	xfconf? ( xfce-base/xfconf )"
 DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
+BDEPEND="dev-util/glib-utils
 	dev-util/intltool
 	sys-devel/autoconf-archive
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-MY_XINPUTSH="90-xinput"
+PATCHES=( "${FILESDIR}"/${PN}-fno-common.patch )
 
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+MY_XINPUTSH="90-xinput"
 
 src_prepare() {
 	sed -i \
 		-e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/$(usex gconf '\1' _)/" \
-		-e "/PKG_CHECK_MODULES/s/\(gtk+-2\.0\)/$(usex gtk2 '\1' _)/" \
-		-e "/PKG_CHECK_MODULES/s/\(gtk+-3\.0\)/$(usex !gtk2 '\1' _)/" \
+		-e "/PKG_CHECK_MODULES/s/\(gtk+-2\.0\)/_/" \
 		-e "/PKG_CHECK_MODULES/s/\(check\)/_/" \
 		-e "/PKG_CHECK_MODULES/s/\(libxfconf-0\)/$(usex xfconf '\1' _)/" \
 		-e "s/use_qt=\"yes\"/use_qt=\"$(usex qt5)\"/" \
diff --git a/app-i18n/imsettings/imsettings-1.8.2.ebuild b/app-i18n/imsettings/imsettings-1.8.2.ebuild
new file mode 100644
index 000000000000..6478f417a858
--- /dev/null
+++ b/app-i18n/imsettings/imsettings-1.8.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools
+
+DESCRIPTION="Delivery framework for general Input Method configuration"
+HOMEPAGE="https://tagoh.bitbucket.io/imsettings"
+SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gconf qt5 +introspection xfconf"
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib:2
+	sys-apps/dbus
+	virtual/libintl
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libgxim
+	x11-libs/libnotify
+	gconf? ( gnome-base/gconf )
+	introspection? ( dev-libs/gobject-introspection )
+	xfconf? ( xfce-base/xfconf )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/glib-utils
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-fno-common.patch )
+
+MY_XINPUTSH="90-xinput"
+
+src_prepare() {
+	sed -i \
+		-e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/$(usex gconf '\1' _)/" \
+		-e "/PKG_CHECK_MODULES/s/\(gtk+-2\.0\)/_/" \
+		-e "/PKG_CHECK_MODULES/s/\(check\)/_/" \
+		-e "/PKG_CHECK_MODULES/s/\(libxfconf-0\)/$(usex xfconf '\1' _)/" \
+		-e "s/use_qt=\"yes\"/use_qt=\"$(usex qt5)\"/" \
+		-e "/^GNOME_/d" \
+		-e "/^CFLAGS/s/\$WARN_CFLAGS/-Wall -Wmissing-prototypes/" \
+		configure.ac
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--with-xinputsh=${MY_XINPUTSH}
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	fperms 0755 /etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EPREFIX}"/etc/X11/xinit/xinputrc ]]; then
+		ln -sf xinput.d/xcompose.conf "${EPREFIX}"/etc/X11/xinit/xinputrc
+	fi
+}
diff --git a/app-i18n/imsettings/metadata.xml b/app-i18n/imsettings/metadata.xml
index 8120f5ba616c..25862f59a7ee 100644
--- a/app-i18n/imsettings/metadata.xml
+++ b/app-i18n/imsettings/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>
-  <use>
-    <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
-    <flag name="gtk2">
-      Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
-     </flag>
-    <flag name="xfconf">Enable support for <pkg>xfce-base/xfconf</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="bitbucket">tagoh/imsettings</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<use>
+		<flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
+		<flag name="xfconf">Enable support for <pkg>xfce-base/xfconf</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="bitbucket">tagoh/imsettings</remote-id>
+	</upstream>
 </pkgmetadata>