diff options
| author |   Jakov Smolic <jakov.smolic@sartura.hr> | 2020-12-28 15:15:31 +0100 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2020-12-28 15:15:31 +0100 |
| commit | ace96448681e8dd7563ceed7505769b3c7792af1 (patch) | |
| tree | 8f9b5f85497d1d6a9963ef0f6aebdb671d098f64 /app-i18n | |
| parent | app-i18n/ibus-rime: Cleanup old versions (diff) | |
| download | gentoo-ace96448681e8dd7563ceed7505769b3c7792af1.tar.gz gentoo-ace96448681e8dd7563ceed7505769b3c7792af1.tar.bz2 gentoo-ace96448681e8dd7563ceed7505769b3c7792af1.zip | |
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@sartura.hr>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'app-i18n')
| -rw-r--r-- | app-i18n/ibus-rime/files/ibus-rime-1.4.0-fno-common.patch | 11 | ||||
| -rw-r--r-- | 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 000000000000..f935a18ef8c3 --- /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 c5d297d74fec..1a7bb058a4c0 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 } |