From 9ebdee63336b59445214386fa5111b9126d52158 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gentoo.org>
Date: Thu, 1 Dec 2022 21:40:46 -0500
Subject: app-i18n/imsettings: Drop dependency on gnome-base/gconf

Closes: https://bugs.gentoo.org/873850
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 app-i18n/imsettings/imsettings-1.8.2-r1.ebuild | 69 +++++++++++++++++++++++++
 app-i18n/imsettings/imsettings-1.8.2.ebuild    | 70 --------------------------
 app-i18n/imsettings/metadata.xml               |  1 -
 3 files changed, 69 insertions(+), 71 deletions(-)
 create mode 100644 app-i18n/imsettings/imsettings-1.8.2-r1.ebuild
 delete mode 100644 app-i18n/imsettings/imsettings-1.8.2.ebuild

(limited to 'app-i18n/imsettings')

diff --git a/app-i18n/imsettings/imsettings-1.8.2-r1.ebuild b/app-i18n/imsettings/imsettings-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..ed1257e0f018
--- /dev/null
+++ b/app-i18n/imsettings/imsettings-1.8.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 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="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
+	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\)/_/" \
+		-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/imsettings-1.8.2.ebuild b/app-i18n/imsettings/imsettings-1.8.2.ebuild
deleted file mode 100644
index 9fad1e854c63..000000000000
--- a/app-i18n/imsettings/imsettings-1.8.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 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 25862f59a7ee..7593ee8f578e 100644
--- a/app-i18n/imsettings/metadata.xml
+++ b/app-i18n/imsettings/metadata.xml
@@ -6,7 +6,6 @@
 		<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>
-- 
cgit v1.2.3-65-gdbad