[gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/
commit: 04b851f1d74d82a6f518c410c7b42511864cc77a
Author: Akinori Hattori gentoo org>
AuthorDate: Thu Nov 18 12:55:23 2021 +
Commit: Akinori Hattori gentoo org>
CommitDate: Thu Nov 18 12:55:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04b851f1
app-i18n/kinput2: update to EAPI 8
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/kinput2/kinput2-3.1-r3.ebuild | 21 +
app-i18n/kinput2/metadata.xml | 8
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/app-i18n/kinput2/kinput2-3.1-r3.ebuild
b/app-i18n/kinput2/kinput2-3.1-r3.ebuild
index 98694463da46..87035d98354a 100644
--- a/app-i18n/kinput2/kinput2-3.1-r3.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=7
+EAPI="8"
inherit toolchain-funcs
@@ -10,14 +10,13 @@ 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=""
-RDEPEND="
- app-i18n/freewnn
+RDEPEND="app-i18n/freewnn
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
@@ -27,9 +26,9 @@ RDEPEND="
x11-libs/libXpm
x11-libs/libXt"
DEPEND="${RDEPEND}"
-BDEPEND="
- x11-misc/gccmakedep
+BDEPEND="x11-misc/gccmakedep
>=x11-misc/imake-1.0.8-r1"
+S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
@@ -38,6 +37,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-segfault.patch
"${FILESDIR}"/${PN}-wnn.patch
)
+DOCS=( README NEWS doc/. )
src_prepare() {
default
@@ -45,8 +45,7 @@ src_prepare() {
}
src_configure() {
- CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
- IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
+ CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)"
IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
}
src_compile() {
@@ -64,17 +63,15 @@ 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 || die
+ rm -rf "${ED}"/usr/$(get_libdir)/X11
insinto /etc/X11/xinit/xinput.d
sed \
-e "s:@EPREFIX@:${EPREFIX}:g" \
-e "s:@SERVER@:wnn:g" \
- "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf || die
+ "${FILESDIR}"/xinput-${PN} >"${T}"/${PN}.conf || die
doins "${T}"/${PN}.conf
}
diff --git a/app-i18n/kinput2/metadata.xml b/app-i18n/kinput2/metadata.xml
index 491c88b3a31f..a94766977fa6 100644
--- a/app-i18n/kinput2/metadata.xml
+++ b/app-i18n/kinput2/metadata.xml
@@ -1,8 +1,8 @@
https://www.gentoo.org/dtd/metadata.dtd;>
-
-c...@gentoo.org
-Cjk
-
+
+ c...@gentoo.org
+ Cjk
+
[gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/
commit: d83fbe3b01bfdfc99782c562611a31b2dc24650f
Author: David Seifert gentoo org>
AuthorDate: Sun Jun 20 13:40:58 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sun Jun 20 13:40:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d83fbe3b
app-i18n/kinput2: Remove USE="canna"
Signed-off-by: David Seifert gentoo.org>
...kinput2-3.1-r2.ebuild => kinput2-3.1-r3.ebuild} | 28 +++---
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
b/app-i18n/kinput2/kinput2-3.1-r3.ebuild
similarity index 77%
rename from app-i18n/kinput2/kinput2-3.1-r2.ebuild
rename to app-i18n/kinput2/kinput2-3.1-r3.ebuild
index 2354479f0fd..98694463da4 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
}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/
commit: 5435abbddfef77233503c26d4e81a711e3a226a6
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Wed Nov 15 19:13:22 2017 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Nov 15 19:26:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5435abbd
app-i18n/kinput2: Delete old version (3.1-r1).
app-i18n/kinput2/kinput2-3.1-r1.ebuild | 70 --
1 file changed, 70 deletions(-)
diff --git a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
deleted file mode 100644
index d18b1cdc75d..000
--- a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-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;
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="freewnn"
-
-RDEPEND="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-misc/gccmakedep
- x11-misc/imake"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-gentoo.patch
- "${FILESDIR}"/${PN}-headers.patch
- "${FILESDIR}"/${PN}-ppc.patch
- "${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
-}
-
-src_configure() {
- xmkmf -a || die
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- CDEBUGFLAGS="${CFLAGS}" \
- LOCAL_LDFLAGS="${LDFLAGS}" \
- XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults"
-}
-
-src_install() {
- emake \
- XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \
- DESTDIR="${D}" \
- install
- einstalldocs
- newman cmd/${PN}.man ${PN}.1
-
- rm -rf "${ED}"/usr/$(get_libdir)/X11
-}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/
commit: e9e7972849f4daf1a209d78760d0dd1063e54397
Author: Sergei Trofimovich gentoo org>
AuthorDate: Thu Nov 9 22:42:54 2017 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Thu Nov 9 22:42:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e79728
app-i18n/kinput2: stable 3.1-r2 for sparc, bug #626802 (thanks to Rolf Eike
Beer)
Package-Manager: Portage-2.3.13, Repoman-2.3.4
RepoMan-Options: --include-arches="sparc"
app-i18n/kinput2/kinput2-3.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
index c976b26622b..78b586f2ec0 100644
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz;
LICENSE="HPND"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
IUSE="freewnn"
RDEPEND="x11-libs/libICE
[gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/
commit: e4cb72d1fe29613e07aacd3986259ebe7a1b1d38
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Oct 14 11:00:48 2017 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Oct 14 11:00:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4cb72d1
app-i18n/kinput2: stable 3.1-r2 for ppc, bug #626802
Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc"
app-i18n/kinput2/kinput2-3.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
index ecd2da0c976..c976b26622b 100644
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz;
LICENSE="HPND"
SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
IUSE="freewnn"
RDEPEND="x11-libs/libICE
[gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/
commit: 6e6838423b565a03017adc4a8a946638f64ecc0c
Author: Sergei Trofimovich gentoo org>
AuthorDate: Fri Oct 13 19:30:19 2017 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Oct 13 19:53:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e683842
app-i18n/kinput2: stable 3.1-r2 for ppc64, bug #626802
Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc64"
app-i18n/kinput2/kinput2-3.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
index 86401101552..ecd2da0c976 100644
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz;
LICENSE="HPND"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
IUSE="freewnn"
RDEPEND="x11-libs/libICE
[gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/, app-i18n/kinput2/files/
commit: 80f2fd6ce99506458d02421a9b9be4cd216116c0
Author: Akinori Hattori gentoo org>
AuthorDate: Tue Jul 18 15:00:19 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Tue Jul 18 15:00:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f2fd6c
app-i18n/kinput2: update patches
Package-Manager: Portage-2.3.6, Repoman-2.3.1
...ut2-3.1-r1-gentoo.diff => kinput2-gentoo.patch} | 36 +++---
app-i18n/kinput2/files/kinput2-ppc.patch | 11 +++
app-i18n/kinput2/files/kinput2-segfault.patch | 12
app-i18n/kinput2/kinput2-3.1-r1.ebuild | 11 ---
app-i18n/kinput2/kinput2-3.1-r2.ebuild | 6 ++--
5 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/app-i18n/kinput2/files/kinput2-3.1-r1-gentoo.diff
b/app-i18n/kinput2/files/kinput2-gentoo.patch
similarity index 72%
rename from app-i18n/kinput2/files/kinput2-3.1-r1-gentoo.diff
rename to app-i18n/kinput2/files/kinput2-gentoo.patch
index d4c03d527c4..2c22723b385 100644
--- a/app-i18n/kinput2/files/kinput2-3.1-r1-gentoo.diff
+++ b/app-i18n/kinput2/files/kinput2-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf
kinput2-v3.1.orig/Kinput2.conf 2002-10-03 18:35:26.0 +0900
-+++ kinput2-v3.1/Kinput2.conf 2003-08-13 15:51:21.0 +0900
+--- a/Kinput2.conf
b/Kinput2.conf
@@ -17,8 +17,8 @@
/* #define UseWnn */ /* define if you are going to use Wnn (v4, v6 or v7) */
@@ -17,7 +16,7 @@ diff -Naur kinput2-v3.1.orig/Kinput2.conf
kinput2-v3.1/Kinput2.conf
* are not installed in /usr/local/lib/wnn (which is the default).
*/
-/* #define WnnLibDir /some/peculiar/directory/wnn */
-+#define WnnLibDir /usr/lib/wnn
++#define WnnLibDir $(EPREFIX)/usr/lib/wnn
/* for convenience.. */
#if defined(UseWnn6) && !defined(UseWnn)
@@ -26,7 +25,7 @@ diff -Naur kinput2-v3.1.orig/Kinput2.conf
kinput2-v3.1/Kinput2.conf
*/
XCOMM use installed header files
-XCOMM WNNINCDIR = /usr/X11R6/include/wnn
-+WNNINCDIR = /usr/include/wnn
++WNNINCDIR = $(EPREFIX)/usr/include/wnn
XCOMM use installed library
-XCOMM WNNLIB = -lwnn
+WNNLIB = -lwnn
@@ -51,7 +50,7 @@ diff -Naur kinput2-v3.1.orig/Kinput2.conf
kinput2-v3.1/Kinput2.conf
-XCOMM CANNAINSTDIR = /usr/local/canna
-XCOMM CANNASRC = $(CANNAINSTDIR)/include
-XCOMM CANNALIB = -lcanna16
-+CANNAINSTDIR = /usr
++CANNAINSTDIR = $(EPREFIX)/usr
+CANNASRC = $(CANNAINSTDIR)/include
+CANNALIB = -lcanna16
@@ -98,28 +97,3 @@ diff -Naur kinput2-v3.1.orig/Kinput2.conf
kinput2-v3.1/Kinput2.conf
/**
-diff -Naur kinput2-v3.1.orig/cmd/kinput2.c kinput2-v3.1/cmd/kinput2.c
kinput2-v3.1.orig/cmd/kinput2.c2002-10-03 18:35:26.0 +0900
-+++ kinput2-v3.1/cmd/kinput2.c 2003-08-13 15:51:21.0 +0900
-@@ -644,3 +644,8 @@
- return n;
- }
- #endif
-+
-+#if defined(linux) && defined(PPC)
-+/* avoid nusty gcc bug */
-+void _XtInherit() {}
-+#endif
-diff -Naur kinput2-v3.1.orig/lib/imlib/imconv.c kinput2-v3.1/lib/imlib/imconv.c
kinput2-v3.1.orig/lib/imlib/imconv.c 2002-10-03 18:35:30.0
+0900
-+++ kinput2-v3.1/lib/imlib/imconv.c2003-08-13 15:55:54.0 +0900
-@@ -591,6 +591,9 @@
- }
- }
- IMFinishRequest(conn, offset);
-+#ifdef STATUS_SYNC
-+ IMFlush(conn);
-+#endif /* STATUS_SYNC */
- }
-
- /*- preeditCaret: do actual preedit caret -*/
diff --git a/app-i18n/kinput2/files/kinput2-ppc.patch
b/app-i18n/kinput2/files/kinput2-ppc.patch
new file mode 100644
index 000..897b154eb5a
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-ppc.patch
@@ -0,0 +1,11 @@
+--- a/cmd/kinput2.c
b/cmd/kinput2.c
+@@ -644,3 +644,8 @@
+ return n;
+ }
+ #endif
++
++#if defined(linux) && defined(PPC)
++/* avoid nusty gcc bug */
++void _XtInherit() {}
++#endif
diff --git a/app-i18n/kinput2/files/kinput2-segfault.patch
b/app-i18n/kinput2/files/kinput2-segfault.patch
new file mode 100644
index 000..9b3a83163b4
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-segfault.patch
@@ -0,0 +1,12 @@
+--- a/lib/imlib/imconv.c
b/lib/imlib/imconv.c
+@@ -591,6 +591,9 @@
+ }
+ }
+ IMFinishRequest(conn, offset);
++#ifdef STATUS_SYNC
++ IMFlush(conn);
++#endif /* STATUS_SYNC */
+ }
+
+ /*- preeditCaret: do actual preedit caret -*/
diff --git a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
index 7badd093e35..7d264fb834e 100644
--- a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit eutils
@@ -32,12 +32,15 @@ src_unpack() {
local mysed=""
unpack ${A}
- epatch "${FILESDIR}/${PF}-gentoo.diff"
+ cd "${S}"
+ epatch "${FILESDIR}/${PN}-gentoo.patch"
+ epatch
[gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/files/, app-i18n/kinput2/
commit: bf119982cec646b01f5dcd69e69fb9cdcd342c78
Author: Akinori Hattori gentoo org>
AuthorDate: Tue Jul 18 15:22:25 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Tue Jul 18 15:22:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf119982
app-i18n/kinput2: fix implicit declarations
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/kinput2/files/kinput2-headers.patch | 101 +++
app-i18n/kinput2/kinput2-3.1-r1.ebuild | 1 +
app-i18n/kinput2/kinput2-3.1-r2.ebuild | 1 +
3 files changed, 103 insertions(+)
diff --git a/app-i18n/kinput2/files/kinput2-headers.patch
b/app-i18n/kinput2/files/kinput2-headers.patch
new file mode 100644
index 000..0075f710e9b
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-headers.patch
@@ -0,0 +1,101 @@
+--- a/cmd/kinput2.c
b/cmd/kinput2.c
+@@ -25,6 +25,7 @@
+ #endif
+
+ #include
++#include
+ #include
+ #include
+ #include
+--- a/lib/Canna.c
b/lib/Canna.c
+@@ -50,6 +50,7 @@
+ static char *rcsid = "$Id: Canna.c,v 1.55 1999/05/25 08:13:03 ishisone Exp $";
+ #endif
+
++#include
+ #include
+ #include
+ #include
+--- a/lib/CcWnn.c
b/lib/CcWnn.c
+@@ -2754,6 +2754,7 @@
+ wchar wbuf[1024];
+ int wlen;
+ int len;
++extern int convJWStoCT();
+
+ TRACE(("CcWnn:saveYomiAndKanji()\n"));
+
+--- a/lib/ConvCtrl.c
b/lib/ConvCtrl.c
+@@ -18,6 +18,7 @@
+ * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
+ */
+
++#include
+ #include
+ #include
+ #include
+--- a/lib/KIProto.c
b/lib/KIProto.c
+@@ -18,6 +18,7 @@
+ * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
+ */
+
++#include
+ #include
+ #include
+ #include
+--- a/lib/XimpProto.c
b/lib/XimpProto.c
+@@ -18,6 +18,7 @@
+ * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
+ */
+
++#include
+ #include
+ #include
+
+--- a/lib/cconv.c
b/lib/cconv.c
+@@ -604,6 +604,7 @@
+ #endif
+
+ #include
++#include
+ #include
+ #include
+ #include
+--- a/lib/ctext.c
b/lib/ctext.c
+@@ -71,6 +71,8 @@
+ static char *rcsid = "$Id: ctext.c,v 2.6 1999/03/10 08:55:15 ishisone Exp $";
+ #endif
+
++#include
++
+ typedef unsigned shortwchar;
+
+ #define NULL 0
+--- a/lib/ioecall.c
b/lib/ioecall.c
+@@ -23,6 +23,7 @@
+ */
+
+ #include
++#include
+ #include
+ #include
+ #include "IOECall.h"
+--- a/lib/wnnlib.c
b/lib/wnnlib.c
+@@ -578,6 +578,7 @@
+ #ifdef DEBUG_WNNLIB
+ #include
+ #endif
++#include
+ #include "wnnlib.h"
+ #include "WStr.h"
+ #include
diff --git a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
index 5e3579baa0d..caf4b59765b 100644
--- a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
@@ -33,6 +33,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-headers.patch
"${FILESDIR}"/${PN}-ppc.patch
"${FILESDIR}"/${PN}-segfault.patch
)
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
index 724a233a91e..0f1fc47b2a4 100644
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -33,6 +33,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-headers.patch
"${FILESDIR}"/${PN}-ppc.patch
"${FILESDIR}"/${PN}-segfault.patch
)
[gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/, app-i18n/kinput2/files/
commit: 9647a5ca1f865b4b5f9332be9d248a64786681ed
Author: Akinori Hattori gentoo org>
AuthorDate: Tue Jul 18 15:24:28 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Tue Jul 18 15:24:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9647a5ca
app-i18n/kinput2: fix build with app-i18n/freewnn
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/kinput2/files/kinput2-wnn.patch | 51
app-i18n/kinput2/kinput2-3.1-r1.ebuild | 1 +
app-i18n/kinput2/kinput2-3.1-r2.ebuild | 1 +
3 files changed, 53 insertions(+)
diff --git a/app-i18n/kinput2/files/kinput2-wnn.patch
b/app-i18n/kinput2/files/kinput2-wnn.patch
new file mode 100644
index 000..4e7001938fb
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-wnn.patch
@@ -0,0 +1,51 @@
+--- a/lib/cconv.c
b/lib/cconv.c
+@@ -790,7 +790,7 @@
+ static int parseLine(uchar *, uchar **, int);
+ static FILE *openfile(char *);
+ static int doinclude(uchar *, Files *, void (*)());
+-static uchar *getline(uchar *, int, Files *, void (*)());
++static uchar *getLine(uchar *, int, Files *, void (*)());
+ static int readRuleFile(ccRule, char *);
+ static int registMode(ccRule, int, uchar **);
+ static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *,
+@@ -1035,8 +1035,8 @@
+ return 0;
+ }
+
+-/* getline -- 1行読み込む (その際 include の処理を行なう) */
+-static uchar *getline(line, linesize, files, efunc)
++/* getLine -- 1行読み込む (その際 include の処理を行なう) */
++static uchar *getLine(line, linesize, files, efunc)
+ uchar *line;
+ int linesize;
+ Files *files;
+@@ -1100,7 +1100,7 @@
+ rule->nmode = 0;
+ rule->initialmode = -1;
+
+- while (getline(line, sizeof(line), , efunc)) {
++ while (getLine(line, sizeof(line), , efunc)) {
+ (void)Strcpy(tmp, line);
+ if ((argc = parseLine(tmp, argv, 20)) == 0)
+ continue;
+@@ -1269,7 +1269,7 @@
+ cdbuf.cdbuf = NULL;
+
+ /* ルールを読んでストアする */
+- while (getline(line, sizeof(line), files, efunc)) {
++ while (getLine(line, sizeof(line), files, efunc)) {
+ /* '#' で始まる行はコメント */
+ if (*line == '\0' || *line == '\n' || *line == '#')
+ continue;
+--- a/lib/wnnlib.c
b/lib/wnnlib.c
+@@ -1367,7 +1367,7 @@
+
+ /* 変換文字列の長さのチェック */
+ clp = buf->clauseInfo + cl;
+- len = jl_kanji_len(buf->wnn, cl);
++ len = jl_kanji_len(buf->wnn, cl, -1);
+ diff = len - ((clp + 1)->dispp - clp->dispp);
+ newlen = (buf->displayEnd - buf->displayBuf) + diff;
+ if (newlen > buf->bufferSize) {
diff --git a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
index caf4b59765b..d18b1cdc75d 100644
--- a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-headers.patch
"${FILESDIR}"/${PN}-ppc.patch
"${FILESDIR}"/${PN}-segfault.patch
+ "${FILESDIR}"/${PN}-wnn.patch
)
DOCS=( README NEWS doc/. )
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
index 0f1fc47b2a4..86401101552 100644
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-headers.patch
"${FILESDIR}"/${PN}-ppc.patch
"${FILESDIR}"/${PN}-segfault.patch
+ "${FILESDIR}"/${PN}-wnn.patch
)
DOCS=( README NEWS doc/. )
[gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/, app-i18n/kinput2/files/
commit: 1258c9e3376bc4e2c4d82cf047312892157c2233
Author: Akinori Hattori gentoo org>
AuthorDate: Tue Jul 18 15:18:57 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Tue Jul 18 15:18:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1258c9e3
app-i18n/kinput2: update to EAPI 6
Gentoo-Bug: 621946
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/kinput2/files/xinput-kinput2 | 2 +-
app-i18n/kinput2/kinput2-3.1-r1.ebuild | 66 +---
app-i18n/kinput2/kinput2-3.1-r2.ebuild | 69 +-
app-i18n/kinput2/metadata.xml | 8 ++--
4 files changed, 75 insertions(+), 70 deletions(-)
diff --git a/app-i18n/kinput2/files/xinput-kinput2
b/app-i18n/kinput2/files/xinput-kinput2
index 16de07ca4f7..dcb3b63330a 100644
--- a/app-i18n/kinput2/files/xinput-kinput2
+++ b/app-i18n/kinput2/files/xinput-kinput2
@@ -1,5 +1,5 @@
XIM=kinput2
-XIM_PROGRAM=@EPREFIX@/usr/bin/kinput2
+XIM_PROGRAM="@EPREFIX@/usr/bin/kinput2"
XIM_ARGS="-@SERVER@ +kinput -xim"
GTK_IM_MODULE=xim
QT_IM_MODULE=xim
diff --git a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
index 7d264fb834e..5e3579baa0d 100644
--- a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
@@ -1,62 +1,68 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-inherit eutils
+EAPI="6"
+
+inherit toolchain-funcs
MY_P="${PN}-v${PV}"
+
DESCRIPTION="A Japanese input server which supports the XIM protocol"
-HOMEPAGE="http://www.nec.co.jp/canna/;
+HOMEPAGE="http://www.nec.co.jp/canna;
SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz;
LICENSE="HPND"
SLOT="0"
-KEYWORDS="x86 ppc sparc amd64 ppc64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
IUSE="freewnn"
-RDEPEND="freewnn? ( >=app-i18n/freewnn-1.1.1_alpha19 )
- !freewnn? ( >=app-i18n/canna-3.5_beta2-r1 )
+RDEPEND="x11-libs/libICE
+ x11-libs/libSM
x11-libs/libX11
x11-libs/libXaw
+ x11-libs/libXext
x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXt"
-
+ x11-libs/libXpm
+ x11-libs/libXt
+ !freewnn? ( app-i18n/canna )
+ freewnn? ( app-i18n/freewnn )"
DEPEND="${RDEPEND}
x11-misc/gccmakedep
- x11-misc/imake
- app-text/rman"
-
+ x11-misc/imake"
S="${WORKDIR}/${MY_P}"
-src_unpack() {
- local mysed=""
+PATCHES=(
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-ppc.patch
+ "${FILESDIR}"/${PN}-segfault.patch
+)
+DOCS=( README NEWS doc/. )
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${PN}-gentoo.patch"
- epatch "${FILESDIR}/${PN}-ppc.patch"
- epatch "${FILESDIR}/${PN}-segfault.patch"
+src_prepare() {
+ default
- if use freewnn; then
- sed -i -e '/\/\* #define UseWnn/s:^:#define UseWnn\n:'
Kinput2.conf
- else
- sed -i -e '/\/\* #define UseCanna/s:^:#define UseCanna\n:'
Kinput2.conf
- fi
+ sed -i "s|^/\* \(#define Use$(usex freewnn Wnn Canna)\) \*/|\1|"
${PN^k}.conf
}
-src_compile() {
+src_configure() {
xmkmf -a || die
+}
+
+src_compile() {
emake \
- XAPPLOADDIR="/usr/share/X11/app-defaults/" \
+ CC="$(tc-getCC)" \
CDEBUGFLAGS="${CFLAGS}" \
LOCAL_LDFLAGS="${LDFLAGS}" \
- || die
+ XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults"
}
src_install() {
- emake XAPPLOADDIR="/usr/share/X11/app-defaults/" DESTDIR="${D}" install
|| die
- rm -rf "${D}/usr/lib/X11"
-
- dodoc README NEWS doc/*
+ emake \
+ XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \
+ DESTDIR="${D}" \
+ install
+ einstalldocs
newman cmd/${PN}.man ${PN}.1
+
+ rm -rf "${ED}"/usr/$(get_libdir)/X11
}
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
index d0412807189..724a233a91e 100644
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -1,12 +1,14 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="3"
-inherit eutils
+EAPI="6"
+
+inherit toolchain-funcs
MY_P="${PN}-v${PV}"
+
DESCRIPTION="A Japanese input server which supports the XIM protocol"
-HOMEPAGE="http://www.nec.co.jp/canna/;
+HOMEPAGE="http://www.nec.co.jp/canna;
SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz;
LICENSE="HPND"
@@ -14,31 +16,32 @@ SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
IUSE="freewnn"
-RDEPEND="freewnn? ( >=app-i18n/freewnn-1.1.1_alpha19 )
- !freewnn? ( >=app-i18n/canna-3.5_beta2-r1 )
+RDEPEND="x11-libs/libICE
+ x11-libs/libSM
x11-libs/libX11
x11-libs/libXaw
+ x11-libs/libXext
x11-libs/libXmu
-
