commit: 966eed05a6bb4f9f01d341709428656e1bcb0a16 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> AuthorDate: Tue Oct 19 14:33:28 2021 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Tue Oct 19 14:41:59 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=966eed05
app-i18n/xvnkb: tidy Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org> app-i18n/xvnkb/metadata.xml | 14 ++++++------- app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild | 38 +++++++++++++++++------------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app-i18n/xvnkb/metadata.xml b/app-i18n/xvnkb/metadata.xml index 5a3a0aa5676..0df6a83c250 100644 --- a/app-i18n/xvnkb/metadata.xml +++ b/app-i18n/xvnkb/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Cjk</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">xvnkb</remote-id> - </upstream> + <maintainer type="project"> + <email>[email protected]</email> + <name>Cjk</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">xvnkb</remote-id> + </upstream> </pkgmetadata> diff --git a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild index 3f52d6d81c3..90dd4d5e6e3 100644 --- a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild +++ b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild @@ -1,47 +1,47 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="7" inherit toolchain-funcs DESCRIPTION="Vietnamese input keyboard for X" -SRC_URI="http://xvnkb.sourceforge.net/${P}.tar.bz2"; HOMEPAGE="http://xvnkb.sourceforge.net/"; +SRC_URI="http://${PN}.sourceforge.net/${P}.tar.bz2"; LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="spell xft" -RDEPEND=" - x11-libs/libX11:= +RDEPEND="x11-libs/libX11:= xft? ( x11-libs/libXft:= )" -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND} x11-base/xorg-proto" +BDEPEND="xft? ( virtual/pkgconfig )" PATCHES=( "${FILESDIR}"/${P}-ldflags.patch ) -src_configure() { +src_prepare() { + default tc-export CC +} - local myconf=() - ! use spell && myconf+=( --no-spellcheck ) - ! use xft && myconf+=( --no-xft ) - +src_configure() { # *not* autotools ./configure \ - --use-extstroke "${myconf[@]}" \ + $(usex spell '' '--no-spellcheck') \ + $(usex xft '' '--no-xft') \ + --use-extstroke \ || die "./configure failed" } src_install() { - dobin xvnkb - dobin tools/xvnkb_ctrl + dobin ${PN} + dobin tools/${PN}_ctrl - dolib.so xvnkb.so.${PV} - dosym xvnkb.so.${PV} /usr/$(get_libdir)/xvnkb.so + dolib.so ${PN}.so.${PV} + dosym ${PN}.so.${PV} /usr/$(get_libdir)/${PN}.so einstalldocs dodoc -r doc/. scripts contrib @@ -51,10 +51,10 @@ pkg_postinst() { elog "Remember to" elog "$ export LANG=en_US.UTF-8" elog "(or any other UTF-8 locale) and" - elog "$ export LD_PRELOAD=/usr/$(get_libdir)/xvnkb.so" + elog "$ export LD_PRELOAD=/usr/$(get_libdir)/${PN}.so" elog "before starting X Window" elog "More documents are in ${EROOT}/usr/share/doc/${PF}" ewarn "Programs with suid/sgid will have LD_PRELOAD cleared" - ewarn "You have to unset suid/sgid to use with xvnkb" + ewarn "You have to unset suid/sgid to use with ${PN}" }
