* [gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/
@ 2017-10-13 19:53 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2017-10-13 19:53 UTC (permalink / raw
To: gentoo-commits
commit: 6e6838423b565a03017adc4a8a946638f64ecc0c
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 13 19:30:19 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 19:53:15 2017 +0000
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/
@ 2017-10-14 11:00 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2017-10-14 11:00 UTC (permalink / raw
To: gentoo-commits
commit: e4cb72d1fe29613e07aacd3986259ebe7a1b1d38
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 11:00:48 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 11:00:48 2017 +0000
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/
@ 2017-11-09 22:43 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2017-11-09 22:43 UTC (permalink / raw
To: gentoo-commits
commit: e9e7972849f4daf1a209d78760d0dd1063e54397
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 9 22:42:54 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Nov 9 22:42:54 2017 +0000
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/
@ 2017-11-15 19:26 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2017-11-15 19:26 UTC (permalink / raw
To: gentoo-commits
commit: 5435abbddfef77233503c26d4e81a711e3a226a6
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Wed Nov 15 19:13:22 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 19:26:14 2017 +0000
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..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/
@ 2021-06-20 13:41 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2021-06-20 13:41 UTC (permalink / raw
To: gentoo-commits
commit: d83fbe3b01bfdfc99782c562611a31b2dc24650f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 20 13:40:58 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jun 20 13:40:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d83fbe3b
app-i18n/kinput2: Remove USE="canna"
Signed-off-by: David Seifert <soap <AT> 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
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/
@ 2021-11-18 12:55 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2021-11-18 12:55 UTC (permalink / raw
To: gentoo-commits
commit: 04b851f1d74d82a6f518c410c7b42511864cc77a
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 12:55:23 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 12:55:23 2021 +0000
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 <hattya <AT> 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 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-11-18 12:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-14 11:00 [gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2021-11-18 12:55 Akinori Hattori
2021-06-20 13:41 David Seifert
2017-11-15 19:26 Mike Gilbert
2017-11-09 22:43 Sergei Trofimovich
2017-10-13 19:53 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox