[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-rime/files/, app-i18n/ibus-rime/

[David Seifert]

commit:     ace96448681e8dd7563ceed7505769b3c7792af1
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Dec 28 14:15:31 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 14:15:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace96448

app-i18n/ibus-rime: Port to EAPI 7

Closes: https://bugs.gentoo.org/708992
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../ibus-rime/files/ibus-rime-1.4.0-fno-common.patch  | 11 +++++++++++
 app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild             | 19 ++++++++++---------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/app-i18n/ibus-rime/files/ibus-rime-1.4.0-fno-common.patch b/app-i18n/ibus-rime/files/ibus-rime-1.4.0-fno-common.patch
new file mode 100644
index 00000000000..f935a18ef8c
--- /dev/null
+++ b/app-i18n/ibus-rime/files/ibus-rime-1.4.0-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/rime_settings.h
++++ b/rime_settings.h
+@@ -20,7 +20,7 @@ struct IBusRimeSettings {
+   struct ColorSchemeDefinition* color_scheme;
+ };
+ 
+-struct IBusRimeSettings g_ibus_rime_settings;
++extern struct IBusRimeSettings g_ibus_rime_settings;
+ 
+ void
+ ibus_rime_load_settings();

diff --git a/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild b/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild
index c5d297d74fe..1a7bb058a4c 100644
--- a/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild
+++ b/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,24 +10,25 @@ SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
 
-CDEPEND="app-i18n/ibus
+RDEPEND="
+	app-i18n/ibus
 	app-i18n/librime
+	app-i18n/rime-data
 	x11-libs/libnotify"
-RDEPEND="${CDEPEND}
-	app-i18n/rime-data"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/cmake
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 src_prepare() {
 	sed -i \
 		-e "/^libexecdir/s:/lib:/libexec:" \
 		-e "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" \
-		-e "s/ make/ \$(MAKE)/" \
-		Makefile
-	sed -i "/exec>/s:/usr/lib:${EPREFIX}/usr/libexec:" rime.xml
+		-e "s/ make/ \$(MAKE)/" Makefile || die
+	sed -i -e "/exec>/s:/usr/lib:${EPREFIX}/usr/libexec:" rime.xml || die
 
 	default
 }