From 05b36d9f991a8434cf14a84d11e7ff0658e9e8e6 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gentoo.org>
Date: Thu, 1 Dec 2022 21:39:02 -0500
Subject: app-i18n/ibus-chewing: Drop dependency on gnome-base/gconf

The dependency was bogus because the ebuild was broken, like most cjk
ebuilds are.

Closes: https://bugs.gentoo.org/873847
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 .../ibus-chewing-1.6.1_p20210117-r1.ebuild         | 67 +++++++++++++++++++++
 .../ibus-chewing-1.6.1_p20210117.ebuild            | 68 ----------------------
 app-i18n/ibus-chewing/metadata.xml                 |  3 -
 3 files changed, 67 insertions(+), 71 deletions(-)
 create mode 100644 app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117-r1.ebuild
 delete mode 100644 app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild

(limited to 'app-i18n/ibus-chewing')

diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117-r1.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117-r1.ebuild
new file mode 100644
index 000000000000..08958e1c6e49
--- /dev/null
+++ b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake gnome2-utils vcs-snapshot virtualx
+
+EGIT_COMMIT="8e17848d3fe3bd7de052a1c26b4161092ba1df9f"
+
+DESCRIPTION="Chinese Chewing engine for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/definite/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~hattya/distfiles/${PN}-gob2.patch.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="app-i18n/ibus
+	app-i18n/libchewing
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/cmake-fedora
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-gob2.patch
+	"${FILESDIR}"/${PN}-test.patch
+)
+DOCS=( AUTHORS ChangeLog README.md RELEASE-NOTES.txt USER-GUIDE )
+
+src_configure() {
+	local mycmakeargs=(
+		-DGCONF2_SUPPORT=OFF
+		-DGSETTINGS_SUPPORT=ON
+		-DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
+		-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
+	)
+	use nls || mycmakeargs+=( -DMANAGE_GETTEXT_SUPPORT=0 )
+	cmake_src_configure
+}
+
+src_test() {
+	"${BROOT}"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die
+
+	export GSETTINGS_BACKEND="memory"
+	export GSETTINGS_SCHEMA_DIR="${BUILD_DIR}/bin"
+	virtx cmake_src_test -j1
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild
deleted file mode 100644
index 85e9e8c0e864..000000000000
--- a/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake gnome2-utils vcs-snapshot virtualx
-
-EGIT_COMMIT="8e17848d3fe3bd7de052a1c26b4161092ba1df9f"
-
-DESCRIPTION="Chinese Chewing engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/definite/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~hattya/distfiles/${PN}-gob2.patch.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gconf nls"
-
-RDEPEND="app-i18n/ibus
-	app-i18n/libchewing
-	dev-libs/glib:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	gconf? ( gnome-base/gconf )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-util/cmake-fedora
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-gob2.patch
-	"${FILESDIR}"/${PN}-test.patch
-)
-DOCS=( AUTHORS ChangeLog README.md RELEASE-NOTES.txt USER-GUIDE )
-
-src_configure() {
-	local mycmakeargs=(
-		-DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
-		-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
-	)
-	use nls || mycmakeargs+=( -DMANAGE_GETTEXT_SUPPORT=0 )
-	cmake_src_configure
-}
-
-src_test() {
-	"${BROOT}"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die
-
-	export GSETTINGS_BACKEND="memory"
-	export GSETTINGS_SCHEMA_DIR="${BUILD_DIR}/bin"
-	virtx cmake_src_test -j1
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-chewing/metadata.xml b/app-i18n/ibus-chewing/metadata.xml
index cf7f054fe39e..2fc61b76269f 100644
--- a/app-i18n/ibus-chewing/metadata.xml
+++ b/app-i18n/ibus-chewing/metadata.xml
@@ -5,9 +5,6 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
-	<use>
-		<flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">definite/ibus-chewing</remote-id>
 	</upstream>
-- 
cgit v1.2.3-65-gdbad