gentoo resync : 03.11.2021

4 files changed, 66 insertions, 26 deletions

diff --git a/app-i18n/im-chooser/Manifest b/app-i18n/im-chooser/Manifest
index d7b9148c94f1..0f73a9cc9eb2 100644
--- a/app-i18n/im-chooser/Manifest
+++ b/app-i18n/im-chooser/Manifest
@@ -1,3 +1,5 @@
 DIST im-chooser-1.7.0.tar.bz2 509630 BLAKE2B 4a7706509ceb19c7292a5c8cf80c8fa0b571819403f30f1fa3002927c69a83522b4de627b1d453db0ada8e662da3624edcb5f85eaf01dfa0187978f2a9b2095c SHA512 2a01488062b5a4dc1e4cd0815dda5a6bcef205dc50ed75d58836c5b46e3f86be79aac70eb5d6753e5f569ccc05015dd6d8de59029e94dc407cc613160d3ac61c
-EBUILD im-chooser-1.7.0.ebuild 966 BLAKE2B de043ef070a6c0ca2fb13e23dd587c25a28770fa768c85f582c52b7aa945e0fcb73c12e1d8142c912bbb7e8141ba595f7e1fced73f76a6039c78ce0c26e2673a SHA512 98247120f4f0d9fe21bf732a226ebf3cf797b276e8c8620583dd149f6d756b06169129b193f6225c4cefad42fb92b5e1adc572f6c683980d140efba330459805
-MISC metadata.xml 626 BLAKE2B f8dd76bbe663f9d91b7d05b110e164a5f8e9c7b6999650d0ce42d7d3ade024f4fc7dfd44eba1200fa615be2d87c7029bcaf672f7e9ca63750717100c30a7d613 SHA512 74a348dd766c442f27dcf71eb32c0eed32b8e5a6bc267ac2d0b9b0d10a7f5fabe4a9d7f074850a9f69e37f2e5429dd829130946ec2bdd4f98aa2dce0e95f3278
+DIST im-chooser-1.7.3.tar.bz2 602217 BLAKE2B d61ad631ff40a25bffef17779b01073062bd70221b7e4ca435b896fc989f9a71036b84a5eb774abd2f42cee218932ccc7511a6056d3aa14d2cb7c262c4b45fe3 SHA512 d43088909e7ba3ad84166965877c4052aad195e360c0583dbc612b46cccd703217b57f149fa584f2f0d3fb706a8bcd6d129c5f9ca407b0a11bb6d304d4a06ef7
+EBUILD im-chooser-1.7.0-r2.ebuild 935 BLAKE2B f696b159972f5f145ef97a0dfc60a08e582e87d40ee7af2d6d96b965d4ccd66c2e186dba6b10c60487d168163b613a602441760b51cea6f77ade8234d36e0252 SHA512 34e016ea178850023e8ad18511e66b621bc69f15570b6f5745c66465e780101e30607eb4b5e17425e66ce0fc48064a30fcc940117b2067e248b8da7563e919ad
+EBUILD im-chooser-1.7.3.ebuild 923 BLAKE2B a4a7a75f6d507541d4d45855db8618454e49d763207973eabdbfb41c1d30ee3a76341852e1bede624c7335cac50cac898525812ce81656894f2219a3c96dfb46 SHA512 ee284d6a198268f696850a7c28027c80ae7870a4f244b615fa8ec008b1b84483d49f8a4f8bc5f870e8fb039b81e8b608f067ab37179604507644fe8d535c03fa
+MISC metadata.xml 492 BLAKE2B 52e0b290e1ff9a3bc27eae91aecdfa145045e5746bddd128ba6fe4a1063f07e33491b3622fe770a58fc52a1fd31864debb811ad50a32b9d30c5f8c7ec3d9df3c SHA512 a2b347f40c28baeaaf7c6375a14723612bdaa3fdc3670b049088681dd18f98d2fbaf56be670f2dba267c5a9e8e9da1e1eb91ac1fafeb54f6530bf490a5e0d6fa
diff --git a/app-i18n/im-chooser/im-chooser-1.7.0.ebuild b/app-i18n/im-chooser/im-chooser-1.7.0-r2.ebuild
index cff570a150e8..f493dc5a0002 100644
--- a/app-i18n/im-chooser/im-chooser-1.7.0.ebuild
+++ b/app-i18n/im-chooser/im-chooser-1.7.0-r2.ebuild
@@ -1,38 +1,37 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="8"
 
-inherit autotools
+inherit autotools xdg
 
 DESCRIPTION="Desktop Input Method configuration tool"
 HOMEPAGE="https://pagure.io/im-chooser"
 SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="gtk2 xfce"
+IUSE="xfce"
 
 RDEPEND="app-i18n/imsettings
 	virtual/libintl
+	x11-libs/gtk+:3
 	x11-libs/libSM
-	gtk2? ( x11-libs/gtk+:2 )
-	!gtk2? ( x11-libs/gtk+:3 )
 	xfce? ( xfce-base/libxfce4util )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
 	sys-devel/autoconf-archive
 	sys-devel/gettext
 	virtual/pkgconfig"
 
 src_prepare() {
 	sed -i \
-		-e "/PKG_CHECK_MODULES/s/\(gtk+-3\.0\)/$(usex !gtk2 '\1' _)/" \
 		-e "/PKG_CHECK_MODULES/s/\(libxfce4util-1\.0\)/$(usex xfce '\1' _)/" \
 		-e "/^GNOME_/d" \
 		-e "/^CFLAGS/s/\$WARN_CFLAGS/-Wall -Wmissing-prototypes/" \
 		configure.ac
+	sed -i "s/Applications;//" src/app/${PN}.desktop.in.in
 
 	default
 	eautoreconf
diff --git a/app-i18n/im-chooser/im-chooser-1.7.3.ebuild b/app-i18n/im-chooser/im-chooser-1.7.3.ebuild
new file mode 100644
index 000000000000..32ca7804c6d7
--- /dev/null
+++ b/app-i18n/im-chooser/im-chooser-1.7.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools xdg
+
+DESCRIPTION="Desktop Input Method configuration tool"
+HOMEPAGE="https://pagure.io/im-chooser"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="xfce"
+
+RDEPEND=">=app-i18n/imsettings-1.8
+	virtual/libintl
+	x11-libs/gtk+:3
+	x11-libs/libSM
+	xfce? ( xfce-base/libxfce4util )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e "/PKG_CHECK_MODULES/s/\(libxfce4util-1\.0\)/$(usex xfce '\1' _)/" \
+		-e "/^GNOME_/d" \
+		-e "/^CFLAGS/s/\$WARN_CFLAGS/-Wall -Wmissing-prototypes/" \
+		configure.ac
+	sed -i "s/Applications;//" src/app/${PN}.desktop.in.in
+
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-i18n/im-chooser/metadata.xml b/app-i18n/im-chooser/metadata.xml
index 44a7fc1547e8..1e89d4e6c916 100644
--- a/app-i18n/im-chooser/metadata.xml
+++ b/app-i18n/im-chooser/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">
-    IM Chooser is a GUI configuration tool for IMSettings to choose Input
-    Method you want to use or disable it entirely on the desktop.
-  </longdescription>
-  <use>
-    <flag name="gtk2">
-      Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
-     </flag>
-    <flag name="xfce">Enable support for XFCE panel</flag>
-  </use>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription lang="en">
+		IM Chooser is a GUI configuration tool for IMSettings to choose Input
+		Method you want to use or disable it entirely on the desktop.
+	</longdescription>
+	<use>
+		<flag name="xfce">Enable support for XFCE panel</flag>
+	</use>
 </pkgmetadata>