diff options
Diffstat (limited to 'app-i18n')
| -rw-r--r-- | app-i18n/Manifest.gz | bin | 19496 -> 19494 bytes | |||
| -rw-r--r-- | app-i18n/kinput2/Manifest | 2 | ||||
| -rw-r--r-- | app-i18n/kinput2/kinput2-3.1-r3.ebuild (renamed from app-i18n/kinput2/kinput2-3.1-r2.ebuild) | 28 |
3 files changed, 15 insertions, 15 deletions
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz Binary files differindex 28f9bcb7505f..01f575408ed3 100644 --- a/app-i18n/Manifest.gz +++ b/app-i18n/Manifest.gz diff --git a/app-i18n/kinput2/Manifest b/app-i18n/kinput2/Manifest index 78cfc3721bd7..683d3f202a7b 100644 --- a/app-i18n/kinput2/Manifest +++ b/app-i18n/kinput2/Manifest @@ -5,5 +5,5 @@ AUX kinput2-segfault.patch 240 BLAKE2B e8815bf5a3ca6b19fac492e51dea7faa98d3acacb AUX kinput2-wnn.patch 1726 BLAKE2B 034b74ce8de370d2088dbd77ac61f3268c5b28537619985ed1ad6896d011ddff31c1b9523f38681e8461b935b01239697606f3106cad521e5d1dc55922f1d760 SHA512 a8ea7756ca893b0bdd7d491c8e2a4187c5d34b084c567449597b8fa1d9fb9ae4437bedba9d771a7b88a3e621573ce6650243dfa5ff396bebb653cbf4b6f5712b AUX xinput-kinput2 121 BLAKE2B 34d40a7874ee79faff6f602bb32d705efdeac28a3d0a2bf89c68ba8f6e771eacc5878faf8347de171e813384e3bfdb113dcba7229ce1b5ecf6b1a293a6516b00 SHA512 09aaae3bebb062db82e8440977f58b9324e53262c6a9c95a276d305e87a2f9c0f9775077bd05c6ea069cceb6e45cb4efc4a6c412da7501b2b01825bc26799ec5 DIST kinput2-v3.1.tar.gz 512177 BLAKE2B d67ca132fe3054d862c80b03b4665cdc5f4089745d848f6af9309b5896e0931182bdeefc621fad1cb8f1fd3686b07106cd6df5e703b3623f926cf83d637fa5df SHA512 5950f7294fa2bf915e6591290a3deb2c95f27706f3a180a084d14fbc008f3cf363b155b29c8103a8b999e44ae98182ff35bcfda85725b2c565f3e37f54788731 -EBUILD kinput2-3.1-r2.ebuild 1744 BLAKE2B 04b183b6073c0a3ae2243aface8b6422e7fc8b0295ba8333f17eec89ed032f4f2586fe047a2f457da334cabe6e3c9dc3009b774fcc4d836c7467a3cd810e4166 SHA512 0a709551ce497d0b65e8b1c5bb6c2e5b3a3abf8f8a038d4846574874a1a83fc0853066d86b0fc9a8acb63523100c955065346a6410193a98032bdc24fe2e002d +EBUILD kinput2-3.1-r3.ebuild 1663 BLAKE2B 302c8a01772167670e5db8b2a45b78b57c91e7ed4387be912a18a67459ba0abf57de318c567fc9925076e0397f4280b9fa857738d37bc9f2d7e77851ae3dcd1a SHA512 b41e6ff23269e12f499ed9e1d39dec91508bd70fe79440258647a9d94ac36e64b41db9d87acc2df7c8c8f42888eab5c66830353de3ac546757bc205d7fffe0f6 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild b/app-i18n/kinput2/kinput2-3.1-r3.ebuild index 2354479f0fd5..98694463da46 100644 --- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild +++ b/app-i18n/kinput2/kinput2-3.1-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit toolchain-funcs @@ -10,26 +10,26 @@ MY_P="${PN}-v${PV}" DESCRIPTION="A Japanese input server which supports the XIM protocol" HOMEPAGE="http://www.nec.co.jp/canna" SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="HPND" SLOT="0" KEYWORDS="amd64 ppc ppc64 sparc x86" -IUSE="freewnn" -RDEPEND="x11-libs/libICE +RDEPEND=" + app-i18n/freewnn + x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm - x11-libs/libXt - !freewnn? ( app-i18n/canna ) - freewnn? ( app-i18n/freewnn )" -DEPEND="${RDEPEND} + x11-libs/libXt" +DEPEND="${RDEPEND}" +BDEPEND=" x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1" -S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch @@ -38,12 +38,10 @@ PATCHES=( "${FILESDIR}"/${PN}-segfault.patch "${FILESDIR}"/${PN}-wnn.patch ) -DOCS=( README NEWS doc/. ) src_prepare() { default - - sed -i "s|^/\* \(#define Use$(usex freewnn Wnn Canna)\) \*/|\1|" ${PN^k}.conf + sed -i "s|^/\* \(#define UseWnn\) \*/|\1|" ${PN^k}.conf || die } src_configure() { @@ -66,15 +64,17 @@ src_install() { XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \ DESTDIR="${D}" \ install + einstalldocs + dodoc -r doc/. newman cmd/${PN}.man ${PN}.1 - rm -rf "${ED}"/usr/$(get_libdir)/X11 + rm -rf "${ED}"/usr/$(get_libdir)/X11 || die insinto /etc/X11/xinit/xinput.d sed \ -e "s:@EPREFIX@:${EPREFIX}:g" \ - -e "s:@SERVER@:$(usex freewnn wnn canna):g" \ - "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf + -e "s:@SERVER@:wnn:g" \ + "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf || die doins "${T}"/${PN}.conf } |