[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 4fa34e5c72a9b985e1e1a09fc6c0fcae549c40c3
Author: Sam James gentoo org>
AuthorDate: Sat Jun 19 23:36:18 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Jun 19 23:48:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fa34e5c
app-i18n/canna: fix DeprecatedInsinto
Signed-off-by: Sam James gentoo.org>
app-i18n/canna/canna-3.7_p3-r4.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r4.ebuild
b/app-i18n/canna/canna-3.7_p3-r4.ebuild
index 998ca0d1f7f..a5e3cf174d4 100644
--- a/app-i18n/canna/canna-3.7_p3-r4.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r4.ebuild
@@ -119,8 +119,7 @@ src_install() {
fi
if use doc; then
- insinto /usr/share/doc/${PF}
- doins doc/man/guide/tex/canna.{dvi,ps,pdf}
+ dodoc doc/man/guide/tex/canna.{dvi,ps,pdf}
fi
# for backward compatibility
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 290951188f0e3abd163d561860508bdacf982160
Author: David Seifert gentoo org>
AuthorDate: Sat Jun 19 22:54:30 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sat Jun 19 22:54:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29095118
app-i18n/canna: Port to EAPI 7
Signed-off-by: David Seifert gentoo.org>
...nna-3.7_p3-r3.ebuild => canna-3.7_p3-r4.ebuild} | 58 +++---
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r4.ebuild
similarity index 74%
rename from app-i18n/canna/canna-3.7_p3-r3.ebuild
rename to app-i18n/canna/canna-3.7_p3-r4.ebuild
index 9540c471791..998ca0d1f7f 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r4.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 autotools cannadic toolchain-funcs
@@ -10,17 +10,20 @@ MY_P="Canna${PV//[._]/}"
DESCRIPTION="A client-server based Kana-Kanji conversion system"
HOMEPAGE="http://canna.osdn.jp/;
SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
LICENSE="MIT GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="canuum doc ipv6"
-RDEPEND="canuum? (
+RDEPEND="
+ canuum? (
dev-libs/libspt
sys-libs/ncurses:=
)"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
x11-misc/gccmakedep
x11-misc/imake
canuum? ( virtual/pkgconfig )
@@ -29,7 +32,6 @@ DEPEND="${RDEPEND}
dev-texlive/texlive-langjapanese
dev-texlive/texlive-latexrecommended
)"
-S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
@@ -41,21 +43,18 @@ PATCHES=(
"${FILESDIR}"/${PN}-Wformat-security.patch
)
-DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
-
src_prepare() {
default
sed -i \
-e "/DefLibCannaDir/s:/lib$:/$(get_libdir):" \
-e "/UseInet6/s:0:$(usex ipv6 1 0):" \
- ${PN^c}.conf
+ ${PN^c}.conf || die
if use canuum; then
- cd canuum
- mv configure.{in,ac}
+ cd canuum || die
+ mv configure.{in,ac} || die
eautoreconf
- cd - > /dev/null
fi
}
@@ -63,17 +62,17 @@ src_configure() {
xmkmf -a || die
if use canuum; then
- cd canuum
+ pushd canuum >/dev/null || die
xmkmf -a || die
# workaround for sys-libs/ncurses[tinfo]
- sed -i "/^TERMCAP_LIB/s:=.*:=$($(tc-getPKG_CONFIG) --libs
ncurses):" Makefile
- cd - > /dev/null
+ sed -i "/^TERMCAP_LIB/s:=.*:=$($(tc-getPKG_CONFIG) --libs
ncurses):" Makefile || die
+ popd >/dev/null || die
fi
if use doc; then
- cd doc/man/guide/tex
+ pushd doc/man/guide/tex >/dev/null || die
xmkmf -a || die
- cd - > /dev/null
+ popd >/dev/null || die
fi
}
@@ -84,7 +83,7 @@ src_compile() {
CDEBUGFLAGS="${CFLAGS}" \
LOCAL_LDFLAGS="${LDFLAGS}" \
SHLIBGLOBALSFLAGS="${LDFLAGS}" \
- ${PN}
+ canna
if use canuum; then
einfo "Compiling canuum"
@@ -103,14 +102,15 @@ src_compile() {
JLATEXCMD="platex -kanji=euc" \
DVI2PSCMD="dvips" \
VARTEXFONTS="${T}"/fonts \
- ${PN}.ps \
- ${PN}.pdf
+ canna.ps \
+ canna.pdf
fi
}
src_install() {
emake DESTDIR="${D}" install install.man
einstalldocs
+ dodoc *CHANGES* INSTALL* RKCCONF* WHATIS*
if use canuum; then
emake -C canuum DESTDIR="${D}" install install.man
@@ -120,26 +120,26 @@ src_install() {
if use doc; then
insinto /usr/share/doc/${PF}
- doins doc/man/guide/tex/${PN}.{dvi,ps,pdf}
+ doins doc/man/guide/tex/canna.{dvi,ps,pdf}
fi
# for backward compatibility
dosbin "${FILESDIR}"/update-canna-dics_dir
- keepdir /var/lib/${PN}/dic/{user,group}
- fowners bin:bin /var/lib/${PN}/dic/{user,group}
- fperms 0775 /var/lib/${PN}/dic/{user,group}
+ keepdir /var/lib/canna/dic/{user,group}
+ fowners bin:bin /var/lib/canna/dic/{user,group}
+ fperms 0775 /var/lib/canna/dic/{user,group}
- insinto /var/lib/${PN}/dic/dics.d
- newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir
+ insinto /var/lib/canna/dic/dics.d
+ newins
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: d371f177bc23ba2d011c3809fb135d969fade356
Author: David Seifert gentoo org>
AuthorDate: Sat Jun 19 21:40:34 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sat Jun 19 21:40:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d371f177
app-i18n/canna: drop 3.7_p3-r1, 3.7_p3-r2
Signed-off-by: David Seifert gentoo.org>
app-i18n/canna/canna-3.7_p3-r1.ebuild | 98 --
app-i18n/canna/canna-3.7_p3-r2.ebuild | 128 --
2 files changed, 226 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild
b/app-i18n/canna/canna-3.7_p3-r1.ebuild
deleted file mode 100644
index ceff5914058..000
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cannadic toolchain-funcs
-
-MY_P="Canna${PV//[._]/}"
-
-DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://canna.osdn.jp/;
-SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="x11-misc/gccmakedep
- x11-misc/imake"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-gentoo.patch
- "${FILESDIR}"/${PN}-kpdef.patch
- "${FILESDIR}"/${PN}-overflow.patch
- "${FILESDIR}"/${PN}-posix-sort.patch
- "${FILESDIR}"/${PN}-Wformat.patch
- "${FILESDIR}"/${PN}-Wformat-security.patch
-)
-DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
-
-src_prepare() {
- default
-
- find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g'
|| die
-
- # Multilib-strict fix for amd64
- sed -i "/DefLibCannaDir/s:/lib$:/$(get_libdir):" Canna.conf
-}
-
-src_configure() {
- xmkmf -a || die
-}
-
-src_compile() {
- # bug #279706
- emake -j1 \
- CC="$(tc-getCC)" \
- CDEBUGFLAGS="${CFLAGS}" \
- LOCAL_LDFLAGS="${LDFLAGS}" \
- SHLIBGLOBALSFLAGS="${LDFLAGS}" \
- ${PN}
-}
-
-src_install() {
- emake DESTDIR="${D}" install install.man
- einstalldocs
-
- dodir /usr/share/man{,/ja}/man8
- local man mandir
- for man in cannaserver cannakill ; do
- for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do
- mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8
- done
- done
-
- # for backward compatibility
- dosbin "${FILESDIR}"/update-canna-dics_dir
-
- keepdir /var/lib/${PN}/dic/{user,group}
- fowners bin:bin /var/lib/${PN}/dic/{user,group}
- fperms 0775 /var/lib/${PN}/dic/{user,group}
-
- insinto /var/lib/${PN}/dic/dics.d
- newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir
-
- keepdir /var/log/${PN}
-
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
- insinto /etc
- newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
-}
-
-pkg_postinst() {
- update-cannadic-dir
-
- if ! locale -a | grep -iq "ja_JP.eucjp"; then
- elog "Some dictionary tools in this package require
ja_JP.EUC-JP locale."
- elog
- elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
- elog "# locale-gen"
- elog
- fi
-}
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild
b/app-i18n/canna/canna-3.7_p3-r2.ebuild
deleted file mode 100644
index a06d55f21d7..000
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cannadic toolchain-funcs
-
-MY_P="Canna${PV//[._]/}"
-
-DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://canna.osdn.jp/;
-SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc ipv6"
-
-DEPEND="x11-misc/gccmakedep
- x11-misc/imake
- doc? (
- app-text/ghostscript-gpl
- dev-texlive/texlive-langjapanese
- dev-texlive/texlive-latexrecommended
- )"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-gentoo.patch
- "${FILESDIR}"/${PN}-kpdef.patch
- "${FILESDIR}"/${PN}-overflow.patch
- "${FILESDIR}"/${PN}-posix-sort.patch
- "${FILESDIR}"/${PN}-Wformat.patch
- "${FILESDIR}"/${PN}-Wformat-security.patch
-)
-DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
-
-src_prepare() {
- default
-
- find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g'
|| die
-
- sed -i \
-
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: a17f847eeaf8abafb8a93dd7a27596a516cbcb83
Author: Sam James gentoo org>
AuthorDate: Thu Apr 22 12:16:48 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Apr 22 12:17:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a17f847e
app-i18n/canna: Stabilize 3.7_p3-r3 ppc, #783927
Signed-off-by: Sam James gentoo.org>
app-i18n/canna/canna-3.7_p3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index 34b7fc8f3b1..f5293dd2e68 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
IUSE="canuum doc ipv6"
RDEPEND="canuum? (
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 7e7a8862a8da4a328814e7edc8172f0eca89dc75
Author: Sam James gentoo org>
AuthorDate: Thu Apr 22 12:15:13 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Apr 22 12:17:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e7a8862
app-i18n/canna: Stabilize 3.7_p3-r3 ppc64, #783927
Signed-off-by: Sam James gentoo.org>
app-i18n/canna/canna-3.7_p3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index ba516286511..34b7fc8f3b1 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86"
IUSE="canuum doc ipv6"
RDEPEND="canuum? (
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 11801aeafaef35ed1d39fddbf03fe69d51d9d99a
Author: Sam James gentoo org>
AuthorDate: Wed Apr 21 18:52:31 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Apr 21 18:52:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11801aea
app-i18n/canna: Stabilize 3.7_p3-r3 amd64, #783927
Signed-off-by: Sam James gentoo.org>
app-i18n/canna/canna-3.7_p3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index d8e29355ad4..ba516286511 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
IUSE="canuum doc ipv6"
RDEPEND="canuum? (
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 402e3377a6acdc8ebbf9d3bab2f64bde11393150
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Tue Apr 20 13:55:03 2021 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Tue Apr 20 17:05:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=402e3377
app-i18n/canna: stable 3.7_p3-r3 for sparc, bug #783927
Package-Manager: Portage-3.0.17, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
app-i18n/canna/canna-3.7_p3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index f36088baafd..dd0821916b6 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
IUSE="canuum doc ipv6"
RDEPEND="canuum? (
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 74bbeadd02c4e71d5359b4f362029b5a9fa8d686
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sat Jun 6 07:02:04 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Jun 6 12:57:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74bbeadd
app-i18n/canna: keyworded 3.7_p3-r3 for hppa, bug #624226
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
app-i18n/canna/canna-3.7_p3-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index ac8473821f7..a2494559aaa 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="canuum doc ipv6"
RDEPEND="canuum? (
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 3e6f14c93d8fb804d5be93f9a0a885a3f353c6cd
Author: Aaron Bauman gentoo org>
AuthorDate: Sat Jul 27 12:29:29 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Sat Jul 27 12:29:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e6f14c9
app-i18n/canna: arm64 stable
Signed-off-by: Aaron Bauman gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm64"
app-i18n/canna/canna-3.7_p3-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild
b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index e38caaff6fb..c6a52cd04a7 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm64 hppa ia64 ppc ppc64 sparc x86"
IUSE=""
DEPEND="x11-misc/gccmakedep
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 1181ba102473cc3031e88266b214ffb654154d34
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Mon Mar 5 19:15:43 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Mar 5 20:26:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1181ba10
app-i18n/canna: keyworded 3.7_p3-r3 for sparc, bug #624226
Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"
app-i18n/canna/canna-3.7_p3-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index beb1f7613d3..ac8473821f7 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="canuum doc ipv6"
RDEPEND="canuum? (
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: d7737ccdbdc0003e7877483356caf9bb22daaff9
Author: Markus Meier gentoo org>
AuthorDate: Thu Sep 7 19:27:29 2017 +
Commit: Markus Meier gentoo org>
CommitDate: Thu Sep 7 19:27:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7737ccd
app-i18n/canna: add ~arm64, bug #624226
Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="arm64"
app-i18n/canna/canna-3.7_p3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index 056f6c92ad0..beb1f7613d3 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
IUSE="canuum doc ipv6"
RDEPEND="canuum? (
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: a5b026cfa2a719820eec84c65f6900d326a77a21
Author: Sergei Trofimovich gentoo org>
AuthorDate: Thu Aug 10 21:04:57 2017 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Thu Aug 10 21:04:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5b026cf
app-i18n/canna: keyworded 3.7_p3-r3 for ppc64, bug #624226
Package-Manager: Portage-2.3.6, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc64"
app-i18n/canna/canna-3.7_p3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index 5a74d90d566..056f6c92ad0 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
IUSE="canuum doc ipv6"
RDEPEND="canuum? (
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 3a8030627b19d4f7d5035f8572fdc53c4ecc05a9
Author: Markus Meier gentoo org>
AuthorDate: Mon Jul 24 17:44:33 2017 +
Commit: Markus Meier gentoo org>
CommitDate: Mon Jul 24 17:44:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a803062
app-i18n/canna: add ~arm, bug #624226
Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"
app-i18n/canna/canna-3.7_p3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index e9b38ff15c1..5a74d90d566 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
IUSE="canuum doc ipv6"
RDEPEND="canuum? (
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/files/
commit: 1752b7ce1aa0691721a888b1c87c6bf6cebc5383 Author: Akinori Hattori gentoo org> AuthorDate: Sun Jul 23 12:25:08 2017 + Commit: Akinori Hattori gentoo org> CommitDate: Sun Jul 23 12:26:11 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1752b7ce app-i18n/canna: set default encoding of canuum to EUC-JP Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-i18n/canna/files/canna-canuum.patch | 13 + 1 file changed, 13 insertions(+) diff --git a/app-i18n/canna/files/canna-canuum.patch b/app-i18n/canna/files/canna-canuum.patch index 87866789c7c..293ffbb54c9 100644 --- a/app-i18n/canna/files/canna-canuum.patch +++ b/app-i18n/canna/files/canna-canuum.patch @@ -9,6 +9,19 @@ [ --with-term-libs=-lLIBterminal library to be used ],) if test -n "$with_term_libs"; then AC_MSG_RESULT($with_term_libs) +--- a/canuum/wnn_config.h b/canuum/wnn_config.h +@@ -149,8 +149,8 @@ + #define TTY_KCODE J_EUJIS + #define PTY_KCODE J_EUJIS + # else /* !DGUX */ +-#define TTY_KCODE J_JIS +-#define PTY_KCODE J_JIS ++#define TTY_KCODE J_EUJIS ++#define PTY_KCODE J_EUJIS + # endif + #endif + --- a/canuum/wnn_os.h +++ b/canuum/wnn_os.h @@ -41,6 +41,7 @@
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 37c7221a142aa8164d18f3442f9cb6273cb4318e
Author: Akinori Hattori gentoo org>
AuthorDate: Sun Jul 23 12:23:14 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sun Jul 23 12:26:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37c7221a
app-i18n/canna: inherit autotools
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r3.ebuild | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index 26a3d509594..e9b38ff15c1 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -3,13 +3,13 @@
EAPI="6"
-inherit cannadic toolchain-funcs
+inherit autotools cannadic toolchain-funcs
MY_P="Canna${PV//[._]/}"
DESCRIPTION="A client-server based Kana-Kanji conversion system"
HOMEPAGE="http://canna.osdn.jp/;
-SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
SLOT="0"
@@ -23,9 +23,7 @@ RDEPEND="canuum? (
DEPEND="${RDEPEND}
x11-misc/gccmakedep
x11-misc/imake
- canuum? (
- virtual/pkgconfig
- )
+ canuum? ( virtual/pkgconfig )
doc? (
app-text/ghostscript-gpl
dev-texlive/texlive-langjapanese
@@ -50,7 +48,7 @@ src_prepare() {
sed -i \
-e "/DefLibCannaDir/s:/lib$:/$(get_libdir):" \
-e "/UseInet6/s:0:$(usex ipv6 1 0):" \
- Canna.conf
+ ${PN^c}.conf
if use canuum; then
cd canuum
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 83502f9516b8633524a53fc0bc3efd827d192d5e
Author: Sergei Trofimovich gentoo org>
AuthorDate: Tue Jul 11 07:51:05 2017 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Tue Jul 11 07:51:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83502f95
app-i18n/canna: ia64 keyworded, bug #624226
Package-Manager: Portage-2.3.6, Repoman-2.3.2
RepoMan-Options: --include-arches="ia64"
app-i18n/canna/canna-3.7_p3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index 506184539b7..26a3d509594 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
IUSE="canuum doc ipv6"
RDEPEND="canuum? (
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 25021f8f6575aebb146303c6b728094bdc4a4924
Author: Akinori Hattori gentoo org>
AuthorDate: Sun Jul 9 13:05:43 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sun Jul 9 13:05:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25021f8f
app-i18n/canna: fix *DEPEND
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r3.ebuild | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index 8dbf091e2dd..506184539b7 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -16,11 +16,14 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~x86"
IUSE="canuum doc ipv6"
-DEPEND="x11-misc/gccmakedep
+RDEPEND="canuum? (
+ dev-libs/libspt
+ sys-libs/ncurses:=
+ )"
+DEPEND="${RDEPEND}
+ x11-misc/gccmakedep
x11-misc/imake
canuum? (
- dev-libs/libspt
- sys-libs/ncurses
virtual/pkgconfig
)
doc? (
@@ -28,7 +31,6 @@ DEPEND="x11-misc/gccmakedep
dev-texlive/texlive-langjapanese
dev-texlive/texlive-latexrecommended
)"
-RDEPEND=""
S="${WORKDIR}/${MY_P}"
PATCHES=(
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/, app-i18n/canna/files/
commit: 3d5e189f8ed0d703a60cf875d306c8eede3f1e9b
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Jul 8 08:59:14 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Jul 8 09:13:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d5e189f
app-i18n/canna: fix buffer overflow
Gentoo-Bug: 341185
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r1.ebuild | 1 +
app-i18n/canna/canna-3.7_p3-r2.ebuild | 1 +
app-i18n/canna/canna-3.7_p3-r3.ebuild | 1 +
app-i18n/canna/files/canna-overflow.patch | 20
4 files changed, 23 insertions(+)
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild
b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index 6a04c297b98..e38caaff6fb 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -24,6 +24,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
"${FILESDIR}"/${PN}-kpdef.patch
+ "${FILESDIR}"/${PN}-overflow.patch
"${FILESDIR}"/${PN}-posix-sort.patch
"${FILESDIR}"/${PN}-Wformat.patch
"${FILESDIR}"/${PN}-Wformat-security.patch
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild
b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index f6c43bc73d8..a06d55f21d7 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -29,6 +29,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
"${FILESDIR}"/${PN}-kpdef.patch
+ "${FILESDIR}"/${PN}-overflow.patch
"${FILESDIR}"/${PN}-posix-sort.patch
"${FILESDIR}"/${PN}-Wformat.patch
"${FILESDIR}"/${PN}-Wformat-security.patch
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index bb324c8e8ea..8dbf091e2dd 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -35,6 +35,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
"${FILESDIR}"/${PN}-canuum.patch
"${FILESDIR}"/${PN}-kpdef.patch
+ "${FILESDIR}"/${PN}-overflow.patch
"${FILESDIR}"/${PN}-posix-sort.patch
"${FILESDIR}"/${PN}-Wformat.patch
"${FILESDIR}"/${PN}-Wformat-security.patch
diff --git a/app-i18n/canna/files/canna-overflow.patch
b/app-i18n/canna/files/canna-overflow.patch
new file mode 100644
index 000..ef3b6ad1b95
--- /dev/null
+++ b/app-i18n/canna/files/canna-overflow.patch
@@ -0,0 +1,20 @@
+--- a/cmd/catdic/rutil.c
b/cmd/catdic/rutil.c
+@@ -384,7 +384,7 @@
+ (void)fprintf(stderr,gettxt("cannacmd:205",
+ "Specified dictionary \"%s\" already exists. Do you overwrite it ?
(y/n)"),
+ dicname);
+- fgets(ans,80,stdin);
++ fgets(ans,sizeof(ans),stdin);
+ } else {
+ (void)fprintf(stderr,gettxt("cannacmd:206",
+ "Specified dictionary \"%s\" already exists."),dicname);
+@@ -474,7 +474,7 @@
+ if (isatty(fileno(stdin)) != 0) {
+ (void)fprintf(stderr,gettxt("cannacmd:216",
+ "Personal learning file of dictionary \"%s\" exists. Do you overwrite it ?
(y/n)"),dicname);
+- fgets(ans,80,stdin);
++ fgets(ans,sizeof(ans),stdin);
+ } else {
+ (void)fprintf(stderr,gettxt("cannacmd:217",
+ "Personal learning file of system dictionary \"%s\" already exists."),
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/files/, app-i18n/canna/
commit: 9d262e2b7d298c04285f2e1357df1475a82bfc00
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Jul 8 08:52:52 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Jul 8 09:13:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d262e2b
app-i18n/canna: fix build with -Werror=format
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r1.ebuild| 1 +
app-i18n/canna/canna-3.7_p3-r2.ebuild| 1 +
app-i18n/canna/canna-3.7_p3-r3.ebuild| 1 +
app-i18n/canna/files/canna-Wformat.patch | 11 +++
4 files changed, 14 insertions(+)
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild
b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index d6727b9c284..97dee1123ab 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -25,6 +25,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
"${FILESDIR}"/${PN}-kpdef.patch
"${FILESDIR}"/${PN}-posix-sort.patch
+ "${FILESDIR}"/${PN}-Wformat.patch
)
DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild
b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 4bc24066bb8..2236655f622 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
"${FILESDIR}"/${PN}-kpdef.patch
"${FILESDIR}"/${PN}-posix-sort.patch
+ "${FILESDIR}"/${PN}-Wformat.patch
)
DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index c4ac85c584a..d794f10e8ed 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-canuum.patch
"${FILESDIR}"/${PN}-kpdef.patch
"${FILESDIR}"/${PN}-posix-sort.patch
+ "${FILESDIR}"/${PN}-Wformat.patch
)
DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
diff --git a/app-i18n/canna/files/canna-Wformat.patch
b/app-i18n/canna/files/canna-Wformat.patch
new file mode 100644
index 000..a8f5aa37163
--- /dev/null
+++ b/app-i18n/canna/files/canna-Wformat.patch
@@ -0,0 +1,11 @@
+--- a/doc/man/guide/tex/cannaindex.c
b/doc/man/guide/tex/cannaindex.c
+@@ -198,7 +198,7 @@
+ }
+ inf = fopen(argv[1], "r");
+ if (!inf) {
+-fprintf(stderr, "%s: Can not open file \"%s\".\n", argv[1]);
++fprintf(stderr, "%s: Can not open file \"%s\".\n", program, argv[1]);
+ exit(1);
+ }
+ pages = readindex(inf, entries);
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/files/, app-i18n/canna/
commit: c88993e713f214c28fb151d8fb05a1425cc13ce5
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Jul 8 08:54:52 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Jul 8 09:13:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c88993e7
app-i18n/canna: fix build with -Werror=format-security
Gentoo-Bug: 521054
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r1.ebuild | 1 +
app-i18n/canna/canna-3.7_p3-r2.ebuild | 1 +
app-i18n/canna/canna-3.7_p3-r3.ebuild | 1 +
app-i18n/canna/files/canna-Wformat-security.patch | 199 ++
4 files changed, 202 insertions(+)
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild
b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index 97dee1123ab..6a04c297b98 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -26,6 +26,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-kpdef.patch
"${FILESDIR}"/${PN}-posix-sort.patch
"${FILESDIR}"/${PN}-Wformat.patch
+ "${FILESDIR}"/${PN}-Wformat-security.patch
)
DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild
b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 2236655f622..f6c43bc73d8 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-kpdef.patch
"${FILESDIR}"/${PN}-posix-sort.patch
"${FILESDIR}"/${PN}-Wformat.patch
+ "${FILESDIR}"/${PN}-Wformat-security.patch
)
DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index d794f10e8ed..bb324c8e8ea 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -37,6 +37,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-kpdef.patch
"${FILESDIR}"/${PN}-posix-sort.patch
"${FILESDIR}"/${PN}-Wformat.patch
+ "${FILESDIR}"/${PN}-Wformat-security.patch
)
DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
diff --git a/app-i18n/canna/files/canna-Wformat-security.patch
b/app-i18n/canna/files/canna-Wformat-security.patch
new file mode 100644
index 000..c83552b5cba
--- /dev/null
+++ b/app-i18n/canna/files/canna-Wformat-security.patch
@@ -0,0 +1,199 @@
+--- a/cmd/catdic/can.c
b/cmd/catdic/can.c
+@@ -1236,7 +1236,7 @@
+ break;
+ default:
+ if (init[0] == '/') {
+- (void)fprintf(stderr,msg_abnl);
++ (void)fprintf(stderr,"%s",msg_abnl);
+ } else {
+ (void)fprintf(stderr,msg_abnls,init);
+ }
+@@ -1297,11 +1297,11 @@
+
+ if ( opt_fq ) {
+ if ( opt_s ) {
+-(void) fprintf(stderr,msg_sfq);
++(void) fprintf(stderr,"%s",msg_sfq);
+ exit(ERR_VALUE) ;
+ }
+ if ( opt_l || opt_std ) {
+-(void) fprintf(stderr,msg_l);
++(void) fprintf(stderr,"%s",msg_l);
+ exit(ERR_VALUE) ;
+ }
+ mode = mode | PL_DIC ;
+@@ -1491,7 +1491,7 @@
+ break;
+ default:
+ if(init[0] == '/') {
+- fprintf(stderr,msg_abnl );
++ fprintf(stderr,"%s",msg_abnl );
+ }
+ else {
+ fprintf(stderr,msg_abnls,init);
+--- a/cmd/catdic/rutil.c
b/cmd/catdic/rutil.c
+@@ -271,7 +271,7 @@
+"Dictionary \"%s\" does not exist.\n"), dicname);
+ break;
+ case NOTALC :
+-(void)fprintf(stderr, msg_mem);
++(void)fprintf(stderr, "%s", msg_mem);
+ break;
+ case BADF :
+ (void)fprintf(stderr, gettxt("cannacmd:196",
+@@ -297,7 +297,7 @@
+ (void)fprintf(stderr,msg_abnls,init);
+ }
+ else {
+- (void)fprintf(stderr,msg_abnl);
++ (void)fprintf(stderr,"%s",msg_abnl);
+ }
+ break;
+ }
+@@ -321,7 +321,7 @@
+ (void)fprintf(stderr, msg_abnls, init);
+ }
+ else {
+- (void)fprintf(stderr, msg_abnl);
++ (void)fprintf(stderr, "%s", msg_abnl);
+ }
+ ret = -1;
+ return ret;
+@@ -332,13 +332,13 @@
+ (void)fprintf(stderr, msg_mnts, init);
+ }
+ else {
+-(void)fprintf(stderr, msg_mnt);
++(void)fprintf(stderr, "%s", msg_mnt);
+ }
+ ret = -1;
+ return ret;
+ }
+ if ((mode & PL_DIC) == PL_DIC ) {
+- (void)fprintf(stderr,msg_fq);
++ (void)fprintf(stderr,"%s",msg_fq);
+ ret = -1 ;
+ return ret ;
+ }
+@@ -359,7 +359,7 @@
+ ret = 0;
+ break;
+ case NOTALC :
+-(void)fprintf(stderr, msg_mem);
++(void)fprintf(stderr, "%s", msg_mem);
+ ret = -1;
+ break;
+ case BADF :
+@@ -421,7 +421,7 @@
+ ret = -1;
+ break;
+ case BADCONT :
+-(void)fprintf(stderr,msg_cnt);
++(void)fprintf(stderr,"%s",msg_cnt);
+ ret = -1;
+ break;
+ default:
+@@ -429,7 +429,7 @@
+ (void)fprintf(stderr, msg_abnls, init);
+ }
+ else {
+-
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/, app-i18n/canna/files/
commit: b091d8d409c0b0b96f344c5c07e3c37c2288e1cf
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Jul 8 08:46:49 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Jul 8 08:46:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b091d8d4
app-i18n/canna: add canuum USE flag
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r3.ebuild | 151
app-i18n/canna/files/canna-canuum.patch | 21 +
app-i18n/canna/metadata.xml | 3 +
3 files changed, 175 insertions(+)
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r3.ebuild
new file mode 100644
index 000..c4ac85c584a
--- /dev/null
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cannadic toolchain-funcs
+
+MY_P="Canna${PV//[._]/}"
+
+DESCRIPTION="A client-server based Kana-Kanji conversion system"
+HOMEPAGE="http://canna.osdn.jp/;
+SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="canuum doc ipv6"
+
+DEPEND="x11-misc/gccmakedep
+ x11-misc/imake
+ canuum? (
+ dev-libs/libspt
+ sys-libs/ncurses
+ virtual/pkgconfig
+ )
+ doc? (
+ app-text/ghostscript-gpl
+ dev-texlive/texlive-langjapanese
+ dev-texlive/texlive-latexrecommended
+ )"
+RDEPEND=""
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-canuum.patch
+ "${FILESDIR}"/${PN}-kpdef.patch
+ "${FILESDIR}"/${PN}-posix-sort.patch
+)
+DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e "/DefLibCannaDir/s:/lib$:/$(get_libdir):" \
+ -e "/UseInet6/s:0:$(usex ipv6 1 0):" \
+ Canna.conf
+
+ if use canuum; then
+ cd canuum
+ mv configure.{in,ac}
+ eautoreconf
+ cd - > /dev/null
+ fi
+}
+
+src_configure() {
+ xmkmf -a || die
+
+ if use canuum; then
+ cd canuum
+ xmkmf -a || die
+ # workaround for sys-libs/ncurses[tinfo]
+ sed -i "/^TERMCAP_LIB/s:=.*:=$(pkg-config --libs ncurses):"
Makefile
+ cd - > /dev/null
+ fi
+
+ if use doc; then
+ cd doc/man/guide/tex
+ xmkmf -a || die
+ cd - > /dev/null
+ fi
+}
+
+src_compile() {
+ # bug #279706
+ emake -j1 \
+ CC="$(tc-getCC)" \
+ CDEBUGFLAGS="${CFLAGS}" \
+ LOCAL_LDFLAGS="${LDFLAGS}" \
+ SHLIBGLOBALSFLAGS="${LDFLAGS}" \
+ ${PN}
+
+ if use canuum; then
+ einfo "Compiling canuum"
+ emake -C canuum -j1 \
+ CC="$(tc-getCC)" \
+ CDEBUGFLAGS="${CFLAGS}" \
+ LOCAL_LDFLAGS="${LDFLAGS}" \
+ canuum
+ fi
+
+ if use doc; then
+ # NOTE: build fails if infinality enabled in fontconfig
+ einfo "Compiling DVI, PS, and PDF documents"
+ # bug #223077
+ emake -C doc/man/guide/tex -j1 \
+ JLATEXCMD="platex -kanji=euc" \
+ DVI2PSCMD="dvips" \
+ VARTEXFONTS="${T}"/fonts \
+ ${PN}.ps \
+ ${PN}.pdf
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install install.man
+ einstalldocs
+
+ if use canuum; then
+ emake -C canuum DESTDIR="${D}" install install.man
+ docinto canuum
+ dodoc README.jp
+ fi
+
+ if use doc; then
+ insinto /usr/share/doc/${PF}
+ doins doc/man/guide/tex/${PN}.{dvi,ps,pdf}
+ fi
+
+ # for backward compatibility
+ dosbin "${FILESDIR}"/update-canna-dics_dir
+
+ keepdir /var/lib/${PN}/dic/{user,group}
+ fowners bin:bin /var/lib/${PN}/dic/{user,group}
+ fperms 0775 /var/lib/${PN}/dic/{user,group}
+
+ insinto /var/lib/${PN}/dic/dics.d
+ newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir
+
+ keepdir /var/log/${PN}
+
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+ insinto /etc
+ newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
+}
+
+pkg_postinst() {
+ update-cannadic-dir
+
+ if ! locale -a | grep -iq "ja_JP.eucjp"; then
+ elog "Some dictionary tools in this package require
ja_JP.EUC-JP locale."
+ elog
+ elog "# echo 'ja_JP.EUC-JP EUC-JP' >>
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 5a0b53c2c241ad013c1ffb1f3f6456f0debb4845
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Jul 8 08:10:39 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Jul 8 08:10:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a0b53c2
app-i18n/canna: add ipv6 USE flag
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r2.ebuild | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild
b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 9045702ca03..4bc24066bb8 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
+IUSE="doc ipv6"
DEPEND="x11-misc/gccmakedep
x11-misc/imake
@@ -38,8 +38,10 @@ src_prepare() {
find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g'
|| die
- # Multilib-strict fix for amd64
- sed -i "/DefLibCannaDir/s:/lib$:/$(get_libdir):" Canna.conf
+ sed -i \
+ -e "/DefLibCannaDir/s:/lib$:/$(get_libdir):" \
+ -e "/UseInet6/s:0:$(usex ipv6 1 0):" \
+ Canna.conf
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 09e280459d51afebdaa8874b128c6bd349137ee6 Author: Akinori Hattori gentoo org> AuthorDate: Sat Jul 8 08:05:58 2017 + Commit: Akinori Hattori gentoo org> CommitDate: Sat Jul 8 08:05:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e28045 app-i18n/canna: fix DEPEND Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-i18n/canna/canna-3.7_p3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild index 19fd9c3667d..9045702ca03 100644 --- a/app-i18n/canna/canna-3.7_p3-r2.ebuild +++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild @@ -20,7 +20,7 @@ DEPEND="x11-misc/gccmakedep x11-misc/imake doc? ( app-text/ghostscript-gpl - >=dev-texlive/texlive-langcjk-2010 + dev-texlive/texlive-langjapanese dev-texlive/texlive-latexrecommended )" RDEPEND=""
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 9ea8f97ee8e8f3f42e95e1e526c312096b52cdf6
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Jul 8 07:56:05 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Jul 8 07:56:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ea8f97e
app-i18n/canna: update to EAPI 6
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r1.ebuild | 99 +++-
app-i18n/canna/canna-3.7_p3-r2.ebuild | 121 +-
app-i18n/canna/metadata.xml | 14 ++--
3 files changed, 107 insertions(+), 127 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild
b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index 2dac49233f0..d6727b9c284 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -1,10 +1,11 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-inherit cannadic eutils multilib
+EAPI="6"
-MY_P="Canna${PV//./}"
-MY_P="${MY_P/_/}"
+inherit cannadic toolchain-funcs
+
+MY_P="Canna${PV//[._]/}"
DESCRIPTION="A client-server based Kana-Kanji conversion system"
HOMEPAGE="http://canna.osdn.jp/;
@@ -15,90 +16,70 @@ SLOT="0"
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
IUSE=""
-DEPEND=">=sys-apps/sed-4
- x11-misc/gccmakedep
+DEPEND="x11-misc/gccmakedep
x11-misc/imake"
RDEPEND=""
S="${WORKDIR}/${MY_P}"
-src_unpack() {
- unpack ${A}
- cd "${S}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-kpdef.patch
+ "${FILESDIR}"/${PN}-posix-sort.patch
+)
+DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
- epatch "${FILESDIR}"/${PN}-gentoo.patch \
- "${FILESDIR}"/${PN}-kpdef.patch \
- "${FILESDIR}"/${PN}-posix-sort.patch
+src_prepare() {
+ default
find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g'
|| die
# Multilib-strict fix for amd64
- sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf*
|| die
+ sed -i "/DefLibCannaDir/s:/lib$:/$(get_libdir):" Canna.conf
}
-src_compile() {
- xmkmf || die
+src_configure() {
+ xmkmf -a || die
+}
- #make libCannaDir=../lib/canna canna || die
+src_compile() {
# bug #279706
- emake -j1 CDEBUGFLAGS="${CFLAGS}" canna || die
-
- #if use doc ; then
- # einfo "Compiling DVI, PS (and PDF) document"
- # cd doc/man/guide/tex
- # xmkmf || die
- # emake -j1 JLATEXCMD=platex \
- # DVI2PSCMD="dvips -f" \
- # canna.dvi canna.ps || die
- # if has_version 'app-text/dvipdfmx' && \
- # ( has_version 'app-text/acroread' \
- # || has_version 'app-text/xpdf-japanese' ); then
- # emake -j1 JLATEXCMD=platex \
- # DVI2PSCMD="dvips -f" \
- # canna.pdf || die
- # fi
- #fi
+ emake -j1 \
+ CC="$(tc-getCC)" \
+ CDEBUGFLAGS="${CFLAGS}" \
+ LOCAL_LDFLAGS="${LDFLAGS}" \
+ SHLIBGLOBALSFLAGS="${LDFLAGS}" \
+ ${PN}
}
src_install() {
- emake DESTDIR="${D}" install || die
- emake DESTDIR="${D}" install.man || die
-
- # install default.canna (removed from Canna36p4)
- insinto /usr/share/canna
- newins misc/initfiles/verbose.canna default.canna
+ emake DESTDIR="${D}" install install.man
+ einstalldocs
- # cannakill should link to /usr/bin/catdic
- dosym ../bin/catdic /usr/sbin/cannakill
-
- dodir /usr/share/man/man8 /usr/share/man/ja/man8
+ dodir /usr/share/man{,/ja}/man8
+ local man mandir
for man in cannaserver cannakill ; do
for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do
mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8
done
done
- dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS*
+ # for backward compatibility
+ dosbin "${FILESDIR}"/update-canna-dics_dir
- #if use doc ; then
- # insinto /usr/share/doc/${PF}
- # doins doc/man/guide/tex/canna.{dvi,ps,pdf}
- #fi
+ keepdir /var/lib/${PN}/dic/{user,group}
+ fowners bin:bin /var/lib/${PN}/dic/{user,group}
+ fperms 0775 /var/lib/${PN}/dic/{user,group}
- newinitd "${FILESDIR}"/${PN}.initd canna || die
- newconfd "${FILESDIR}"/${PN}.confd canna || die
- insinto /etc/ ; newins "${FILESDIR}"/canna.hosts hosts.canna || die
- keepdir /var/log/canna/ || die
+ insinto /var/lib/${PN}/dic/dics.d
+ newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir
- # for backward compatibility
- dosbin
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: ce74ba0b07a01be5e3814965d5f5bc57bb528b2c Author: Akinori Hattori gentoo org> AuthorDate: Sat Jul 8 07:57:34 2017 + Commit: Akinori Hattori gentoo org> CommitDate: Sat Jul 8 07:57:34 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce74ba0b app-i18n/canna: drop unused DEPEND Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-i18n/canna/canna-3.7_p3-r2.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild index 2a51c4b0815..19fd9c3667d 100644 --- a/app-i18n/canna/canna-3.7_p3-r2.ebuild +++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild @@ -21,8 +21,6 @@ DEPEND="x11-misc/gccmakedep doc? ( app-text/ghostscript-gpl >=dev-texlive/texlive-langcjk-2010 - dev-texlive/texlive-fontsextra - || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended ) dev-texlive/texlive-latexrecommended )" RDEPEND=""
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/files/, app-i18n/canna/
commit: 6f479e1a55e376ef959b82b028339444348e79a3
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Jul 8 07:50:09 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Jul 8 07:50:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f479e1a
app-i18n/canna: update init script
Gentoo-Bug: 603702
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r1.ebuild | 4 +--
app-i18n/canna/canna-3.7_p3-r2.ebuild | 4 +--
app-i18n/canna/files/canna-3.7_p3.initd| 41 --
.../files/{canna-3.7_p3.confd => canna.confd} | 0
app-i18n/canna/files/canna.initd | 31
5 files changed, 35 insertions(+), 45 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild
b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index 2ee6f1090d1..2dac49233f0 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -84,8 +84,8 @@ src_install() {
# doins doc/man/guide/tex/canna.{dvi,ps,pdf}
#fi
- newinitd "${FILESDIR}"/${P}.initd canna || die
- newconfd "${FILESDIR}"/${P}.confd canna || die
+ newinitd "${FILESDIR}"/${PN}.initd canna || die
+ newconfd "${FILESDIR}"/${PN}.confd canna || die
insinto /etc/ ; newins "${FILESDIR}"/canna.hosts hosts.canna || die
keepdir /var/log/canna/ || die
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild
b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index fb7bc151458..6511e2168c8 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -96,8 +96,8 @@ src_install() {
doins doc/man/guide/tex/canna.{dvi,ps,pdf}
fi
- newinitd "${FILESDIR}"/${P}.initd canna || die
- newconfd "${FILESDIR}"/${P}.confd canna || die
+ newinitd "${FILESDIR}"/${PN}.initd canna || die
+ newconfd "${FILESDIR}"/${PN}.confd canna || die
insinto /etc/ ; newins "${FILESDIR}"/canna.hosts hosts.canna || die
keepdir /var/log/canna/ || die
diff --git a/app-i18n/canna/files/canna-3.7_p3.initd
b/app-i18n/canna/files/canna-3.7_p3.initd
deleted file mode 100644
index 9e21b061368..000
--- a/app-i18n/canna/files/canna-3.7_p3.initd
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# CANNASERVER_OPTS and CANNASERVER_OWNER is defined in /etc/conf.d/canna
-CANNASERVER_LOGFILE="/var/log/canna/CANNA0msgs"
-
-depend() {
- after logger
-}
-
-start() {
- if [ -S /tmp/.iroha_unix/IROHA ] ; then
- /usr/sbin/cannakill >/dev/null 2>&1
- fi
- rm -f /tmp/.iroha_unix/IROHA
-
- if [ "${CANNASERVER_ENABLE_SYSLOG}" = "yes" ] ; then
- CANNASERVER_OPTS="${CANNASERVER_OPTS} -syslog"
- else
- touch "${CANNASERVER_LOGFILE}"
- chmod u+w "${CANNASERVER_LOGFILEj}"
- fi
-
- if [ ! -z "${CANNASERVER_OWNER}" ] ; then
- if [ -f "${CANNASERVER_LOGFILE}" ] ; then
- chown "${CANNASERVER_OWNER}" "${CANNASERVER_LOGFILE}"
- fi
- CANNASERVER_OPTS="${CANNASERVER_OPTS} -u ${CANNASERVER_OWNER}"
- fi
-
- ebegin "Starting canna"
- /usr/sbin/cannaserver ${CANNASERVER_OPTS}
- eend $? "Failed to start canna"
-}
-
-stop() {
- ebegin "Stopping canna"
- /usr/sbin/cannakill
- eend $? "Failed to stop canna"
-}
diff --git a/app-i18n/canna/files/canna-3.7_p3.confd
b/app-i18n/canna/files/canna.confd
similarity index 100%
rename from app-i18n/canna/files/canna-3.7_p3.confd
rename to app-i18n/canna/files/canna.confd
diff --git a/app-i18n/canna/files/canna.initd b/app-i18n/canna/files/canna.initd
new file mode 100644
index 000..97dac733fa9
--- /dev/null
+++ b/app-i18n/canna/files/canna.initd
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/${RC_SVCNAME}server"
+command_args="${CANNASERVER_OPTS}"
+
+# CANNASERVER_OPTS and CANNASERVER_OWNER is defined in /etc/conf.d/canna
+CANNASERVER_LOGFILE="/var/log/${RC_SVCNAME}/CANNA0msgs"
+
+depend() {
+ use logger
+ need net
+}
+
+start_pre() {
+ if [ "${CANNASERVER_ENABLE_SYSLOG}" = "yes" ]; then
+ command_args="${command_args} -syslog"
+ elif [ -z "${CANNASERVER_OWNER}" ]; then
+ checkpath "${CANNASERVER_LOGFILE}"
+ else
+ checkpath -o "${CANNASERVER_OWNER}" "${CANNASERVER_LOGFILE}"
+ command_args="${command_args} -u ${CANNASERVER_OWNER}"
+ fi
+}
+
+stop() {
+ ebegin "Stopping ${name:-${RC_SVCNAME}}"
+ /usr/sbin/${RC_SVCNAME}kill
+ eend ${?}
+}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/, app-i18n/canna/files/
commit: e9bf929c7254140da82714c052130348180a9464
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Jul 8 07:21:03 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Jul 8 07:21:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9bf929c
app-i18n/canna: update patches
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r1.ebuild | 17 +--
app-i18n/canna/canna-3.7_p3-r2.ebuild | 17 +--
app-i18n/canna/files/canna-3.7-gentoo.diff.in | 144
app-i18n/canna/files/canna-3.7_p3-strip.patch | 142
app-i18n/canna/files/canna-gentoo.patch| 146 +
.../{canna-kpdef-gentoo.diff => canna-kpdef.patch} | 4 +-
app-i18n/canna/files/canna-posix-sort.patch| 11 ++
7 files changed, 167 insertions(+), 314 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild
b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index d9b11fd2453..2ee6f1090d1 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -25,23 +25,14 @@ src_unpack() {
unpack ${A}
cd "${S}"
- find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g'
|| die
- sed -e "s%@cannapkgver@%${PF}%" \
- "${FILESDIR}"/${PN}-3.7-gentoo.diff.in >
"${T}"/${PF}-gentoo.diff || die
- epatch "${T}"/${PF}-gentoo.diff
+ epatch "${FILESDIR}"/${PN}-gentoo.patch \
+ "${FILESDIR}"/${PN}-kpdef.patch \
+ "${FILESDIR}"/${PN}-posix-sort.patch
- # bug #248723
- epatch "${FILESDIR}"/${P}-strip.patch
+ find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g'
|| die
# Multilib-strict fix for amd64
sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf*
|| die
- # fix deprecated sort syntax
- sed -e 's:^\(sortcmd=\".* -s\).*$:\1 -k 1,1\":' \
- -i cmd/mkbindic/mkbindic.cpp || die
-
- cd "${S}"/dic/phono
- epatch "${FILESDIR}"/${PN}-kpdef-gentoo.diff
-
}
src_compile() {
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild
b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index a8c2701d3d5..fb7bc151458 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -32,23 +32,14 @@ src_unpack() {
unpack ${A}
cd "${S}"
- find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g'
|| die
- sed -e "s%@cannapkgver@%${PF}%" \
- "${FILESDIR}"/${PN}-3.7-gentoo.diff.in >
"${T}"/${PF}-gentoo.diff || die
- epatch "${T}"/${PF}-gentoo.diff
+ epatch "${FILESDIR}"/${PN}-gentoo.patch \
+ "${FILESDIR}"/${PN}-kpdef.patch \
+ "${FILESDIR}"/${PN}-posix-sort.patch
- # bug #248723
- epatch "${FILESDIR}"/${P}-strip.patch
+ find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g'
|| die
# Multilib-strict fix for amd64
sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf*
|| die
- # fix deprecated sort syntax
- sed -e 's:^\(sortcmd=\".* -s\).*$:\1 -k 1,1\":' \
- -i cmd/mkbindic/mkbindic.cpp || die
-
- cd "${S}"/dic/phono
- epatch "${FILESDIR}"/${PN}-kpdef-gentoo.diff
-
}
src_compile() {
diff --git a/app-i18n/canna/files/canna-3.7-gentoo.diff.in
b/app-i18n/canna/files/canna-3.7-gentoo.diff.in
deleted file mode 100644
index 940c97f6dca..000
--- a/app-i18n/canna/files/canna-3.7-gentoo.diff.in
+++ /dev/null
@@ -1,144 +0,0 @@
-diff -urN Canna37b1.ORIG/Canna.conf Canna37b1/Canna.conf
Canna37b1.ORIG/Canna.conf 2003-09-27 15:23:08.0 +0900
-+++ Canna37b1/Canna.conf 2003-09-27 19:09:13.0 +0900
-@@ -114,7 +114,7 @@
- # define DefErrDir /usr/spool/canna
- # define DefLibCannaDir /usr/lib
- # else
--# define DefErrDir /var/log
-+# define DefErrDir /var/log/canna
- # define DefLibCannaDir $(cannaExecPrefix)/lib
- # endif
- #endif
-@@ -140,16 +140,18 @@
- # define ModernElfLinkAvailable NO
- #endif
-
--cannaPrefix = DefCannaPrefix
-+cannaPrefix = /usr
- cannaExecPrefix = $(cannaPrefix)
- cannaBinDir = $(cannaExecPrefix)/bin
- cannaSrvDir = DefCannaSrvDir
- XCOMM cannaLibDir = /var/lib/canna
- XCOMM cannaLibDir = /var/db/canna
- cannaLibDir = DefCannaLibDir
--XCOMM cannaManDir = $(cannaPrefix)/share/man
--cannaManDir = $(cannaPrefix)/man
-+cannaManDir = $(cannaPrefix)/share/man
-+XCOMM cannaManDir = $(cannaPrefix)/man
- cannaIncDir = $(cannaPrefix)/include/canna
-+cannaDocDir = $(cannaPrefix)/share/doc/@cannapkgver@
-+cannaShareDir = $(cannaPrefix)/share/canna
-
- libCannaDir = DefLibCannaDir
- ErrDir = DefErrDir
-@@ -158,7 +160,7 @@
- #define SupportOldWchar 1
-
- /* IPv6���Ѥ�1�Ƥ��� */
--#define UseInet6 0 /* requires newer IPv6 implementation */
-+/* #define UseInet6 0 /* requires newer IPv6
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 8fb28e6f65c094a6300e41efe46ae84e0cf7458f
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Jul 8 07:08:31 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Jul 8 07:08:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb28e6f
app-i18n/canna: keyword ia64
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild
b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 4b23269bdc0..a8c2701d3d5 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc"
DEPEND=">=sys-apps/sed-4
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 9c89a22ad52ed7f2af39de029a39e27650970a57
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Jul 8 07:04:08 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Jul 8 07:04:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c89a22a
app-i18n/canna: update HOMEPAGE
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r1.ebuild | 2 +-
app-i18n/canna/canna-3.7_p3-r2.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild
b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index 2d56ee7ccd6..d9b11fd2453 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -7,7 +7,7 @@ MY_P="Canna${PV//./}"
MY_P="${MY_P/_/}"
DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://canna.sourceforge.jp/;
+HOMEPAGE="http://canna.osdn.jp/;
SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild
b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 0a609c5c94e..4b23269bdc0 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -7,7 +7,7 @@ MY_P="Canna${PV//./}"
MY_P="${MY_P/_/}"
DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://canna.sourceforge.jp/;
+HOMEPAGE="http://canna.osdn.jp/;
SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 6a4f353f033ae652c443132d2296035d9cc2702f
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Jul 8 06:58:33 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Jul 8 06:58:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a4f353f
app-i18n/canna: update pkg_postinst
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r1.ebuild | 12
app-i18n/canna/canna-3.7_p3-r2.ebuild | 13 +++--
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild
b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index 51effafc6b7..2d56ee7ccd6 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -112,8 +112,12 @@ src_install() {
pkg_postinst() {
update-cannadic-dir
- elog
- elog "Canna dictionary format has been changed."
- elog "You should rebuild app-dict/canna-* after emerge."
- elog
+
+ if ! locale -a | grep -iq "ja_JP.eucjp"; then
+ elog "Some dictionary tools in this package require
ja_JP.EUC-JP locale."
+ elog
+ elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
+ elog "# locale-gen"
+ elog
+ fi
}
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild
b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 0f222e9dac2..0a609c5c94e 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -124,16 +124,9 @@ src_install() {
pkg_postinst() {
update-cannadic-dir
- elog
- elog "Canna dictionary format has been changed."
- elog "You should rebuild app-dict/canna-* after emerge."
- elog
-
- local localearchive="${ROOT}usr/$(get_libdir)/locale/locale-archive"
- if [ -f "${localearchive}" -a -x /usr/bin/localedef ] && \
- ! /usr/bin/localedef --list-archive "${localearchive}" | grep
-i 'ja_JP.eucjp' >/dev/null 2>&1 ; then
- elog "Some dictionary tools in this package require ja_JP.eucJP
locale."
- elog "Please add ja_JP.eucJP locale to /etc/locale.gen:"
+
+ if ! locale -a | grep -iq "ja_JP.eucjp"; then
+ elog "Some dictionary tools in this package require
ja_JP.EUC-JP locale."
elog
elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
elog "# locale-gen"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 98fc3da5328a90e90d93fe6fddd3aec964f579c0
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Jul 8 06:49:59 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Jul 8 06:49:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98fc3da5
app-i18n/canna: remove pkg_prerm and pkg_postrm
Gentoo-Bug: 328693
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r1.ebuild | 26 +-
app-i18n/canna/canna-3.7_p3-r2.ebuild | 24
2 files changed, 1 insertion(+), 49 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild
b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index 1153ee9dc23..51effafc6b7 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-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 cannadic eutils multilib
@@ -19,7 +19,6 @@ DEPEND=">=sys-apps/sed-4
x11-misc/gccmakedep
x11-misc/imake"
RDEPEND=""
-
S="${WORKDIR}/${MY_P}"
src_unpack() {
@@ -118,26 +117,3 @@ pkg_postinst() {
elog "You should rebuild app-dict/canna-* after emerge."
elog
}
-
-pkg_prerm() {
- if [ -S /tmp/.iroha_unix/IROHA ] ; then
- # make sure cannaserver get stopped because otherwise
- # we cannot stop it with /etc/init.d after emerge -C canna
- einfo
- einfo "Stopping Canna for safe unmerge"
- einfo
- /etc/init.d/canna stop
- touch "${T}"/canna.cookie
- fi
-}
-
-pkg_postrm() {
- if [ -f /usr/sbin/cannaserver -a -e "${T}"/canna.cookie ] ; then
- #update-cannadic-dir
- einfo
- einfo "Restarting Canna"
- einfo
- /etc/init.d/canna start
- rm -f "${T}"/canna.cookie
- fi
-}
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild
b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 1f4b241bce4..0f222e9dac2 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -26,7 +26,6 @@ DEPEND=">=sys-apps/sed-4
dev-texlive/texlive-latexrecommended
)"
RDEPEND=""
-
S="${WORKDIR}/${MY_P}"
src_unpack() {
@@ -141,26 +140,3 @@ pkg_postinst() {
elog
fi
}
-
-pkg_prerm() {
- if [ -S /tmp/.iroha_unix/IROHA ] ; then
- # make sure cannaserver get stopped because otherwise
- # we cannot stop it with /etc/init.d after emerge -C canna
- einfo
- einfo "Stopping Canna for safe unmerge"
- einfo
- /etc/init.d/canna stop
- touch "${T}"/canna.cookie
- fi
-}
-
-pkg_postrm() {
- if [ -f /usr/sbin/cannaserver -a -e "${T}"/canna.cookie ] ; then
- #update-cannadic-dir
- einfo
- einfo "Restarting Canna"
- einfo
- /etc/init.d/canna start
- rm -f "${T}"/canna.cookie
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 4693c919c0d97325519190e3609576fa4631e146
Author: Alexis Ballier gentoo org>
AuthorDate: Thu Jun 22 11:30:29 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Thu Jun 22 11:47:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4693c919
app-i18n/canna: keyword ~arm64
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-i18n/canna/canna-3.7_p3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild
b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index a449de4f5f9..1f4b241bce4 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc"
DEPEND=">=sys-apps/sed-4
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: 7a10a6c230beb4f38e27ef6452efd0ffef0d64cc Author: Alexis Ballier gentoo org> AuthorDate: Sun Jun 11 11:24:00 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Sun Jun 11 11:24:00 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a10a6c2 app-i18n/canna: adapt deps for texlive 2017 Package-Manager: Portage-2.3.6, Repoman-2.3.2 app-i18n/canna/canna-3.7_p3-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild index de02627c1fc..a449de4f5f9 100644 --- a/app-i18n/canna/canna-3.7_p3-r2.ebuild +++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 inherit cannadic eutils multilib @@ -22,7 +22,7 @@ DEPEND=">=sys-apps/sed-4 app-text/ghostscript-gpl >=dev-texlive/texlive-langcjk-2010 dev-texlive/texlive-fontsextra - dev-texlive/texlive-genericrecommended + || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended ) dev-texlive/texlive-latexrecommended )" RDEPEND=""
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/files/
commit: d1e8bd79d7a1a0eaef02f48ff5e72f22238de0c2
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Thu Jul 7 17:03:21 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Aug 11 08:07:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1e8bd79
app-i18n/canna: remove unused init/confd files
Signed-off-by: Patrice Clement gentoo.org>
app-i18n/canna/files/canna.confd | 8
app-i18n/canna/files/canna.initd | 37 -
2 files changed, 45 deletions(-)
diff --git a/app-i18n/canna/files/canna.confd b/app-i18n/canna/files/canna.confd
deleted file mode 100644
index 1cb4213..000
--- a/app-i18n/canna/files/canna.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Config file for /etc/init.d/canna
-
-# Specify user to run as
-CANNASERVER_OPTS=""
diff --git a/app-i18n/canna/files/canna.initd b/app-i18n/canna/files/canna.initd
deleted file mode 100644
index f5ed1d4..000
--- a/app-i18n/canna/files/canna.initd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# CANNASERVER_OPTS is defined in /etc/conf.d/canna
-
-depend() {
- after logger
-}
-
-start() {
- if [ -S /tmp/.iroha_unix/IROHA ] ; then
- /usr/sbin/cannakill >/dev/null 2>&1
- fi
- rm -f /tmp/.iroha_unix/IROHA
-
- if [ "${CANNASERVER_OPTS}" = "${CANNASERVER_OPTS/-syslog/}" ] ; then
- if [ ! -f /var/log/canna/CANNA0msgs ] ; then
- touch /var/log/canna/CANNA0msgs
- fi
- if [ "${CANNASERVER_OPTS}" != "${CANNASERVER_OPTS/-u/}" ] ; then
- chown `echo ${CANNASERVER_OPTS} | sed -e 's/.*-u
*\(\w*\).*/\1/'` /var/log/canna/CANNA0msgs
- fi
- chmod u+w /var/log/canna/CANNA0msgs
- fi
-
- ebegin "Starting canna"
- /usr/sbin/cannaserver ${CANNASERVER_OPTS}
- eend $? "Failed to start canna"
-}
-
-stop() {
- ebegin "Stopping canna"
- /usr/sbin/cannakill
- eend $? "Failed to stop canna"
-}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: c56d8e167b2809dfeb4d65796a8c854646950291
Author: Yixun Lan gentoo org>
AuthorDate: Tue Jun 14 02:20:23 2016 +
Commit: Yixun Lan gentoo org>
CommitDate: Tue Jun 14 02:20:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c56d8e16
app-i18n/canna: keyword ~arm
requested by app-i18n/uim
Gentoo-Bug: 585670
Package-Manager: portage-2.3.0_rc1
app-i18n/canna/canna-3.7_p3-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild
b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 9979712..97e8a62 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
LICENSE="MIT GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc"
DEPEND=">=sys-apps/sed-4
[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
commit: a1053d197a9ff55a8d9d2329342c50bfe3447a05
Author: Manuel Rüger gentoo org>
AuthorDate: Sun Sep 27 11:50:44 2015 +
Commit: Manuel Rüger gentoo org>
CommitDate: Sun Sep 27 11:50:44 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1053d19
app-i18n/canna: Quote variables
Package-Manager: portage-2.2.22
app-i18n/canna/canna-3.7_p3-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild
b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 533560a..9979712 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -68,7 +68,7 @@ src_compile() {
emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
LOCAL_LDFLAGS="${LDFLAGS}"
SHLIBGLOBALSFLAGS="${LDFLAGS}" \
JLATEXCMD=platex \
- DVI2PSCMD="dvips -f" VARTEXFONTS=${T}/fonts \
+ DVI2PSCMD="dvips -f" VARTEXFONTS="${T}"/fonts \
canna.dvi canna.ps || die
if has_version 'app-text/dvipdfmx' && \
( has_version 'app-text/acroread' \
@@ -76,7 +76,7 @@ src_compile() {
emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
LOCAL_LDFLAGS="${LDFLAGS}"
SHLIBGLOBALSFLAGS="${LDFLAGS}" \
JLATEXCMD=platex \
- DVI2PSCMD="dvips -f" VARTEXFONTS=${T}/fonts \
+ DVI2PSCMD="dvips -f" VARTEXFONTS="${T}"/fonts \
canna.pdf || die
fi
fi
