Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/xvnkb/, app-i18n/xvnkb/files/
Date: Tue, 19 Oct 2021 14:42:15
Message-Id: 1634654523.987d5b923141f62ea0a65234a9a1faa6febb33d0.hattya@gentoo
1 commit: 987d5b923141f62ea0a65234a9a1faa6febb33d0
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 19 14:41:15 2021 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 19 14:42:03 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=987d5b92
7
8 app-i18n/xvnkb: new upstream release
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
12
13 app-i18n/xvnkb/Manifest | 1 +
14 app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch | 30 ++++++++++++
15 app-i18n/xvnkb/xvnkb-0.2.11.ebuild | 63 +++++++++++++++++++++++++
16 3 files changed, 94 insertions(+)
17
18 diff --git a/app-i18n/xvnkb/Manifest b/app-i18n/xvnkb/Manifest
19 index 595ce7a35ab..c6e7264d80b 100644
20 --- a/app-i18n/xvnkb/Manifest
21 +++ b/app-i18n/xvnkb/Manifest
22 @@ -1 +1,2 @@
23 +DIST xvnkb-0.2.11.tar.bz2 76397 BLAKE2B 8ebe4c389f5174b74af32fb001ef5f94d388b16a7c1ca0f409faffc6d63a4543d4daf7dc3609a8e7066324280eaf2d980e4a4e379ae478010269b808effb61cd SHA512 10d24ec159a89dd5fa68540bb8a92ae4d925f11039e7a7b77ed273862e4eb28ccd66d53ca1d0304f2a6d38182eddd304362d2bfd8c6804a2e7bfb354b20e5e83
24 DIST xvnkb-0.2.9a.tar.bz2 76429 BLAKE2B 33205bfe8dcc2fd68eaffb507dfb2db55cc1a71d33765f807b3804091a29f8c34ca8dcaf65a3f3978da921534d054096fb22abded3c4829d5ca256d3e51fff34 SHA512 3dbf4adb65f321d721fc74e05e92d2d1460e63c49e8a1ab2e10ab9f015e1a57bd3e641645d1283f1d0c5592eb7b342bf210d9fcab9ba441b6416c2f8fd1af6da
25
26 diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch b/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch
27 new file mode 100644
28 index 00000000000..8cae65fda77
29 --- /dev/null
30 +++ b/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch
31 @@ -0,0 +1,30 @@
32 +--- a/Makefile.common
33 ++++ b/Makefile.common
34 +@@ -19,10 +19,10 @@
35 + $(CC) -fpic $(CFLAGS) $(FPTR) $(VK_OPT) -DVERSION=\"$(VERSION)\" -Wall -I$(XLIB_INC) -c $<
36 +
37 + $(CORE): $(CORE_OBJS)
38 +- $(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) -lX11
39 ++ $(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) $(LDFLAGS) -lX11
40 +
41 + $(GUI): $(GUI_OBJS)
42 +- $(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
43 ++ $(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
44 +
45 + main: $(CORE) $(GUI)
46 + @echo >/dev/null
47 +--- a/tools/Makefile.common
48 ++++ b/tools/Makefile.common
49 +@@ -16,10 +16,10 @@
50 + $(CC) $(CFLAGS) $(DEFS) -Wall -I$(XLIB_INC) -c $<
51 +
52 + xvnkb_ctrl: $(CONTROL_OBJS)
53 +- $(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS)
54 ++ $(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS) $(LDFLAGS)
55 +
56 + xvnkb_setup: $(SETUP_OBJS)
57 +- $(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
58 ++ $(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
59 +
60 + main-tools: $(TOOLS)
61 +
62
63 diff --git a/app-i18n/xvnkb/xvnkb-0.2.11.ebuild b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
64 new file mode 100644
65 index 00000000000..66a1c6ccd41
66 --- /dev/null
67 +++ b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
68 @@ -0,0 +1,63 @@
69 +# Copyright 1999-2021 Gentoo Authors
70 +# Distributed under the terms of the GNU General Public License v2
71 +
72 +EAPI="8"
73 +
74 +inherit toolchain-funcs
75 +
76 +DESCRIPTION="Vietnamese input keyboard for X"
77 +HOMEPAGE="http://xvnkb.sourceforge.net/"
78 +SRC_URI="http://${PN}.sourceforge.net/${P}.tar.bz2"
79 +
80 +LICENSE="GPL-2+"
81 +SLOT="0"
82 +KEYWORDS="~amd64 ~ppc ~x86"
83 +IUSE="spell xft"
84 +
85 +RDEPEND="x11-libs/libX11:=
86 + xft? ( x11-libs/libXft:= )"
87 +DEPEND="${RDEPEND}
88 + x11-base/xorg-proto"
89 +BDEPEND="xft? ( virtual/pkgconfig )"
90 +
91 +PATCHES=(
92 + "${FILESDIR}"/${PN}-cc.patch
93 + "${FILESDIR}"/${P}-ldflags.patch
94 +)
95 +
96 +src_prepare() {
97 + default
98 + tc-export CC
99 +}
100 +
101 +src_configure() {
102 + # *not* autotools
103 + ./configure \
104 + $(usex spell '' '--no-spellcheck') \
105 + $(usex xft '' '--no-xft') \
106 + --use-extstroke \
107 + || die "./configure failed"
108 +}
109 +
110 +src_install() {
111 + dobin ${PN}
112 + dobin tools/${PN}_ctrl
113 +
114 + dolib.so ${PN}.so.${PV}
115 + dosym ${PN}.so.${PV} /usr/$(get_libdir)/${PN}.so
116 +
117 + einstalldocs
118 + dodoc -r doc/. scripts contrib
119 +}
120 +
121 +pkg_postinst() {
122 + elog "Remember to"
123 + elog "$ export LANG=en_US.UTF-8"
124 + elog "(or any other UTF-8 locale) and"
125 + elog "$ export LD_PRELOAD=/usr/$(get_libdir)/${PN}.so"
126 + elog "before starting X Window"
127 + elog "More documents are in ${EROOT}/usr/share/doc/${PF}"
128 +
129 + ewarn "Programs with suid/sgid will have LD_PRELOAD cleared"
130 + ewarn "You have to unset suid/sgid to use with ${PN}"
131 +}